From ac22124244abf3fca9e97d840adc1ec1fe5f53d6 Mon Sep 17 00:00:00 2001 From: sim Date: Wed, 15 Jan 2025 16:13:25 +0100 Subject: [PATCH] Use lib strings --- .../sunup/activities/ui/AppBarUi.kt | 7 +++--- .../sunup/activities/ui/ChangeServerUi.kt | 2 +- .../distributor/sunup/api/ServerConnection.kt | 6 ++--- .../distributor/sunup/utils/Notifications.kt | 24 +++++++++++-------- app/src/main/res/values/strings.xml | 16 ------------- gradle/libs.versions.toml | 6 ++--- 6 files changed, 25 insertions(+), 36 deletions(-) delete mode 100644 app/src/main/res/values/strings.xml diff --git a/app/src/main/java/org/unifiedpush/distributor/sunup/activities/ui/AppBarUi.kt b/app/src/main/java/org/unifiedpush/distributor/sunup/activities/ui/AppBarUi.kt index dc18589..6e5bb33 100644 --- a/app/src/main/java/org/unifiedpush/distributor/sunup/activities/ui/AppBarUi.kt +++ b/app/src/main/java/org/unifiedpush/distributor/sunup/activities/ui/AppBarUi.kt @@ -14,6 +14,7 @@ import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import org.unifiedpush.distributor.sunup.R +import org.unifiedpush.android.distributor.ui.R as LibR import org.unifiedpush.distributor.sunup.activities.AppAction import org.unifiedpush.distributor.sunup.activities.AppBarViewModel import org.unifiedpush.distributor.sunup.activities.publishAction @@ -42,7 +43,7 @@ fun AppBarUi(appBarViewModel: AppBarViewModel) { ) { Icon( imageVector = Icons.Default.MoreVert, - contentDescription = stringResource(R.string.app_bar_dropdown_description) + contentDescription = stringResource(LibR.string.app_bar_dropdown_description) ) } Dropdown( @@ -79,7 +80,7 @@ fun Dropdown(expanded: Boolean, onRestart: () -> Unit, onDismiss: () -> Unit, on DropdownMenuItem( onClick = onRestart, text = { - Text(stringResource(R.string.app_dropdown_restart)) + Text(stringResource(LibR.string.app_dropdown_restart)) } ) DropdownMenuItem( @@ -89,7 +90,7 @@ fun Dropdown(expanded: Boolean, onRestart: () -> Unit, onDismiss: () -> Unit, on }, text = { Text( - stringResource(R.string.app_dropdown_change_server) + stringResource(LibR.string.app_dropdown_change_server) ) } ) diff --git a/app/src/main/java/org/unifiedpush/distributor/sunup/activities/ui/ChangeServerUi.kt b/app/src/main/java/org/unifiedpush/distributor/sunup/activities/ui/ChangeServerUi.kt index a8095e1..e90e643 100644 --- a/app/src/main/java/org/unifiedpush/distributor/sunup/activities/ui/ChangeServerUi.kt +++ b/app/src/main/java/org/unifiedpush/distributor/sunup/activities/ui/ChangeServerUi.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import org.unifiedpush.distributor.sunup.BuildConfig -import org.unifiedpush.distributor.sunup.R +import org.unifiedpush.android.distributor.ui.R @Preview @Composable diff --git a/app/src/main/java/org/unifiedpush/distributor/sunup/api/ServerConnection.kt b/app/src/main/java/org/unifiedpush/distributor/sunup/api/ServerConnection.kt index b4aabef..985b05c 100644 --- a/app/src/main/java/org/unifiedpush/distributor/sunup/api/ServerConnection.kt +++ b/app/src/main/java/org/unifiedpush/distributor/sunup/api/ServerConnection.kt @@ -19,7 +19,7 @@ import org.unifiedpush.distributor.sunup.AppStore import org.unifiedpush.distributor.sunup.DatabaseFactory import org.unifiedpush.distributor.sunup.Distributor import org.unifiedpush.distributor.sunup.Distributor.sendMessage -import org.unifiedpush.distributor.sunup.R +import org.unifiedpush.android.distributor.ui.R as LibR import org.unifiedpush.distributor.sunup.activities.UiAction import org.unifiedpush.distributor.sunup.api.data.ClientMessage import org.unifiedpush.distributor.sunup.api.data.ServerMessage @@ -93,7 +93,7 @@ class ServerConnection(private val context: Context, private val releaseLock: () Handler(Looper.getMainLooper()).post { Toast.makeText( context, - context.getString(R.string.toast_url_candidate_success, it), + context.getString(LibR.string.toast_url_candidate_success, it), Toast.LENGTH_SHORT ).show() } @@ -178,7 +178,7 @@ class ServerConnection(private val context: Context, private val releaseLock: () Handler(Looper.getMainLooper()).post { Toast.makeText( context, - context.getString(R.string.toast_url_candidate_fail, url), + context.getString(LibR.string.toast_url_candidate_fail, url), Toast.LENGTH_SHORT ).show() } diff --git a/app/src/main/java/org/unifiedpush/distributor/sunup/utils/Notifications.kt b/app/src/main/java/org/unifiedpush/distributor/sunup/utils/Notifications.kt index 59f3732..2fb3246 100644 --- a/app/src/main/java/org/unifiedpush/distributor/sunup/utils/Notifications.kt +++ b/app/src/main/java/org/unifiedpush/distributor/sunup/utils/Notifications.kt @@ -6,6 +6,7 @@ import android.content.Context import java.util.concurrent.atomic.AtomicBoolean import org.unifiedpush.distributor.AppNotification import org.unifiedpush.distributor.sunup.R +import org.unifiedpush.android.distributor.ui.R as LibR import org.unifiedpush.distributor.sunup.activities.MainActivity import org.unifiedpush.distributor.sunup.services.MainRegistrationCounter @@ -31,9 +32,9 @@ class MainNotificationData( private val Context.warningChannelData: AppNotification.ChannelData get() = AppNotification.ChannelData( "${this.getString(R.string.app_name)}.Warning", - "Warning", + this.getString(LibR.string.warning), NotificationManager.IMPORTANCE_HIGH, - this.getString(R.string.warning_notif_description) + this.resources.getString(LibR.string.warning_notif_description).format(this.getString(R.string.app_name)) ) class DisconnectedNotification(context: Context) : AppNotification( @@ -42,8 +43,10 @@ class DisconnectedNotification(context: Context) : AppNotification( NOTIFICATION_ID_WARNING, MainNotificationData( context.getString(R.string.app_name), - context.getString(R.string.warning_notif_content), - context.getString(R.string.warning_notif_ticker), + context.getString(LibR.string.warning_notif_content).format( + context.getString(R.string.app_name) + ), + context.getString(LibR.string.warning), Notification.PRIORITY_HIGH, true ), @@ -57,20 +60,21 @@ class ForegroundNotification(context: Context) : AppNotification( MainNotificationData( context.getString(R.string.app_name), if (MainRegistrationCounter.oneOrMore(context)) { - context.getString(R.string.foreground_notif_content_with_reg) - .format(MainRegistrationCounter.getCount(context)) + MainRegistrationCounter.getCount(context).let { + context.resources.getQuantityString(LibR.plurals.foreground_notif_content_with_reg, it, it) + } } else { - context.getString(R.string.foreground_notif_content_no_reg) + context.getString(LibR.string.foreground_notif_content_no_reg) }, - context.getString(R.string.foreground_notif_ticker), + context.getString(LibR.string.foreground_service), Notification.PRIORITY_LOW, true ), ChannelData( "${context.getString(R.string.app_name)}.Listener", - "Foreground Service", + context.getString(LibR.string.foreground_service), NotificationManager.IMPORTANCE_LOW, - context.getString(R.string.foreground_notif_description) + context.getString(LibR.string.foreground_notif_description) ) ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml deleted file mode 100644 index 8c0c0dd..0000000 --- a/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - Notification to run in the foreground - Waiting for registration to connect - Connected for %s registration(s) - Foreground - Restart Service - Change server - Sunup is disconnected - Warn when Sunup is disconnected or an issue occurred. - Warning - Fail to use %1$s - Successfully using %1$s - Actions - Custom Push server - URL - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 104fb52..af3f9c4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,10 +9,10 @@ androidx-lifecycle = "2.8.7" androidx-runtimeAndroid = "1.7.6" androidx-work = "2.10.0" appcompat = "1.7.0" -unifiedpush_distributor = "0.1.0" -unifiedpush_distributor_ui = "0.1.0" +unifiedpush_distributor = "0.1.1" +unifiedpush_distributor_ui = "0.1.1" kotlin = "2.1.0" -kotlinx_serializationJson = "1.8.0-RC" +kotlinx_serializationJson = "1.8.0" ktlint = "12.1.2" material = "1.12.0" material3Android = "1.3.1"