diff --git a/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/saved/SavedMovieScreen.kt b/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/saved/SavedMovieScreen.kt index 623d100..94e93eb 100644 --- a/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/saved/SavedMovieScreen.kt +++ b/apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/saved/SavedMovieScreen.kt @@ -6,13 +6,18 @@ import androiddev.apps.vbox.client.shared.generated.resources.saved_movies import androiddev.apps.vbox.client.shared.generated.resources.saved_movies_not_found import androiddev.apps.vbox.client.shared.generated.resources.user_tags import androiddev.apps.vbox.client.shared.generated.resources.user_tags_filter_disable +import androidx.compose.foundation.background import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.items -import androidx.compose.material3.AlertDialog +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.Checkbox import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -28,6 +33,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import org.jetbrains.compose.resources.painterResource @@ -104,15 +110,18 @@ private fun FilterDialog( onFilterBy: (String?) -> Unit ) { allTags ?: return - AlertDialog( - onDismissRequest = onDismiss, - title = { + BasicAlertDialog(onDismissRequest = onDismiss) { + Column( + modifier = Modifier.clip(RoundedCornerShape(28.dp)) + .background(MaterialTheme.colorScheme.surfaceContainerHigh) + .padding(16.dp) + ) { Text( text = stringResource(Res.string.user_tags), - style = MaterialTheme.typography.titleLarge + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onSurface ) - }, - text = { + Spacer(Modifier.height(16.dp)) LazyColumn(modifier = Modifier.fillMaxWidth()) { item { FilterItemCheckBox( @@ -127,6 +136,7 @@ private fun FilterDialog( items = allTags.filter { it.id != null }, key = { tag -> tag.id ?: tag.tag } ) { tag -> + Spacer(Modifier.height(4.dp)) FilterItemCheckBox( isChecked = filterTag == tag.tag, name = tag.tag @@ -136,9 +146,8 @@ private fun FilterDialog( } } } - }, - confirmButton = {} - ) + } + } } @Composable