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

AudioScreen code styling

Browse Source
This commit is contained in:
Juha Heinanen
2026-08-03 11:39:26 +03:00
parent 4d0512eaab
commit bb54f41144
1 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/kotlin/com/tutpro/baresip/AudioScreen.kt
View File

@ -68,9 +68,7 @@ enum class Result {
OK, ERROR, RESTART
}
fun NavGraphBuilder.audioScreenRoute(
navController: NavController,
) {
fun NavGraphBuilder.audioScreenRoute(navController: NavController) {
composable("audio") {
val ctx = LocalContext.current
AudioScreen(
@ -127,8 +125,8 @@ private fun AudioScreen(onBack: () -> Unit, checkOnClick: () -> Unit) {
)
}
}
) { contentPadding ->
AudioContent(contentPadding)
) {
contentPadding -> AudioContent(contentPadding)
}
}
@ -163,8 +161,7 @@ private fun AudioContent(contentPadding: PaddingValues) {
newAudioModules[module] = oldAudioModules.contains("${module}.so")
oldOpusBitrate = Config.variable("opus_bitrate")
oldOpusPacketLoss = Config.variable("opus_packet_loss")
if (!BaresipService.agcAvailable)
oldMicGain = Config.variable("augain")
if (!BaresipService.agcAvailable) oldMicGain = Config.variable("augain")
if (showAlert.value)
AlertDialog(
@ -203,10 +200,12 @@ private fun Ringtone() {
val selectRingToneMessage = stringResource(R.string.select_ringtone)
val ctx = LocalContext.current
var ringtoneUri by remember {
mutableStateOf(if (Preferences(ctx).ringtoneUri == "")
mutableStateOf(
if (Preferences(ctx).ringtoneUri == "")
RingtoneManager.getActualDefaultRingtoneUri(ctx, RingtoneManager.TYPE_RINGTONE).toString()
else
Preferences(ctx).ringtoneUri!!)
Preferences(ctx).ringtoneUri!!
)
}
newRingtoneUri = ringtoneUri
val launcher = rememberLauncherForActivityResult(
@ -265,7 +264,8 @@ private fun ToneCountry() {
) {
val toneCountryTitle = stringResource(R.string.tone_country)
val toneCountryHelp = stringResource(R.string.tone_country_help)
Text(text = toneCountryTitle,
Text(
text = toneCountryTitle,
modifier = Modifier
.weight(1f)
.clickable {
@ -275,9 +275,7 @@ private fun ToneCountry() {
},
fontSize = 18.sp
)
val isDropDownExpanded = remember {
mutableStateOf(false)
}
val isDropDownExpanded = remember { mutableStateOf(false) }
val countryNames = arrayListOf("BG", "BR", "DE", "CZ", "ES", "FI", "FR", "GB", "JP", "NO", "NZ", "SE", "RU", "US")
val countryValues = arrayListOf("bg", "br", "de", "cz", "es", "fi", "fr", "uk", "jp", "no", "nz", "se", "ru", "us")
val itemPosition = remember {
@ -288,9 +286,7 @@ private fun ToneCountry() {
Row(
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.clickable {
isDropDownExpanded.value = true
}
modifier = Modifier.clickable { isDropDownExpanded.value = true }
) {
Text(text = countryNames[itemPosition.intValue])
Icon(
@ -359,7 +355,8 @@ private fun CallVolume() {
) {
val defaultCallVolumeTitle = stringResource(R.string.default_call_volume)
val defaultCallVolumeHelp = stringResource(R.string.default_call_volume_help)
Text(text = defaultCallVolumeTitle,
Text(
text = defaultCallVolumeTitle,
modifier = Modifier.weight(1f)
.clickable {
alertTitle.value = defaultCallVolumeTitle
@ -379,9 +376,7 @@ private fun CallVolume() {
Row(
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.clickable {
isDropDownExpanded.value = true
}
modifier = Modifier.clickable { isDropDownExpanded.value = true }
) {
Text(text = volNames[itemPosition.intValue])
Icon(
@ -451,14 +446,15 @@ private fun AudioModules() {
) {
val audioModulesTitle = stringResource(R.string.audio_modules_title)
val audioModulesHelp = stringResource(R.string.audio_modules_help)
Text(text = audioModulesTitle,
Text(
text = audioModulesTitle,
fontSize = 18.sp,
modifier = Modifier.clickable {
alertTitle.value = audioModulesTitle
alertMessage.value = audioModulesHelp
showAlert.value = true
})
for (module in Config.audioModules) {
for (module in Config.audioModules)
Row(horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(start = 18.dp, end = 10.dp)
@ -474,7 +470,6 @@ private fun AudioModules() {
}
)
}
}
}
}
@ -584,7 +579,6 @@ private fun checkOnClick(ctx: Context): Result {
BaresipService.rt = RingtoneManager.getRingtone(ctx, newRingtoneUri.toUri())
}
if (BaresipService.toneCountry != newToneCountry) {
BaresipService.toneCountry = newToneCountry
Config.replaceVariable("tone_country", newToneCountry)
@ -599,8 +593,7 @@ private fun checkOnClick(ctx: Context): Result {
if (!BaresipService.agcAvailable) {
var gain = newMicGain.trim()
if (!gain.contains("."))
gain = "$gain.0"
if (!gain.contains(".")) gain = "$gain.0"
if (gain != oldMicGain) {
if (!checkMicGain(gain)) {
alertTitle.value = ctx.getString(R.string.notice)