jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In contacts screen menu, show only the currently selected contacts mode

Browse Source
This commit is contained in:
Juha Heinanen
2026-07-22 10:58:52 +03:00
parent 8a4ef99a9b
commit 28e69b2feb
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/kotlin/com/tutpro/baresip/ContactsScreen.kt
View File

@ -117,6 +117,7 @@ private fun ContactsScreen(navController: NavController) {
val ok = stringResource(R.string.ok) val ok = stringResource(R.string.ok)
var expanded by remember { mutableStateOf(false) } var expanded by remember { mutableStateOf(false) }
val showModeDialog = remember { mutableStateOf(false) }
val both = stringResource(R.string.both) val both = stringResource(R.string.both)
val import = stringResource(R.string.import_contacts) val import = stringResource(R.string.import_contacts)
val export = stringResource(R.string.export_contacts) val export = stringResource(R.string.export_contacts)
@ -300,25 +301,9 @@ private fun ContactsScreen(navController: NavController) {
listOf(if (BaresipService.contactAction == "call") call else showCall) listOf(if (BaresipService.contactAction == "call") call else showCall)
} }
val contactNames = remember(BaresipService.contactsMode) { val contactModeNames = remember(both) { listOf("baresip", "Android", both) }
val names = mutableListOf("baresip", "Android", both) val contactModeValues = listOf("baresip", "android", "both")
val values = listOf("baresip", "android", "both") val currentContactModeName = contactModeNames[contactModeValues.indexOf(BaresipService.contactsMode)]
val index = values.indexOf(BaresipService.contactsMode)
if (index != -1) {
val name = names.removeAt(index)
names.add(0, name)
}
names
}
val contactValues = remember(BaresipService.contactsMode) {
val values = mutableListOf("baresip", "android", "both")
val index = values.indexOf(BaresipService.contactsMode)
if (index != -1) {
val value = values.removeAt(index)
values.add(0, value)
}
values
}
val showDialog = remember { mutableStateOf(false) } val showDialog = remember { mutableStateOf(false) }
val showNoticeDialog = remember { mutableStateOf(false) } val showNoticeDialog = remember { mutableStateOf(false) }
@ -418,12 +403,17 @@ private fun ContactsScreen(navController: NavController) {
IconButton(onClick = { expanded = !expanded }) { IconButton(onClick = { expanded = !expanded }) {
Icon(imageVector = Icons.Filled.Menu, contentDescription = "Menu") Icon(imageVector = Icons.Filled.Menu, contentDescription = "Menu")
} }
val contactModeMenuName = currentContactModeName
CustomElements.DropdownMenu( CustomElements.DropdownMenu(
expanded = expanded, expanded = expanded,
onDismissRequest = { expanded = false }, onDismissRequest = { expanded = false },
items = contactNames + contactActionName + import + export + delete, items = listOf(contactModeMenuName) + contactActionName + import + export + delete,
onItemClick = { name -> onItemClick = { name ->
expanded = false expanded = false
if (name == contactModeMenuName) {
showModeDialog.value = true
return@DropdownMenu
}
if (name == call || name == showCall) { if (name == call || name == showCall) {
val newAction = if (BaresipService.contactAction == "call") "dial" else "call" val newAction = if (BaresipService.contactAction == "call") "dial" else "call"
BaresipService.contactAction = newAction BaresipService.contactAction = newAction
@ -462,7 +452,14 @@ private fun ContactsScreen(navController: NavController) {
showDialog.value = true showDialog.value = true
return@DropdownMenu return@DropdownMenu
} }
val mode = contactValues[contactNames.indexOf(name)] }
)
CustomElements.SelectableAlertDialog(
openDialog = showModeDialog,
title = stringResource(R.string.contacts),
items = contactModeNames,
onItemClicked = { index ->
val mode = contactModeValues[index]
val contactsPermissions = arrayOf( val contactsPermissions = arrayOf(
Manifest.permission.READ_CONTACTS, Manifest.permission.READ_CONTACTS,
Manifest.permission.WRITE_CONTACTS Manifest.permission.WRITE_CONTACTS