From 6197152f6e122b77c2ac24ebe6f82ed34c206857 Mon Sep 17 00:00:00 2001
From: Shihaam Abdul Rahman <shihaam@shihaam.me>
Date: Sun, 17 May 2026 21:09:43 +0500
Subject: [PATCH] fix ui glitch, trasnfer button to take you to transfer tab in
 bottom bar

---
 .../sar/basedbank/ui/home/DashboardFragment.kt  |  2 +-
 .../sh/sar/basedbank/ui/home/HomeActivity.kt    |  8 ++++++++
 app/src/main/res/layout/fragment_transfer.xml   | 17 -----------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/sh/sar/basedbank/ui/home/DashboardFragment.kt b/app/src/main/java/sh/sar/basedbank/ui/home/DashboardFragment.kt
index d6c3675..f260993 100644
--- a/app/src/main/java/sh/sar/basedbank/ui/home/DashboardFragment.kt
+++ b/app/src/main/java/sh/sar/basedbank/ui/home/DashboardFragment.kt
@@ -31,7 +31,7 @@ class DashboardFragment : Fragment() {
         viewModel.bmlLimits.observe(viewLifecycleOwner) { updateForeignLimits(it) }
 
         binding.btnTransfer.setOnClickListener {
-            (requireActivity() as HomeActivity).showWithBackStack(TransferFragment())
+            (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer)
         }
         binding.btnPayMvQr.setOnClickListener {
             Toast.makeText(requireContext(), R.string.work_in_progress, Toast.LENGTH_SHORT).show()
diff --git a/app/src/main/java/sh/sar/basedbank/ui/home/HomeActivity.kt b/app/src/main/java/sh/sar/basedbank/ui/home/HomeActivity.kt
index 33edf89..3a72673 100644
--- a/app/src/main/java/sh/sar/basedbank/ui/home/HomeActivity.kt
+++ b/app/src/main/java/sh/sar/basedbank/ui/home/HomeActivity.kt
@@ -55,6 +55,7 @@ class HomeActivity : AppCompatActivity() {
     private lateinit var binding: ActivityHomeBinding
     private val viewModel: HomeViewModel by viewModels()
     private lateinit var toggle: ActionBarDrawerToggle
+    private var suppressBottomNavCallback = false
 
     private val autolockHandler = Handler(Looper.getMainLooper())
     private var warningDialog: AlertDialog? = null
@@ -91,6 +92,7 @@ class HomeActivity : AppCompatActivity() {
         toggle.syncState()
 
         binding.bottomNavigation.setOnItemSelectedListener { item ->
+            if (suppressBottomNavCallback) return@setOnItemSelectedListener true
             when (item.itemId) {
                 R.id.nav_dashboard -> { show(DashboardFragment()); true }
                 R.id.nav_accounts -> { show(AccountsFragment()); true }
@@ -209,6 +211,12 @@ class HomeActivity : AppCompatActivity() {
             R.id.nav_settings -> show(SettingsFragment())
             else -> Toast.makeText(this, R.string.work_in_progress, Toast.LENGTH_SHORT).show()
         }
+        val bottomNavIds = setOf(R.id.nav_dashboard, R.id.nav_accounts, R.id.nav_contacts, R.id.nav_transfer, R.id.nav_more)
+        if (binding.bottomNavigation.visibility == View.VISIBLE && itemId in bottomNavIds) {
+            suppressBottomNavCallback = true
+            binding.bottomNavigation.selectedItemId = itemId
+            suppressBottomNavCallback = false
+        }
     }
 
     fun setRefreshing(visible: Boolean) {
diff --git a/app/src/main/res/layout/fragment_transfer.xml b/app/src/main/res/layout/fragment_transfer.xml
index 24c5d70..359d963 100644
--- a/app/src/main/res/layout/fragment_transfer.xml
+++ b/app/src/main/res/layout/fragment_transfer.xml
@@ -12,19 +12,6 @@
         android:orientation="vertical"
         android:padding="16dp">
 
-        <com.google.android.material.card.MaterialCardView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:cardCornerRadius="16dp"
-            app:cardElevation="0dp"
-            app:strokeWidth="1dp"
-            app:strokeColor="?attr/colorOutlineVariant">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="20dp">
 
                 <!-- From label + account dropdown -->
                 <TextView
@@ -355,10 +342,6 @@
                     android:layout_height="wrap_content"
                     android:text="@string/transfer" />
 
-            </LinearLayout>
-
-        </com.google.android.material.card.MaterialCardView>
-
     </LinearLayout>
 
 </androidx.core.widget.NestedScrollView>