fix openMF#1759: FAB behaviour rectified in Accounts

PatelVatsalB21 · Mar 5, 2021 · 951dd47 · 951dd47
1 parent ba265f1
commit 951dd47
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 46 deletions.
diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/ClientAccountsFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/ClientAccountsFragment.kt
@@ -124,6 +124,16 @@ import javax.inject.Inject
                 } else {
                     fabCreateLoan?.hide()
                 }
+                if (position != 2) {
+                    viewPager?.getChildAt(position)?.findViewById<RecyclerView>(R.id.rv_accounts)?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                            super.onScrollStateChanged(recyclerView, newState)
+                            if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                                fabCreateLoan?.show()
+                            } else fabCreateLoan?.hide()
+                        }
+                    })
+                }
             }
 
             override fun onPageScrollStateChanged(state: Int) {}
@@ -164,6 +174,14 @@ import javax.inject.Inject
                 ?.showLoanAccounts(loanAccounts)
         (childFragmentManager.findFragmentByTag(getFragmentTag(1)) as AccountsView?)
                 ?.hideProgress()
+        viewPager?.getChildAt(1)?.findViewById<RecyclerView>(R.id.rv_accounts)?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                super.onScrollStateChanged(recyclerView, newState)
+                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    fabCreateLoan?.show()
+                } else fabCreateLoan?.hide()
+            }
+        })
     }
 
     /**
@@ -178,6 +196,14 @@ import javax.inject.Inject
                 ?.showSavingsAccounts(savingAccounts)
         (childFragmentManager.findFragmentByTag(getFragmentTag(0)) as AccountsView?)
                 ?.hideProgress()
+        viewPager?.getChildAt(0)?.findViewById<RecyclerView>(R.id.rv_accounts)?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                super.onScrollStateChanged(recyclerView, newState)
+                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    fabCreateLoan?.show()
+                } else fabCreateLoan?.hide()
+            }
+        })
     }
 
     @OnClick(R.id.fab_create_loan)

diff --git a/app/src/main/java/org/mifos/mobile/utils/ScrollFabBehavior.kt b/app/src/main/java/org/mifos/mobile/utils/ScrollFabBehavior.kt
diff --git a/app/src/main/res/layout/fragment_client_accounts.xml b/app/src/main/res/layout/fragment_client_accounts.xml
@@ -33,7 +33,6 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/margin_16dp"
         android:layout_width="wrap_content"
-        app:layout_behavior="org.mifos.mobile.utils.ScrollFabBehavior"
         app:srcCompat="@drawable/ic_add_white_24dp"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>