remove cards and quick action lables from dashboard

Reviewed-on: shihaam/thijooree#5

app/build.gradle.kts

@@ -27,6 +27,10 @@ android {
     }
 
     buildTypes {
+        debug {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+        }
         release {
             signingConfig = signingConfigs.getByName("release")
             isMinifyEnabled = false

app/src/debug/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#CC0000"
+        android:pathData="M0,0h108v108h-108z" />
+</vector>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Thijooree Debug</string>
+</resources>

app/src/main/java/sh/sar/basedbank/BasedBankApp.kt

@@ -115,7 +115,11 @@ class BasedBankApp : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        DynamicColors.applyToActivitiesIfAvailable(this)
+        // Only apply wallpaper-based dynamic colors in system theme mode.
+        // Light/dark modes use content-based accent colors applied per-activity via ThemeHelper.
+        DynamicColors.applyToActivitiesIfAvailable(this) { _, _ ->
+            getSharedPreferences("prefs", MODE_PRIVATE).getString("theme", "system") == "system"
+        }
 
         val theme = getSharedPreferences("prefs", MODE_PRIVATE).getString("theme", "system")
         AppCompatDelegate.setDefaultNightMode(when (theme) {

app/src/main/java/sh/sar/basedbank/LockActivity.kt

@@ -21,6 +21,7 @@ import kotlinx.coroutines.withContext
 import sh.sar.basedbank.databinding.ActivityLockBinding
 import sh.sar.basedbank.ui.home.HomeActivity
 import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.ThemeHelper
 import sh.sar.basedbank.BasedBankApp
 import javax.crypto.SecretKeyFactory
 import javax.crypto.spec.PBEKeySpec
@@ -46,6 +47,7 @@ class LockActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        ThemeHelper.applyAccent(this)
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
         binding = ActivityLockBinding.inflate(layoutInflater)
@@ -55,6 +57,9 @@ class LockActivity : AppCompatActivity() {
             isAppearanceLightStatusBars = isLight
             isAppearanceLightNavigationBars = isLight
         }
+        val ta = obtainStyledAttributes(intArrayOf(android.R.attr.colorBackground))
+        window.statusBarColor = ta.getColor(0, if (isLight) android.graphics.Color.WHITE else android.graphics.Color.BLACK)
+        ta.recycle()
         ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, insets ->
             val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             view.setPadding(bars.left, bars.top, bars.right, bars.bottom)
@@ -264,6 +269,13 @@ class LockActivity : AppCompatActivity() {
         if (intent.getBooleanExtra(EXTRA_RESUME, false)) {
             finish()
         } else {
+            val store = CredentialStore(this)
+            val hasCredentials = store.hasMibCredentials() || store.hasBmlCredentials() || store.hasFahipayCredentials()
+            if (!hasCredentials) {
+                startActivity(Intent(this, sh.sar.basedbank.ui.login.LoginActivity::class.java))
+                finish()
+                return
+            }
             val navDest = intent.getIntExtra("nav_destination", -1)
             val autoScan = intent.getBooleanExtra("auto_scan", false)
             startActivity(Intent(this, HomeActivity::class.java).apply {

app/src/main/java/sh/sar/basedbank/api/mib/MibLoginFlow.kt

@@ -9,6 +9,7 @@ import org.json.JSONObject
 import java.security.MessageDigest
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.math.abs
 import kotlin.random.Random
 
 class SessionExpiredException : Exception("MIB session expired")
@@ -168,7 +169,7 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {
                                 accountTypeName  = a.optString("accountTypeName"),
                                 availableBalance = a.optString("availableBalance"),
                                 currentBalance   = a.optString("currentBalance"),
-                                blockedAmount    = a.optString("blockedAmount"),
+                                blockedAmount    = absBlockedAmount(a.optString("blockedAmount")),
                                 mvrBalance       = a.optString("mvrBalance"),
                                 statusDesc       = a.optString("statusDesc"),
                                 profileImageHash = profile.customerImage,
@@ -188,6 +189,13 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {
 
     // ─── Helpers ─────────────────────────────────────────────────────────────
 
+    /** MIB returns blockedAmount as a signed decimal where negative = funds held.
+     *  Normalize to a positive magnitude so downstream code can treat it uniformly. */
+    private fun absBlockedAmount(raw: String): String {
+        val v = raw.toDoubleOrNull() ?: return raw
+        return "%.2f".format(abs(v))
+    }
+
     private fun initialKeyExchange(
         appId: String, encKey: String, sfunc: String, key2: String? = null
     ): Pair<MibSession, String> {
@@ -325,7 +333,7 @@ class MibLoginFlow(private val credentialStore: CredentialStore) {
                         accountTypeName = a.optString("accountTypeName"),
                         availableBalance = a.optString("availableBalance"),
                         currentBalance = a.optString("currentBalance"),
-                        blockedAmount = a.optString("blockedAmount"),
+                        blockedAmount = absBlockedAmount(a.optString("blockedAmount")),
                         mvrBalance = a.optString("mvrBalance"),
                         statusDesc = a.optString("statusDesc"),
                         profileImageHash = profile.customerImage,

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

@@ -125,6 +125,14 @@ class AccountsAdapter(
             binding.tvAccountNumber.text = display.number
             binding.tvAccountType.text   = display.typeLabel
             binding.tvBalance.text       = if (hideAmounts) maskAmount(display.balance) else display.balance
+            val blocked = display.blockedBalance
+            if (blocked != null) {
+                val shown = if (hideAmounts) maskAmount(blocked) else blocked
+                binding.tvBlocked.text       = binding.root.context.getString(R.string.account_blocked_label, shown)
+                binding.tvBlocked.visibility = View.VISIBLE
+            } else {
+                binding.tvBlocked.visibility = View.GONE
+            }
             binding.btnTransfer.setOnClickListener { onTransferClick?.invoke(account) }
             binding.root.setOnClickListener { onAccountClick(account) }
             binding.root.setOnLongClickListener {

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

@@ -57,14 +57,24 @@ class DashboardFragment : Fragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        viewModel.accounts.observe(viewLifecycleOwner) { updateBalances(it) }
+        viewModel.accounts.observe(viewLifecycleOwner) {
-        viewModel.financing.observe(viewLifecycleOwner) { updatePendingFinances() }
+            updateBalances(it)
-        viewModel.bmlLoanDetails.observe(viewLifecycleOwner) { updatePendingFinances() }
+            updateAttentionRow()
+        }
+        viewModel.financing.observe(viewLifecycleOwner) {
+            updatePendingFinances()
+            updateAttentionRow()
+        }
+        viewModel.bmlLoanDetails.observe(viewLifecycleOwner) {
+            updatePendingFinances()
+            updateAttentionRow()
+        }
         viewModel.bmlLimits.observe(viewLifecycleOwner) { updateForeignLimits(it) }
         viewModel.hideAmounts.observe(viewLifecycleOwner) {
             updateBalances(viewModel.accounts.value ?: emptyList())
             updatePendingFinances()
             updateForeignLimits(viewModel.bmlLimits.value ?: emptyList())
+            updateAttentionRow()
         }
 
         binding.swipeRefresh.setOnRefreshListener {
@@ -76,6 +86,10 @@ class DashboardFragment : Fragment() {
             (activity as? HomeActivity)?.navigateTo(R.id.nav_finances)
         }
 
+        binding.cardOverdue.setOnClickListener {
+            (activity as? HomeActivity)?.navigateTo(R.id.nav_finances)
+        }
+
         val cardAdapter = DashboardCardAdapter()
         binding.rvCards.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
         binding.rvCards.adapter = cardAdapter
@@ -112,6 +126,12 @@ class DashboardFragment : Fragment() {
 
     private fun refreshQuickActions() {
         val prefs = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE)
+        val isBottom = prefs.getBoolean("bottom_nav", false)
+        if (isBottom) {
+            binding.buttonBar.visibility = View.GONE
+            return
+        }
+        binding.buttonBar.visibility = View.VISIBLE
         val ids = NavCustomization.getQuickActions(prefs)
         listOf(binding.btnQuickAction1, binding.btnQuickAction2).forEachIndexed { i, btn ->
             val def = NavCustomization.ALL_SWAPPABLE.find { it.id == ids[i] }
@@ -244,6 +264,56 @@ class DashboardFragment : Fragment() {
         }
     }
 
+    private fun updateAttentionRow() {
+        val hide = viewModel.hideAmounts.value ?: false
+        val accounts = viewModel.accounts.value ?: emptyList()
+
+        // Blocked: sum across CASA-style accounts (exclude cards and loans) per currency.
+        val blockedByCurrency = accounts
+            .filter { it.profileType != "BML_CREDIT" && it.profileType != "BML_PREPAID" && it.profileType != "BML_DEBIT" && it.profileType != "BML_LOAN" }
+            .mapNotNull { acc ->
+                val v = acc.blockedAmount.replace(",", "").toDoubleOrNull() ?: 0.0
+                if (v > 0.0) acc.currencyName.uppercase() to v else null
+            }
+            .groupBy({ it.first }, { it.second })
+            .mapValues { (_, vs) -> vs.sum() }
+
+        val blockedTotal = blockedByCurrency.values.sum()
+        if (blockedTotal > 0.0) {
+            // Primary line: prefer MVR if present, otherwise the first currency.
+            val primaryCcy = if ("MVR" in blockedByCurrency) "MVR" else blockedByCurrency.keys.first()
+            val primaryAmt = blockedByCurrency.getValue(primaryCcy)
+            binding.tvBlockedTotal.text = if (hide) "$primaryCcy ••••••" else "$primaryCcy %,.2f".format(primaryAmt)
+
+            val secondary = blockedByCurrency.filterKeys { it != primaryCcy }
+            if (secondary.isNotEmpty()) {
+                binding.tvBlockedSecondary.text = secondary.entries.joinToString(" · ") { (ccy, amt) ->
+                    if (hide) "$ccy ••••••" else "$ccy %,.2f".format(amt)
+                }
+                binding.tvBlockedSecondary.visibility = View.VISIBLE
+            } else {
+                binding.tvBlockedSecondary.visibility = View.GONE
+            }
+            binding.cardBlocked.visibility = View.VISIBLE
+        } else {
+            binding.cardBlocked.visibility = View.GONE
+        }
+
+        // Overdue: MIB finance deals + BML loan details (assumed MVR — matches existing Pending Finances).
+        val mibOverdue = (viewModel.financing.value ?: emptyList()).sumOf { it.overdueAmount }
+        val bmlOverdue = (viewModel.bmlLoanDetails.value ?: emptyMap()).values.sumOf { it.overdueAmount }
+        val overdueTotal = mibOverdue + bmlOverdue
+        if (overdueTotal > 0.0) {
+            binding.tvOverdueTotal.text = if (hide) "MVR ••••••" else "MVR %,.2f".format(overdueTotal)
+            binding.cardOverdue.visibility = View.VISIBLE
+        } else {
+            binding.cardOverdue.visibility = View.GONE
+        }
+
+        binding.rowAttention.visibility =
+            if (blockedTotal > 0.0 || overdueTotal > 0.0) View.VISIBLE else View.GONE
+    }
+
     private fun updatePendingFinances() {
         val hide = viewModel.hideAmounts.value ?: false
         val mibTotal = (viewModel.financing.value ?: emptyList()).sumOf { it.outstandingAmount }

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

@@ -68,6 +68,7 @@ import sh.sar.basedbank.util.CredentialStore
 import sh.sar.basedbank.util.CardsCache
 import sh.sar.basedbank.util.FinancingCache
 import sh.sar.basedbank.util.ForeignLimitsCache
+import sh.sar.basedbank.util.ThemeHelper
 
 class HomeActivity : AppCompatActivity() {
 
@@ -106,6 +107,7 @@ class HomeActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        ThemeHelper.applyAccent(this)
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
         binding = ActivityHomeBinding.inflate(layoutInflater)
@@ -118,6 +120,9 @@ class HomeActivity : AppCompatActivity() {
             isAppearanceLightStatusBars = isLight
             isAppearanceLightNavigationBars = isLight
         }
+        val ta = obtainStyledAttributes(intArrayOf(android.R.attr.colorBackground))
+        window.statusBarColor = ta.getColor(0, if (isLight) android.graphics.Color.WHITE else android.graphics.Color.BLACK)
+        ta.recycle()
         // Auth guard: HomeActivity must only be reachable after LockActivity or fresh login.
         // Using loadSecurityHash() (EncryptedSharedPreferences) instead of plain prefs so
         // a rooted device cannot bypass this by editing security_method in plain prefs.
@@ -512,9 +517,8 @@ fun applyNavLabelVisibility() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.toolbar_menu, menu)
-        val eyeEnabled = getSharedPreferences("prefs", MODE_PRIVATE).getBoolean("hide_sensitive_info", false)
         val eyeItem = menu.findItem(R.id.action_hide_amounts)
-        eyeItem?.isVisible = eyeEnabled
+        eyeItem?.isVisible = true
         val hidden = viewModel.hideAmounts.value ?: false
         eyeItem?.setIcon(if (hidden) R.drawable.ic_visibility_off else R.drawable.ic_visibility)
         return true

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

@@ -276,7 +276,7 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
 
     companion object {
         fun cardImageAsset(card: MibCard): String? = when (card.cardType) {
-            "51" -> "cards/mib/faisa.png"
+            "51" -> "cards/mib/faisa_card.png"
             "53" -> "cards/mib/visa_black_platinum.png"
             "57" -> "cards/mib/visa_blue_everyday.png"
             "70" -> "cards/mib/visa_business.png"

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

@@ -2,7 +2,9 @@ package sh.sar.basedbank.ui.home
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.graphics.Color
 import android.os.Bundle
+import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,6 +12,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ScrollView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDelegate.setApplicationLocales
 import androidx.core.os.LocaleListCompat
@@ -18,8 +21,11 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
 import sh.sar.basedbank.R
 import sh.sar.basedbank.databinding.FragmentSettingsAppearanceBinding
+import sh.sar.basedbank.util.ThemeHelper
 import java.util.Collections
 
 class SettingsAppearanceFragment : Fragment() {
@@ -54,19 +60,29 @@ class SettingsAppearanceFragment : Fragment() {
         // Quick actions
         quickActions.clear()
         quickActions.addAll(NavCustomization.getQuickActions(prefs))
-        quickActionAdapter = NavItemAdapter(quickActions) {
+        quickActionAdapter = NavItemAdapter(
-            NavCustomization.saveQuickActions(prefs, quickActions)
+            items = quickActions,
+            onSave = { NavCustomization.saveQuickActions(prefs, quickActions) },
+            isEnabled = { !prefs.getBoolean("bottom_nav", false) }
+        )
+        setupNavItemRecyclerView(binding.rvQuickActions, quickActionAdapter, quickActions) {
+            !prefs.getBoolean("bottom_nav", false)
         }
-        setupNavItemRecyclerView(binding.rvQuickActions, quickActionAdapter, quickActions)
 
         // Bottom bar shortcuts
         slots.clear()
         slots.addAll(NavCustomization.getSlots(prefs))
-        slotAdapter = NavItemAdapter(slots) {
+        slotAdapter = NavItemAdapter(
+            items = slots,
+            onSave = {
                 NavCustomization.saveSlots(prefs, slots)
                 (activity as? HomeActivity)?.rebuildBottomNav(prefs)
+            },
+            isEnabled = { prefs.getBoolean("bottom_nav", false) }
+        )
+        setupNavItemRecyclerView(binding.rvNavSlots, slotAdapter, slots) {
+            prefs.getBoolean("bottom_nav", false)
         }
-        setupNavItemRecyclerView(binding.rvNavSlots, slotAdapter, slots)
         // Show labels toggle
         val showLabels = prefs.getBoolean("bottom_nav_show_labels", true)
         binding.switchShowLabels.isChecked = showLabels
@@ -93,8 +109,45 @@ class SettingsAppearanceFragment : Fragment() {
             }
             prefs.edit().putString("theme", key).apply()
             AppCompatDelegate.setDefaultNightMode(mode)
+            updateAccentState(key == "system")
+            updatePitchBlackState(key == "dark")
         }
 
+        // Pitch black
+        binding.switchPitchBlack.isChecked = prefs.getBoolean("pitch_black", false)
+        binding.switchPitchBlack.setOnCheckedChangeListener { _, checked ->
+            prefs.edit().putBoolean("pitch_black", checked).apply()
+            requireActivity().recreate()
+        }
+        val isDark = prefs.getString("theme", "system") == "dark"
+        updatePitchBlackState(isDark)
+
+        // Accent color
+        val savedPreset = prefs.getString("accent_preset", ThemeHelper.PRESET_BLUE)
+        binding.accentToggle.check(when (savedPreset) {
+            ThemeHelper.PRESET_RED -> R.id.btnAccentOrange
+            ThemeHelper.PRESET_GREEN  -> R.id.btnAccentGreen
+            ThemeHelper.PRESET_CUSTOM -> R.id.btnAccentCustom
+            else                      -> R.id.btnAccentBlue
+        })
+        binding.accentToggle.addOnButtonCheckedListener { _, checkedId, isChecked ->
+            if (!isChecked) return@addOnButtonCheckedListener
+            val preset = when (checkedId) {
+                R.id.btnAccentOrange -> ThemeHelper.PRESET_RED
+                R.id.btnAccentGreen  -> ThemeHelper.PRESET_GREEN
+                R.id.btnAccentCustom -> ThemeHelper.PRESET_CUSTOM
+                else                 -> ThemeHelper.PRESET_BLUE
+            }
+            if (preset == ThemeHelper.PRESET_CUSTOM) {
+                showCustomColorPicker()
+            } else {
+                prefs.edit().putString("accent_preset", preset).apply()
+                requireActivity().recreate()
+            }
+        }
+        val isSystem = prefs.getString("theme", "system") == "system"
+        updateAccentState(isSystem)
+
         // Language
         val currentLocales = AppCompatDelegate.getApplicationLocales()
         val currentLang = if (currentLocales.isEmpty) "en" else currentLocales[0]?.language ?: "en"
@@ -109,13 +162,18 @@ class SettingsAppearanceFragment : Fragment() {
     private fun setupNavItemRecyclerView(
         rv: RecyclerView,
         adapter: NavItemAdapter,
-        items: MutableList<Int>
+        items: MutableList<Int>,
+        isEnabled: () -> Boolean
     ) {
         rv.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
         rv.adapter = adapter
         ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
             ItemTouchHelper.START or ItemTouchHelper.END, 0
         ) {
+            override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
+                if (!isEnabled()) return 0
+                return super.getMovementFlags(recyclerView, viewHolder)
+            }
             override fun onMove(
                 rv: RecyclerView,
                 from: RecyclerView.ViewHolder,
@@ -134,11 +192,79 @@ class SettingsAppearanceFragment : Fragment() {
 
     private fun updateShortcutsVisibility() {
         val isBottom = prefs.getBoolean("bottom_nav", false)
+        binding.sectionQuickActions.alpha = if (isBottom) 0.38f else 1f
         binding.sectionBottomBarShortcuts.alpha = if (isBottom) 1f else 0.38f
+        binding.switchShowLabels.isClickable = isBottom
+        quickActionAdapter.notifyDataSetChanged()
+        slotAdapter.notifyDataSetChanged()
+    }
+
+    private fun updatePitchBlackState(isDark: Boolean) {
+        binding.rowPitchBlack.alpha = if (isDark) 1f else 0.38f
+        binding.switchPitchBlack.isEnabled = isDark
+    }
+
+    private fun updateAccentState(isSystem: Boolean) {
+        binding.sectionAccentColor.alpha = if (isSystem) 0.38f else 1f
+        for (i in 0 until binding.accentToggle.childCount) {
+            binding.accentToggle.getChildAt(i)?.isEnabled = !isSystem
+        }
+    }
+
+    private fun showCustomColorPicker() {
+        val ctx = requireContext()
+        val currentHex = prefs.getString("accent_custom_color", "") ?: ""
+        val inputLayout = TextInputLayout(ctx).apply {
+            hint = getString(R.string.accent_custom_hint)
+            val pad = (16 * resources.displayMetrics.density).toInt()
+            setPadding(pad, pad / 2, pad, 0)
+        }
+        val input = TextInputEditText(ctx).apply {
+            setText(currentHex)
+            inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
+            setSingleLine(true)
+        }
+        inputLayout.addView(input)
+
+        val dialog = MaterialAlertDialogBuilder(ctx)
+            .setTitle(R.string.accent_custom_pick)
+            .setView(inputLayout)
+            .setPositiveButton(android.R.string.ok, null)
+            .setNegativeButton(R.string.cancel) { _, _ -> revertAccentToggle() }
+            .setOnCancelListener { revertAccentToggle() }
+            .show()
+
+        dialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+            val raw = input.text.toString().trim()
+            val hex = if (raw.startsWith("#")) raw else "#$raw"
+            try {
+                Color.parseColor(hex)
+                prefs.edit()
+                    .putString("accent_preset", ThemeHelper.PRESET_CUSTOM)
+                    .putString("accent_custom_color", hex)
+                    .apply()
+                dialog.dismiss()
+                requireActivity().recreate()
+            } catch (_: Exception) {
+                Toast.makeText(ctx, R.string.accent_invalid_color, Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    private fun revertAccentToggle() {
+        val saved = prefs.getString("accent_preset", ThemeHelper.PRESET_BLUE)
+        binding.accentToggle.check(when (saved) {
+            ThemeHelper.PRESET_RED -> R.id.btnAccentOrange
+            ThemeHelper.PRESET_GREEN  -> R.id.btnAccentGreen
+            ThemeHelper.PRESET_CUSTOM -> R.id.btnAccentCustom
+            else                      -> R.id.btnAccentBlue
+        })
     }
 
     private fun showItemPicker(items: MutableList<Int>, slotIndex: Int, adapter: NavItemAdapter) {
-        if (items === slots && !prefs.getBoolean("bottom_nav", false)) return
+        val isBottom = prefs.getBoolean("bottom_nav", false)
+        if (items === slots && !isBottom) return
+        if (items === quickActions && isBottom) return
         val ctx = requireContext()
         val otherIds = items.filterIndexed { i, _ -> i != slotIndex }.toSet()
         val available = NavCustomization.ALL_SWAPPABLE.filter { it.id !in otherIds }
@@ -147,6 +273,7 @@ class SettingsAppearanceFragment : Fragment() {
             LayoutInflater.from(ctx).inflate(R.layout.item_more_nav, listLayout, false).also { row ->
                 row.findViewById<ImageView>(R.id.ivIcon).setImageResource(item.iconRes)
                 row.findViewById<TextView>(R.id.tvLabel).setText(item.titleRes)
+                row.findViewById<TextView>(R.id.tvDescription).visibility = View.GONE
                 listLayout.addView(row)
             }
         }
@@ -169,7 +296,8 @@ class SettingsAppearanceFragment : Fragment() {
 
     private inner class NavItemAdapter(
         val items: MutableList<Int>,
-        val onSave: () -> Unit
+        val onSave: () -> Unit,
+        val isEnabled: () -> Boolean = { true }
     ) : RecyclerView.Adapter<NavItemAdapter.VH>() {
 
         inner class VH(view: View) : RecyclerView.ViewHolder(view) {
@@ -191,7 +319,12 @@ class SettingsAppearanceFragment : Fragment() {
             val def = NavCustomization.ALL_SWAPPABLE.find { it.id == items[position] } ?: return
             holder.ivNavIcon.setImageResource(def.iconRes)
             holder.tvNavLabel.setText(def.titleRes)
-            holder.itemView.setOnClickListener { showItemPicker(items, holder.adapterPosition, this) }
+            val enabled = isEnabled()
+            holder.itemView.setOnClickListener(
+                if (enabled) View.OnClickListener { showItemPicker(items, holder.adapterPosition, this) }
+                else null
+            )
+            holder.itemView.isClickable = enabled
         }
     }
 

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

@@ -86,17 +86,6 @@ class SettingsSecurityFragment : Fragment() {
             (activity as? HomeActivity)?.resetAutolockTimer()
         }
 
-        // Hide sensitive information (enables/disables the eye icon in toolbar)
-        val viewModel = (requireActivity() as HomeActivity).let {
-            androidx.lifecycle.ViewModelProvider(it)[HomeViewModel::class.java]
-        }
-        binding.switchHideAmounts.isChecked = prefs.getBoolean("hide_sensitive_info", false)
-        binding.switchHideAmounts.setOnCheckedChangeListener { _, isChecked ->
-            prefs.edit().putBoolean("hide_sensitive_info", isChecked).apply()
-            if (!isChecked) viewModel.hideAmounts.value = false
-            requireActivity().invalidateOptionsMenu()
-        }
-
         // Block screenshots
         val blockScreenshots = prefs.getBoolean("block_screenshots", true)
         binding.switchBlockScreenshots.isChecked = blockScreenshots

app/src/main/java/sh/sar/basedbank/ui/login/LoginActivity.kt

@@ -9,12 +9,14 @@ import sh.sar.basedbank.BasedBankApp
 import sh.sar.basedbank.LockActivity
 import sh.sar.basedbank.databinding.ActivityLoginBinding
 import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.ThemeHelper
 
 class LoginActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityLoginBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        ThemeHelper.applyAccent(this)
         super.onCreate(savedInstanceState)
 
         // If security is configured and the user hasn't unlocked this session,
@@ -34,5 +36,8 @@ class LoginActivity : AppCompatActivity() {
             isAppearanceLightStatusBars = isLight
             isAppearanceLightNavigationBars = isLight
         }
+        val ta = obtainStyledAttributes(intArrayOf(android.R.attr.colorBackground))
+        window.statusBarColor = ta.getColor(0, if (isLight) android.graphics.Color.WHITE else android.graphics.Color.BLACK)
+        ta.recycle()
     }
 }

app/src/main/java/sh/sar/basedbank/ui/onboarding/OnboardingActivity.kt

@@ -19,6 +19,7 @@ import sh.sar.basedbank.R
 import sh.sar.basedbank.databinding.ActivityOnboardingBinding
 import sh.sar.basedbank.ui.login.LoginActivity
 import sh.sar.basedbank.util.CredentialStore
+import sh.sar.basedbank.util.ThemeHelper
 
 class OnboardingActivity : AppCompatActivity(), SecuritySetupFragment.Callback {
 
@@ -27,6 +28,7 @@ class OnboardingActivity : AppCompatActivity(), SecuritySetupFragment.Callback {
     private var countDownTimer: CountDownTimer? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        ThemeHelper.applyAccent(this)
         super.onCreate(savedInstanceState)
 
         // If security is already configured, onboarding is complete. Redirect to lock screen
@@ -45,6 +47,9 @@ class OnboardingActivity : AppCompatActivity(), SecuritySetupFragment.Callback {
             isAppearanceLightStatusBars = isLight
             isAppearanceLightNavigationBars = isLight
         }
+        val ta = obtainStyledAttributes(intArrayOf(android.R.attr.colorBackground))
+        window.statusBarColor = ta.getColor(0, if (isLight) android.graphics.Color.WHITE else android.graphics.Color.BLACK)
+        ta.recycle()
         prefs = getSharedPreferences("prefs", MODE_PRIVATE)
         val originalBottomPadding = binding.bottomBar.paddingBottom
         ViewCompat.setOnApplyWindowInsetsListener(binding.bottomBar) { view, insets ->
@@ -109,6 +114,9 @@ class OnboardingActivity : AppCompatActivity(), SecuritySetupFragment.Callback {
 
         binding.btnGetStarted.setOnClickListener {
             prefs.edit().putBoolean("onboarding_done", true).apply()
+            // Mark as unlocked so LoginActivity doesn't redirect to LockActivity.
+            // The user just completed setup — they shouldn't have to re-authenticate immediately.
+            (application as BasedBankApp).isUnlocked = true
             startActivity(Intent(this, LoginActivity::class.java))
             finish()
         }

app/src/main/java/sh/sar/basedbank/util/AccountListDisplay.kt

@@ -5,6 +5,7 @@ data class AccountListDisplay(
     val number: String,
     val typeLabel: String,
     val balance: String,
+    val blockedBalance: String? = null, // null when zero or not applicable
     val isCard: Boolean = false,
     val cardBrandIcon: Int = 0,       // drawable res, only meaningful if isCard
     val statusLabel: String? = null   // null = active; shown as status pill if set

app/src/main/java/sh/sar/basedbank/util/ThemeHelper.kt

@@ -0,0 +1,78 @@
+package sh.sar.basedbank.util
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.os.Build
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.color.DynamicColors
+import com.google.android.material.color.DynamicColorsOptions
+import sh.sar.basedbank.R
+
+object ThemeHelper {
+
+    const val PRESET_BLUE   = "blue"
+    const val PRESET_RED    = "red"
+    const val PRESET_GREEN  = "green"
+    const val PRESET_CUSTOM = "custom"
+
+    fun isSystemTheme(context: Context): Boolean =
+        context.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            .getString("theme", "system") == "system"
+
+    fun getAccentPreset(context: Context): String =
+        context.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            .getString("accent_preset", PRESET_BLUE) ?: PRESET_BLUE
+
+    fun getCustomColor(context: Context): Int? {
+        val hex = context.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            .getString("accent_custom_color", null) ?: return null
+        return try { Color.parseColor(hex) } catch (_: Exception) { null }
+    }
+
+    fun presetSeedColor(context: Context, preset: String): Int = when (preset) {
+        PRESET_RED -> Color.parseColor("#D32F2F")
+        PRESET_GREEN  -> Color.parseColor("#4CAF50")
+        PRESET_CUSTOM -> getCustomColor(context) ?: Color.parseColor("#3F65AD")
+        else          -> Color.parseColor("#3F65AD")
+    }
+
+    fun isPitchBlackEnabled(context: Context): Boolean =
+        context.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+            .getBoolean("pitch_black", false)
+
+    /**
+     * Apply the user-chosen accent theme to the given activity.
+     * Must be called BEFORE super.onCreate() so window-level attributes
+     * (status bar color, etc.) are resolved from the correct overlay.
+     * Has no effect when the theme is set to "system" (dynamic colors are
+     * handled by BasedBankApp via DynamicColors.applyToActivitiesIfAvailable).
+     */
+    fun applyAccent(activity: AppCompatActivity) {
+        if (isSystemTheme(activity)) return
+        val preset = getAccentPreset(activity)
+        val seed = presetSeedColor(activity, preset)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            val bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
+            bitmap.setPixel(0, 0, seed)
+            DynamicColors.applyToActivityIfAvailable(
+                activity,
+                DynamicColorsOptions.Builder().setContentBasedSource(bitmap).build()
+            )
+        } else {
+            // API < 31: apply a simple style overlay (partial palette, but functional)
+            val styleRes = when (preset) {
+                PRESET_RED -> R.style.ThemeOverlay_Accent_Orange
+                PRESET_GREEN  -> R.style.ThemeOverlay_Accent_Green
+                else          -> R.style.ThemeOverlay_Accent_Blue
+            }
+            activity.theme.applyStyle(styleRes, true)
+        }
+
+        val prefs = activity.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+        val isDark = prefs.getString("theme", "system") == "dark"
+        if (isDark && prefs.getBoolean("pitch_black", false)) {
+            activity.theme.applyStyle(R.style.ThemeOverlay_PitchBlack, true)
+        }
+    }
+}

app/src/main/java/sh/sar/basedbank/util/bmlapi/BmlDashboardParser.kt

@@ -26,11 +26,13 @@ object BmlDashboardParser {
                 statusLabel   = if (isActive) null else account.statusDesc
             )
         } else {
+            val blocked = account.blockedAmount.toDoubleOrNull() ?: 0.0
             AccountListDisplay(
                 name           = account.accountBriefName,
                 number         = account.accountNumber,
                 typeLabel      = productLabel(account.accountTypeName),
-                balance   = listBalance(account)
+                balance        = listBalance(account),
+                blockedBalance = if (blocked > 0.0) "${account.currencyName} ${account.blockedAmount}" else null
             )
         }
     }
@@ -52,9 +54,9 @@ object BmlDashboardParser {
         }
     }
 
-    /** Balance shown in the accounts list — ledger (working) balance for BML CASA. */
+    /** Balance shown in the accounts list — available balance, consistent with transfer/contact picker. */
     fun listBalance(account: BankAccount): String =
-        "${account.currencyName} ${account.currentBalance}"
+        "${account.currencyName} ${account.availableBalance}"
 
     fun cardBrandIcon(productName: String): Int = when {
         productName.contains("AMEX", ignoreCase = true) ||

app/src/main/java/sh/sar/basedbank/util/mibapi/MibAccountParser.kt

@@ -5,12 +5,16 @@ import sh.sar.basedbank.util.AccountListDisplay
 
 object MibAccountParser {
 
-    fun displayData(account: BankAccount) = AccountListDisplay(
+    fun displayData(account: BankAccount): AccountListDisplay {
+        val blocked = account.blockedAmount.toDoubleOrNull() ?: 0.0
+        return AccountListDisplay(
             name           = account.accountBriefName,
             number         = account.accountNumber,
             typeLabel      = productLabel(account.accountTypeName),
-        balance   = "${account.currencyName} ${account.availableBalance}"
+            balance        = "${account.currencyName} ${account.availableBalance}",
+            blockedBalance = if (blocked > 0.0) "${account.currencyName} ${account.blockedAmount}" else null
         )
+    }
 
     /**
      * Returns a display-ready product label for a MIB (Faisanet) account type name.

app/src/main/java/sh/sar/basedbank/util/mibapi/MibHistoryParser.kt

@@ -5,13 +5,16 @@ import sh.sar.basedbank.util.AccountHistoryDisplay
 
 object MibHistoryParser {
 
-    fun displayData(account: BankAccount) = AccountHistoryDisplay(
+    fun displayData(account: BankAccount): AccountHistoryDisplay {
+        val blocked = account.blockedAmount.toDoubleOrNull() ?: 0.0
+        return AccountHistoryDisplay(
             name             = account.accountBriefName,
             number           = account.accountNumber,
             bankPill         = null,   // MIB has no bank pill
             typeLabel        = MibAccountParser.productLabel(account.accountTypeName),
             availableBalance = "${account.currencyName} ${account.availableBalance}",
             workingBalance   = "${account.currencyName} ${account.currentBalance}",
-        blockedBalance   = null
+            blockedBalance   = if (blocked > 0.0) "${account.currencyName} ${account.blockedAmount}" else null
         )
     }
+}

app/src/main/res/drawable/ic_qr_scan.xml

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?attr/colorOnSurface"
+        android:fillColor="?attr/colorOnSurfaceVariant"
         android:pathData="M9.5,6.5v3h-3v-3H9.5zM11,5L5,5v5.5h6L11,5zM9.5,14.5v3h-3v-3H9.5zM11,13L5,13v5.5h6L11,13zM17.5,6.5v3h-3v-3H17.5zM19,5h-6v5.5h6L19,5zM13,13h1.5v1.5L13,14.5zM14.5,14.5L16,14.5L16,16h-1.5zM16,13h1.5v1.5L16,14.5zM13,16h1.5v1.5L13,17.5zM14.5,17.5L16,17.5L16,19h-1.5zM16,16h1.5v1.5L16,17.5zM17.5,14.5L19,14.5L19,16h-1.5zM17.5,17.5L19,17.5L19,19h-1.5z"/>
 </vector>

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

@@ -176,6 +176,103 @@
 
         </LinearLayout>
 
+        <!-- Attention row: Blocked + Overdue (hidden when nothing applies) -->
+        <LinearLayout
+            android:id="@+id/rowAttention"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="16dp"
+            android:visibility="gone">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cardBlocked"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginEnd="8dp"
+                app:cardElevation="1dp"
+                app:cardCornerRadius="12dp"
+                app:cardBackgroundColor="?attr/colorErrorContainer"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/dashboard_blocked"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                    <TextView
+                        android:id="@+id/tvBlockedTotal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="MVR —"
+                        android:textAppearance="?attr/textAppearanceTitleMedium"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                    <TextView
+                        android:id="@+id/tvBlockedSecondary"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnErrorContainer"
+                        android:alpha="0.75"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/cardOverdue"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginStart="8dp"
+                app:cardElevation="1dp"
+                app:cardCornerRadius="12dp"
+                app:cardBackgroundColor="?attr/colorErrorContainer"
+                android:clickable="true"
+                android:focusable="true"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/dashboard_overdue"
+                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                    <TextView
+                        android:id="@+id/tvOverdueTotal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="MVR —"
+                        android:textAppearance="?attr/textAppearanceTitleMedium"
+                        android:textColor="?attr/colorOnErrorContainer" />
+
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </LinearLayout>
+
         <!-- Pending Finances card -->
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/cardPendingFinances"
@@ -228,14 +325,6 @@
             android:layout_marginTop="16dp"
             android:visibility="gone">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/nav_pay_with_card"
-                android:textAppearance="?attr/textAppearanceLabelMedium"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:layout_marginBottom="8dp"/>
-
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvCards"
                 android:layout_width="match_parent"
@@ -261,14 +350,6 @@
         android:paddingTop="8dp"
         android:paddingBottom="16dp">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/dashboard_quick_actions"
-            android:textAppearance="?attr/textAppearanceLabelMedium"
-            android:textColor="?attr/colorOnSurfaceVariant"
-            android:layout_marginBottom="8dp" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -45,7 +45,14 @@
 
         </com.google.android.material.button.MaterialButtonToggleGroup>
 
-        <!-- Quick actions (always active) -->
+        <!-- Quick actions — shown only when drawer nav is active -->
+        <LinearLayout
+            android:id="@+id/sectionQuickActions"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginBottom="16dp">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -59,8 +66,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:nestedScrollingEnabled="false"
-            android:overScrollMode="never"
+                android:overScrollMode="never" />
-            android:layout_marginBottom="16dp" />
+
+        </LinearLayout>
 
         <!-- Bottom bar shortcuts — shown only when bottom nav is active -->
         <LinearLayout
@@ -148,6 +156,87 @@
 
         </com.google.android.material.button.MaterialButtonToggleGroup>
 
+        <!-- Pitch black — enabled only in explicit dark mode -->
+        <LinearLayout
+            android:id="@+id/rowPitchBlack"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/settings_pitch_black"
+                android:textAppearance="?attr/textAppearanceBodyLarge" />
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/switchPitchBlack"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
+        <!-- Accent color — always shown, disabled/grayed in system theme mode -->
+        <LinearLayout
+            android:id="@+id/sectionAccentColor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginTop="24dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_accent_color"
+                android:textAppearance="?attr/textAppearanceTitleMedium"
+                android:layout_marginBottom="12dp" />
+
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/accentToggle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:singleSelection="true"
+                app:selectionRequired="true">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnAccentBlue"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/accent_blue" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnAccentOrange"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/accent_orange" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnAccentGreen"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/accent_green" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnAccentCustom"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/accent_custom" />
+
+            </com.google.android.material.button.MaterialButtonToggleGroup>
+
+        </LinearLayout>
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -194,44 +194,6 @@
             android:layout_marginTop="24dp"
             android:layout_marginBottom="8dp" />
 
-        <LinearLayout
-            android:id="@+id/rowHideAmounts"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-            android:layout_marginBottom="4dp">
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_hide_amounts"
-                    android:textAppearance="?attr/textAppearanceBodyLarge"
-                    android:textColor="?attr/colorOnSurface" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_hide_amounts_desc"
-                    android:textAppearance="?attr/textAppearanceBodySmall"
-                    android:textColor="?attr/colorOnSurfaceVariant" />
-
-            </LinearLayout>
-
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/switchHideAmounts"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp" />
-
-        </LinearLayout>
-
         <LinearLayout
             android:id="@+id/rowBlockScreenshots"
             android:layout_width="match_parent"

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

@@ -72,6 +72,15 @@
                 android:textAppearance="?attr/textAppearanceTitleSmall"
                 android:textColor="?attr/colorOnSurface" />
 
+            <TextView
+                android:id="@+id/tvBlocked"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:textAppearance="?attr/textAppearanceLabelSmall"
+                android:textColor="?attr/colorError"
+                android:visibility="gone" />
+
             <ImageButton
                 android:id="@+id/btnTransfer"
                 android:layout_width="40dp"

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

@@ -148,6 +148,15 @@
     <string name="theme_system">System</string>
     <string name="theme_light">Light</string>
     <string name="theme_dark">Dark</string>
+    <string name="settings_pitch_black">Pitch Black</string>
+    <string name="settings_accent_color">Accent Color</string>
+    <string name="accent_blue">Blue</string>
+    <string name="accent_orange">Red</string>
+    <string name="accent_green">Green</string>
+    <string name="accent_custom">Custom</string>
+    <string name="accent_custom_pick">Custom Accent Color</string>
+    <string name="accent_custom_hint">#RRGGBB hex color</string>
+    <string name="accent_invalid_color">Invalid color — enter a valid hex code</string>
     <string name="language">Language</string>
     <string name="lang_english">English</string>
     <string name="lang_dhivehi">ދިވެހި</string>
@@ -208,6 +217,9 @@
     <string name="accounts">Accounts</string>
     <string name="cards">Cards</string>
     <string name="available_balance">Available Balance</string>
+    <string name="account_blocked_label">%1$s blocked</string>
+    <string name="dashboard_blocked">Blocked Funds</string>
+    <string name="dashboard_overdue">Overdue Financing</string>
 
     <!-- Transfer -->
     <string name="transfer_tab_quick">Quick Transfer</string>

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

@@ -6,4 +6,32 @@
         <item name="colorSecondary">@color/seed_secondary</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
     </style>
+
+    <!-- Accent overlays — applied on API < 31 as fallback when content-based dynamic colors unavailable -->
+    <style name="ThemeOverlay_Accent_Blue" parent="">
+        <item name="colorPrimary">#3F65AD</item>
+        <item name="colorSecondary">#9AD141</item>
+    </style>
+
+    <style name="ThemeOverlay_Accent_Orange" parent="">
+        <item name="colorPrimary">#D32F2F</item>
+        <item name="colorSecondary">#EF9A9A</item>
+    </style>
+
+    <style name="ThemeOverlay_Accent_Green" parent="">
+        <item name="colorPrimary">#4CAF50</item>
+        <item name="colorSecondary">#80CBC4</item>
+    </style>
+
+    <!-- Pitch black overlay — forces pure black surfaces for OLED displays -->
+    <style name="ThemeOverlay_PitchBlack" parent="">
+        <item name="android:colorBackground">#000000</item>
+        <item name="colorSurface">#000000</item>
+        <item name="colorSurfaceVariant">#0d0d0d</item>
+        <item name="colorSurfaceContainer">#0d0d0d</item>
+        <item name="colorSurfaceContainerLow">#000000</item>
+        <item name="colorSurfaceContainerLowest">#000000</item>
+        <item name="colorSurfaceContainerHigh">#1a1a1a</item>
+        <item name="colorSurfaceContainerHighest">#1a1a1a</item>
+    </style>
 </resources>