Skip to content

Copilot polish: 233c77c #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GAME-OVER-op wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Copilot polish: 233c77c #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions application/app/src/main/java/com/android/zdtd/service/ui/DeleteModuleDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ import androidx.compose.ui.window.DialogProperties
import androidx.compose.ui.unit.dp
import com.android.zdtd.service.R

// Color scheme for delete module dialogs
private val DeleteModuleDangerColor = Color(0xFFFF2D55)
private val DeleteModuleAccentColor = Color(0xFFA78BFA)

@Composable
fun DeleteModuleConfirmDialog(
visible: Boolean,
Expand All @@ -50,8 +54,6 @@ fun DeleteModuleConfirmDialog(
if (!visible) return

val compact = rememberIsCompactWidth() || rememberIsShortHeight()
val danger = Color(0xFFFF2D55)
val accent = Color(0xFFA78BFA)

Dialog(
onDismissRequest = onDismiss,
Expand All @@ -62,7 +64,7 @@ fun DeleteModuleConfirmDialog(
bottomActions = {
DeleteModuleActions(
compact = compact,
danger = danger,
danger = DeleteModuleDangerColor,
confirmText = stringResource(R.string.delete_module_yes),
onDismiss = onDismiss,
onConfirm = onConfirm,
Expand Down Expand Up @@ -96,15 +98,15 @@ fun DeleteModuleConfirmDialog(
Spacer(Modifier.height(if (compact) 16.dp else 20.dp))

DeleteModuleInfoCard(
accent = danger,
accent = DeleteModuleDangerColor,
title = stringResource(R.string.settings_delete_module_action),
body = stringResource(R.string.delete_module_warning_reboot),
)

Spacer(Modifier.height(12.dp))

DeleteModuleInfoCard(
accent = accent,
accent = DeleteModuleAccentColor,
title = stringResource(R.string.common_attention),
body = stringResource(R.string.delete_module_goodbye),
soft = true,
Expand All @@ -121,7 +123,6 @@ fun DeleteModuleNextStepDialog(
if (!visible) return

val compact = rememberIsCompactWidth() || rememberIsShortHeight()
val accent = Color(0xFFA78BFA)

Dialog(
onDismissRequest = onDismiss,
Expand All @@ -135,7 +136,7 @@ fun DeleteModuleNextStepDialog(
modifier = Modifier.fillMaxWidth(),
shape = CircleShape,
colors = ButtonDefaults.buttonColors(
containerColor = accent.copy(alpha = 0.92f),
containerColor = DeleteModuleAccentColor.copy(alpha = 0.92f),
contentColor = Color.White,
),
) {
Expand All @@ -159,15 +160,15 @@ fun DeleteModuleNextStepDialog(
Spacer(Modifier.height(14.dp))

DeleteModuleInfoCard(
accent = accent,
accent = DeleteModuleAccentColor,
title = stringResource(R.string.common_attention),
body = stringResource(R.string.delete_module_next_body),
)

Spacer(Modifier.height(12.dp))

DeleteModuleInfoCard(
accent = Color(0xFFFF2D55),
accent = DeleteModuleDangerColor,
title = stringResource(R.string.settings_delete_module_action),
body = stringResource(R.string.delete_module_warning_reboot),
soft = true,
Expand All @@ -185,7 +186,7 @@ fun DeleteModulePreparingDialog(
if (!visible && errorText == null) return

val compact = rememberIsCompactWidth() || rememberIsShortHeight()
val accent = if (errorText == null) Color(0xFFA78BFA) else Color(0xFFFF2D55)
val accent = if (errorText == null) DeleteModuleAccentColor else DeleteModuleDangerColor
val shape = RoundedCornerShape(if (compact) 26.dp else 30.dp)

Dialog(
Expand Down
Loading