From 5388e90331ba8d4cf8ee384d5bcfd1f4a4ed3cb2 Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Wed, 5 Dec 2018 10:10:45 -0600 Subject: [PATCH] Add methods to remember the currently selected Spinner's Asset and make sure that selection is not lost when the balances table is updated. Make an improvement to the camera feed UI. --- .../fragments/SendTransactionFragment.kt | 25 +++++++++++++++++++ .../res/drawable/camera_view_background.xml | 5 ++++ .../res/layout/fragment_send_transaction.xml | 5 ++-- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable/camera_view_background.xml diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt index c424c47..edf0056 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt @@ -7,6 +7,7 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.AdapterView import android.widget.Toast import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment @@ -40,6 +41,8 @@ class SendTransactionFragment : Fragment(), ZXingScannerView.ResultHandler { private var mAssetsAdapter: AssetsAdapter? = null + private var selectedAssetSymbol = "" + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { return inflater.inflate(R.layout.fragment_send_transaction, container, false) @@ -59,7 +62,25 @@ class SendTransactionFragment : Fragment(), ZXingScannerView.ResultHandler { mBalancesDetails = balancesDetails mAssetsAdapter = AssetsAdapter(context!!, android.R.layout.simple_spinner_item, mBalancesDetails!!) spAsset.adapter = mAssetsAdapter + + // Try to select the selectedAssetSymbol + for (i in 0 until mAssetsAdapter!!.count) { + if (mAssetsAdapter!!.getItem(i)!!.symbol == selectedAssetSymbol) { + spAsset.setSelection(i) + break + } + } }) + + spAsset.onItemSelectedListener = object : AdapterView.OnItemSelectedListener{ + override fun onNothingSelected(parent: AdapterView<*>?) { } + + override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { + selectedAssetSymbol = mAssetsAdapter!!.getItem(position)!!.symbol + } + } + + fabSendTransaction.setOnClickListener { validateFields() } } private fun verifyCameraPermission() { @@ -140,6 +161,10 @@ class SendTransactionFragment : Fragment(), ZXingScannerView.ResultHandler { } } + private fun validateFields() { + + } + override fun onResume() { super.onResume() if (isCameraPreviewVisible) diff --git a/app/src/main/res/drawable/camera_view_background.xml b/app/src/main/res/drawable/camera_view_background.xml new file mode 100644 index 0000000..3557241 --- /dev/null +++ b/app/src/main/res/drawable/camera_view_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_send_transaction.xml b/app/src/main/res/layout/fragment_send_transaction.xml index a665e66..0e06f22 100644 --- a/app/src/main/res/layout/fragment_send_transaction.xml +++ b/app/src/main/res/layout/fragment_send_transaction.xml @@ -123,12 +123,11 @@