fix ui glitch, trasnfer button to take you to transfer tab in bottom bar

This commit is contained in:
2026-05-17 21:09:43 +05:00
parent ecbbb3ed6b
commit 6197152f6e
3 changed files with 9 additions and 18 deletions
@@ -31,7 +31,7 @@ class DashboardFragment : Fragment() {
viewModel.bmlLimits.observe(viewLifecycleOwner) { updateForeignLimits(it) } viewModel.bmlLimits.observe(viewLifecycleOwner) { updateForeignLimits(it) }
binding.btnTransfer.setOnClickListener { binding.btnTransfer.setOnClickListener {
(requireActivity() as HomeActivity).showWithBackStack(TransferFragment()) (requireActivity() as HomeActivity).navigateTo(R.id.nav_transfer)
} }
binding.btnPayMvQr.setOnClickListener { binding.btnPayMvQr.setOnClickListener {
Toast.makeText(requireContext(), R.string.work_in_progress, Toast.LENGTH_SHORT).show() Toast.makeText(requireContext(), R.string.work_in_progress, Toast.LENGTH_SHORT).show()
@@ -55,6 +55,7 @@ class HomeActivity : AppCompatActivity() {
private lateinit var binding: ActivityHomeBinding private lateinit var binding: ActivityHomeBinding
private val viewModel: HomeViewModel by viewModels() private val viewModel: HomeViewModel by viewModels()
private lateinit var toggle: ActionBarDrawerToggle private lateinit var toggle: ActionBarDrawerToggle
private var suppressBottomNavCallback = false
private val autolockHandler = Handler(Looper.getMainLooper()) private val autolockHandler = Handler(Looper.getMainLooper())
private var warningDialog: AlertDialog? = null private var warningDialog: AlertDialog? = null
@@ -91,6 +92,7 @@ class HomeActivity : AppCompatActivity() {
toggle.syncState() toggle.syncState()
binding.bottomNavigation.setOnItemSelectedListener { item -> binding.bottomNavigation.setOnItemSelectedListener { item ->
if (suppressBottomNavCallback) return@setOnItemSelectedListener true
when (item.itemId) { when (item.itemId) {
R.id.nav_dashboard -> { show(DashboardFragment()); true } R.id.nav_dashboard -> { show(DashboardFragment()); true }
R.id.nav_accounts -> { show(AccountsFragment()); true } R.id.nav_accounts -> { show(AccountsFragment()); true }
@@ -209,6 +211,12 @@ class HomeActivity : AppCompatActivity() {
R.id.nav_settings -> show(SettingsFragment()) R.id.nav_settings -> show(SettingsFragment())
else -> Toast.makeText(this, R.string.work_in_progress, Toast.LENGTH_SHORT).show() 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) { fun setRefreshing(visible: Boolean) {
@@ -12,19 +12,6 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp"> 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 --> <!-- From label + account dropdown -->
<TextView <TextView
@@ -355,10 +342,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/transfer" /> android:text="@string/transfer" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>