Capacity change warning. Improve notification message.

Author: sdsantos

app/src/main/java/io/bloco/snowflake/background/SnowflakeWorker.kt

@@ -126,13 +126,15 @@ class SnowflakeWorker(
             .setColor(SeedColor.toArgb())
             .setContentTitle(resources.getString(R.string.notification_channel))
             .setContentText(
-                resources.getString(
-                    if (state.clientsConnected > 0) {
-                        R.string.notification_text_connected
-                    } else {
-                        R.string.notification_text
-                    },
-                ),
+                if (state.clientsConnected > 0) {
+                    resources.getQuantityString(
+                        R.plurals.notification_text_connected,
+                        state.clientsConnected,
+                        state.clientsConnected,
+                    )
+                } else {
+                    resources.getString(R.string.notification_text)
+                },
             ).setAutoCancel(false)
             .setOngoing(true)
             .setPriority(NotificationCompat.PRIORITY_LOW)

app/src/main/java/io/bloco/snowflake/ui/settings/SettingsScreen.kt

@@ -199,6 +199,16 @@ fun SettingsScreen(
                         .fillMaxWidth()
                         .padding(horizontal = 16.dp),
             )
+            if (state.capacityWasChanged) {
+                Text(
+                    text = stringResource(R.string.settings_capacity_warning),
+                    style = MaterialTheme.typography.labelMedium,
+                    textAlign = TextAlign.End,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 4.dp, horizontal = 16.dp),
+                )
+            }
         }
     }
 }

app/src/main/java/io/bloco/snowflake/ui/settings/SettingsViewModel.kt

@@ -45,15 +45,19 @@ class SettingsViewModel(
             .filterIsInstance<Event.ChargingOnlyChange>()
             .onEach { setChargingOnly(it.value) }
             .launchIn(viewModelScope)
+
         events
             .filterIsInstance<Event.CapacityChange>()
-            .onEach { setCapacity(it.value) }
-            .launchIn(viewModelScope)
+            .onEach {
+                setCapacity(it.value)
+                _state.update { state -> state.copy(capacityWasChanged = true) }
+            }.launchIn(viewModelScope)
     }
 
     data class State(
         val config: AppConfig? = null,
         val capacity: Capacity? = null,
+        val capacityWasChanged: Boolean = false,
     )
 
     sealed interface Event {

app/src/main/res/values-ja/strings.xml

@@ -40,7 +40,6 @@
     <string name="settings_capacity_unlimited">人数に制限なく支援します</string>
     <string name="notification_channel">Snowflake</string>
     <string name="notification_text">Snowflake は他のユーザーが検閲を回避するのを支援する準備ができています。</string>
-    <string name="notification_text_connected">Snowflake は他のユーザーが検閲を回避できるよう支援しています。</string>
     <string name="enabled">有効</string>
     <string name="disabled">無効</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="close">Fechar</string>
-    <string name="snowflake_disabled">Ativar Snowflake. Ajude outros a contornar a censura.</string>
-    <string name="snowflake_enabled">Snowflake Ativo. Está a ajudar a contornar a censura.</string>
+    <string name="snowflake_disabled">Ativar Snowflake. Ajude outros contornar a censura.</string>
+    <string name="snowflake_enabled">Snowflake Ativo. Está a ajudar contornar a censura.</string>
     <string name="snowflake_stopped">Parado</string>
-    <string name="snowflake_looking_to_help">À procura de alguém…</string>
+    <string name="snowflake_looking_to_help">À procura de alguém para ajudar…</string>
     <string name="snowflake_helping">A ajudar</string>
     <plurals name="persons">
         <item quantity="one">%d pessoa</item>
@@ -42,8 +42,12 @@
     </plurals>
     <string name="settings_capacity_unlimited">Ajuda um número ilimitado de pessoas</string>
     <string name="notification_channel">Snowflake</string>
-    <string name="notification_text">O seu Snowflake está pronto para ajudar outros a contornar a censura.</string>
-    <string name="notification_text_connected">O seu Snowflake está neste momento a ajudar alguém contornar a censura.</string>
+    <string name="notification_text">À procura de alguém para ajudar contornar a censura…</string>
+    <plurals name="notification_text_connected">
+        <item quantity="one">A ajudar %d pessoa contornar a censura</item>
+        <item quantity="many">A ajudar %d de pessoas contornar a censura</item>
+        <item quantity="other">A ajudar %d pessoas contornar a censura</item>
+    </plurals>
     <string name="enabled">Ativado</string>
     <string name="disabled">Desativado</string>
     <string name="settings_capacity">Quantas pessoas ajudar ao mesmo tempo</string>

app/src/main/res/values/strings.xml

@@ -57,10 +57,14 @@
         <item quantity="other">Help %d persons at the same time</item>
     </plurals>
     <string name="settings_capacity_unlimited">Help an unlimited number of persons</string>
+    <string name="settings_capacity_warning">Changes only apply on service restart</string>
 
     <string name="notification_channel">Snowflake</string>
-    <string name="notification_text">Your Snowflake is ready to help users circumvent censorship.</string>
-    <string name="notification_text_connected">Your Snowflake is currently helping someone circumvent censorship.</string>
+    <string name="notification_text">Looking for someone to help circumvent censorship…</string>
+    <plurals name="notification_text_connected">
+        <item quantity="one">Helping %d person circumvent censorship</item>
+        <item quantity="other">Helping %d persons circumvent censorship</item>
+    </plurals>
 
     <string name="enabled">Enabled</string>
     <string name="disabled">Disabled</string>