From bee79976b58d4758085f7cfb03627c15e209d77d Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Thu, 3 Jan 2019 11:09:19 -0600 Subject: [PATCH] Create SendTransactionFragment menu, which consists of only an info icon. --- .../fragments/SendTransactionFragment.kt | 18 +++++++++++++++--- app/src/main/res/drawable/ic_info.xml | 5 +++++ .../main/res/menu/menu_send_transaction.xml | 11 +++++++++++ app/src/main/res/values/strings.xml | 11 +---------- 4 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/drawable/ic_info.xml create mode 100644 app/src/main/res/menu/menu_send_transaction.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 46a42cc..0bb762c 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt @@ -10,9 +10,7 @@ import android.os.Bundle import android.os.IBinder import android.preference.PreferenceManager import android.util.Log -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup +import android.view.* import android.widget.AdapterView import android.widget.Toast import androidx.core.content.ContextCompat @@ -108,6 +106,8 @@ class SendTransactionFragment : Fragment(), ZXingScannerView.ResultHandler, Serv private var destinationPublicKey: PublicKey? = null override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + setHasOptionsMenu(true) + return inflater.inflate(R.layout.fragment_send_transaction, container, false) } @@ -447,6 +447,18 @@ class SendTransactionFragment : Fragment(), ZXingScannerView.ResultHandler, Serv Log.d(TAG, "Network Service is not connected") } + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.menu_send_transaction, menu) + } + + override fun onOptionsItemSelected(item: MenuItem?): Boolean { + if (item?.itemId == R.id.menu_info) { + context?.toast("Info") + return true + } + return super.onOptionsItemSelected(item) + } + override fun onResume() { super.onResume() if (isCameraPreviewVisible) diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml new file mode 100644 index 0000000..af0d4d0 --- /dev/null +++ b/app/src/main/res/drawable/ic_info.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/menu/menu_send_transaction.xml b/app/src/main/res/menu/menu_send_transaction.xml new file mode 100644 index 0000000..6703b30 --- /dev/null +++ b/app/src/main/res/menu/menu_send_transaction.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 30ff5ac..00959f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,16 +6,6 @@ Agree Disagree - - Loading Assets… - Performing a series of requests in order to get the complete list of all - existing assets - - Loaded %1$d assets into the database - Assets Loaded - Next, please setup your account… - Next - 6+ digits PIN PIN too short @@ -50,6 +40,7 @@ Export + Info To Amount Memo