Merge pull request #2321 from adlifarizi/integration/localization

Refactor app localization, resource cleanup, and UI localizations

Author: theovilardo

app/src/main/java/com/theveloper/pixelplay/MainActivity.kt

@@ -24,6 +24,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import androidx.annotation.CallSuper
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
@@ -159,6 +160,7 @@ import kotlinx.coroutines.flow.map
 @Immutable
 data class BottomNavItem(
     val label: String,
+    @StringRes val labelResId: Int,
     @DrawableRes val iconResId: Int,
     @DrawableRes val selectedIconResId: Int? = null,
     val screen: Screen
@@ -608,9 +610,9 @@ class MainActivity : ComponentActivity() {
 
         val commonNavItems = remember {
             persistentListOf(
-                BottomNavItem("Home", R.drawable.rounded_home_24, R.drawable.home_24_rounded_filled, Screen.Home),
-                BottomNavItem("Search", R.drawable.rounded_search_24, R.drawable.rounded_search_24, Screen.Search),
-                BottomNavItem("Library", R.drawable.rounded_library_music_24, R.drawable.round_library_music_24, Screen.Library)
+                BottomNavItem("Home", R.string.nav_bar_home, R.drawable.rounded_home_24, R.drawable.home_24_rounded_filled, Screen.Home),
+                BottomNavItem("Search", R.string.nav_bar_search, R.drawable.rounded_search_24, R.drawable.rounded_search_24, Screen.Search),
+                BottomNavItem("Library", R.string.nav_bar_library, R.drawable.rounded_library_music_24, R.drawable.round_library_music_24, Screen.Library)
             )
         }
         val navBackStackEntry by navController.currentBackStackEntryAsState()

app/src/main/java/com/theveloper/pixelplay/PixelPlayApplication.kt

@@ -77,6 +77,8 @@ class PixelPlayApplication : Application(), ImageLoaderFactory, Configuration.Pr
     // AÑADE EL COMPANION OBJECT
     companion object {
         const val NOTIFICATION_CHANNEL_ID = "pixelplay_music_channel"
+        lateinit var instance: PixelPlayApplication
+            private set
     }
 
     private val appLifecycleObserver = object : DefaultLifecycleObserver {
@@ -90,6 +92,7 @@ class PixelPlayApplication : Application(), ImageLoaderFactory, Configuration.Pr
     }
 
     override fun onCreate() {
+        instance = this
         super.onCreate()
 
         // Benchmark variant intentionally restarts/kills app process during tests.

app/src/main/java/com/theveloper/pixelplay/data/media/MediaMapper.kt

@@ -28,12 +28,12 @@ class MediaMapper @Inject constructor(
             ?: return null
 
         val title = metadata.title?.toString()?.takeIf { it.isNotBlank() }
-            ?: context.getString(R.string.unknown_song_title)
+            ?: context.getString(R.string.common_unknown_track)
         val artist = metadata.artist?.toString()?.takeIf { it.isNotBlank() }
-            ?: context.getString(R.string.unknown_artist)
+            ?: context.getString(R.string.common_unknown_artist)
         val album = extras?.getString(MediaItemBuilder.EXTERNAL_EXTRA_ALBUM)?.takeIf { it.isNotBlank() }
             ?: metadata.albumTitle?.toString()?.takeIf { it.isNotBlank() }
-            ?: context.getString(R.string.unknown_album)
+            ?: context.getString(R.string.common_unknown_album)
         val albumId = -1L
         val duration = extras?.getLong(MediaItemBuilder.EXTERNAL_EXTRA_DURATION) ?: 0L
         val dateAdded = extras?.getLong(MediaItemBuilder.EXTERNAL_EXTRA_DATE_ADDED) ?: System.currentTimeMillis()

app/src/main/java/com/theveloper/pixelplay/data/model/LibraryTabId.kt

@@ -1,19 +1,22 @@
 package com.theveloper.pixelplay.data.model
 
+import androidx.annotation.StringRes
 import androidx.compose.runtime.Immutable
+import com.theveloper.pixelplay.R
 
 @Immutable
 enum class LibraryTabId(
     val storageKey: String,
     val title: String,
+    @StringRes val titleRes: Int,
     val defaultSort: SortOption
 ) {
-    SONGS("SONGS", "SONGS", SortOption.SongTitleAZ),
-    ALBUMS("ALBUMS", "ALBUMS", SortOption.AlbumTitleAZ),
-    ARTISTS("ARTIST", "ARTIST", SortOption.ArtistNameAZ),
-    PLAYLISTS("PLAYLISTS", "PLAYLISTS", SortOption.PlaylistNameAZ),
-    FOLDERS("FOLDERS", "FOLDERS", SortOption.FolderNameAZ),
-    LIKED("LIKED", "LIKED", SortOption.LikedSongDateLiked);
+    SONGS("SONGS", "SONGS", R.string.library_tab_songs, SortOption.SongTitleAZ),
+    ALBUMS("ALBUMS", "ALBUMS", R.string.library_tab_albums, SortOption.AlbumTitleAZ),
+    ARTISTS("ARTIST", "ARTIST", R.string.library_tab_artists, SortOption.ArtistNameAZ),
+    PLAYLISTS("PLAYLISTS", "PLAYLISTS", R.string.library_tab_playlists, SortOption.PlaylistNameAZ),
+    FOLDERS("FOLDERS", "FOLDERS", R.string.library_tab_folders, SortOption.FolderNameAZ),
+    LIKED("LIKED", "LIKED", R.string.library_tab_liked, SortOption.LikedSongDateLiked);
 
     companion object {
         fun fromStorageKey(key: String): LibraryTabId =