pornking/android-projects
0
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

fix alert content style

Browse Source
This commit is contained in:
pornking
2026-07-27 22:31:04 +03:00
parent 4202547931
commit 7aef8ded96
2 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/ui/src/commonMain/kotlin/ru/shadowsparky/ui/components/AlertContent.kt
+31 -24
View File
@@ -5,6 +5,8 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.BasicAlertDialog
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.MaterialExpressiveTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.ModalBottomSheetProperties
@@ -14,8 +16,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.DialogProperties
import ru.shadowsparky.ui.theme.getColorScheme
@OptIn(ExperimentalMaterial3Api::class)
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun AlertContent(
onDismissRequest: () -> Unit,
@@ -40,31 +43,35 @@ fun AlertContent(
content()
}
}
if (isTv()) {
BasicAlertDialog(
onDismissRequest = onDismissRequest,
modifier = modifier,
properties = DialogProperties(
dismissOnBackPress = canDismiss,
dismissOnClickOutside = canDismiss
)
MaterialExpressiveTheme(getColorScheme()) {
Surface(
shape = MaterialTheme.shapes.extraLarge,
color = MaterialTheme.colorScheme.surface
) {
Surface(
shape = MaterialTheme.shapes.extraLarge,
color = MaterialTheme.colorScheme.surface
) {
BaseDialogLayout()
if (isTv()) {
BasicAlertDialog(
onDismissRequest = onDismissRequest,
modifier = modifier,
properties = DialogProperties(
dismissOnBackPress = canDismiss,
dismissOnClickOutside = canDismiss
)
) {
BaseDialogLayout()
}
} else {
ModalBottomSheet(
onDismissRequest = onDismissRequest,
modifier = modifier,
properties = ModalBottomSheetProperties(
shouldDismissOnBackPress = canDismiss,
shouldDismissOnClickOutside = canDismiss
),
shape = MaterialTheme.shapes.extraLarge
) {
BaseDialogLayout()
}
}
}
} else {
ModalBottomSheet(
onDismissRequest = onDismissRequest,
modifier = modifier,
properties = ModalBottomSheetProperties(
shouldDismissOnBackPress = canDismiss,
shouldDismissOnClickOutside = canDismiss
),
shape = MaterialTheme.shapes.extraLarge
) { BaseDialogLayout() }
}
}