Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f0f2707a1
|
||
|
|
117733b766
|
||
|
|
d769df6f6b
|
||
|
|
caf0db60da
|
@@ -234,6 +234,12 @@ class AddContactSheetFragment : BottomSheetDialogFragment() {
|
||||
|
||||
private fun setupAccountSearch() {
|
||||
binding.tilAccount.setEndIconOnClickListener { performLookup() }
|
||||
binding.etAccount.setOnEditorActionListener { _, actionId, _ ->
|
||||
if (actionId == android.view.inputmethod.EditorInfo.IME_ACTION_SEARCH) {
|
||||
performLookup()
|
||||
true
|
||||
} else false
|
||||
}
|
||||
}
|
||||
|
||||
private fun performLookup() {
|
||||
@@ -387,7 +393,7 @@ class AddContactSheetFragment : BottomSheetDialogFragment() {
|
||||
|
||||
// Auto-fill alias with existing alias or name
|
||||
if (binding.etAlias.text.isNullOrBlank()) {
|
||||
binding.etAlias.setText(validation.name)
|
||||
binding.etAlias.setText(sh.sar.basedbank.util.bmlapi.BmlDashboardParser.toTitleCase(validation.name))
|
||||
}
|
||||
binding.etCurrency.setText(validation.currency)
|
||||
|
||||
|
||||
@@ -990,10 +990,12 @@ fun applyNavLabelVisibility() {
|
||||
}
|
||||
}
|
||||
|
||||
/** Filters accounts whose profileId the user has hidden in settings. */
|
||||
/** Filters accounts whose profileId or account number the user has hidden in settings. */
|
||||
private fun List<BankAccount>.filterVisibleAccounts(): List<BankAccount> {
|
||||
val store = CredentialStore(this@HomeActivity)
|
||||
val hiddenAccountNumbers = store.getHiddenAccountNumbers()
|
||||
return filter { acc ->
|
||||
if (acc.accountNumber in hiddenAccountNumbers) return@filter false
|
||||
when (acc.bank) {
|
||||
"MIB" -> {
|
||||
val loginId = acc.loginTag.removePrefix("mib_")
|
||||
|
||||
@@ -30,6 +30,7 @@ import sh.sar.basedbank.BasedBankApp
|
||||
import sh.sar.basedbank.R
|
||||
import sh.sar.basedbank.api.bml.BmlProfile
|
||||
import sh.sar.basedbank.api.mib.MibProfile
|
||||
import sh.sar.basedbank.api.models.BankAccount
|
||||
import sh.sar.basedbank.api.mib.TransactionCache
|
||||
import sh.sar.basedbank.databinding.FragmentSettingsLoginsBinding
|
||||
import sh.sar.basedbank.ui.login.LoginActivity
|
||||
@@ -486,6 +487,98 @@ class SettingsLoginsFragment : Fragment() {
|
||||
}
|
||||
}
|
||||
|
||||
/** A single account row with a visibility toggle; [indent] nests it under a parent profile row (tree view). */
|
||||
private fun addAccountRow(
|
||||
ctx: Context,
|
||||
container: LinearLayout,
|
||||
dp: Float,
|
||||
acc: BankAccount,
|
||||
hiddenAccounts: MutableSet<String>,
|
||||
indent: Boolean
|
||||
): Pair<BankAccount, MaterialSwitch> {
|
||||
val row = LinearLayout(ctx).apply {
|
||||
orientation = LinearLayout.HORIZONTAL
|
||||
gravity = Gravity.CENTER_VERTICAL
|
||||
layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).also {
|
||||
it.bottomMargin = (4 * dp).toInt()
|
||||
if (indent) it.marginStart = (28 * dp).toInt()
|
||||
}
|
||||
}
|
||||
val textCol = LinearLayout(ctx).apply {
|
||||
orientation = LinearLayout.VERTICAL
|
||||
layoutParams = LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f)
|
||||
}
|
||||
val nameAppearance = if (indent) com.google.android.material.R.style.TextAppearance_Material3_BodySmall
|
||||
else com.google.android.material.R.style.TextAppearance_Material3_BodyMedium
|
||||
textCol.addView(TextView(ctx).apply {
|
||||
text = acc.accountBriefName.ifBlank { acc.accountTypeName.ifBlank { acc.accountNumber } }
|
||||
setTextAppearance(nameAppearance)
|
||||
})
|
||||
val typeLabel = sh.sar.basedbank.util.AccountListParser.from(acc)?.typeLabel
|
||||
?: if (acc.bank == "BML") sh.sar.basedbank.util.bmlapi.BmlDashboardParser.productLabel(acc.accountTypeName)
|
||||
else acc.accountTypeName.trim()
|
||||
textCol.addView(TextView(ctx).apply {
|
||||
text = listOfNotNull(acc.accountNumber, typeLabel.takeIf { it.isNotBlank() }, acc.currencyName.takeIf { it.isNotBlank() })
|
||||
.joinToString(" · ")
|
||||
setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodySmall)
|
||||
alpha = 0.6f
|
||||
})
|
||||
val toggle = MaterialSwitch(ctx).apply {
|
||||
isChecked = acc.accountNumber !in hiddenAccounts
|
||||
layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
|
||||
marginStart = (4 * dp).toInt()
|
||||
}
|
||||
}
|
||||
row.addView(textCol)
|
||||
row.addView(toggle)
|
||||
container.addView(row)
|
||||
return acc to toggle
|
||||
}
|
||||
|
||||
/** Nests [accounts] directly under their parent profile row, without a header — the tree's leaves. */
|
||||
private fun addNestedAccountRows(
|
||||
ctx: Context,
|
||||
container: LinearLayout,
|
||||
dp: Float,
|
||||
accounts: List<BankAccount>,
|
||||
hiddenAccounts: MutableSet<String>
|
||||
): List<Pair<BankAccount, MaterialSwitch>> =
|
||||
accounts.map { addAccountRow(ctx, container, dp, it, hiddenAccounts, indent = true) }
|
||||
|
||||
/** Builds a headered, flat "Accounts" section for accounts with no profile to nest under. */
|
||||
private fun addAccountsSection(
|
||||
ctx: Context,
|
||||
container: LinearLayout,
|
||||
dp: Float,
|
||||
accounts: List<BankAccount>,
|
||||
hiddenAccounts: MutableSet<String>,
|
||||
showDivider: Boolean
|
||||
): List<Pair<BankAccount, MaterialSwitch>> {
|
||||
if (accounts.isEmpty()) return emptyList()
|
||||
if (showDivider) {
|
||||
container.addView(View(ctx).apply {
|
||||
layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, (1 * dp).toInt()).also {
|
||||
it.topMargin = (12 * dp).toInt(); it.bottomMargin = (12 * dp).toInt()
|
||||
}
|
||||
setBackgroundColor(0x1F000000)
|
||||
})
|
||||
}
|
||||
container.addView(TextView(ctx).apply {
|
||||
text = getString(R.string.accounts)
|
||||
setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_LabelMedium)
|
||||
layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).also {
|
||||
it.bottomMargin = (8 * dp).toInt()
|
||||
}
|
||||
})
|
||||
return accounts.map { addAccountRow(ctx, container, dp, it, hiddenAccounts, indent = false) }
|
||||
}
|
||||
|
||||
/** Merges this login's account-hide choices into the global hidden-accounts set, leaving other logins untouched. */
|
||||
private fun persistHiddenAccounts(store: CredentialStore, scopedAccounts: List<BankAccount>, hiddenAccounts: Set<String>) {
|
||||
val scopedNumbers = scopedAccounts.map { it.accountNumber }.toSet()
|
||||
store.setHiddenAccountNumbers((store.getHiddenAccountNumbers() - scopedNumbers) + hiddenAccounts)
|
||||
}
|
||||
|
||||
private fun showMibLoginDetails(
|
||||
store: CredentialStore,
|
||||
loginId: String,
|
||||
@@ -496,6 +589,10 @@ class SettingsLoginsFragment : Fragment() {
|
||||
val dp = ctx.resources.displayMetrics.density
|
||||
val originalHidden = store.getHiddenMibProfileIds(loginId)
|
||||
val hidden = originalHidden.toMutableSet()
|
||||
val app = requireActivity().application as BasedBankApp
|
||||
val loginAccounts = app.mibAccounts.filter { it.loginTag == "mib_$loginId" }
|
||||
val originalHiddenAccounts = loginAccounts.map { it.accountNumber }.filter { it in store.getHiddenAccountNumbers() }.toSet()
|
||||
val hiddenAccounts = originalHiddenAccounts.toMutableSet()
|
||||
|
||||
val scroll = android.widget.ScrollView(ctx)
|
||||
val container = LinearLayout(ctx).apply {
|
||||
@@ -538,7 +635,10 @@ class SettingsLoginsFragment : Fragment() {
|
||||
})
|
||||
}
|
||||
|
||||
// Build toggle rows — wired up after dialog.show() so we can reference the Save button
|
||||
// Build toggle rows — wired up after dialog.show() so we can reference the Save button.
|
||||
// Each profile's own accounts nest directly beneath it (tree view), since one profile
|
||||
// can have multiple accounts.
|
||||
val accountRows = mutableListOf<Pair<BankAccount, MaterialSwitch>>()
|
||||
val toggleRows = mibProfiles.map { p ->
|
||||
val row = LinearLayout(ctx).apply {
|
||||
orientation = LinearLayout.HORIZONTAL
|
||||
@@ -579,16 +679,24 @@ class SettingsLoginsFragment : Fragment() {
|
||||
row.addView(pencil)
|
||||
row.addView(toggle)
|
||||
container.addView(row)
|
||||
accountRows += addNestedAccountRows(ctx, container, dp, loginAccounts.filter { it.profileId == p.profileId }, hiddenAccounts)
|
||||
p to toggle
|
||||
}
|
||||
|
||||
// Accounts that don't belong to any known profile still need to be reachable.
|
||||
val unassignedAccounts = loginAccounts.filter { acc -> mibProfiles.none { it.profileId == acc.profileId } }
|
||||
accountRows += addAccountsSection(
|
||||
ctx, container, dp, unassignedAccounts, hiddenAccounts,
|
||||
showDivider = mibProfiles.isNotEmpty() || profile != null
|
||||
)
|
||||
|
||||
fun updateToggleStates(saveBtn: android.widget.Button) {
|
||||
val visibleCount = mibProfiles.count { it.profileId !in hidden }
|
||||
toggleRows.forEach { (p, toggle) ->
|
||||
// Disable the sole remaining visible toggle so it can't be turned off
|
||||
toggle.isEnabled = !(toggle.isChecked && visibleCount == 1)
|
||||
}
|
||||
saveBtn.isEnabled = hidden != originalHidden && visibleCount >= 1
|
||||
saveBtn.isEnabled = (hidden != originalHidden || hiddenAccounts != originalHiddenAccounts) && visibleCount >= 1
|
||||
}
|
||||
|
||||
val dialog = MaterialAlertDialogBuilder(ctx)
|
||||
@@ -612,8 +720,16 @@ class SettingsLoginsFragment : Fragment() {
|
||||
}
|
||||
}
|
||||
|
||||
accountRows.forEach { (acc, toggle) ->
|
||||
toggle.setOnCheckedChangeListener { _, checked ->
|
||||
if (checked) hiddenAccounts.remove(acc.accountNumber) else hiddenAccounts.add(acc.accountNumber)
|
||||
updateToggleStates(saveBtn)
|
||||
}
|
||||
}
|
||||
|
||||
saveBtn.setOnClickListener {
|
||||
store.setHiddenMibProfileIds(loginId, hidden)
|
||||
persistHiddenAccounts(store, loginAccounts, hiddenAccounts)
|
||||
clearAllCaches(ctx)
|
||||
dialog.dismiss()
|
||||
(activity as? HomeActivity)?.relogin()
|
||||
@@ -638,6 +754,10 @@ class SettingsLoginsFragment : Fragment() {
|
||||
if (hidden.add(id)) store.setHiddenBmlProfileIds(loginId, hidden)
|
||||
}
|
||||
val originalHidden = hidden.toSet()
|
||||
val app = requireActivity().application as BasedBankApp
|
||||
val loginAccounts = app.bmlAccounts.filter { it.loginTag == "bml_$loginId" }
|
||||
val originalHiddenAccounts = loginAccounts.map { it.accountNumber }.filter { it in store.getHiddenAccountNumbers() }.toSet()
|
||||
val hiddenAccounts = originalHiddenAccounts.toMutableSet()
|
||||
|
||||
val scroll = android.widget.ScrollView(ctx)
|
||||
val container = LinearLayout(ctx).apply {
|
||||
@@ -683,6 +803,9 @@ class SettingsLoginsFragment : Fragment() {
|
||||
})
|
||||
}
|
||||
|
||||
// Each profile's own accounts nest directly beneath it (tree view), since one profile
|
||||
// can have multiple accounts.
|
||||
val accountRows = mutableListOf<Pair<BankAccount, MaterialSwitch>>()
|
||||
val toggleRows = bmlProfiles.map { p ->
|
||||
val avatarIv = makeCircleAvatarView(ctx, 36)
|
||||
val currentBitmap = ProfileImageStore.load(ctx, ProfileImageStore.bmlKey(p.profileId))
|
||||
@@ -730,15 +853,23 @@ class SettingsLoginsFragment : Fragment() {
|
||||
row.addView(pencil)
|
||||
row.addView(toggle)
|
||||
container.addView(row)
|
||||
accountRows += addNestedAccountRows(ctx, container, dp, loginAccounts.filter { it.profileId == p.profileId }, hiddenAccounts)
|
||||
p to toggle
|
||||
}
|
||||
|
||||
// Accounts that don't belong to any known profile still need to be reachable.
|
||||
val unassignedAccounts = loginAccounts.filter { acc -> bmlProfiles.none { it.profileId == acc.profileId } }
|
||||
accountRows += addAccountsSection(
|
||||
ctx, container, dp, unassignedAccounts, hiddenAccounts,
|
||||
showDivider = bmlProfiles.isNotEmpty() || profile != null
|
||||
)
|
||||
|
||||
fun updateToggleStates(saveBtn: android.widget.Button) {
|
||||
val visibleCount = bmlProfiles.count { it.profileId !in hidden }
|
||||
toggleRows.forEach { (_, toggle) ->
|
||||
toggle.isEnabled = !(toggle.isChecked && visibleCount == 1)
|
||||
}
|
||||
saveBtn.isEnabled = hidden != originalHidden && visibleCount >= 1
|
||||
saveBtn.isEnabled = (hidden != originalHidden || hiddenAccounts != originalHiddenAccounts) && visibleCount >= 1
|
||||
}
|
||||
|
||||
val dialog = MaterialAlertDialogBuilder(ctx)
|
||||
@@ -773,8 +904,16 @@ class SettingsLoginsFragment : Fragment() {
|
||||
}
|
||||
}
|
||||
|
||||
accountRows.forEach { (acc, toggle) ->
|
||||
toggle.setOnCheckedChangeListener { _, checked ->
|
||||
if (checked) hiddenAccounts.remove(acc.accountNumber) else hiddenAccounts.add(acc.accountNumber)
|
||||
updateToggleStates(saveBtn)
|
||||
}
|
||||
}
|
||||
|
||||
saveBtn.setOnClickListener {
|
||||
store.setHiddenBmlProfileIds(loginId, hidden)
|
||||
persistHiddenAccounts(store, loginAccounts, hiddenAccounts)
|
||||
clearAllCaches(ctx)
|
||||
dialog.dismiss()
|
||||
(activity as? HomeActivity)?.relogin()
|
||||
@@ -1000,6 +1139,10 @@ class SettingsLoginsFragment : Fragment() {
|
||||
val dp = ctx.resources.displayMetrics.density
|
||||
val hide = viewModel.hideAmounts.value ?: false
|
||||
val masked = "••••••"
|
||||
val app = requireActivity().application as BasedBankApp
|
||||
val loginAccounts = app.fahipayAccounts.filter { it.loginTag == "fahipay_$loginId" }
|
||||
val originalHiddenAccounts = loginAccounts.map { it.accountNumber }.filter { it in store.getHiddenAccountNumbers() }.toSet()
|
||||
val hiddenAccounts = originalHiddenAccounts.toMutableSet()
|
||||
|
||||
val scroll = android.widget.ScrollView(ctx)
|
||||
val container = LinearLayout(ctx).apply {
|
||||
@@ -1050,14 +1193,38 @@ class SettingsLoginsFragment : Fragment() {
|
||||
})
|
||||
}
|
||||
|
||||
MaterialAlertDialogBuilder(ctx)
|
||||
val accountRows = addAccountsSection(ctx, container, dp, loginAccounts, hiddenAccounts, showDivider = true)
|
||||
|
||||
val dialog = MaterialAlertDialogBuilder(ctx)
|
||||
.setTitle(getString(R.string.fahipay_name))
|
||||
.setView(scroll)
|
||||
.setPositiveButton(R.string.close, null)
|
||||
.setNegativeButton(R.string.settings_logout) { _, _ ->
|
||||
confirmLogout(getString(R.string.fahipay_name)) { logoutFahipay(store, loginId) }
|
||||
.apply {
|
||||
if (loginAccounts.isNotEmpty()) setPositiveButton(R.string.save, null)
|
||||
setNeutralButton(R.string.close, null)
|
||||
setNegativeButton(R.string.settings_logout) { _, _ ->
|
||||
confirmLogout(getString(R.string.fahipay_name)) { logoutFahipay(store, loginId) }
|
||||
}
|
||||
}
|
||||
.show()
|
||||
|
||||
if (loginAccounts.isNotEmpty()) {
|
||||
val saveBtn = dialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE)
|
||||
saveBtn.isEnabled = false
|
||||
|
||||
accountRows.forEach { (acc, toggle) ->
|
||||
toggle.setOnCheckedChangeListener { _, checked ->
|
||||
if (checked) hiddenAccounts.remove(acc.accountNumber) else hiddenAccounts.add(acc.accountNumber)
|
||||
saveBtn.isEnabled = hiddenAccounts != originalHiddenAccounts
|
||||
}
|
||||
}
|
||||
|
||||
saveBtn.setOnClickListener {
|
||||
persistHiddenAccounts(store, loginAccounts, hiddenAccounts)
|
||||
clearAllCaches(ctx)
|
||||
dialog.dismiss()
|
||||
(activity as? HomeActivity)?.relogin()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun showLoginDetails(title: String, details: String, onLogout: () -> Unit) {
|
||||
@@ -1140,6 +1307,8 @@ class SettingsLoginsFragment : Fragment() {
|
||||
val pockets = sh.sar.basedbank.util.AccountCache.loadMfaisa(ctx, loginId)
|
||||
val hidden = store.getHiddenMfaisaPocketIds(loginId).toMutableSet()
|
||||
val originalHidden = hidden.toSet()
|
||||
val originalHiddenAccounts = pockets.map { it.accountNumber }.filter { it in store.getHiddenAccountNumbers() }.toSet()
|
||||
val hiddenAccounts = originalHiddenAccounts.toMutableSet()
|
||||
|
||||
// The user-visible "profiles" are: M-Faisa (every non-PayPal pocket) and PayPal (if linked).
|
||||
// Each toggle covers the set of pocket account numbers that belong to that profile.
|
||||
@@ -1195,6 +1364,9 @@ class SettingsLoginsFragment : Fragment() {
|
||||
})
|
||||
}
|
||||
|
||||
// Each group's own pockets nest directly beneath it (tree view), since a group
|
||||
// ("M-Faisa" / "PayPal") can hold multiple pocket accounts.
|
||||
val accountRows = mutableListOf<Pair<BankAccount, MaterialSwitch>>()
|
||||
val toggleRows = profileRows.map { row ->
|
||||
val v = LinearLayout(ctx).apply {
|
||||
orientation = LinearLayout.HORIZONTAL
|
||||
@@ -1217,6 +1389,7 @@ class SettingsLoginsFragment : Fragment() {
|
||||
v.addView(label)
|
||||
v.addView(toggle)
|
||||
container.addView(v)
|
||||
accountRows += addNestedAccountRows(ctx, container, dp, pockets.filter { it.accountNumber in row.pocketIds }, hiddenAccounts)
|
||||
row to toggle
|
||||
}
|
||||
|
||||
@@ -1225,7 +1398,7 @@ class SettingsLoginsFragment : Fragment() {
|
||||
toggleRows.forEach { (_, toggle) ->
|
||||
toggle.isEnabled = !(toggle.isChecked && visibleCount == 1)
|
||||
}
|
||||
saveBtn.isEnabled = hidden != originalHidden && visibleCount >= 1
|
||||
saveBtn.isEnabled = (hidden != originalHidden || hiddenAccounts != originalHiddenAccounts) && visibleCount >= 1
|
||||
}
|
||||
|
||||
val dialog = MaterialAlertDialogBuilder(ctx)
|
||||
@@ -1252,8 +1425,16 @@ class SettingsLoginsFragment : Fragment() {
|
||||
}
|
||||
}
|
||||
|
||||
accountRows.forEach { (acc, toggle) ->
|
||||
toggle.setOnCheckedChangeListener { _, checked ->
|
||||
if (checked) hiddenAccounts.remove(acc.accountNumber) else hiddenAccounts.add(acc.accountNumber)
|
||||
updateToggleStates(saveBtn)
|
||||
}
|
||||
}
|
||||
|
||||
saveBtn.setOnClickListener {
|
||||
store.setHiddenMfaisaPocketIds(loginId, hidden)
|
||||
persistHiddenAccounts(store, pockets, hiddenAccounts)
|
||||
clearAllCaches(ctx)
|
||||
dialog.dismiss()
|
||||
(activity as? HomeActivity)?.relogin()
|
||||
|
||||
@@ -40,9 +40,11 @@ import kotlinx.coroutines.withContext
|
||||
import sh.sar.basedbank.BasedBankApp
|
||||
import sh.sar.basedbank.R
|
||||
import sh.sar.basedbank.api.models.BankAccount
|
||||
import sh.sar.basedbank.api.models.BankContact
|
||||
import sh.sar.basedbank.api.mib.MibIpsAccountInfo
|
||||
import sh.sar.basedbank.databinding.FragmentTransferBinding
|
||||
import sh.sar.basedbank.databinding.ItemAccountDropdownBinding
|
||||
import sh.sar.basedbank.databinding.ItemPickerRowBinding
|
||||
import sh.sar.basedbank.databinding.ItemPickerSectionHeaderBinding
|
||||
import sh.sar.basedbank.ui.home.transfer.BmlTransferHandler
|
||||
import sh.sar.basedbank.ui.home.transfer.FahipayTransferHandler
|
||||
@@ -92,6 +94,7 @@ class TransferFragment : Fragment() {
|
||||
private val dropdownProfileImageCache = mutableMapOf<String, Bitmap>()
|
||||
|
||||
private var accountDropdownAdapter: AccountDropdownAdapter? = null
|
||||
private var contactDropdownAdapter: ContactDropdownAdapter? = null
|
||||
|
||||
/**
|
||||
* Owns everything BML-specific: sessions, the transfer itself, the business-profile OTP
|
||||
@@ -305,6 +308,9 @@ class TransferFragment : Fragment() {
|
||||
|
||||
setupFromDropdown()
|
||||
setupAccountLookup()
|
||||
// Contact search dropdown on the To field needs viewModel.contacts populated —
|
||||
// otherwise it stays empty until the contacts tab or picker sheet is opened first.
|
||||
(activity as? HomeActivity)?.loadAllContacts()
|
||||
|
||||
viewModel.hideAmounts.observe(viewLifecycleOwner) {
|
||||
accountDropdownAdapter?.notifyDataSetChanged()
|
||||
@@ -327,7 +333,7 @@ class TransferFragment : Fragment() {
|
||||
// MFAISA source + a phone-number pick (e.g. a tagged M-Faisa recent) — re-run the
|
||||
// basicBeneDetails lookup so the recipient gets fully resolved before Send is enabled.
|
||||
if (selectedAccount?.bank == "MFAISA") {
|
||||
binding.etTo.setText(accountNumber)
|
||||
binding.etTo.setText(accountNumber, false)
|
||||
mfaisaHandler().searchRecipient(accountNumber)
|
||||
return@setFragmentResultListener
|
||||
}
|
||||
@@ -408,7 +414,7 @@ class TransferFragment : Fragment() {
|
||||
binding.cardToInfo.visibility = View.VISIBLE
|
||||
if (savedToImageHash != null) loadToPhoto(savedToImageHash!!, isProfile = resolvedToOwnAccount != null)
|
||||
} else if (savedToText.isNotEmpty()) {
|
||||
binding.etTo.setText(savedToText)
|
||||
binding.etTo.setText(savedToText, false)
|
||||
}
|
||||
if (savedAmount.isNotEmpty()) binding.etAmount.setText(savedAmount)
|
||||
if (savedRemarks.isNotEmpty()) binding.etRemarks.setText(savedRemarks)
|
||||
@@ -537,7 +543,7 @@ class TransferFragment : Fragment() {
|
||||
resolvedToOwnAccount = null
|
||||
binding.cardToInfo.visibility = View.GONE
|
||||
binding.tilTo.visibility = View.VISIBLE
|
||||
binding.etTo.setText("")
|
||||
binding.etTo.setText("", false)
|
||||
}
|
||||
} else {
|
||||
binding.tilTo.hint = getString(R.string.transfer_to)
|
||||
@@ -551,7 +557,7 @@ class TransferFragment : Fragment() {
|
||||
resolvedToOwnAccount = null
|
||||
binding.cardToInfo.visibility = View.GONE
|
||||
binding.tilTo.visibility = View.VISIBLE
|
||||
binding.etTo.setText("")
|
||||
binding.etTo.setText("", false)
|
||||
}
|
||||
}
|
||||
// The picker and QR-scan icons live alongside the tilTo input. Keep them in sync with
|
||||
@@ -764,6 +770,30 @@ class TransferFragment : Fragment() {
|
||||
updateTransferButton()
|
||||
}
|
||||
}
|
||||
|
||||
setupContactDropdown()
|
||||
}
|
||||
|
||||
/** Live "search contacts as you type" dropdown on the To field (shown once 3+ chars are entered). */
|
||||
private fun setupContactDropdown() {
|
||||
val adapter = ContactDropdownAdapter(requireContext()) { selectedAccount?.bank == "MFAISA" }
|
||||
contactDropdownAdapter = adapter
|
||||
binding.etTo.setAdapter(adapter)
|
||||
|
||||
viewModel.contacts.observe(viewLifecycleOwner) { contacts ->
|
||||
adapter.updateSource(contacts)
|
||||
}
|
||||
|
||||
binding.etTo.setOnItemClickListener { _, _, position, _ ->
|
||||
val contact = adapter.getContact(position) ?: return@setOnItemClickListener
|
||||
prefillToDirectly(
|
||||
accountNumber = contact.benefAccount,
|
||||
displayName = contact.benefNickName,
|
||||
subtitle = "${contact.benefBankName} · ${contact.benefAccount}",
|
||||
colorHex = contact.bankColor,
|
||||
imageHash = contact.customerImgHash
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun lookupAccount() {
|
||||
@@ -975,7 +1005,7 @@ class TransferFragment : Fragment() {
|
||||
binding.btnPickContact.visibility = View.VISIBLE
|
||||
binding.btnScanQr.visibility = View.VISIBLE
|
||||
binding.tilTo.error = null
|
||||
binding.etTo.setText(accountNumber)
|
||||
binding.etTo.setText(accountNumber, false)
|
||||
lookupAccount()
|
||||
}
|
||||
|
||||
@@ -1512,7 +1542,7 @@ class TransferFragment : Fragment() {
|
||||
binding.tilTo.visibility = View.VISIBLE
|
||||
binding.btnPickContact.visibility = View.VISIBLE
|
||||
binding.btnScanQr.visibility = View.VISIBLE
|
||||
binding.etTo.setText("")
|
||||
binding.etTo.setText("", false)
|
||||
binding.tilTo.error = null
|
||||
binding.tilAmount.error = null
|
||||
}
|
||||
@@ -1782,4 +1812,59 @@ class TransferFragment : Fragment() {
|
||||
override fun convertResultToString(r: Any?) = ""
|
||||
}
|
||||
}
|
||||
|
||||
/** Filters [source] contacts by nickname/name/account number, shown once the query is 3+ chars. */
|
||||
private inner class ContactDropdownAdapter(
|
||||
private val context: Context,
|
||||
private val isDisabled: () -> Boolean
|
||||
) : BaseAdapter(), Filterable {
|
||||
|
||||
private var source: List<BankContact> = emptyList()
|
||||
private var filtered: List<BankContact> = emptyList()
|
||||
|
||||
fun updateSource(contacts: List<BankContact>) {
|
||||
source = contacts
|
||||
}
|
||||
|
||||
fun getContact(position: Int): BankContact? = filtered.getOrNull(position)
|
||||
|
||||
override fun getCount() = filtered.size
|
||||
override fun getItem(position: Int) = filtered[position]
|
||||
override fun getItemId(position: Int) = position.toLong()
|
||||
|
||||
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
|
||||
val contact = filtered[position]
|
||||
val b = if (convertView?.tag is ItemPickerRowBinding) {
|
||||
convertView.tag as ItemPickerRowBinding
|
||||
} else {
|
||||
ItemPickerRowBinding.inflate(LayoutInflater.from(context), parent, false).also { it.root.tag = it }
|
||||
}
|
||||
b.tvPrimary.text = contact.benefNickName
|
||||
b.tvSecondary.text = "${contact.benefBankName} · ${contact.benefAccount}"
|
||||
b.tvBalance.visibility = View.GONE
|
||||
b.ivIcon.scaleType = android.widget.ImageView.ScaleType.CENTER_CROP
|
||||
b.ivIcon.setImageBitmap(makeInitialsBitmap(contact.benefNickName, contact.bankColor))
|
||||
return b.root
|
||||
}
|
||||
|
||||
override fun getFilter() = object : Filter() {
|
||||
override fun performFiltering(constraint: CharSequence?): FilterResults {
|
||||
val query = constraint?.toString()?.trim().orEmpty()
|
||||
val matches = if (isDisabled() || query.length < 3) emptyList() else source.filter {
|
||||
it.benefNickName.contains(query, ignoreCase = true) ||
|
||||
it.benefName.contains(query, ignoreCase = true) ||
|
||||
it.benefAccount.contains(query, ignoreCase = true)
|
||||
}.take(8)
|
||||
return FilterResults().apply { values = matches; count = matches.size }
|
||||
}
|
||||
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
|
||||
filtered = results?.values as? List<BankContact> ?: emptyList()
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
|
||||
override fun convertResultToString(r: Any?) = ""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -784,6 +784,15 @@ class CredentialStore(context: Context) {
|
||||
fun setHiddenMibProfileIds(loginId: String, ids: Set<String>) =
|
||||
prefs.edit().putStringSet("mib_${loginId}_hidden_profile_ids", ids).apply()
|
||||
|
||||
// ── Per-account visibility (account numbers are globally unique) ─────────
|
||||
|
||||
/** Returns the set of account numbers the user has chosen to hide, across all logins. */
|
||||
fun getHiddenAccountNumbers(): Set<String> =
|
||||
prefs.getStringSet("hidden_account_numbers", emptySet()) ?: emptySet()
|
||||
|
||||
fun setHiddenAccountNumbers(accountNumbers: Set<String>) =
|
||||
prefs.edit().putStringSet("hidden_account_numbers", accountNumbers).apply()
|
||||
|
||||
// ── Crypto primitives ─────────────────────────────────────────────────────
|
||||
|
||||
private fun getOrCreateKey(): SecretKey {
|
||||
|
||||
@@ -148,12 +148,15 @@
|
||||
app:endIconDrawable="@android:drawable/ic_menu_search"
|
||||
app:endIconContentDescription="@string/transfer_lookup_account">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
<com.google.android.material.textfield.MaterialAutoCompleteTextView
|
||||
android:id="@+id/etTo"
|
||||
style="@style/Widget.Material3.AutoCompleteTextView.OutlinedBox"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textNoSuggestions"
|
||||
android:maxLines="1" />
|
||||
android:maxLines="1"
|
||||
android:completionThreshold="3"
|
||||
android:dropDownHeight="wrap_content" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user