app: Fix strings

* Fix #250 #251 #252 #253 #254 * Move toast strings to strings
DD3Boh · Jan 27, 2025 · 49e437f · 49e437f
1 parent b5c1c3f
commit 49e437f
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 46 deletions.
diff --git a/app/src/main/java/com/dd3boh/outertune/ui/menu/AddToPlaylistDialog.kt b/app/src/main/java/com/dd3boh/outertune/ui/menu/AddToPlaylistDialog.kt
@@ -118,7 +118,7 @@ fun AddToPlaylistDialog(
 
             item {
                 Text(
-                    text = "Note: Adding local songs to synced/remote playlists is unsupported. Any other combination is valid.",
+                    text = stringResource(R.string.playlist_add_local_to_synced_note),
                     fontSize = TextUnit(12F, TextUnitType.Sp),
                     modifier = Modifier.padding(horizontal = 20.dp)
                 )

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/AppearanceSettings.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/AppearanceSettings.kt
@@ -30,7 +30,6 @@ import androidx.compose.material.icons.rounded.DragHandle
 import androidx.compose.material.icons.rounded.FolderCopy
 import androidx.compose.material.icons.rounded.MoreHoriz
 import androidx.compose.material.icons.rounded.Palette
-import androidx.compose.material.icons.rounded.PlaylistAdd
 import androidx.compose.material.icons.rounded.Reorder
 import androidx.compose.material.icons.rounded.Tab
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -314,7 +313,7 @@ fun AppearanceSettings(
                                         NavigationTab.ALBUM -> stringResource(R.string.albums)
                                         NavigationTab.PLAYLIST -> stringResource(R.string.playlists)
                                         else -> {
-                                            "--- Drag below here to disable ---"
+                                            stringResource(R.string.tab_arrangement_disable_tip)
                                         }
                                     }
                                 )
@@ -328,7 +327,7 @@ fun AppearanceSettings(
                     }
                 }
 
-                InfoLabel(text = "The Home tab is required.")
+                InfoLabel(stringResource(R.string.tab_arrangement_home_required))
             }
 
         if (newInterfaceStyle) {

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/ContentSettings.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/ContentSettings.kt
@@ -203,7 +203,7 @@ fun ContentSettings(
         )
 
         PreferenceGroupTitle(
-            title = stringResource(R.string.localization)
+            title = stringResource(R.string.grp_localization)
         )
         ListPreference(
             title = { Text(stringResource(R.string.content_language)) },
@@ -231,7 +231,7 @@ fun ContentSettings(
         )
 
         PreferenceGroupTitle(
-            title = stringResource(R.string.proxy)
+            title = stringResource(R.string.grp_proxy)
         )
         SwitchPreference(
             title = { Text(stringResource(R.string.enable_proxy)) },

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/ExperimentalSettings.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/ExperimentalSettings.kt
@@ -113,13 +113,13 @@ fun ExperimentalSettings(
 
         // TODO: move to home screen as button?
         PreferenceEntry(
-            title = { Text("Trigger manual sync") },
+            title = { Text(stringResource(R.string.scanner_manual_btn)) },
             icon = { Icon(Icons.Rounded.Sync, null) },
             onClick = {
-                Toast.makeText(context, "Syncing with YouTube account...", Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, context.getString(R.string.sync_progress_active), Toast.LENGTH_SHORT).show()
                 coroutineScope.launch(Dispatchers.Main) {
                     syncUtils.syncAll()
-                    Toast.makeText(context, "Sync complete", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, context.getString(R.string.sync_progress_active), Toast.LENGTH_SHORT).show()
                 }
             }
         )
@@ -138,12 +138,12 @@ fun ExperimentalSettings(
                 title = { Text("DEBUG: Force local to remote artist migration NOW") },
                 icon = { Icon(Icons.Rounded.Backup, null) },
                 onClick = {
-                    Toast.makeText(context, "Starting YouTube artist linking...", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, context.getString(R.string.scanner_ytm_link_start), Toast.LENGTH_SHORT).show()
                     coroutineScope.launch(Dispatchers.IO) {
                         val scanner = LocalMediaScanner.getScanner(context, ScannerImpl.TAGLIB)
                         Timber.tag("Settings").d("Force Migrating local artists to YTM (MANUAL TRIGGERED)")
                         scanner.localToRemoteArtist(database)
-                        Toast.makeText(context, "YouTube artist linking job complete", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(context, context.getString(R.string.scanner_ytm_link_success), Toast.LENGTH_SHORT).show()
                     }
                 }
             )

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/LocalPlayerSettings.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/LocalPlayerSettings.kt
@@ -44,7 +44,6 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.material3.VerticalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -101,7 +100,6 @@ import com.dd3boh.outertune.utils.scanners.LocalMediaScanner.Companion.scannerRe
 import com.dd3boh.outertune.utils.scanners.LocalMediaScanner.Companion.scannerShowLoading
 import com.dd3boh.outertune.utils.scanners.ScannerAbortException
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import java.time.LocalDateTime
 import java.time.ZoneOffset
@@ -159,7 +157,10 @@ fun LocalPlayerSettings(
 
     // other vars
     var tempScanPaths by remember { mutableStateOf("") }
-    val (lastLocalScan, onLastLocalScanChange) = rememberPreference(LastLocalScanKey, LocalDateTime.now().atOffset(ZoneOffset.UTC).toEpochSecond())
+    val (lastLocalScan, onLastLocalScanChange) = rememberPreference(
+        LastLocalScanKey,
+        LocalDateTime.now().atOffset(ZoneOffset.UTC).toEpochSecond()
+    )
 
     Column(
         Modifier
@@ -305,7 +306,7 @@ fun LocalPlayerSettings(
         }
 
         PreferenceGroupTitle(
-            title = stringResource(R.string.manual_scanner_title)
+            title = stringResource(R.string.grp_manual_scanner)
         )
         // scanner
         Row(
@@ -329,7 +330,7 @@ fun LocalPlayerSettings(
 
                         Toast.makeText(
                             context,
-                            "The scanner requires storage permissions",
+                            context.getString(R.string.scanner_missing_storage_perm),
                             Toast.LENGTH_SHORT
                         ).show()
 
@@ -371,14 +372,20 @@ fun LocalPlayerSettings(
                                     coroutineScope.launch(Dispatchers.IO) {
                                         Looper.prepare()
                                         try {
-                                            Toast.makeText(context, "Starting YouTube artist linking...", Toast.LENGTH_SHORT).show()
+                                            Toast.makeText(
+                                                context, context.getString(R.string.scanner_ytm_link_start),
+                                                Toast.LENGTH_SHORT
+                                            ).show()
                                             scanner.localToRemoteArtist(database)
-                                            Toast.makeText(context, "YouTube artist linking job complete", Toast.LENGTH_SHORT).show()
+                                            Toast.makeText(
+                                                context, context.getString(R.string.scanner_ytm_link_success),
+                                                Toast.LENGTH_SHORT
+                                            ).show()
                                         } catch (e: ScannerAbortException) {
                                             Looper.prepare()
                                             Toast.makeText(
                                                 context,
-                                                "Scanner (background task) failed: ${e.message}",
+                                                "${context.getString(R.string.scanner_ytm_link_success)}: ${e.message}",
                                                 Toast.LENGTH_LONG
                                             ).show()
                                         }
@@ -390,7 +397,7 @@ fun LocalPlayerSettings(
                                 Looper.prepare()
                                 Toast.makeText(
                                     context,
-                                    "Scanner failed: ${e.message}",
+                                    "${context.getString(R.string.scanner_scan_fail)}: ${e.message}",
                                     Toast.LENGTH_LONG
                                 ).show()
                             } finally {
@@ -416,13 +423,21 @@ fun LocalPlayerSettings(
                                     coroutineScope.launch(Dispatchers.IO) {
                                         Looper.prepare()
                                         try {
-                                            Toast.makeText(context, "Starting YouTube artist linking...", Toast.LENGTH_SHORT).show()
+                                            Toast.makeText(
+                                                context,
+                                                context.getString(R.string.scanner_ytm_link_start),
+                                                Toast.LENGTH_SHORT
+                                            ).show()
                                             scanner.localToRemoteArtist(database)
-                                            Toast.makeText(context, "YouTube artist linking job complete", Toast.LENGTH_SHORT).show()
+                                            Toast.makeText(
+                                                context,
+                                                context.getString(R.string.scanner_ytm_link_success),
+                                                Toast.LENGTH_SHORT
+                                            ).show()
                                         } catch (e: ScannerAbortException) {
                                             Toast.makeText(
                                                 context,
-                                                "Scanner (background task) failed: ${e.message}",
+                                                "${context.getString(R.string.scanner_ytm_link_fail)}: ${e.message}",
                                                 Toast.LENGTH_LONG
                                             ).show()
                                         }
@@ -434,7 +449,7 @@ fun LocalPlayerSettings(
                                 Looper.prepare()
                                 Toast.makeText(
                                     context,
-                                    "Scanner failed: ${e.message}",
+                                    "${context.getString(R.string.scanner_scan_fail)}: ${e.message}",
                                     Toast.LENGTH_LONG
                                 ).show()
                             } finally {
@@ -486,18 +501,22 @@ fun LocalPlayerSettings(
                 Column {
                     val isSyncing = scannerProgressCurrent > -1
                     Text(
-                        text = if (isSyncing) "Syncing..." else "Scanning...",
+                        text = if (isSyncing) {
+                            stringResource(R.string.scanner_progress_syncing)
+                        } else {
+                            stringResource(R.string.scanner_progress_scanning)
+                        },
                         color = MaterialTheme.colorScheme.secondary,
                         fontSize = 12.sp
                     )
                     Text(
                         text = "${if (isSyncing) scannerProgressCurrent else "—"}/${
                             pluralStringResource(
-                                R.plurals.n_song,
+                                if (isSyncing) R.plurals.scanner_n_song_processed else R.plurals.scanner_n_song_found,
                                 scannerProgressTotal,
                                 scannerProgressTotal
                             )
-                        } ${if (isSyncing) "processed" else "found"}",
+                        }",
                         color = MaterialTheme.colorScheme.secondary,
                         fontSize = 12.sp
                     )
@@ -555,7 +574,7 @@ fun LocalPlayerSettings(
         }
 
         PreferenceGroupTitle(
-            title = stringResource(R.string.scanner_settings_title)
+            title = stringResource(R.string.grp_extra_scanner_settings)
         )
         // scanner sensitivity
         EnumListPreference(
@@ -597,7 +616,8 @@ fun LocalPlayerSettings(
                 if (it == ScannerImpl.FFMPEG_EXT && isFFmpegInstalled) {
                     onScannerImplChange(it)
                 } else {
-                    Toast.makeText(context, "FFmpeg extractor not detected.", Toast.LENGTH_LONG).show()
+                    Toast.makeText(context, context.getString(R.string.scanner_missing_ffmpeg), Toast.LENGTH_LONG)
+                        .show()
                     // Explicitly revert to TagLib if FFmpeg is not available
                     onScannerImplChange(ScannerImpl.TAGLIB)
                 }

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/LyricsSettings.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/LyricsSettings.kt
@@ -88,7 +88,7 @@ fun LyricsSettings(
             .verticalScroll(rememberScrollState())
     ) {
         PreferenceGroupTitle(
-            title = "Lyric sources"
+            title = stringResource(R.string.grp_lyrics_source)
         )
         SwitchPreference(
             title = { Text(stringResource(R.string.enable_lrclib)) },
@@ -112,7 +112,7 @@ fun LyricsSettings(
         )
 
         PreferenceGroupTitle(
-            title = "Parser"
+            title = stringResource(R.string.grp_lyrics_parser)
         )
         // multiline lyrics
         SwitchPreference(
@@ -132,7 +132,7 @@ fun LyricsSettings(
         )
 
         PreferenceGroupTitle(
-            title = "Formatting"
+            title = stringResource(R.string.grp_lyrics_format)
         )
         // lyrics position
         EnumListPreference(

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/PlayerSettings.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/settings/PlayerSettings.kt
@@ -26,7 +26,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavController
@@ -119,7 +118,7 @@ fun PlayerSettings(
         )
 
         PreferenceGroupTitle(
-            title = stringResource(R.string.audio)
+            title = stringResource(R.string.grp_audio)
         )
         EnumListPreference(
             title = { Text(stringResource(R.string.audio_quality)) },