feat: Finish up design

This commit is contained in:
Ushie 2025-03-05 18:38:57 +03:00
parent 690ab655f6
commit 9a9d1ea775
No known key found for this signature in database
GPG Key ID: B3AAD18842E34632

View File

@ -39,7 +39,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex import androidx.compose.ui.zIndex
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
@ -241,21 +240,6 @@ fun DownloadsSettingsScreen(
} }
} }
@Preview
@Composable
private fun PreviewTrustDialog() {
TrustDialog(
title = R.string.downloader_plugin_trust_dialog_title,
body = stringResource(
R.string.downloader_plugin_trust_dialog_body,
),
onDismiss = { },
onConfirm = { },
pluginName = "app.revanced.manager.apkmirror",
signature = "23 01 84 F6 0B AE 2F EA F2 44 F1 0A 8B AC 05 3C 8F F3 3A 18 3B CC 36 5B 4D 8B 87 6D 2B 7F 48 09"
)
}
@Composable @Composable
private fun TrustDialog( private fun TrustDialog(
@StringRes title: Int, @StringRes title: Int,
@ -281,7 +265,11 @@ private fun TrustDialog(
text = { text = {
Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
Text(body) Text(body)
Card { Card(
colors = CardDefaults.outlinedCardColors(
containerColor = MaterialTheme.colorScheme.surfaceContainer
)
) {
Column( Column(
Modifier.padding(12.dp), Modifier.padding(12.dp),
verticalArrangement = Arrangement.spacedBy(12.dp) verticalArrangement = Arrangement.spacedBy(12.dp)
@ -294,7 +282,7 @@ private fun TrustDialog(
) )
OutlinedCard( OutlinedCard(
colors = CardDefaults.outlinedCardColors( colors = CardDefaults.outlinedCardColors(
containerColor = MaterialTheme.colorScheme.surfaceContainerHighest containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
) )
) { ) {
Text( Text(