fix alert content style

This commit is contained in:
2026-07-27 22:31:04 +03:00
parent 4202547931
commit 7aef8ded96
2 changed files with 56 additions and 40 deletions
@@ -5,6 +5,8 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.BasicAlertDialog
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.MaterialExpressiveTheme
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.ModalBottomSheetProperties import androidx.compose.material3.ModalBottomSheetProperties
@@ -14,8 +16,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.DialogProperties import androidx.compose.ui.window.DialogProperties
import ru.shadowsparky.ui.theme.getColorScheme
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@Composable @Composable
fun AlertContent( fun AlertContent(
onDismissRequest: () -> Unit, onDismissRequest: () -> Unit,
@@ -40,6 +43,11 @@ fun AlertContent(
content() content()
} }
} }
MaterialExpressiveTheme(getColorScheme()) {
Surface(
shape = MaterialTheme.shapes.extraLarge,
color = MaterialTheme.colorScheme.surface
) {
if (isTv()) { if (isTv()) {
BasicAlertDialog( BasicAlertDialog(
onDismissRequest = onDismissRequest, onDismissRequest = onDismissRequest,
@@ -48,14 +56,9 @@ fun AlertContent(
dismissOnBackPress = canDismiss, dismissOnBackPress = canDismiss,
dismissOnClickOutside = canDismiss dismissOnClickOutside = canDismiss
) )
) {
Surface(
shape = MaterialTheme.shapes.extraLarge,
color = MaterialTheme.colorScheme.surface
) { ) {
BaseDialogLayout() BaseDialogLayout()
} }
}
} else { } else {
ModalBottomSheet( ModalBottomSheet(
onDismissRequest = onDismissRequest, onDismissRequest = onDismissRequest,
@@ -65,6 +68,10 @@ fun AlertContent(
shouldDismissOnClickOutside = canDismiss shouldDismissOnClickOutside = canDismiss
), ),
shape = MaterialTheme.shapes.extraLarge shape = MaterialTheme.shapes.extraLarge
) { BaseDialogLayout() } ) {
BaseDialogLayout()
}
}
}
} }
} }
@@ -38,6 +38,7 @@ import com.arkivanov.decompose.extensions.compose.subscribeAsState
import org.jetbrains.compose.resources.StringResource import org.jetbrains.compose.resources.StringResource
import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.resources.stringResource
import ru.shadowsparky.ui.components.AlertContent import ru.shadowsparky.ui.components.AlertContent
import ru.shadowsparky.ui.components.LazyColumn
import ru.shadowsparky.ui.components.Loading import ru.shadowsparky.ui.components.Loading
import ru.shadowsparky.updater.domain.UpdateState import ru.shadowsparky.updater.domain.UpdateState
@@ -122,17 +123,23 @@ private fun UpdateAvailableContent(
style = MaterialTheme.typography.titleLarge, style = MaterialTheme.typography.titleLarge,
modifier = Modifier.align(Alignment.CenterHorizontally) modifier = Modifier.align(Alignment.CenterHorizontally)
) )
Column(modifier = Modifier.fillMaxWidth()) { LazyColumn(modifier = Modifier.fillMaxWidth()) {
item {
Text( Text(
text = stringResource(Res.string.updater_changelog_title), text = stringResource(Res.string.updater_changelog_title),
style = MaterialTheme.typography.titleMedium style = MaterialTheme.typography.titleMedium
) )
}
item {
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(4.dp))
}
item {
Text( Text(
text = changeLog ?: stringResource(Res.string.updater_changelog_empty), text = changeLog ?: stringResource(Res.string.updater_changelog_empty),
style = MaterialTheme.typography.bodyMedium style = MaterialTheme.typography.bodyMedium
) )
} }
item {
Button(onClick = onDownloadClick, modifier = Modifier.fillMaxWidth()) { Button(onClick = onDownloadClick, modifier = Modifier.fillMaxWidth()) {
Text( Text(
stringResource(Res.string.updater_btn_download), stringResource(Res.string.updater_btn_download),
@@ -141,6 +148,8 @@ private fun UpdateAvailableContent(
} }
} }
} }
}
}
@Composable @Composable
private fun UpdatePermissionContent( private fun UpdatePermissionContent(