agorise/bitsy-wallet
agorise/bitsy-wallet
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Order assets alphabetically on Spinners in ReceiveTransactionFragment, SendTransactionFragment and TransactionsFragment's FilterOptionsDialog, always trying to select BTS by default.

Browse source
This commit is contained in:
Severiano Jaramillo 2019-01-31 19:37:05 -06:00
parent a8fe1ed2c5
commit 032c627725
3 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/FilterOptionsDialog.kt
View file

@ -21,6 +21,7 @@ import cy.agorise.bitsybitshareswallet.views.DatePickerFragment
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
import kotlin.ClassCastException import kotlin.ClassCastException
import kotlin.collections.ArrayList
/** /**
@ -100,6 +101,8 @@ class FilterOptionsDialog : DialogFragment() {
// */ // */
// private val mUserCurrency = RuntimeData.EXTERNAL_CURRENCY // private val mUserCurrency = RuntimeData.EXTERNAL_CURRENCY
private var mBalanceDetails = ArrayList<BalanceDetail>()
private lateinit var mBalanceDetailViewModel: BalanceDetailViewModel private lateinit var mBalanceDetailViewModel: BalanceDetailViewModel
private var mBalancesDetailsAdapter: BalancesDetailsAdapter? = null private var mBalancesDetailsAdapter: BalancesDetailsAdapter? = null
@ -218,7 +221,12 @@ class FilterOptionsDialog : DialogFragment() {
mBalanceDetailViewModel = ViewModelProviders.of(this).get(BalanceDetailViewModel::class.java) mBalanceDetailViewModel = ViewModelProviders.of(this).get(BalanceDetailViewModel::class.java)
mBalanceDetailViewModel.getAll().observe(this, Observer<List<BalanceDetail>> { balancesDetails -> mBalanceDetailViewModel.getAll().observe(this, Observer<List<BalanceDetail>> { balancesDetails ->
mBalancesDetailsAdapter = BalancesDetailsAdapter(context!!, android.R.layout.simple_spinner_item, balancesDetails!!) mBalanceDetails.clear()
mBalanceDetails.addAll(balancesDetails)
mBalanceDetails.sortWith(
Comparator { a, b -> a.toString().compareTo(b.toString(), true) }
)
mBalancesDetailsAdapter = BalancesDetailsAdapter(context!!, android.R.layout.simple_spinner_item, mBalanceDetails)
sAsset.adapter = mBalancesDetailsAdapter sAsset.adapter = mBalancesDetailsAdapter
val assetSelected = arguments!!.getString(KEY_FILTER_ASSET) val assetSelected = arguments!!.getString(KEY_FILTER_ASSET)

5
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt
View file

@ -72,7 +72,7 @@ class ReceiveTransactionFragment : ConnectedFragment() {
private var mAssets = ArrayList<cy.agorise.bitsybitshareswallet.database.entities.Asset>() private var mAssets = ArrayList<cy.agorise.bitsybitshareswallet.database.entities.Asset>()
/** Keeps track of the current selected asset symbol */ /** Keeps track of the current selected asset symbol */
private var selectedAssetSymbol = "" private var selectedAssetSymbol = "BTS"
/** Used to avoid erasing the QR code when the user selects an item from the AutoComplete suggestions */ /** Used to avoid erasing the QR code when the user selects an item from the AutoComplete suggestions */
private var selectedInAutoCompleteTextView = false private var selectedInAutoCompleteTextView = false
@ -119,6 +119,9 @@ class ReceiveTransactionFragment : ConnectedFragment() {
Observer<List<cy.agorise.bitsybitshareswallet.database.entities.Asset>> { assets -> Observer<List<cy.agorise.bitsybitshareswallet.database.entities.Asset>> { assets ->
mAssets.clear() mAssets.clear()
mAssets.addAll(assets) mAssets.addAll(assets)
mAssets.sortWith(
Comparator { a, b -> a.toString().compareTo(b.toString(), true) }
)
// Add an option at the end so the user can search for an asset other than the ones saved in the db // Add an option at the end so the user can search for an asset other than the ones saved in the db
val asset = cy.agorise.bitsybitshareswallet.database.entities.Asset( val asset = cy.agorise.bitsybitshareswallet.database.entities.Asset(

12
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
View file

@ -72,14 +72,14 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
private var isToAccountCorrect = false private var isToAccountCorrect = false
private var isAmountCorrect = false private var isAmountCorrect = false
private var mBalancesDetails: List<BalanceDetail>? = null private var mBalancesDetails = ArrayList<BalanceDetail>()
private lateinit var mBalanceDetailViewModel: BalanceDetailViewModel private lateinit var mBalanceDetailViewModel: BalanceDetailViewModel
private var mBalancesDetailsAdapter: BalancesDetailsAdapter? = null private var mBalancesDetailsAdapter: BalancesDetailsAdapter? = null
/** Keeps track of the asset's symbol selected in the Asset spinner */ /** Keeps track of the asset's symbol selected in the Asset spinner */
private var selectedAssetSymbol = "" private var selectedAssetSymbol = "BTS"
/** Current user account */ /** Current user account */
private var mUserAccount: UserAccount? = null private var mUserAccount: UserAccount? = null
@ -144,8 +144,12 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
mBalanceDetailViewModel = ViewModelProviders.of(this).get(BalanceDetailViewModel::class.java) mBalanceDetailViewModel = ViewModelProviders.of(this).get(BalanceDetailViewModel::class.java)
mBalanceDetailViewModel.getAll().observe(this, Observer<List<BalanceDetail>> { balancesDetails -> mBalanceDetailViewModel.getAll().observe(this, Observer<List<BalanceDetail>> { balancesDetails ->
mBalancesDetails = balancesDetails mBalancesDetails.clear()
mBalancesDetailsAdapter = BalancesDetailsAdapter(context!!, android.R.layout.simple_spinner_item, mBalancesDetails!!) mBalancesDetails.addAll(balancesDetails)
mBalancesDetails.sortWith(
Comparator { a, b -> a.toString().compareTo(b.toString(), true) }
)
mBalancesDetailsAdapter = BalancesDetailsAdapter(context!!, android.R.layout.simple_spinner_item, mBalancesDetails)
spAsset.adapter = mBalancesDetailsAdapter spAsset.adapter = mBalancesDetailsAdapter
// Try to select the selectedAssetSymbol // Try to select the selectedAssetSymbol