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

Improve AutoSuggestAssetAdapter to use Bitsy's Asset model, which has a 'toString' method to automatically show the symbol of the AssetSelected in the AutoCompleteTextView. Also Add a variable to avoid clearing the QR code just after the user selects an Asset from the AutoComplete suggestions.

master
Severiano Jaramillo 2018-12-20 13:57:47 -06:00
parent 7f462bec63
commit 397515fea9
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/cy/agorise/bitsybitshareswallet/adapters/AutoSuggestAssetAdapter.kt
View File

@ -1,12 +1,8 @@
package cy.agorise.bitsybitshareswallet.adapters
import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ArrayAdapter
import android.widget.TextView
import cy.agorise.graphenej.Asset
import cy.agorise.bitsybitshareswallet.database.entities.Asset
class AutoSuggestAssetAdapter(context: Context, resource: Int):
ArrayAdapter<Asset>(context, resource) {
@ -25,20 +21,4 @@ class AutoSuggestAssetAdapter(context: Context, resource: Int):
override fun getItem(position: Int): Asset? {
return mAssets[position]
}
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
var cv = convertView
if (cv == null) {
val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
cv = inflater.inflate(android.R.layout.simple_spinner_dropdown_item, parent, false)
}
val text: TextView = cv!!.findViewById(android.R.id.text1)
val asset = getItem(position)
text.text = asset!!.symbol
return cv
}
}

45
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt
View File

@ -45,6 +45,7 @@ import java.text.DecimalFormat
import java.text.DecimalFormatSymbols
import java.util.*
import java.util.concurrent.TimeUnit
import kotlin.collections.ArrayList
class ReceiveTransactionFragment : Fragment(), ServiceConnection {
private val TAG = this.javaClass.simpleName
@ -74,6 +75,9 @@ class ReceiveTransactionFragment : Fragment(), ServiceConnection {
private var selectedAssetSymbol = ""
/** Used to avoid erasing the QR code when the user selects an item from the AutoComplete suggestions */
private var selectedInAutoCompleteTextView = false
// Map used to keep track of request and response id pairs
private val responseMap = HashMap<Long, Int>()
@ -146,19 +150,6 @@ class ReceiveTransactionFragment : Fragment(), ServiceConnection {
}
}
// mAssetViewModel.getAll().observe(this,
// Observer<List<cy.agorise.bitsybitshareswallet.database.entities.Asset>> { assets ->
// val adapter = ArrayAdapter<cy.agorise.bitsybitshareswallet.database.entities.Asset>(context!!,
// android.R.layout.simple_dropdown_item_1line, assets)
// actvAsset.setAdapter(adapter)
// })
//
// actvAsset.setOnItemClickListener { parent, _, position, _ ->
// val asset = parent.adapter.getItem(position) as cy.agorise.bitsybitshareswallet.database.entities.Asset
// mAsset = Asset(asset.id, asset.symbol, asset.precision)
// updateQR()
// }
// Use RxJava Debounce to create QR code only after the user stopped typing an amount
mDisposables.add(
RxTextView.textChanges(tietAmount)
@ -180,8 +171,11 @@ class ReceiveTransactionFragment : Fragment(), ServiceConnection {
.map { it.toString().trim().toUpperCase() }
.observeOn(AndroidSchedulers.mainThread())
.subscribe {
mAsset = null
updateQR()
if (!selectedInAutoCompleteTextView) {
mAsset = null
updateQR()
}
selectedInAutoCompleteTextView = false
// Get a list of assets that match the already typed string by the user
if (it.length > 1 && mNetworkService != null) {
@ -192,6 +186,13 @@ class ReceiveTransactionFragment : Fragment(), ServiceConnection {
}
)
actvAsset.setOnItemClickListener { parent, _, position, _ ->
val asset = parent.adapter.getItem(position) as cy.agorise.bitsybitshareswallet.database.entities.Asset
mAsset = Asset(asset.id, asset.symbol, asset.precision)
selectedInAutoCompleteTextView = true
updateQR()
}
// Connect to the RxBus, which receives events from the NetworkService
mDisposables.add(
RxBus.getBusInstance()
@ -221,7 +222,19 @@ class ReceiveTransactionFragment : Fragment(), ServiceConnection {
private fun handleListAssets(assetList: List<Asset>) {
Log.d(TAG, "handleListAssets")
mAutoSuggestAssetAdapter.setData(assetList)
val assets = ArrayList<cy.agorise.bitsybitshareswallet.database.entities.Asset>()
for (_asset in assetList) {
val asset = cy.agorise.bitsybitshareswallet.database.entities.Asset(
_asset.objectId,
_asset.symbol,
_asset.precision,
_asset.description ?: "",
_asset.bitassetId ?: ""
)
assets.add(asset)
}
mAutoSuggestAssetAdapter.setData(assets)
mAutoSuggestAssetAdapter.notifyDataSetChanged()
}