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 @@
+