From 09eccb37a4295729262b38bf9ec680425e0ee7b0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 15:55:19 +0000 Subject: [PATCH 1/2] Update dependency androidx.compose:compose-bom to v2025.12.01 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f9fc072..b94cbfe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ espressoCore = "3.7.0" lifecycleRuntimeKtx = "2.10.0" activityCompose = "1.12.3" kotlin = "2.3.10" -composeBom = "2025.04.01" +composeBom = "2025.12.01" navVersion = "2.9.7" shizukuVersion = "13.1.0" jacksonVersion = "2.19.4" From 445eaffea7677e50f03be578d67e2e588565f823 Mon Sep 17 00:00:00 2001 From: voruti <45130096+voruti@users.noreply.github.com> Date: Tue, 10 Feb 2026 19:26:18 +0100 Subject: [PATCH 2/2] Replace context.getString with stringResource --- .../redno/disabledlauncher/ui/components/Common.kt | 14 ++++++++------ .../ui/screens/SelectMultipleAppsScreen.kt | 11 ++++++++--- .../disabledlauncher/ui/screens/SettingsScreen.kt | 5 +++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/de/redno/disabledlauncher/ui/components/Common.kt b/app/src/main/java/de/redno/disabledlauncher/ui/components/Common.kt index b2810a0..6d1396d 100644 --- a/app/src/main/java/de/redno/disabledlauncher/ui/components/Common.kt +++ b/app/src/main/java/de/redno/disabledlauncher/ui/components/Common.kt @@ -250,6 +250,8 @@ fun AppEntry( contextContent = { DropdownMenu( expanded = dropdownExpanded, onDismissRequest = { dropdownExpanded = false }) { + val textLauncherNotSupportPinned: String = + stringResource(R.string.launcher_not_support_pinned) DropdownMenuItem( onClick = { if (ShortcutManagerCompat.isRequestPinShortcutSupported(context)) { @@ -269,7 +271,7 @@ fun AppEntry( } else { Toast.makeText( context, - context.getString(R.string.launcher_not_support_pinned), + textLauncherNotSupportPinned, Toast.LENGTH_LONG ).show() } @@ -280,6 +282,8 @@ fun AppEntry( Text(stringResource(R.string.add_shortcut)) }) app.overlyingListType?.let { + val appRemovedFormat: String = stringResource(R.string.app_removed) + val textCouldntRemoveApp: String = stringResource(R.string.couldnt_remove_app) DropdownMenuItem( onClick = { if (Datasource.removePackage(context, app.packageName, it)) { @@ -287,14 +291,14 @@ fun AppEntry( AndroidUtil.asyncToastMakeText( context, - String.format(context.getString(R.string.app_removed), app.name), + String.format(appRemovedFormat, app.name), Toast.LENGTH_SHORT ) // TODO: refresh app list (+ there are other actions/code locations that need to trigger a list refresh) } else { Toast.makeText( context, - context.getString(R.string.couldnt_remove_app), + textCouldntRemoveApp, Toast.LENGTH_LONG ).show() } @@ -333,8 +337,6 @@ fun AppList( onSelectedValueChangeAsWell: (App, Boolean) -> Unit = { _, _ -> }, sortByName: Boolean = false ) { - val context = LocalContext.current - Column(modifier = modifier) { var text by rememberSaveable { mutableStateOf("") } TextField( // TODO: https://developer.android.com/jetpack/compose/text#enter-modify-text @@ -348,7 +350,7 @@ fun AppList( onClick = { text = "" }) { Icon( imageVector = Icons.Default.Clear, - contentDescription = context.getString(R.string.clear_search) + contentDescription = stringResource(R.string.clear_search) ) } }) diff --git a/app/src/main/java/de/redno/disabledlauncher/ui/screens/SelectMultipleAppsScreen.kt b/app/src/main/java/de/redno/disabledlauncher/ui/screens/SelectMultipleAppsScreen.kt index 3606c50..a99c7e2 100644 --- a/app/src/main/java/de/redno/disabledlauncher/ui/screens/SelectMultipleAppsScreen.kt +++ b/app/src/main/java/de/redno/disabledlauncher/ui/screens/SelectMultipleAppsScreen.kt @@ -12,6 +12,7 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalResources import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.core.graphics.drawable.toBitmap @@ -25,7 +26,7 @@ import de.redno.disabledlauncher.ui.theme.DisabledLauncherTheme @Preview(showBackground = true, showSystemUi = true) @Composable private fun SelectMultipleAppsPreview() { - val context = LocalContext.current + val resources = LocalResources.current DisabledLauncherTheme { SelectMultipleAppsScreen( @@ -36,7 +37,10 @@ private fun SelectMultipleAppsPreview() { packageName = "test.p1", isEnabled = true, isInstalled = true, - icon = context.getDrawable(R.drawable.ic_launcher_background)!! + icon = resources.getDrawable( + R.drawable.ic_launcher_background, + null + )!! .toBitmap() ) ), @@ -69,12 +73,13 @@ fun SelectMultipleAppsScreen( ) }, floatingActionButton = { + val textNoAppsSelected: String = stringResource(R.string.no_apps_selected) FloatingActionButton(onClick = { Thread { if (selectedAppList.isEmpty()) { AndroidUtil.asyncToastMakeText( context, - context.getString(R.string.no_apps_selected), + textNoAppsSelected, Toast.LENGTH_SHORT ) } else { diff --git a/app/src/main/java/de/redno/disabledlauncher/ui/screens/SettingsScreen.kt b/app/src/main/java/de/redno/disabledlauncher/ui/screens/SettingsScreen.kt index e37c77f..c1b5ffa 100644 --- a/app/src/main/java/de/redno/disabledlauncher/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/de/redno/disabledlauncher/ui/screens/SettingsScreen.kt @@ -90,6 +90,7 @@ private fun SettingsList(modifier: Modifier = Modifier) { }) } + val textFailedAddingApps: String = stringResource(R.string.failed_adding_apps) Box { val addDirectAppsTitle = stringResource(R.string.add_direct_apps_title) val addDirectAppsDialogOpen = remember { mutableStateOf(false) } @@ -119,7 +120,7 @@ private fun SettingsList(modifier: Modifier = Modifier) { ) { AndroidUtil.asyncToastMakeText( context, - context.getString(R.string.failed_adding_apps), + textFailedAddingApps, Toast.LENGTH_SHORT ) } @@ -157,7 +158,7 @@ private fun SettingsList(modifier: Modifier = Modifier) { ) { AndroidUtil.asyncToastMakeText( context, - context.getString(R.string.failed_adding_apps), + textFailedAddingApps, Toast.LENGTH_SHORT ) }