Skip to content

remove: anko #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhruv1294 wants to merge 2 commits into
base: dalal-street-21
Choose a base branch
from
Open

remove: anko #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c22ef9
remove: anko
dhruv1294 Jan 24, 2021
9d7e77c
refactor:remove wildcard imports
dhruv1294 Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ dependencies {

// Kotlin libraries
implementation (Libs.kotlinStd)
implementation (Libs.anko)
implementation (Libs.kotlinCoroutine)

// Navigation
Expand Down
16 changes: 9 additions & 7 deletions app/src/main/java/org/pragyan/dalal18/fragment/HomeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import dalalstreet.api.DalalActionServiceGrpc
import dalalstreet.api.actions.GetMarketEventsRequest
import dalalstreet.api.actions.GetMarketEventsResponse
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.toast
import org.jetbrains.anko.uiThread
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import kotlinx.coroutines.withContext
import org.pragyan.dalal18.R
import org.pragyan.dalal18.adapter.CompanyTickerRecyclerAdapter
import org.pragyan.dalal18.adapter.NewsRecyclerAdapter
Expand All @@ -37,6 +38,7 @@ import org.pragyan.dalal18.data.NewsDetails
import org.pragyan.dalal18.databinding.FragmentHomeBinding
import org.pragyan.dalal18.utils.ConnectionUtils
import org.pragyan.dalal18.utils.Constants
import org.pragyan.dalal18.utils.toast
import org.pragyan.dalal18.utils.viewLifecycle
import java.text.DecimalFormat
import javax.inject.Inject
Expand Down Expand Up @@ -133,13 +135,13 @@ class HomeFragment : Fragment(), NewsRecyclerAdapter.NewsItemClickListener, Swip
binding.loadingNewsHomeFragmentProgressBar.visibility = View.VISIBLE
binding.loadingNewsTextView.text = getString(R.string.getting_latest_news)

doAsync {
GlobalScope.async (Dispatchers.Default){
if (ConnectionUtils.getConnectionInfo(context)) {
if (ConnectionUtils.isReachableByTcp(Constants.HOST, Constants.PORT)) {

val marketEventsResponse = actionServiceBlockingStub.getMarketEvents(GetMarketEventsRequest.newBuilder().setCount(0).setLastEventId(0).build())

uiThread {
withContext(Dispatchers.Main) {
binding.newsSwipeRefreshLayout.isRefreshing = false
if (marketEventsResponse.statusCode == GetMarketEventsResponse.StatusCode.OK) {

Expand All @@ -161,10 +163,10 @@ class HomeFragment : Fragment(), NewsRecyclerAdapter.NewsItemClickListener, Swip
}
}
} else {
uiThread { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_server_down), R.id.home_dest) }
withContext(Dispatchers.Main) { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_server_down), R.id.home_dest) }
}
} else {
uiThread { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_check_internet), R.id.home_dest) }
withContext(Dispatchers.Main) { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_check_internet), R.id.home_dest) }
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/pragyan/dalal18/fragment/NewsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import dalalstreet.api.actions.GetMarketEventsResponse
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.jetbrains.anko.toast
import org.pragyan.dalal18.R
import org.pragyan.dalal18.adapter.NewsRecyclerAdapter
import org.pragyan.dalal18.dagger.ContextModule
Expand All @@ -33,6 +32,7 @@ import org.pragyan.dalal18.data.NewsDetails
import org.pragyan.dalal18.databinding.FragmentNewsBinding
import org.pragyan.dalal18.utils.ConnectionUtils
import org.pragyan.dalal18.utils.Constants
import org.pragyan.dalal18.utils.toast
import org.pragyan.dalal18.utils.viewLifecycle
import javax.inject.Inject

Expand Down
24 changes: 12 additions & 12 deletions app/src/main/java/org/pragyan/dalal18/fragment/OrdersFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ import kotlinx.android.synthetic.main.order_list_item.view.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.longToast
import org.jetbrains.anko.toast
import org.jetbrains.anko.uiThread
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import org.pragyan.dalal18.R
import org.pragyan.dalal18.adapter.OrdersRecyclerAdapter
import org.pragyan.dalal18.dagger.ContextModule
Expand All @@ -50,9 +48,11 @@ import org.pragyan.dalal18.data.Order
import org.pragyan.dalal18.databinding.FragmentMyOrdersBinding
import org.pragyan.dalal18.utils.ConnectionUtils
import org.pragyan.dalal18.utils.Constants
import org.pragyan.dalal18.utils.Constants.CANCEL_ORDER_TOUR_KEY
import org.pragyan.dalal18.utils.OrderItemTouchHelper
import org.pragyan.dalal18.utils.viewLifecycle
import org.pragyan.dalal18.utils.longToast
import org.pragyan.dalal18.utils.toast
import org.pragyan.dalal18.utils.OrderItemTouchHelper
import org.pragyan.dalal18.utils.Constants.CANCEL_ORDER_TOUR_KEY
import javax.inject.Inject

class OrdersFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener, OrderItemTouchHelper.BusItemTouchHelperListener {
Expand Down Expand Up @@ -184,12 +184,12 @@ class OrdersFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener, OrderIt

private fun getOpenOrdersAsynchronously() {
loadingOrdersDialog.show()
doAsync {
GlobalScope.async (Dispatchers.Default){
if (ConnectionUtils.getConnectionInfo(context)) {
if (ConnectionUtils.isReachableByTcp(Constants.HOST, Constants.PORT)) {
val openOrdersResponse = actionServiceBlockingStub.getMyOpenOrders(GetMyOpenOrdersRequest.newBuilder().build())

uiThread {
withContext(Dispatchers.Main) {

if (openOrdersResponse?.statusCode == GetMyOpenOrdersResponse.StatusCode.OK) {
binding.ordersRecyclerSwipeRefreshLayout.isRefreshing = false
Expand Down Expand Up @@ -243,12 +243,12 @@ class OrdersFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener, OrderIt
}
}
} else {
uiThread { networkDownHandler?.onNetworkDownError(resources.getString(R.string.error_server_down), R.id.open_orders_dest) }
withContext(Dispatchers.Main) { networkDownHandler?.onNetworkDownError(resources.getString(R.string.error_server_down), R.id.open_orders_dest) }
}
} else {
uiThread { networkDownHandler?.onNetworkDownError(resources.getString(R.string.error_check_internet), R.id.open_orders_dest) }
withContext(Dispatchers.Main) { networkDownHandler?.onNetworkDownError(resources.getString(R.string.error_check_internet), R.id.open_orders_dest) }
}
uiThread { loadingOrdersDialog.dismiss() }
withContext(Dispatchers.Main) { loadingOrdersDialog.dismiss() }
}
}

Expand Down Expand Up @@ -352,7 +352,7 @@ class OrdersFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener, OrderIt

LocalBroadcastManager.getInstance(context!!).unregisterReceiver(ordersReceiver)

doAsync {
GlobalScope.async (Dispatchers.Default){
if (orderSubscriptionId != null) {
streamServiceBlockingStub.unsubscribe(UnsubscribeRequest.newBuilder().setSubscriptionId(orderSubscriptionId).build())
}
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/org/pragyan/dalal18/fragment/SecretFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,19 @@ import dalalstreet.api.actions.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
<<<<<<< HEAD
import org.jetbrains.anko.toast
=======
import org.pragyan.dalal18.R
>>>>>>> remove: anko
import org.pragyan.dalal18.dagger.ContextModule
import org.pragyan.dalal18.dagger.DaggerDalalStreetApplicationComponent
import org.pragyan.dalal18.data.DalalViewModel
import org.pragyan.dalal18.databinding.FragmentSecretBinding
import org.pragyan.dalal18.utils.ConnectionUtils
import org.pragyan.dalal18.utils.Constants
import org.pragyan.dalal18.utils.hideKeyboard
import org.pragyan.dalal18.utils.toast
import org.pragyan.dalal18.utils.viewLifecycle
import javax.inject.Inject

Expand Down
22 changes: 13 additions & 9 deletions app/src/main/java/org/pragyan/dalal18/fragment/StockExchangeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@ import dalalstreet.api.models.Stock
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.toast
import org.jetbrains.anko.uiThread
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import org.pragyan.dalal18.R
import org.pragyan.dalal18.dagger.ContextModule
import org.pragyan.dalal18.dagger.DaggerDalalStreetApplicationComponent
import org.pragyan.dalal18.data.DalalViewModel
import org.pragyan.dalal18.databinding.FragmentStockExchangeBinding
import org.pragyan.dalal18.ui.MainActivity.Companion.GAME_STATE_UPDATE_ACTION
import org.pragyan.dalal18.utils.*
import org.pragyan.dalal18.utils.ConnectionUtils
import org.pragyan.dalal18.utils.Constants
import org.pragyan.dalal18.utils.hideKeyboard
import org.pragyan.dalal18.utils.toast
import org.pragyan.dalal18.utils.viewLifecycle
import org.pragyan.dalal18.utils.setStatusIndicator
import java.text.DecimalFormat
import javax.inject.Inject

Expand Down Expand Up @@ -177,13 +181,13 @@ class StockExchangeFragment : Fragment() {
stocksInExchangeTextView.text = ""
}

doAsync {
GlobalScope.async (Dispatchers.Default){
if (ConnectionUtils.getConnectionInfo(context)) {
if (ConnectionUtils.isReachableByTcp(Constants.HOST, Constants.PORT)) {
val companyProfileResponse = actionServiceBlockingStub.getCompanyProfile(
GetCompanyProfileRequest.newBuilder().setStockId(stockId).build())

uiThread {
withContext(Dispatchers.Main) {

currentStock = companyProfileResponse.stockDetails

Expand Down Expand Up @@ -214,12 +218,12 @@ class StockExchangeFragment : Fragment() {
}
}
} else {
uiThread { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_server_down), R.id.exchange_dest) }
withContext(Dispatchers.Main) { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_server_down), R.id.exchange_dest) }
}
} else {
uiThread { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_check_internet), R.id.exchange_dest) }
withContext(Dispatchers.Main) { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_check_internet), R.id.exchange_dest) }
}
uiThread { loadingDialog?.dismiss() }
withContext(Dispatchers.Main) { loadingDialog?.dismiss() }
}
}

Expand Down
26 changes: 17 additions & 9 deletions app/src/main/java/org/pragyan/dalal18/fragment/TradeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,24 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.navigation.fragment.findNavController
import dalalstreet.api.DalalActionServiceGrpc
import dalalstreet.api.actions.PlaceOrderRequest
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.toast
import org.jetbrains.anko.uiThread
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import org.pragyan.dalal18.R
import org.pragyan.dalal18.dagger.ContextModule
import org.pragyan.dalal18.dagger.DaggerDalalStreetApplicationComponent
import org.pragyan.dalal18.data.DalalViewModel
import org.pragyan.dalal18.databinding.FragmentTradeBinding
import org.pragyan.dalal18.ui.MainActivity.Companion.GAME_STATE_UPDATE_ACTION
import org.pragyan.dalal18.utils.*
import org.pragyan.dalal18.utils.ConnectionUtils
import org.pragyan.dalal18.utils.Constants
import org.pragyan.dalal18.utils.DalalTourUtils
import org.pragyan.dalal18.utils.setStatusIndicator
import org.pragyan.dalal18.utils.OrderTypeUtils
import org.pragyan.dalal18.utils.hideKeyboard
import org.pragyan.dalal18.utils.toast
import org.pragyan.dalal18.utils.viewLifecycle
import org.pragyan.dalal18.utils.Constants.ORDER_FEE_RATE
import org.pragyan.dalal18.utils.Constants.PREF_TRADE
import java.text.DecimalFormat
Expand Down Expand Up @@ -286,12 +294,12 @@ class TradeFragment : Fragment() {
.setStockQuantity((noOfStocksEditText.text.toString()).toLong())
.build()

doAsync {
GlobalScope.async (Dispatchers.Default) {
if (ConnectionUtils.getConnectionInfo(context)) {
if (ConnectionUtils.isReachableByTcp(Constants.HOST, Constants.PORT)) {
val orderResponse = actionServiceBlockingStub.placeOrder(orderRequest)

uiThread {
withContext(Dispatchers.Main) {
if (orderResponse.statusCodeValue == 0) {
context?.toast("Order Placed")
noOfStocksEditText.setText("")
Expand All @@ -302,12 +310,12 @@ class TradeFragment : Fragment() {
}
}
} else {
uiThread { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_server_down), R.id.trade_dest) }
withContext(Dispatchers.Main) { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_server_down), R.id.trade_dest) }
}
} else {
uiThread { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_check_internet), R.id.trade_dest) }
withContext(Dispatchers.Main) { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_check_internet), R.id.trade_dest) }
}
uiThread { loadingDialog?.dismiss() }
withContext(Dispatchers.Main) { loadingDialog?.dismiss() }
}
}
}
Expand Down
16 changes: 9 additions & 7 deletions app/src/main/java/org/pragyan/dalal18/fragment/TransactionsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ import androidx.recyclerview.widget.RecyclerView
import dalalstreet.api.DalalActionServiceGrpc
import dalalstreet.api.actions.GetTransactionsRequest
import dalalstreet.api.models.Transaction
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.uiThread
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import kotlinx.coroutines.withContext
import org.pragyan.dalal18.R
import org.pragyan.dalal18.adapter.TransactionRecyclerAdapter
import org.pragyan.dalal18.dagger.ContextModule
Expand Down Expand Up @@ -94,7 +96,7 @@ class TransactionsFragment : Fragment() {

loadingDialog?.show()

doAsync {
GlobalScope.async (Dispatchers.Default){

lastId = preferences.getInt(Constants.LAST_TRANSACTION_ID, 0)

Expand All @@ -107,7 +109,7 @@ class TransactionsFragment : Fragment() {
.setLastTransactionId(lastId)
.build())

uiThread {
withContext(Dispatchers.Main) {

paginate = transactionsResponse.transactionsCount == 10

Expand All @@ -129,12 +131,12 @@ class TransactionsFragment : Fragment() {
}
}
} else {
uiThread { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_server_down), R.id.transactions_dest) }
withContext(Dispatchers.Main) { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_server_down), R.id.transactions_dest) }
}
} else {
uiThread { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_check_internet), R.id.transactions_dest) }
withContext(Dispatchers.Main) { networkDownHandler.onNetworkDownError(resources.getString(R.string.error_check_internet), R.id.transactions_dest) }
}
uiThread { loadingDialog?.dismiss() }
withContext(Dispatchers.Main) { loadingDialog?.dismiss() }
}
}

Expand Down
16 changes: 16 additions & 0 deletions app/src/main/java/org/pragyan/dalal18/fragment/leaderboard/LeaderboardListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,34 @@ import dalalstreet.api.actions.GetLeaderboardResponse
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
<<<<<<< HEAD:app/src/main/java/org/pragyan/dalal18/fragment/leaderboard/LeaderboardListFragment.kt
import org.jetbrains.anko.longToast
import org.jetbrains.anko.toast
=======
>>>>>>> remove: anko:app/src/main/java/org/pragyan/dalal18/fragment/LeaderboardFragment.kt
import org.pragyan.dalal18.R
import org.pragyan.dalal18.adapter.LeaderboardRecyclerAdapter
import org.pragyan.dalal18.dagger.ContextModule
import org.pragyan.dalal18.dagger.DaggerDalalStreetApplicationComponent
import org.pragyan.dalal18.data.LeaderBoardDetails
<<<<<<< HEAD:app/src/main/java/org/pragyan/dalal18/fragment/leaderboard/LeaderboardListFragment.kt
import org.pragyan.dalal18.databinding.FragmentLeaderboardListBinding
import org.pragyan.dalal18.utils.ConnectionUtils
import org.pragyan.dalal18.utils.Constants
import org.pragyan.dalal18.utils.MiscellaneousUtils
import org.pragyan.dalal18.utils.viewLifecycle
=======
import org.pragyan.dalal18.databinding.FragmentLeaderboardBinding
<<<<<<< HEAD:app/src/main/java/org/pragyan/dalal18/fragment/leaderboard/LeaderboardListFragment.kt
import org.pragyan.dalal18.utils.*
>>>>>>> remove: anko:app/src/main/java/org/pragyan/dalal18/fragment/LeaderboardFragment.kt
=======
import org.pragyan.dalal18.utils.ConnectionUtils
import org.pragyan.dalal18.utils.Constants
import org.pragyan.dalal18.utils.MiscellaneousUtils
import org.pragyan.dalal18.utils.viewLifecycle
import org.pragyan.dalal18.utils.longToast
>>>>>>> refactor:remove wildcard imports:app/src/main/java/org/pragyan/dalal18/fragment/LeaderboardFragment.kt
import java.util.*
import javax.inject.Inject

Expand Down
Loading