Skip to content

Native Android client for Spotify, built with Jetpack Compose

Extension update and refused-actions cards: Accept is a filled button, shown greyed with "Tick the box above to accept" until the box is ticked (a greyed text-only Accept was not seen)

kota-zod60a79bef3af
diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionDetail.kt b/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionDetail.kt
index e408601e..054aa7de 100644
--- a/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionDetail.kt
+++ b/base/app/src/main/java/com/music/spotui/ui/screens/ExtensionDetail.kt
@@ -465,12 +465,32 @@ internal fun UpdateNeedsOk(name: String, from: String, p: com.music.spotui.exten
if (critical && !codeOnly) Text(stringResource(R.string.actions_critical_warning), color = Warning, fontSize = 12.sp, modifier = Modifier.padding(top = 6.dp))
var risk by remember(p) { mutableStateOf(false) }
if (!codeOnly) RiskBox(risk) { risk = it }
- Row(Modifier.padding(top = 6.dp)) {
- TextButton(enabled = risk || codeOnly, onClick = onAccept) {
- Text(stringResource(if (codeOnly) R.string.update_code_update else R.string.extension_update_accept), color = if (risk || codeOnly) tint else AppMuted)
- }
- TextButton(onClick = onKeep) { Text(stringResource(if (codeOnly) R.string.update_code_later else R.string.extension_update_keep), color = AppText) }
- }
+ AcceptRow(
+ accept = stringResource(if (codeOnly) R.string.update_code_update else R.string.extension_update_accept),
+ enabled = risk || codeOnly,
+ tint = tint,
+ onAccept = onAccept,
+ keep = stringResource(if (codeOnly) R.string.update_code_later else R.string.extension_update_keep),
+ onKeep = onKeep,
+ )
+ }
+}
+
+/**
+ * Accept as a filled button, there before the box is ticked (greyed, with what to tick), and the
+ * other choice beside it. Reported: a greyed text-only Accept was not seen as a button at all.
+ */
+@Composable
+private fun AcceptRow(accept: String, enabled: Boolean, tint: Color, onAccept: () -> Unit, keep: String? = null, onKeep: () -> Unit = {}) {
+ if (!enabled) Text(stringResource(R.string.extension_accept_tick_first), color = AppMuted, fontSize = 12.sp, modifier = Modifier.padding(top = 8.dp))
+ Row(Modifier.fillMaxWidth().padding(top = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) {
+ androidx.compose.material3.Button(
+ onClick = onAccept,
+ enabled = enabled,
+ colors = androidx.compose.material3.ButtonDefaults.buttonColors(containerColor = tint, contentColor = Color.Black, disabledContainerColor = AppMuted.copy(alpha = 0.25f), disabledContentColor = AppText.copy(alpha = 0.6f)),
+ modifier = Modifier.weight(1f),
+ ) { Text(accept, fontWeight = FontWeight.SemiBold) }
+ if (keep != null) androidx.compose.material3.OutlinedButton(onClick = onKeep, modifier = Modifier.weight(1f)) { Text(keep, color = AppText) }
}
}
@@ -488,9 +508,7 @@ internal fun RefusedNeedsOk(refused: List<Ask>, onAccept: () -> Unit) {
if (refused.any { it.critical }) Text(stringResource(R.string.actions_critical_warning), color = Warning, fontSize = 12.sp, modifier = Modifier.padding(top = 6.dp))
var risk by remember { mutableStateOf(false) }
RiskBox(risk) { risk = it }
- TextButton(enabled = risk, onClick = onAccept, modifier = Modifier.padding(top = 6.dp)) {
- Text(stringResource(R.string.extension_update_accept), color = if (risk) Warning else AppMuted)
- }
+ AcceptRow(stringResource(R.string.extension_update_accept), enabled = risk, tint = Warning, onAccept = onAccept)
}
}
diff --git a/base/app/src/main/res/values-de/extensions_strings.xml b/base/app/src/main/res/values-de/extensions_strings.xml
index 117eb1ec..88e979e1 100644
--- a/base/app/src/main/res/values-de/extensions_strings.xml
+++ b/base/app/src/main/res/values-de/extensions_strings.xml
@@ -186,6 +186,7 @@
<string name="extension_update_needs_ok">Update braucht dein OK: %1$s → %2$s</string>
<string name="extension_update_needs_ok_body">Diese Version fordert mehr an, als du akzeptiert hast. Die aktuelle läuft weiter, bis du dich entscheidest.</string>
<string name="extension_update_accept">Akzeptieren</string>
+ <string name="extension_accept_tick_first">Setze oben das Häkchen, um zu akzeptieren.</string>
<string name="extension_update_keep">Aktuelle behalten</string>
<string name="extension_refused_title">Wartet auf Ihr OK</string>
<string name="extension_refused_body">Sie wurde installiert, als sich Aktionen abwählen ließen, und einige wurden abgewählt. Erweiterungen erhalten jetzt alle Aktionen, die sie angeben: Sie bleibt aus, bis Sie sie annehmen.</string>
diff --git a/base/app/src/main/res/values-el/extensions_strings.xml b/base/app/src/main/res/values-el/extensions_strings.xml
index 3739c4c6..56b6d8cb 100644
--- a/base/app/src/main/res/values-el/extensions_strings.xml
+++ b/base/app/src/main/res/values-el/extensions_strings.xml
@@ -186,6 +186,7 @@
<string name="extension_update_needs_ok">Η ενημέρωση χρειάζεται την έγκρισή σου: %1$s → %2$s</string>
<string name="extension_update_needs_ok_body">Αυτή η έκδοση ζητά περισσότερα από όσα αποδέχτηκες. Η τρέχουσα συνεχίζει να λειτουργεί μέχρι να αποφασίσεις.</string>
<string name="extension_update_accept">Αποδοχή</string>
+ <string name="extension_accept_tick_first">Επίλεξε το πλαίσιο παραπάνω για αποδοχή.</string>
<string name="extension_update_keep">Διατήρηση της τρέχουσας</string>
<string name="extension_refused_title">Περιμένει την έγκρισή σας</string>
<string name="extension_refused_body">Εγκαταστάθηκε όταν οι ενέργειες μπορούσαν να αποεπιλεγούν, και κάποιες αποεπιλέχθηκαν. Πλέον μια επέκταση λαμβάνει όλες τις ενέργειες που δηλώνει: μένει απενεργοποιημένη μέχρι να τις αποδεχτείτε.</string>
diff --git a/base/app/src/main/res/values-es/extensions_strings.xml b/base/app/src/main/res/values-es/extensions_strings.xml
index de5ef916..4b281919 100644
--- a/base/app/src/main/res/values-es/extensions_strings.xml
+++ b/base/app/src/main/res/values-es/extensions_strings.xml
@@ -186,6 +186,7 @@
<string name="extension_update_needs_ok">La actualización necesita tu aprobación: %1$s → %2$s</string>
<string name="extension_update_needs_ok_body">Esta versión pide más de lo que aceptaste. La actual sigue funcionando hasta que decidas.</string>
<string name="extension_update_accept">Aceptar</string>
+ <string name="extension_accept_tick_first">Marca la casilla de arriba para aceptar.</string>
<string name="extension_update_keep">Conservar la actual</string>
<string name="extension_refused_title">Espera tu aprobación</string>
<string name="extension_refused_body">Se instaló cuando se podían desmarcar acciones, y se desmarcaron algunas. Ahora una extensión recibe todas las acciones que declara: queda desactivada hasta que las aceptes.</string>
diff --git a/base/app/src/main/res/values-fr/extensions_strings.xml b/base/app/src/main/res/values-fr/extensions_strings.xml
index 9085788f..9271a781 100644
--- a/base/app/src/main/res/values-fr/extensions_strings.xml
+++ b/base/app/src/main/res/values-fr/extensions_strings.xml
@@ -190,6 +190,7 @@
<string name="extension_update_needs_ok">Mise à jour à valider : %1$s → %2$s</string>
<string name="extension_update_needs_ok_body">Cette version demande plus que ce que vous avez accepté. L\'actuelle continue de tourner jusqu\'à votre choix.</string>
<string name="extension_update_accept">Accepter</string>
+ <string name="extension_accept_tick_first">Coche la case ci-dessus pour accepter.</string>
<string name="extension_update_keep">Garder l\'actuelle</string>
<string name="extension_refused_title">Attend votre accord</string>
<string name="extension_refused_body">Elle a été installée quand on pouvait décocher des actions, et vous en avez décoché. Une extension reçoit désormais toutes les actions qu\'elle demande : elle reste éteinte tant que vous ne les acceptez pas.</string>
diff --git a/base/app/src/main/res/values-it/extensions_strings.xml b/base/app/src/main/res/values-it/extensions_strings.xml
index 1b1ab9fa..8b727324 100644
--- a/base/app/src/main/res/values-it/extensions_strings.xml
+++ b/base/app/src/main/res/values-it/extensions_strings.xml
@@ -186,6 +186,7 @@
<string name="extension_update_needs_ok">L\'aggiornamento richiede il tuo OK: %1$s → %2$s</string>
<string name="extension_update_needs_ok_body">Questa versione chiede più di quanto hai accettato. Quella attuale continua a funzionare finché non scegli.</string>
<string name="extension_update_accept">Accetta</string>
+ <string name="extension_accept_tick_first">Spunta la casella qui sopra per accettare.</string>
<string name="extension_update_keep">Mantieni l\'attuale</string>
<string name="extension_refused_title">Attende il tuo OK</string>
<string name="extension_refused_body">È stata installata quando si potevano deselezionare azioni, e alcune lo sono state. Ora un\'estensione riceve tutte le azioni che dichiara: resta spenta finché non le accetti.</string>
diff --git a/base/app/src/main/res/values-pt/extensions_strings.xml b/base/app/src/main/res/values-pt/extensions_strings.xml
index bced16fe..080f6d1c 100644
--- a/base/app/src/main/res/values-pt/extensions_strings.xml
+++ b/base/app/src/main/res/values-pt/extensions_strings.xml
@@ -186,6 +186,7 @@
<string name="extension_update_needs_ok">A atualização precisa do teu OK: %1$s → %2$s</string>
<string name="extension_update_needs_ok_body">Esta versão pede mais do que aceitaste. A atual continua a funcionar até escolheres.</string>
<string name="extension_update_accept">Aceitar</string>
+ <string name="extension_accept_tick_first">Marque a caixa acima para aceitar.</string>
<string name="extension_update_keep">Manter a atual</string>
<string name="extension_refused_title">Aguarda a sua aprovação</string>
<string name="extension_refused_body">Foi instalada quando era possível desmarcar ações, e algumas foram desmarcadas. Agora uma extensão recebe todas as ações que declara: fica desligada até as aceitar.</string>
diff --git a/base/app/src/main/res/values-ru/extensions_strings.xml b/base/app/src/main/res/values-ru/extensions_strings.xml
index d80a96f0..f923861b 100644
--- a/base/app/src/main/res/values-ru/extensions_strings.xml
+++ b/base/app/src/main/res/values-ru/extensions_strings.xml
@@ -186,6 +186,7 @@
<string name="extension_update_needs_ok">Обновление требует вашего согласия: %1$s → %2$s</string>
<string name="extension_update_needs_ok_body">Эта версия запрашивает больше, чем вы принимали. Текущая продолжает работать, пока вы не решите.</string>
<string name="extension_update_accept">Принять</string>
+ <string name="extension_accept_tick_first">Отметьте флажок выше, чтобы принять.</string>
<string name="extension_update_keep">Оставить текущую</string>
<string name="extension_refused_title">Ждёт вашего согласия</string>
<string name="extension_refused_body">Оно было установлено, когда действия можно было отключать, и некоторые были отключены. Теперь расширение получает все заявленные действия: оно выключено, пока вы их не примете.</string>
diff --git a/base/app/src/main/res/values-zh/extensions_strings.xml b/base/app/src/main/res/values-zh/extensions_strings.xml
index 2b4493ef..79db26b0 100644
--- a/base/app/src/main/res/values-zh/extensions_strings.xml
+++ b/base/app/src/main/res/values-zh/extensions_strings.xml
@@ -186,6 +186,7 @@
<string name="extension_update_needs_ok">更新需要你确认:%1$s → %2$s</string>
<string name="extension_update_needs_ok_body">此版本请求的权限超出你已接受的范围。在你选择之前,当前版本会继续运行。</string>
<string name="extension_update_accept">接受</string>
+ <string name="extension_accept_tick_first">勾选上方的复选框以接受。</string>
<string name="extension_update_keep">保留当前版本</string>
<string name="extension_refused_title">等待你的确认</string>
<string name="extension_refused_body">它安装时还可以取消勾选操作,且有些被取消了。现在扩展会获得它声明的全部操作:在你接受之前它保持关闭。</string>
diff --git a/base/app/src/main/res/values/extensions_strings.xml b/base/app/src/main/res/values/extensions_strings.xml
index abce68c2..c92432aa 100644
--- a/base/app/src/main/res/values/extensions_strings.xml
+++ b/base/app/src/main/res/values/extensions_strings.xml
@@ -191,6 +191,7 @@
<string name="extension_update_needs_ok">Update needs your OK: %1$s → %2$s</string>
<string name="extension_update_needs_ok_body">This version asks for more than you accepted. The current one keeps running until you choose.</string>
<string name="extension_update_accept">Accept</string>
+ <string name="extension_accept_tick_first">Tick the box above to accept.</string>
<string name="extension_update_keep">Keep current</string>
<string name="extension_refused_title">Waits for your OK</string>
<string name="extension_refused_body">It was installed when actions could be unticked, and some were. Extensions now get every action they list: it stays off until you accept them.</string>