Moved Block Unknown account setting below Check Origin

This commit is contained in:
Juha Heinanen
2025-12-26 05:59:51 +02:00
parent 9b404efefe
commit e3b56d7449

View File

@ -549,12 +549,37 @@ private fun AccountContent(
} }
} }
@Composable
fun BlockUnknown() {
val blockUnknownTitle = stringResource(R.string.block_unknown)
val blockUnknownHelp = stringResource(R.string.block_unknown_help)
val block by viewModel.blockUnknown.collectAsState()
Row(
Modifier.fillMaxWidth().padding(end = 10.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Start
) {
Text(text = blockUnknownTitle,
modifier = Modifier
.weight(1f)
.clickable {
alertTitle.value = blockUnknownTitle
alertMessage.value = blockUnknownHelp
showAlert.value = true
},
fontSize = 18.sp
)
Switch(
checked = block,
onCheckedChange = { viewModel.blockUnknown.value = it }
)
}
}
@Composable @Composable
fun AudioCodecs(navController: NavController, aor: String) { fun AudioCodecs(navController: NavController, aor: String) {
Row( Row(
Modifier Modifier.fillMaxWidth(),
.fillMaxWidth()
.padding(top = 12.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Start horizontalArrangement = Arrangement.Start
) { ) {
@ -577,7 +602,7 @@ private fun AccountContent(
val mediaEncryptionTitle = stringResource(R.string.media_encryption) val mediaEncryptionTitle = stringResource(R.string.media_encryption)
val mediaEncryptionHelp = stringResource(R.string.media_encryption_help) val mediaEncryptionHelp = stringResource(R.string.media_encryption_help)
Row( Row(
Modifier.fillMaxWidth().padding(end = 10.dp), Modifier.fillMaxWidth().padding(top = 2.dp, end = 10.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Start horizontalArrangement = Arrangement.Start
) { ) {
@ -1027,33 +1052,6 @@ private fun AccountContent(
} }
} }
@Composable
fun BlockUnknown() {
val blockUnknownTitle = stringResource(R.string.block_unknown)
val blockUnknownHelp = stringResource(R.string.block_unknown_help)
val block by viewModel.blockUnknown.collectAsState()
Row(
Modifier.fillMaxWidth().padding(end = 10.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Start
) {
Text(text = blockUnknownTitle,
modifier = Modifier
.weight(1f)
.clickable {
alertTitle.value = blockUnknownTitle
alertMessage.value = blockUnknownHelp
showAlert.value = true
},
fontSize = 18.sp
)
Switch(
checked = block,
onCheckedChange = { viewModel.blockUnknown.value = it }
)
}
}
@Composable @Composable
fun Voicemail() { fun Voicemail() {
val voicemailUriTitle = stringResource(R.string.voicemail_uri) val voicemailUriTitle = stringResource(R.string.voicemail_uri)
@ -1230,6 +1228,7 @@ private fun AccountContent(
RegInt() RegInt()
CheckOrigin() CheckOrigin()
} }
BlockUnknown()
AudioCodecs(navController, aor) AudioCodecs(navController, aor)
MediaEnc() MediaEnc()
MediaNat() MediaNat()
@ -1243,7 +1242,6 @@ private fun AccountContent(
Dtmf() Dtmf()
Answer() Answer()
Redirect() Redirect()
BlockUnknown()
Voicemail() Voicemail()
CountryCode() CountryCode()
TelProvider() TelProvider()