descriptive menus

app/src/main/java/sh/sar/basedbank/ui/home/HomeActivity.kt

@@ -14,8 +14,10 @@ import android.widget.Toast
 import sh.sar.basedbank.ui.home.NavCustomization
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.core.view.GravityCompat
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
@@ -72,6 +74,10 @@ class HomeActivity : AppCompatActivity() {
     private lateinit var toggle: ActionBarDrawerToggle
     private var suppressBottomNavCallback = false
 
+    private var backPressedOnce = false
+    private val backPressHandler = Handler(Looper.getMainLooper())
+    private val resetBackPress = Runnable { backPressedOnce = false }
+
     private val autolockHandler = Handler(Looper.getMainLooper())
     private var warningDialog: AlertDialog? = null
     private var countdownTimer: CountDownTimer? = null
@@ -211,6 +217,42 @@ class HomeActivity : AppCompatActivity() {
             binding.navigationView.setCheckedItem(R.id.nav_dashboard)
         }
 
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                // Close drawer if open (drawer-nav mode)
+                if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
+                    binding.drawerLayout.closeDrawers()
+                    return
+                }
+                // Pop fragment back stack if there's anything on it (e.g. showWithBackStack)
+                if (supportFragmentManager.backStackEntryCount > 0) {
+                    supportFragmentManager.popBackStack()
+                    return
+                }
+                // In bottom nav mode, pressing back navigates up the hierarchy
+                val isBottomNav = getSharedPreferences("prefs", MODE_PRIVATE).getBoolean("bottom_nav", false)
+                if (isBottomNav && binding.bottomNavigation.selectedItemId != R.id.nav_dashboard) {
+                    val currentFrag = supportFragmentManager.findFragmentById(R.id.contentFrame)
+                    // Sub-page reached via More (e.g. Settings, Activities) — go back to More
+                    if (binding.bottomNavigation.selectedItemId == R.id.nav_more && currentFrag !is MoreFragment) {
+                        show(MoreFragment())
+                        return
+                    }
+                    binding.bottomNavigation.selectedItemId = R.id.nav_dashboard
+                    return
+                }
+                // At top level — require double-tap to exit
+                if (backPressedOnce) {
+                    backPressHandler.removeCallbacks(resetBackPress)
+                    finish()
+                } else {
+                    backPressedOnce = true
+                    Toast.makeText(this@HomeActivity, R.string.press_back_to_exit, Toast.LENGTH_SHORT).show()
+                    backPressHandler.postDelayed(resetBackPress, 2000)
+                }
+            }
+        })
+
         // Keep all MIB sessions alive every 25 seconds while the app is in the foreground
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.STARTED) {

app/src/main/java/sh/sar/basedbank/ui/home/MoreFragment.kt

@@ -25,6 +25,7 @@ class MoreFragment : Fragment() {
             val row = inflater.inflate(R.layout.item_more_nav, list, false)
             row.findViewById<ImageView>(R.id.ivIcon).setImageResource(item.iconRes)
             row.findViewById<TextView>(R.id.tvLabel).setText(item.titleRes)
+            row.findViewById<TextView>(R.id.tvDescription).setText(item.descriptionRes)
             row.setOnClickListener { (requireActivity() as HomeActivity).navigateTo(item.id) }
             list.addView(row)
         }

app/src/main/java/sh/sar/basedbank/ui/home/NavCustomization.kt

@@ -10,22 +10,23 @@ object NavCustomization {
     data class NavItemDef(
         val id: Int,
         @DrawableRes val iconRes: Int,
-        @StringRes val titleRes: Int
+        @StringRes val titleRes: Int,
+        @StringRes val descriptionRes: Int
     )
 
     /** All items that can occupy either a bottom nav slot or the "More" screen. */
     val ALL_SWAPPABLE = listOf(
-        NavItemDef(R.id.nav_accounts,         R.drawable.ic_nav_accounts,         R.string.nav_accounts),
-        NavItemDef(R.id.nav_contacts,         R.drawable.ic_contacts,             R.string.nav_contacts),
-        NavItemDef(R.id.nav_transfer,         R.drawable.ic_send,                 R.string.transfer),
-        NavItemDef(R.id.nav_pay_mv_qr,        R.drawable.ic_qr_scan,              R.string.pay_mv_qr),
-        NavItemDef(R.id.nav_activities,       R.drawable.ic_nav_activities,       R.string.nav_activities),
-        NavItemDef(R.id.nav_transfer_history, R.drawable.ic_nav_transfer_history, R.string.nav_transfer_history),
-        NavItemDef(R.id.nav_finances,         R.drawable.ic_nav_finances,         R.string.nav_finances),
-        NavItemDef(R.id.nav_pay_with_card,     R.drawable.ic_nav_card,             R.string.nav_pay_with_card),
-        NavItemDef(R.id.nav_card_settings,    R.drawable.ic_nav_card,             R.string.nav_card_settings),
-        NavItemDef(R.id.nav_otp,              R.drawable.ic_nav_otp,              R.string.nav_otp),
-        NavItemDef(R.id.nav_settings,         R.drawable.ic_nav_settings,         R.string.nav_settings),
+        NavItemDef(R.id.nav_accounts,         R.drawable.ic_nav_accounts,         R.string.nav_accounts,         R.string.nav_desc_accounts),
+        NavItemDef(R.id.nav_contacts,         R.drawable.ic_contacts,             R.string.nav_contacts,         R.string.nav_desc_contacts),
+        NavItemDef(R.id.nav_transfer,         R.drawable.ic_send,                 R.string.transfer,             R.string.nav_desc_transfer),
+        NavItemDef(R.id.nav_pay_mv_qr,        R.drawable.ic_qr_scan,              R.string.pay_mv_qr,            R.string.nav_desc_pay_mv_qr),
+        NavItemDef(R.id.nav_activities,       R.drawable.ic_nav_activities,       R.string.nav_activities,       R.string.nav_desc_activities),
+        NavItemDef(R.id.nav_transfer_history, R.drawable.ic_nav_transfer_history, R.string.nav_transfer_history, R.string.nav_desc_transfer_history),
+        NavItemDef(R.id.nav_finances,         R.drawable.ic_nav_finances,         R.string.nav_finances,         R.string.nav_desc_finances),
+        NavItemDef(R.id.nav_pay_with_card,    R.drawable.ic_nav_card,             R.string.nav_pay_with_card,    R.string.nav_desc_pay_with_card),
+        NavItemDef(R.id.nav_card_settings,    R.drawable.ic_nav_card,             R.string.nav_card_settings,    R.string.nav_desc_card_settings),
+        NavItemDef(R.id.nav_otp,              R.drawable.ic_nav_otp,              R.string.nav_otp,              R.string.nav_desc_otp),
+        NavItemDef(R.id.nav_settings,         R.drawable.ic_nav_settings,         R.string.nav_settings,         R.string.nav_desc_settings),
     )
 
     fun getSlots(prefs: SharedPreferences): List<Int> = listOf(

app/src/main/java/sh/sar/basedbank/ui/home/SettingsFragment.kt

@@ -17,14 +17,15 @@ class SettingsFragment : Fragment() {
     private data class SettingsItem(
         @DrawableRes val icon: Int,
         @StringRes val title: Int,
+        @StringRes val description: Int,
         val dest: () -> Fragment
     )
 
     private val items = listOf(
-        SettingsItem(R.drawable.ic_contacts,            R.string.settings_logins)           { SettingsLoginsFragment() },
-        SettingsItem(R.drawable.ic_settings_appearance, R.string.settings_appearance)        { SettingsAppearanceFragment() },
-        SettingsItem(R.drawable.ic_lock,                R.string.settings_privacy_security)  { SettingsSecurityFragment() },
-        SettingsItem(R.drawable.ic_settings_storage,    R.string.settings_storage)           { SettingsStorageFragment() },
+        SettingsItem(R.drawable.ic_contacts,            R.string.settings_logins,          R.string.settings_desc_logins)           { SettingsLoginsFragment() },
+        SettingsItem(R.drawable.ic_settings_appearance, R.string.settings_appearance,       R.string.settings_desc_appearance)       { SettingsAppearanceFragment() },
+        SettingsItem(R.drawable.ic_lock,                R.string.settings_privacy_security, R.string.settings_desc_privacy_security) { SettingsSecurityFragment() },
+        SettingsItem(R.drawable.ic_settings_storage,    R.string.settings_storage,          R.string.settings_desc_storage)          { SettingsStorageFragment() },
     )
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
@@ -37,6 +38,7 @@ class SettingsFragment : Fragment() {
             val row = inflater.inflate(R.layout.item_more_nav, list, false)
             row.findViewById<ImageView>(R.id.ivIcon).setImageResource(item.icon)
             row.findViewById<TextView>(R.id.tvLabel).setText(item.title)
+            row.findViewById<TextView>(R.id.tvDescription).setText(item.description)
             row.setOnClickListener {
                 (requireActivity() as HomeActivity).showWithBackStack(item.dest())
             }

app/src/main/res/layout/item_more_nav.xml

@@ -15,13 +15,26 @@
         android:layout_height="24dp"
         android:layout_marginEnd="16dp" />
 
-    <TextView
-        android:id="@+id/tvLabel"
+    <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:textAppearance="?attr/textAppearanceBodyLarge"
-        android:textColor="?attr/colorOnSurface" />
+        android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/tvLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface" />
+
+        <TextView
+            android:id="@+id/tvDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant" />
+
+    </LinearLayout>
 
 </LinearLayout>

app/src/main/res/values-b+dv/strings.xml

@@ -74,6 +74,17 @@
     <string name="nav_finances">ފައިނޭންސް</string>
     <string name="nav_card_settings">ކާޑް ސެޓިންގ</string>
     <string name="nav_settings">ސެޓިންގ</string>
+    <string name="nav_desc_accounts">ހުރިހާ ބޭންކް އެކައުންޓްތައް ބަލާ</string>
+    <string name="nav_desc_contacts">ޓްރާންސްފަ ކޮންޓެކްޓްތައް މެނޭޖް ކުރޭ</string>
+    <string name="nav_desc_transfer">ކޮންޓެކްޓަކަށް ފައިސާ ފޮނުވާ</string>
+    <string name="nav_desc_pay_mv_qr">PayMV QR ކޯޑް ސްކޭން ނުވަތަ ތައްޔާރު ކުރޭ</string>
+    <string name="nav_desc_activities">ފަހުގެ ޓްރާންސްފަތައް ބަލާ</string>
+    <string name="nav_desc_transfer_history">އެކައުންޓް ތަކުގެ ޓްރާންސެކްޝަން ތާރީހް</string>
+    <string name="nav_desc_finances">ލޯން އަދި ފައިނޭންސިންގ</string>
+    <string name="nav_desc_pay_with_card">ކާޑް ބޭނުންކޮށް ފައިސާ ދައްކާ</string>
+    <string name="nav_desc_card_settings">ކާޑް ސެޓިންގ މެނޭޖް ކުރޭ</string>
+    <string name="nav_desc_otp">OTP ކޯޑް ތައްޔާރު ކުރޭ</string>
+    <string name="nav_desc_settings">އެޕްލިކޭޝަންގެ ތަރުތީބު</string>
     <string name="nav_open_drawer">ނެވިގޭޝަން ހުޅުވާ</string>
     <string name="nav_close_drawer">ނެވިގޭޝަން ލައްޕާ</string>
     <string name="work_in_progress">ތައްޔާރުވަމުން ދަނީ</string>
@@ -106,6 +117,10 @@
     <string name="settings_clear_cache">ކޭޝް ސާފުކުރޭ</string>
     <string name="settings_cache_cleared">ކޭޝް ސާފުކުރެވިއްޖެ</string>
     <string name="settings_logins">ލޮގިންތައް</string>
+    <string name="settings_desc_logins">ބޭންކް ލޮގިންތައް މެނޭޖް ކުރޭ</string>
+    <string name="settings_desc_appearance">ތީމް، ބަސް، އަދި ދައްކުވާ ގޮތް</string>
+    <string name="settings_desc_privacy_security">އެޕް ލޮކް، ޕިން، އަދި ސަލާމަތީ ސެޓިންގ</string>
+    <string name="settings_desc_storage">ކޭޝް ޑޭޓާ އަދި ސްޓޯރޭޖް</string>
     <string name="settings_logout">ލޮގްއައުޓް</string>
     <string name="settings_logout_confirm_title">%s އިން ލޮގްއައުޓް ވަންތަ؟</string>
     <string name="settings_logout_confirm_message">ހުރިހާ ކޭޝް ޑޭޓާ ސާފުވެ، ބާކީ ހުރި އެކައުންޓްތައް އަލުން ލޯޑްވާނެ.</string>

app/src/main/res/values/strings.xml

@@ -86,9 +86,21 @@
     <string name="nav_otp">OTP Codes</string>
     <string name="nav_settings">Settings</string>
     <string name="nav_more">More</string>
+    <string name="nav_desc_accounts">View all your bank accounts</string>
+    <string name="nav_desc_contacts">Manage your transfer contacts</string>
+    <string name="nav_desc_transfer">Send money to a contact</string>
+    <string name="nav_desc_pay_mv_qr">Scan or generate a PayMV QR code</string>
+    <string name="nav_desc_activities">View your recent transfers</string>
+    <string name="nav_desc_transfer_history">Full transaction history by account</string>
+    <string name="nav_desc_finances">Loans and financing overview</string>
+    <string name="nav_desc_pay_with_card">Make a payment using your card</string>
+    <string name="nav_desc_card_settings">Manage your card preferences</string>
+    <string name="nav_desc_otp">Generate OTP codes for authentication</string>
+    <string name="nav_desc_settings">App preferences and configuration</string>
     <string name="nav_open_drawer">Open navigation</string>
     <string name="nav_close_drawer">Close navigation</string>
     <string name="work_in_progress">Work in progress</string>
+    <string name="press_back_to_exit">Press back again to exit</string>
 
     <!-- Dashboard -->
     <string name="dashboard_pending_finances">Pending Finances</string>
@@ -161,6 +173,10 @@
     <string name="settings_privacy_security">Privacy &amp; Security</string>
     <string name="settings_storage">Storage</string>
     <string name="settings_logins">Logins</string>
+    <string name="settings_desc_logins">Manage your bank account logins</string>
+    <string name="settings_desc_appearance">Theme, language, and display options</string>
+    <string name="settings_desc_privacy_security">App lock, PIN, and security preferences</string>
+    <string name="settings_desc_storage">Manage cached data and storage usage</string>
     <string name="settings_logout">Log out</string>
     <string name="settings_logout_confirm_title">Log out of %s?</string>
     <string name="settings_logout_confirm_message">All cached data will be cleared and remaining accounts will be refreshed.</string>