From 26e1e427c9c2443192a3cbae00d12f45dae1d65b Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Wed, 19 Dec 2018 10:08:24 -0600 Subject: [PATCH] Add Transactions toolbar menu items with their respective icons. --- .../fragments/TransactionsFragment.kt | 13 +++++----- .../utils/BounceTouchListener.kt | 6 +---- .../main/res/drawable/ic_file_download.xml | 5 ++++ app/src/main/res/drawable/ic_filter.xml | 5 ++++ app/src/main/res/drawable/ic_search.xml | 5 ++++ .../main/res/layout/fragment_transactions.xml | 3 +-- app/src/main/res/menu/menu_home.xml | 2 +- app/src/main/res/menu/menu_transactions.xml | 26 +++++++++++++++++++ .../main/res/navigation/mobile_navigation.xml | 8 ------ app/src/main/res/values/strings.xml | 3 +++ 10 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 app/src/main/res/drawable/ic_file_download.xml create mode 100644 app/src/main/res/drawable/ic_filter.xml create mode 100644 app/src/main/res/drawable/ic_search.xml create mode 100644 app/src/main/res/menu/menu_transactions.xml diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt index 704b1a1..3629f87 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt @@ -3,9 +3,7 @@ package cy.agorise.bitsybitshareswallet.fragments import android.graphics.Point import android.os.Bundle import android.preference.PreferenceManager -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup +import android.view.* import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.lifecycle.Observer @@ -32,7 +30,7 @@ class TransactionsFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { -// setHasOptionsMenu(true) + setHasOptionsMenu(true) return inflater.inflate(R.layout.fragment_transactions, container, false) } @@ -54,6 +52,7 @@ class TransactionsFragment : Fragment() { transfersDetailsAdapter.replaceAll(transfersDetails) }) + // Create bouncy effect when user tries to over scroll rvTransactions.pivotX = getScreenWidth(activity) * 0.5f pivotY1 = 0f @@ -94,7 +93,7 @@ class TransactionsFragment : Fragment() { return size.y } -// override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { -// inflater.inflate(R.menu.menu_home, menu) -// } + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.menu_transactions, menu) + } } diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/BounceTouchListener.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/BounceTouchListener.kt index 47739b8..9d4c306 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/BounceTouchListener.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/BounceTouchListener.kt @@ -23,7 +23,7 @@ class BounceTouchListener private constructor( View.OnTouchListener { private var downCalled = false - private val mContent: View + private val mContent: View = if (contentResId == -1) mMainView else mMainView.findViewById(contentResId) private var mDownY: Float = 0.toFloat() private var mSwipingDown: Boolean = false private var mSwipingUp: Boolean = false @@ -34,10 +34,6 @@ class BounceTouchListener private constructor( private var mMaxAbsTranslation = -99 - init { - mContent = if (contentResId == -1) mMainView else mMainView.findViewById(contentResId) - } - override fun onTouch(view: View, motionEvent: MotionEvent): Boolean { val action = MotionEventCompat.getActionMasked(motionEvent) diff --git a/app/src/main/res/drawable/ic_file_download.xml b/app/src/main/res/drawable/ic_file_download.xml new file mode 100644 index 0000000..b8e8361 --- /dev/null +++ b/app/src/main/res/drawable/ic_file_download.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml new file mode 100644 index 0000000..5d4ec18 --- /dev/null +++ b/app/src/main/res/drawable/ic_filter.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml new file mode 100644 index 0000000..be5ad99 --- /dev/null +++ b/app/src/main/res/drawable/ic_search.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/fragment_transactions.xml b/app/src/main/res/layout/fragment_transactions.xml index 20aec7d..430ce36 100644 --- a/app/src/main/res/layout/fragment_transactions.xml +++ b/app/src/main/res/layout/fragment_transactions.xml @@ -8,5 +8,4 @@ android:padding="@dimen/card_margin" android:clipToPadding="false" tools:listitem="@layout/item_transaction" - tools:itemCount="6" - android:layoutAnimation="@anim/layout_animation_from_bottom"/> \ No newline at end of file + tools:itemCount="6"/> \ No newline at end of file diff --git a/app/src/main/res/menu/menu_home.xml b/app/src/main/res/menu/menu_home.xml index b7e0b0c..f9d5c72 100644 --- a/app/src/main/res/menu/menu_home.xml +++ b/app/src/main/res/menu/menu_home.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/menu_transactions.xml b/app/src/main/res/menu/menu_transactions.xml new file mode 100644 index 0000000..097141f --- /dev/null +++ b/app/src/main/res/menu/menu_transactions.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index cfd3b08..1e2c596 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -35,14 +35,6 @@ app:exitAnim="@anim/slide_out_left" app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right"/> - - Coming soon Net Worth + Search + Filter + Export