Added per-app language support with Google-translated strings.xml

Removed unused imports Refactored code for adding and removing wallpapers and folders
Anthonyy232 · May 13, 2024 · df1bc64 · df1bc64
1 parent 8eb9cb2
commit df1bc64
Show file tree

Hide file tree

Showing 127 changed files with 15,600 additions and 62 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,7 +18,7 @@ android {
         minSdk = 26
         targetSdk = 34
         versionCode = 9
-        versionName = "1.1.1"
+        versionName = "1.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -50,6 +50,10 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = "1.5.10"
     }
+
+    androidResources {
+        generateLocaleConfig = true
+    }
 }
 
 androidComponents {

diff --git a/app/src/main/java/com/anthonyla/paperize/feature/wallpaper/data/data_source/Converters.kt b/app/src/main/java/com/anthonyla/paperize/feature/wallpaper/data/data_source/Converters.kt
@@ -2,7 +2,6 @@ package com.anthonyla.paperize.feature.wallpaper.data.data_source
 
 import androidx.room.TypeConverter
 import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 
 /**
  * Converters for Room database to convert list of strings to json string and vice versa

diff --git a/...a/com/anthonyla/paperize/feature/wallpaper/data/repository/SelectedAlbumRepositoryImpl.kt b/...a/com/anthonyla/paperize/feature/wallpaper/data/repository/SelectedAlbumRepositoryImpl.kt
@@ -2,8 +2,6 @@ package com.anthonyla.paperize.feature.wallpaper.data.repository
 
 import com.anthonyla.paperize.feature.wallpaper.data.data_source.SelectedAlbumDao
 import com.anthonyla.paperize.feature.wallpaper.domain.model.Album
-import com.anthonyla.paperize.feature.wallpaper.domain.model.AlbumWithWallpaperAndFolder
-import com.anthonyla.paperize.feature.wallpaper.domain.model.Folder
 import com.anthonyla.paperize.feature.wallpaper.domain.model.SelectedAlbum
 import com.anthonyla.paperize.feature.wallpaper.domain.model.Wallpaper
 import com.anthonyla.paperize.feature.wallpaper.domain.repository.SelectedAlbumRepository

diff --git a/.../com/anthonyla/paperize/feature/wallpaper/presentation/add_album_screen/AddAlbumScreen.kt b/.../com/anthonyla/paperize/feature/wallpaper/presentation/add_album_screen/AddAlbumScreen.kt
@@ -30,7 +30,6 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.anthonyla.paperize.feature.wallpaper.presentation.add_album_screen.components.AddAlbumAnimatedFab
-import com.anthonyla.paperize.feature.wallpaper.presentation.add_album_screen.components.AddAlbumFabMenuOptions
 import com.anthonyla.paperize.feature.wallpaper.presentation.add_album_screen.components.AddAlbumSmallTopBar
 import com.anthonyla.paperize.feature.wallpaper.presentation.album.components.FolderItem
 import com.anthonyla.paperize.feature.wallpaper.presentation.album.components.WallpaperItem
@@ -137,7 +136,6 @@ fun AddAlbumScreen(
                     exit = scaleOut(tween(400, 50, FastOutSlowInEasing)),
                 ) {
                     AddAlbumAnimatedFab(
-                        menuOptions = AddAlbumFabMenuOptions(),
                         onImageClick = {
                             selectionMode = false
                             imagePickerLauncher.launch(arrayOf("image/*"))
@@ -152,7 +150,6 @@ fun AddAlbumScreen(
             }
             else {
                 AddAlbumAnimatedFab(
-                    menuOptions = AddAlbumFabMenuOptions(),
                     onImageClick = {
                         selectionMode = false
                         imagePickerLauncher.launch(arrayOf("image/*"))

diff --git a/...aperize/feature/wallpaper/presentation/add_album_screen/components/AddAlbumAnimatedFab.kt b/...aperize/feature/wallpaper/presentation/add_album_screen/components/AddAlbumAnimatedFab.kt
@@ -21,6 +21,8 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Folder
+import androidx.compose.material.icons.filled.PhotoLibrary
 import androidx.compose.material.icons.filled.Remove
 import androidx.compose.material3.CardColors
 import androidx.compose.material3.ElevatedCard
@@ -49,7 +51,6 @@ import com.anthonyla.paperize.feature.wallpaper.presentation.library_screen.comp
  */
 @Composable
 fun AddAlbumAnimatedFab(
-    menuOptions: AddAlbumFabMenuOptions,
     animate: Boolean,
     onImageClick: () -> Unit,
     onFolderClick: () -> Unit
@@ -108,17 +109,17 @@ fun AddAlbumAnimatedFab(
                 Surface(tonalElevation = 5.dp) {
                     Column(modifier = Modifier.height(menuHeight)) {
                         MenuRow(
-                            text = menuOptions.imageOption.text,
-                            icon = menuOptions.imageOption.icon,
+                            text = stringResource(R.string.add_images_btn),
+                            icon = Icons.Filled.PhotoLibrary,
                             horizontalExpansion = expandHorizontally,
                             onClick = {
                                 expanded = false
                                 onImageClick()
                             }
                         )
                         MenuRow(
-                            text = menuOptions.folderOption.text,
-                            icon = menuOptions.folderOption.icon,
+                            text = stringResource(R.string.add_folder_btn),
+                            icon = Icons.Filled.Folder,
                             horizontalExpansion = expandHorizontally,
                             onClick = {
                                 expanded = false
@@ -174,17 +175,17 @@ fun AddAlbumAnimatedFab(
                 Surface(tonalElevation = 5.dp) {
                     Column(modifier = Modifier.height(if (expanded) menuHeightSize.first else menuHeightSize.second)) {
                         MenuRow(
-                            text = menuOptions.imageOption.text,
-                            icon = menuOptions.imageOption.icon,
+                            text = stringResource(R.string.add_images_btn),
+                            icon = Icons.Filled.PhotoLibrary,
                             horizontalExpansion = if (expanded) expandHorizontalSize.first else expandHorizontalSize.second,
                             onClick = {
                                 expanded = false
                                 onImageClick()
                             }
                         )
                         MenuRow(
-                            text = menuOptions.folderOption.text,
-                            icon = menuOptions.folderOption.icon,
+                            text = stringResource(R.string.add_folder_btn),
+                            icon = Icons.Filled.Folder,
                             horizontalExpansion = if (expanded) expandHorizontalSize.first else expandHorizontalSize.second,
                             onClick = {
                                 expanded = false

diff --git a/...yla/paperize/feature/wallpaper/presentation/add_album_screen/components/AddAlbumDialog.kt b/...yla/paperize/feature/wallpaper/presentation/add_album_screen/components/AddAlbumDialog.kt
@@ -60,7 +60,7 @@ fun AddAlbumDialog(
                 horizontalAlignment = Alignment.CenterHorizontally,
             ) {
                 Text(
-                    text = "New Album",
+                    text = stringResource(R.string.new_album),
                     modifier = Modifier.padding(20.dp),
                     fontSize = 25.sp
                 )

diff --git a/...rize/feature/wallpaper/presentation/add_album_screen/components/AddAlbumFabMenuOptions.kt b/...rize/feature/wallpaper/presentation/add_album_screen/components/AddAlbumFabMenuOptions.kt
diff --git a/...java/com/anthonyla/paperize/feature/wallpaper/presentation/album/components/FolderItem.kt b/...java/com/anthonyla/paperize/feature/wallpaper/presentation/album/components/FolderItem.kt
@@ -96,8 +96,11 @@ fun FolderItem(
             .clip(RoundedCornerShape(roundedCornerShapeTransition))
             .combinedClickable(
                 onClick = {
-                    if (!selectionMode) { onFolderViewClick() }
-                    else { onItemSelection() }
+                    if (!selectionMode) {
+                        onFolderViewClick()
+                    } else {
+                        onItemSelection()
+                    }
                 },
                 onLongClick = {
                     if (!selectionMode) {
@@ -171,7 +174,7 @@ fun FolderItem(
                 )
             }
             Text(
-                text = folder.wallpapers.size.toString().plus(" wallpapers"),
+                text = folder.wallpapers.size.toString().plus(" " + stringResource(R.string.wallpapers)),
                 modifier = Modifier
                     .padding(horizontal = 24.dp)
                     .align(Alignment.Start),

diff --git a/...om/anthonyla/paperize/feature/wallpaper/presentation/album_view_screen/AlbumViewScreen.kt b/...om/anthonyla/paperize/feature/wallpaper/presentation/album_view_screen/AlbumViewScreen.kt
@@ -31,7 +31,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.anthonyla.paperize.feature.wallpaper.domain.model.AlbumWithWallpaperAndFolder
 import com.anthonyla.paperize.feature.wallpaper.presentation.add_album_screen.components.AddAlbumAnimatedFab
-import com.anthonyla.paperize.feature.wallpaper.presentation.add_album_screen.components.AddAlbumFabMenuOptions
 import com.anthonyla.paperize.feature.wallpaper.presentation.album.components.FolderItem
 import com.anthonyla.paperize.feature.wallpaper.presentation.album.components.WallpaperItem
 import com.anthonyla.paperize.feature.wallpaper.presentation.album_view_screen.components.AlbumViewTopBar
@@ -129,7 +128,6 @@ fun AlbumViewScreen(
                     exit = scaleOut(tween(400, 50, FastOutSlowInEasing)),
                 ) {
                     AddAlbumAnimatedFab(
-                        menuOptions = AddAlbumFabMenuOptions(),
                         onImageClick = {
                             selectionMode = false
                             imagePickerLauncher.launch(arrayOf("image/*"))
@@ -144,7 +142,6 @@ fun AlbumViewScreen(
             }
             else {
                 AddAlbumAnimatedFab(
-                    menuOptions = AddAlbumFabMenuOptions(),
                     onImageClick = {
                         selectionMode = false
                         imagePickerLauncher.launch(arrayOf("image/*"))

diff --git a/...honyla/paperize/feature/wallpaper/presentation/licenses_screen/components/LicenseTitle.kt b/...honyla/paperize/feature/wallpaper/presentation/licenses_screen/components/LicenseTitle.kt
@@ -1,19 +1,11 @@
 package com.anthonyla.paperize.feature.wallpaper.presentation.licenses_screen.components
 
-import androidx.compose.foundation.ScrollState
-import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.State
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier

diff --git a/...honyla/paperize/feature/wallpaper/presentation/notifications_screen/NotificationScreen.kt b/...honyla/paperize/feature/wallpaper/presentation/notifications_screen/NotificationScreen.kt
@@ -122,14 +122,17 @@ fun NotificationScreen(
         content = { it
             Column (modifier = Modifier.padding(32.dp)) {
                 Spacer(modifier = Modifier.height(120.dp))
-                Text(text = "Notifications", style = MaterialTheme.typography.headlineLarge)
+                Text(text = stringResource(id = R.string.notifications), style = MaterialTheme.typography.headlineLarge)
                 Spacer(modifier = Modifier.height(16.dp))
                 LottieAnimation(
                     composition = composition,
                     progress = { progress },
                     modifier = Modifier
                         .fillMaxHeight(0.5f)
-                        .semantics { contentDescription = context.getString(R.string.notification_bell_animation) },
+                        .semantics {
+                            contentDescription =
+                                context.getString(R.string.notification_bell_animation)
+                        },
                     safeMode = true,
                     enableMergePaths = true
                 )

diff --git a/...yla/paperize/feature/wallpaper/presentation/settings_screen/components/ContactListItem.kt b/...yla/paperize/feature/wallpaper/presentation/settings_screen/components/ContactListItem.kt
@@ -4,10 +4,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ArrowCircleRight
 import androidx.compose.material.icons.outlined.Email
-import androidx.compose.material.icons.outlined.PrivacyTip
-import androidx.compose.material.icons.outlined.SubdirectoryArrowRight
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme

diff --git a/...la/paperize/feature/wallpaper/presentation/settings_screen/components/PaperizeListItem.kt b/...la/paperize/feature/wallpaper/presentation/settings_screen/components/PaperizeListItem.kt
@@ -54,7 +54,9 @@ fun PaperizeListItem(onGitHubClick: () -> Unit, onPlaystoreClick: () -> Unit, on
                 Icon(
                     imageVector = ImageVector.vectorResource(id = R.drawable.app_icon_foreground),
                     contentDescription = stringResource(id = R.string.app_name),
-                    modifier = Modifier.size(160.dp).scale(1.5f),
+                    modifier = Modifier
+                        .size(160.dp)
+                        .scale(1.5f),
                     tint = MaterialTheme.colorScheme.primary,
                 )
                 Text(
@@ -63,7 +65,7 @@ fun PaperizeListItem(onGitHubClick: () -> Unit, onPlaystoreClick: () -> Unit, on
                     fontSize = MaterialTheme.typography.titleLarge.fontSize
                 )
                 Text(
-                    text = "Version: 1.1.1",
+                    text = stringResource(R.string.version) + " " + "1.2.0",
                     style = MaterialTheme.typography.bodySmall,
                     fontSize = MaterialTheme.typography.bodyMedium.fontSize
                 )

diff --git a/...e/feature/wallpaper/presentation/settings_screen/components/SettingsScrollableSettings.kt b/...e/feature/wallpaper/presentation/settings_screen/components/SettingsScrollableSettings.kt
@@ -27,9 +27,11 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.anthonyla.paperize.R
 import com.anthonyla.paperize.data.Contact
 import com.anthonyla.paperize.feature.wallpaper.presentation.settings_screen.SettingsState
 import kotlinx.coroutines.flow.StateFlow
@@ -90,7 +92,7 @@ fun SettingsScrollableSettings(
 
                 Spacer(modifier = Modifier.height(16.dp))
 
-                ListSectionTitle("Appearance")
+                ListSectionTitle(stringResource(R.string.appearance))
                 Spacer(modifier = Modifier.height(16.dp))
                 DarkModeListItem(
                     darkMode = state.value.darkMode,
@@ -109,7 +111,7 @@ fun SettingsScrollableSettings(
                 )
 
                 Spacer(modifier = Modifier.height(16.dp))
-                ListSectionTitle("About")
+                ListSectionTitle(stringResource(R.string.about))
                 Spacer(modifier = Modifier.height(16.dp))
                 PrivacyPolicyListItem (onPrivacyPolicyClick = onPrivacyClick)
                 Spacer(modifier = Modifier.height(16.dp))
@@ -127,8 +129,8 @@ fun SettingsScrollableSettings(
                         coroutineScope.launch {
                             snackbarHostState.currentSnackbarData?.dismiss()
                             snackbarHostState.showSnackbar(
-                                message = "Coming soon",
-                                actionLabel = "Dismiss",
+                                message = context.getString(R.string.coming_soon),
+                                actionLabel = context.getString(R.string.dismiss),
                                 duration = SnackbarDuration.Short
                             )
                         }
@@ -137,8 +139,8 @@ fun SettingsScrollableSettings(
                         coroutineScope.launch {
                             snackbarHostState.currentSnackbarData?.dismiss()
                             snackbarHostState.showSnackbar(
-                                message = "Coming soon",
-                                actionLabel = "Dismiss",
+                                message = context.getString(R.string.coming_soon),
+                                actionLabel = context.getString(R.string.dismiss),
                                 duration = SnackbarDuration.Short
                             )
                         }

diff --git a/.../com/anthonyla/paperize/feature/wallpaper/presentation/wallpaper_screen/WallpaperEvent.kt b/.../com/anthonyla/paperize/feature/wallpaper/presentation/wallpaper_screen/WallpaperEvent.kt
@@ -1,8 +1,6 @@
 package com.anthonyla.paperize.feature.wallpaper.presentation.wallpaper_screen
 
-import com.anthonyla.paperize.feature.wallpaper.domain.model.AlbumWithWallpaperAndFolder
 import com.anthonyla.paperize.feature.wallpaper.domain.model.SelectedAlbum
-import com.anthonyla.paperize.feature.wallpaper.domain.model.Wallpaper
 
 sealed class WallpaperEvent {
     data class UpdateSelectedAlbum(val selectedAlbum: SelectedAlbum): WallpaperEvent()

diff --git a/...perize/feature/wallpaper/presentation/wallpaper_screen/components/CurrentAndNextChange.kt b/...perize/feature/wallpaper/presentation/wallpaper_screen/components/CurrentAndNextChange.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.QueuePlayNext
 import androidx.compose.material.icons.outlined.RemoveFromQueue
-import androidx.compose.material3.Card
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface

diff --git a/...n/java/com/anthonyla/paperize/feature/wallpaper/wallpaperservice/WallpaperBootReceiver.kt b/...n/java/com/anthonyla/paperize/feature/wallpaper/wallpaperservice/WallpaperBootReceiver.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.util.Log
 import com.anthonyla.paperize.core.SettingsConstants
 import com.anthonyla.paperize.data.settings.SettingsDataStore
-import com.anthonyla.paperize.feature.wallpaper.presentation.settings_screen.SettingsViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.runBlocking
 import javax.inject.Inject

diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale=en-US