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

Improved alert dialog

Browse Source
This commit is contained in:
Juha Heinanen
2026-08-06 18:18:41 +03:00
parent 31d8893872
commit be267c4afa
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/kotlin/com/tutpro/baresip/CustomElements.kt
View File

@ -1,6 +1,7 @@
package com.tutpro.baresip package com.tutpro.baresip
import android.content.Context import android.content.Context
import android.content.res.Configuration
import android.graphics.Bitmap import android.graphics.Bitmap
import android.widget.Toast import android.widget.Toast
import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.animateFloatAsState
@ -9,6 +10,8 @@ import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Canvas import androidx.compose.foundation.Canvas
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.ScrollState import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
@ -68,6 +71,7 @@ import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.SoftwareKeyboardController import androidx.compose.ui.platform.SoftwareKeyboardController
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle
@ -310,12 +314,15 @@ object CustomElements {
onLastClicked: () -> Unit = {} onLastClicked: () -> Unit = {}
) { ) {
if (showDialog.value) { if (showDialog.value) {
val configuration = LocalConfiguration.current
val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
BasicAlertDialog( BasicAlertDialog(
onDismissRequest = { showDialog.value = false }, onDismissRequest = { showDialog.value = false },
properties = DialogProperties(usePlatformDefaultWidth = false),
content = { content = {
Card( Card(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth(if (isLandscape) 0.9f else 0.95f)
.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 0.dp), .padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 0.dp),
shape = RoundedCornerShape(16.dp), shape = RoundedCornerShape(16.dp),
colors = CardDefaults.cardColors( colors = CardDefaults.cardColors(
@ -331,13 +338,22 @@ object CustomElements {
color = MaterialTheme.colorScheme.onSurface color = MaterialTheme.colorScheme.onSurface
) )
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
Text( val scrollState = rememberScrollState()
text = message, Column(
modifier = Modifier.fillMaxWidth(), modifier = Modifier
textAlign = TextAlign.Start, .fillMaxWidth()
fontSize = 16.sp, .weight(1f, fill = false)
color = MaterialTheme.colorScheme.onSurfaceVariant .verticalScrollbar(scrollState)
) .verticalScroll(scrollState)
) {
Text(
text = message,
modifier = Modifier.fillMaxWidth(),
textAlign = TextAlign.Start,
fontSize = 16.sp,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
val buttons = listOf( val buttons = listOf(
@ -469,14 +485,17 @@ object CustomElements {
onNeutralClicked: () -> Unit = {} onNeutralClicked: () -> Unit = {}
) { ) {
if (openDialog.value) { if (openDialog.value) {
val configuration = LocalConfiguration.current
val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
BasicAlertDialog( BasicAlertDialog(
onDismissRequest = { onDismissRequest = {
openDialog.value = false openDialog.value = false
}, },
properties = DialogProperties(usePlatformDefaultWidth = false),
content = { content = {
Card( Card(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth(if (isLandscape) 0.9f else 0.95f)
.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 0.dp), .padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 0.dp),
shape = RoundedCornerShape(16.dp), shape = RoundedCornerShape(16.dp),
colors = CardDefaults.cardColors( colors = CardDefaults.cardColors(
@ -555,10 +574,13 @@ object CustomElements {
val focusRequester = remember { FocusRequester() } val focusRequester = remember { FocusRequester() }
if (showPasswordDialog.value) { if (showPasswordDialog.value) {
val configuration = LocalConfiguration.current
val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
BasicAlertDialog( BasicAlertDialog(
properties = DialogProperties( properties = DialogProperties(
dismissOnBackPress = false, dismissOnBackPress = false,
dismissOnClickOutside = false, dismissOnClickOutside = false,
usePlatformDefaultWidth = false
), ),
onDismissRequest = { onDismissRequest = {
keyboardController?.hide() keyboardController?.hide()
@ -567,7 +589,7 @@ object CustomElements {
) { ) {
Card( Card(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth(if (isLandscape) 0.9f else 0.95f)
.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 0.dp), .padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 0.dp),
shape = RoundedCornerShape(16.dp), shape = RoundedCornerShape(16.dp),
colors = CardDefaults.cardColors( colors = CardDefaults.cardColors(