update dependencies pt 1

app/src/main/java/com/geode/launcher/AltMainActivity.kt

@@ -22,12 +22,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Info
-import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material.icons.filled.Refresh
-import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
@@ -137,8 +131,8 @@ fun LaunchCancelledIcon(cancelReason: LaunchViewModel.LaunchCancelReason, modifi
         LaunchViewModel.LaunchCancelReason.GAME_OUTDATED,
         LaunchViewModel.LaunchCancelReason.GAME_MISSING -> Icon(painterResource(R.drawable.icon_error), contentDescription = null, modifier)
         LaunchViewModel.LaunchCancelReason.LAST_LAUNCH_CRASHED,
-        LaunchViewModel.LaunchCancelReason.GEODE_NOT_FOUND -> Icon(Icons.Default.Warning, contentDescription = null, modifier)
-        else -> Icon(Icons.Default.Info, contentDescription = null, modifier)
+        LaunchViewModel.LaunchCancelReason.GEODE_NOT_FOUND -> Icon(painterResource(R.drawable.icon_warning), contentDescription = null, modifier)
+        else -> Icon(painterResource(R.drawable.icon_info), contentDescription = null, modifier)
     }
 }
 
@@ -285,7 +279,7 @@ fun RetryButtonContents(reason: LaunchViewModel.LaunchCancelReason) {
         LaunchViewModel.LaunchCancelReason.MANUAL,
         LaunchViewModel.LaunchCancelReason.AUTOMATIC -> {
             Icon(
-                Icons.Filled.PlayArrow,
+                painterResource(R.drawable.icon_play_arrow),
                 contentDescription = null
             )
             Spacer(Modifier.size(ButtonDefaults.IconSpacing))
@@ -293,7 +287,7 @@ fun RetryButtonContents(reason: LaunchViewModel.LaunchCancelReason) {
         }
         LaunchViewModel.LaunchCancelReason.GEODE_NOT_FOUND -> {
             Icon(
-                Icons.Filled.Refresh,
+                painterResource(R.drawable.icon_refresh),
                 contentDescription = null
             )
             Spacer(Modifier.size(ButtonDefaults.IconSpacing))
@@ -398,7 +392,7 @@ fun ExtraOptions(onSettings: () -> Unit) {
         onClick = onSettings,
     ) {
         Icon(
-            Icons.Filled.Settings,
+            painterResource(R.drawable.icon_settings),
             contentDescription = stringResource(R.string.launcher_settings_icon_alt)
         )
     }

app/src/main/java/com/geode/launcher/MainActivity.kt

@@ -9,8 +9,6 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -160,11 +158,11 @@ fun MainScreen(
         ) {
             Image(
                 painter = painterResource(id = R.drawable.geode_logo),
-                contentDescription = context.getString(R.string.launcher_logo_alt),
+                contentDescription = stringResource(R.string.launcher_logo_alt),
                 modifier = Modifier.size(100.dp, 100.dp)
             )
             Text(
-                context.getString(R.string.launcher_title),
+                stringResource(R.string.launcher_title),
                 style = launcherTitleStyle,
                 modifier = Modifier.padding(12.dp)
             )
@@ -199,7 +197,7 @@ fun MainScreen(
                 }
                 gdInstalled -> {
                     Text(
-                        context.getString(R.string.geode_download_title),
+                        stringResource(R.string.geode_download_title),
                         modifier = Modifier.padding(12.dp)
                     )
 
@@ -210,16 +208,16 @@ fun MainScreen(
                         ) {
                             Icon(
                                 painterResource(R.drawable.icon_download),
-                                contentDescription = context.getString(R.string.launcher_download_icon_alt)
+                                contentDescription = stringResource(R.string.launcher_download_icon_alt)
                             )
                             Spacer(Modifier.size(ButtonDefaults.IconSpacing))
-                            Text(context.getString(R.string.launcher_download))
+                            Text(stringResource(R.string.launcher_download))
                         }
                         Spacer(Modifier.size(2.dp))
                         IconButton(onClick = { onSettings(context) }) {
                             Icon(
-                                Icons.Filled.Settings,
-                                contentDescription = context.getString(R.string.launcher_settings_icon_alt)
+                                painterResource(R.drawable.icon_settings),
+                                contentDescription = stringResource(R.string.launcher_settings_icon_alt)
                             )
                         }
                     }

app/src/main/java/com/geode/launcher/main/ErrorComponents.kt

@@ -18,8 +18,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Share
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -241,7 +239,7 @@ fun ErrorInfoActions(extraDetails: String?, modifier: Modifier = Modifier) {
         } else {
             Button(onClick = { onShareCrash(context) }) {
                 Icon(
-                    Icons.Filled.Share,
+                    painterResource(R.drawable.icon_share),
                     contentDescription = null
                 )
                 Spacer(Modifier.size(ButtonDefaults.IconSpacing))

app/src/main/java/com/geode/launcher/main/LaunchComponents.kt

@@ -10,10 +10,6 @@ import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -34,6 +30,7 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -71,7 +68,7 @@ fun UpdateWarning(inSafeMode: Boolean = false, onDismiss: () -> Unit) {
         AlertDialog(
             icon = {
                 Icon(
-                    Icons.Filled.Warning,
+                    painterResource(R.drawable.icon_warning),
                     contentDescription = stringResource(R.string.launcher_warning_icon_alt)
                 )
             },
@@ -116,7 +113,7 @@ fun SafeModeDialog(onDismiss: () -> Unit, onLaunch: () -> Unit) {
     AlertDialog(
         icon = {
             Icon(
-                Icons.Filled.Warning,
+                painterResource(R.drawable.icon_warning),
                 contentDescription = stringResource(R.string.launcher_warning_icon_alt)
             )
         },
@@ -243,17 +240,17 @@ fun PlayButton(
             }
         ) {
             Icon(
-                Icons.Filled.PlayArrow,
-                contentDescription = context.getString(R.string.launcher_launch_icon_alt)
+                painterResource(R.drawable.icon_play_arrow),
+                contentDescription = stringResource(R.string.launcher_launch_icon_alt)
             )
             Spacer(Modifier.size(ButtonDefaults.IconSpacing))
-            Text(context.getString(R.string.launcher_launch))
+            Text(stringResource(R.string.launcher_launch))
         }
         Spacer(Modifier.size(2.dp))
         IconButton(onClick = { onSettings(context) }) {
             Icon(
-                Icons.Filled.Settings,
-                contentDescription = context.getString(R.string.launcher_settings_icon_alt)
+                painterResource(R.drawable.icon_settings),
+                contentDescription = stringResource(R.string.launcher_settings_icon_alt)
             )
         }
     }
@@ -295,7 +292,7 @@ fun UnsupportedVersionWarning(modifier: Modifier = Modifier) {
     InlineDialog(
         headline = {
             Icon(
-                Icons.Default.Warning,
+                painterResource(R.drawable.icon_warning),
                 contentDescription = null,
                 modifier = Modifier.size(28.dp)
             )

app/src/main/java/com/geode/launcher/main/LaunchNotification.kt

@@ -13,9 +13,6 @@ import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Info
-import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.LocalContentColor
@@ -199,7 +196,7 @@ fun LauncherUpdateContent(modifier: Modifier = Modifier) {
         },
         leadingContent = {
             Icon(
-                Icons.Filled.Info,
+                painterResource(R.drawable.icon_info),
                 contentDescription = null,
             )
         },
@@ -232,7 +229,7 @@ fun OutdatedVersionContent(modifier: Modifier = Modifier) {
         },
         leadingContent = {
             Icon(
-                Icons.Filled.Warning,
+                painterResource(R.drawable.icon_warning),
                 contentDescription = null,
             )
         },
@@ -251,7 +248,7 @@ fun UpdateFailedContent(modifier: Modifier = Modifier) {
         },
         leadingContent = {
             Icon(
-                Icons.Filled.Warning,
+                painterResource(R.drawable.icon_warning),
                 contentDescription = null,
             )
         },

app/src/main/java/com/geode/launcher/main/UpdateComponents.kt

@@ -17,8 +17,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ElevatedCard
@@ -320,7 +318,7 @@ fun UpdateMessageIndicator(
                 },
             ) {
                 Icon(
-                    Icons.Filled.Refresh,
+                    painterResource(R.drawable.icon_refresh),
                     contentDescription = stringResource(R.string.launcher_retry_icon_alt)
                 )
                 Spacer(Modifier.size(ButtonDefaults.IconSpacing))

app/src/main/java/com/geode/launcher/preferences/ApplicationIconActivity.kt

@@ -21,8 +21,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -44,6 +42,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -162,7 +161,7 @@ fun ApplicationIconScreen(
                     navigationIcon = {
                         IconButton(onClick = { onBackPressedDispatcher?.onBackPressed() }) {
                             Icon(
-                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                                painterResource(R.drawable.icon_arrow_back),
                                 contentDescription = stringResource(R.string.back_icon_alt)
                             )
                         }

app/src/main/java/com/geode/launcher/preferences/ApplicationLogsActivity.kt

@@ -18,11 +18,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.filled.Share
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -53,6 +48,7 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
@@ -189,6 +185,7 @@ fun ApplicationLogsScreen(
     val isLoading by logViewModel.isLoading.collectAsState()
 
     val context = LocalContext.current
+    val resources = LocalResources.current
 
     val coroutineScope = rememberCoroutineScope()
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -236,7 +233,7 @@ fun ApplicationLogsScreen(
                     navigationIcon = {
                         IconButton(onClick = { onBackPressedDispatcher?.onBackPressed() }) {
                             Icon(
-                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                                painterResource(R.drawable.icon_arrow_back),
                                 contentDescription = stringResource(R.string.back_icon_alt)
                             )
                         }
@@ -244,7 +241,7 @@ fun ApplicationLogsScreen(
                     actions = {
                         IconButton(onClick = {
                             coroutineScope.launch {
-                                saveLauncher.launch(context.getString(R.string.application_logs_default_filename))
+                                saveLauncher.launch(resources.getString(R.string.application_logs_default_filename))
                             }
                         }, enabled = !logLines.isEmpty()) {
                             Icon(
@@ -254,7 +251,7 @@ fun ApplicationLogsScreen(
                         }
                         IconButton(onClick = { showMoreOptions = !showMoreOptions }) {
                             Icon(
-                                Icons.Filled.MoreVert,
+                                painterResource(R.drawable.icon_more_vert),
                                 contentDescription = stringResource(R.string.application_logs_more)
                             )
                         }
@@ -273,7 +270,7 @@ fun ApplicationLogsScreen(
                                 trailingIcon = {
                                     if (logViewModel.filterCrashes) {
                                         Icon(
-                                            Icons.Filled.Check,
+                                            painterResource(R.drawable.icon_check),
                                             contentDescription = stringResource(R.string.application_logs_crash_only_enabled_alt)
                                         )
                                     }

app/src/main/java/com/geode/launcher/preferences/CrashLogsActivity.kt

@@ -25,11 +25,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.filled.Share
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -169,7 +164,7 @@ fun CrashCard(crashDump: CrashDump, crashViewModel: CrashViewModel, modifier: Mo
                 shareCrash(context, crashDump.filename)
             }) {
                 Icon(
-                    Icons.Filled.Share,
+                    painterResource(R.drawable.icon_share),
                     contentDescription = stringResource(R.string.application_logs_share)
                 )
             }
@@ -178,7 +173,7 @@ fun CrashCard(crashDump: CrashDump, crashViewModel: CrashViewModel, modifier: Mo
                 crashViewModel.removeCrash(crashDump.filename)
             }) {
                 Icon(
-                    Icons.Filled.Delete,
+                    painterResource(R.drawable.icon_delete),
                     contentDescription = stringResource(R.string.application_crashes_delete_one)
                 )
             }
@@ -207,7 +202,7 @@ fun CrashLogsScreen(
                     navigationIcon = {
                         IconButton(onClick = { onBackPressedDispatcher?.onBackPressed() }) {
                             Icon(
-                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                                painterResource(R.drawable.icon_arrow_back),
                                 contentDescription = stringResource(R.string.back_icon_alt)
                             )
                         }
@@ -215,7 +210,7 @@ fun CrashLogsScreen(
                     actions = {
                         IconButton(onClick = { showMoreOptions = !showMoreOptions }) {
                             Icon(
-                                Icons.Filled.MoreVert,
+                                painterResource(R.drawable.icon_more_vert),
                                 contentDescription = stringResource(R.string.application_logs_more)
                             )
                         }

app/src/main/java/com/geode/launcher/preferences/DeveloperSettingsActivity.kt

@@ -20,9 +20,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Info
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -114,7 +111,7 @@ fun DeveloperSettingsScreen(onBackPressedDispatcher: OnBackPressedDispatcher?) {
                     navigationIcon = {
                         IconButton(onClick = { onBackPressedDispatcher?.onBackPressed() }) {
                             Icon(
-                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                                painterResource(R.drawable.icon_arrow_back),
                                 contentDescription = stringResource(R.string.back_icon_alt)
                             )
                         }

app/src/main/java/com/geode/launcher/preferences/SettingsActivity.kt

@@ -21,9 +21,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -37,6 +34,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
@@ -123,6 +121,7 @@ fun UpdateIndicator(
     updateStatus: ReleaseViewModel.ReleaseUIState
 ) {
     val context = LocalContext.current
+    val resources = LocalResources.current
 
     var enablePopup by remember { mutableStateOf(false) }
 
@@ -158,8 +157,8 @@ fun UpdateIndicator(
             is ReleaseViewModel.ReleaseUIState.Failure -> {
                 val message = when (updateStatus.exception) {
                     is UnknownHostException, is ConnectException ->
-                        context.getString(R.string.release_fetch_no_internet)
-                    else -> context.getString(R.string.preference_check_for_updates_failed)
+                        resources.getString(R.string.release_fetch_no_internet)
+                    else -> resources.getString(R.string.preference_check_for_updates_failed)
                 }
 
                 snackbarHostState.showSnackbar(message)
@@ -167,17 +166,17 @@ fun UpdateIndicator(
             is ReleaseViewModel.ReleaseUIState.Finished -> {
                 if (updateStatus.hasUpdated) {
                     snackbarHostState.showSnackbar(
-                        context.getString(R.string.preference_check_for_updates_success)
+                        resources.getString(R.string.preference_check_for_updates_success)
                     )
                 } else {
                     val gameVersion = GamePackageUtils.getGameVersionCodeOrNull(context.packageManager)
                     if (gameVersion != null && gameVersion < Constants.SUPPORTED_VERSION_CODE) {
                         snackbarHostState.showSnackbar(
-                            context.getString(R.string.launcher_game_update_required_short)
+                            resources.getString(R.string.launcher_game_update_required_short)
                         )
                     } else {
                         snackbarHostState.showSnackbar(
-                            context.getString(R.string.preference_check_for_updates_none_found)
+                            resources.getString(R.string.preference_check_for_updates_none_found)
                         )
                     }
                 }
@@ -218,7 +217,7 @@ fun DeveloperModeDialog(onDismiss: () -> Unit, onEnable: () -> Unit) {
     AlertDialog(
         icon = {
             Icon(
-                Icons.Filled.Warning,
+                painterResource(R.drawable.icon_warning),
                 contentDescription = null,
             )
         },
@@ -245,6 +244,7 @@ fun SettingsScreen(
     releaseViewModel: ReleaseViewModel = viewModel(factory = ReleaseViewModel.Factory)
 ) {
     val context = LocalContext.current
+    val resources = LocalResources.current
 
     val currentRelease by PreferenceUtils.useStringPreference(PreferenceUtils.Key.CURRENT_VERSION_TAG)
     val updateStatus by releaseViewModel.uiState.collectAsState()
@@ -255,7 +255,7 @@ fun SettingsScreen(
     if (showUpdateInProgress) {
         LaunchedEffect(snackbarHostState) {
             snackbarHostState.showSnackbar(
-                context.getString(R.string.preference_check_for_updates_already_updating)
+                resources.getString(R.string.preference_check_for_updates_already_updating)
             )
             showUpdateInProgress = false
         }
@@ -280,14 +280,14 @@ fun SettingsScreen(
                 navigationIcon = {
                     IconButton(onClick = { onBackPressedDispatcher?.onBackPressed() }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                            contentDescription = context.getString(R.string.back_icon_alt)
+                            painterResource(R.drawable.icon_arrow_back),
+                            contentDescription = stringResource(R.string.back_icon_alt)
                         )
                     }
                 },
                 title = {
                     Text(
-                        context.getString(R.string.title_activity_settings),
+                        stringResource(R.string.title_activity_settings),
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
                     )
@@ -304,7 +304,7 @@ fun SettingsScreen(
                     .verticalScroll(rememberScrollState()),
                 verticalArrangement = Arrangement.spacedBy(8.dp)
             ) {
-                OptionsGroup(context.getString(R.string.preference_category_testing)) {
+                OptionsGroup(stringResource(R.string.preference_category_testing)) {
                     SettingsSelectCard(
                         title = stringResource(R.string.preference_theme_name),
                         dialogTitle = stringResource(R.string.preference_theme_select),
@@ -361,8 +361,8 @@ fun SettingsScreen(
 
                 OptionsGroup(stringResource(R.string.preference_category_gameplay)) {
                     SettingsCard(
-                        title = context.getString(R.string.preference_load_automatically_name),
-                        description = context.getString(R.string.preference_load_automatically_description),
+                        title = stringResource(R.string.preference_load_automatically_name),
+                        description = stringResource(R.string.preference_load_automatically_description),
                         preferenceKey = PreferenceUtils.Key.LOAD_AUTOMATICALLY,
                     )
                     SettingsSelectCard(
@@ -407,7 +407,7 @@ fun SettingsScreen(
                         step = 5,
                     ) {
                         SettingsCard(
-                            title = context.getString(R.string.preference_screen_zoom_fit_name),
+                            title = stringResource(R.string.preference_screen_zoom_fit_name),
                             preferenceKey = PreferenceUtils.Key.SCREEN_ZOOM_FIT,
                             asCard = false
                         )
@@ -430,9 +430,9 @@ fun SettingsScreen(
                     )
                 }
 
-                OptionsGroup(context.getString(R.string.preference_category_updater)) {
+                OptionsGroup(stringResource(R.string.preference_category_updater)) {
                     SettingsCard(
-                        title = context.getString(R.string.preference_update_automatically_name),
+                        title = stringResource(R.string.preference_update_automatically_name),
                         preferenceKey = PreferenceUtils.Key.UPDATE_AUTOMATICALLY,
                     )
                     OptionsCard(
@@ -538,7 +538,7 @@ fun SettingsScreen(
                         }
 
                         val gameSource = remember {
-                            context.getString(when (GamePackageUtils.identifyGameSource(context.packageManager)) {
+                            resources.getString(when (GamePackageUtils.identifyGameSource(context.packageManager)) {
                                 GamePackageUtils.GameSource.GOOGLE -> R.string.preference_game_source_google
                                 GamePackageUtils.GameSource.AMAZON -> R.string.preference_game_source_amazon
                                 else -> R.string.preference_game_source_unknown

app/src/main/java/com/geode/launcher/preferences/SettingsComponents.kt

@@ -20,10 +20,6 @@ import androidx.compose.foundation.selection.toggleable
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Clear
-import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
@@ -274,7 +270,7 @@ fun StringDialog(
                         if (enteredValue.isNotEmpty()) {
                             IconButton(onClick = { enteredValue = "" }) {
                                 Icon(
-                                    Icons.Filled.Clear,
+                                    painterResource(R.drawable.icon_close_small),
                                     contentDescription = stringResource(R.string.preference_text_clear)
                                 )
                             }
@@ -419,7 +415,7 @@ fun FrameRateDialog(
                         enteredValue = nextValue.toString()
                     }, enabled = currentValue == null || currentValue < maxFrameRate) {
                         Icon(
-                            Icons.Filled.Add,
+                            painterResource(R.drawable.icon_add),
                             contentDescription = stringResource(R.string.preference_limit_framerate_add)
                         )
                     }
@@ -794,7 +790,7 @@ fun ProfileSelectCard() {
                                 )
                             } else {
                                 Icon(
-                                    Icons.Filled.Delete,
+                                    painterResource(R.drawable.icon_delete),
                                     contentDescription = stringResource(R.string.preference_profiles_delete_alt)
                                 )
                             }