From 17ef122f6b27e6036e1df6fcb3f9b17c6f2ac2cf Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Mon, 14 Apr 2025 16:17:39 +0300 Subject: [PATCH] Composed codecs activity dialogs --- .../com/tutpro/baresip/CodecsActivity.kt | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt index 3372608d..6eff079e 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt @@ -1,7 +1,6 @@ package com.tutpro.baresip import android.os.Bundle -import android.view.Menu import androidx.activity.ComponentActivity import androidx.activity.OnBackPressedCallback import androidx.activity.compose.setContent @@ -40,11 +39,13 @@ import androidx.compose.runtime.snapshots.SnapshotStateList import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import com.tutpro.baresip.CustomElements.AlertDialog import com.tutpro.baresip.CustomElements.verticalScrollbar class CodecsActivity : ComponentActivity() { @@ -60,6 +61,10 @@ class CodecsActivity : ComponentActivity() { private var media = "" private var title = "" + private val alertTitle = mutableStateOf("") + private val alertMessage = mutableStateOf("") + private val showAlert = mutableStateOf(false) + private val onBackPressedCallback = object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { goBack() @@ -164,6 +169,16 @@ class CodecsActivity : ComponentActivity() { @Composable fun CodecsContent(contentPadding: PaddingValues) { + + if (showAlert.value) { + AlertDialog( + showDialog = showAlert, + title = alertTitle.value, + message = alertMessage.value, + positiveButtonText = stringResource(R.string.ok), + ) + } + Column( modifier = Modifier .fillMaxWidth() @@ -191,16 +206,15 @@ class CodecsActivity : ComponentActivity() { .fillMaxWidth() .padding(top = 8.dp) .clickable { - if (media == "audio") - Utils.alertView( - this, getString(R.string.audio_codecs), - getString(R.string.audio_codecs_help) - ) - else - Utils.alertView( - this, getString(R.string.video_codecs), - getString(R.string.video_codecs_help) - ) + if (media == "audio") { + alertTitle.value = getString(R.string.audio_codecs) + alertMessage.value = getString(R.string.audio_codecs_help) + } + else { + alertTitle.value = getString(R.string.video_codecs) + alertMessage.value = getString(R.string.video_codecs_help) + } + showAlert.value = true }, fontSize = 18.sp, fontWeight = FontWeight.SemiBold,