chore: Use compose resources for strings

Author: ishubhamsingh

composeApp/src/androidMain/kotlin/dev/ishubhamsingh/splashy/core/utils/FileUtils.kt

@@ -31,12 +31,19 @@ import android.provider.MediaStore
 import android.widget.Toast
 import com.eygraber.uri.toAndroidUri
 import com.eygraber.uri.toUri
-import dev.ishubhamsingh.splashy.core.presentation.CommonRes
 import dev.ishubhamsingh.splashy.features.details.WallpaperScreenType
+import dev.ishubhamsingh.splashy.resources.Res
+import dev.ishubhamsingh.splashy.resources.applying_wallpaper_failed_message
+import dev.ishubhamsingh.splashy.resources.applying_wallpaper_success_message
+import dev.ishubhamsingh.splashy.resources.downloading_file_failed_message
+import dev.ishubhamsingh.splashy.resources.downloading_file_success_message
+import dev.ishubhamsingh.splashy.resources.opening_file_failed_message
+import dev.ishubhamsingh.splashy.resources.wallpaper_chooser_title
 import kotlin.coroutines.coroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.jetbrains.compose.resources.getString
 
 /** Created by Shubham Singh on 19/08/23. */
 actual class FileUtils(private val context: Context) {
@@ -78,19 +85,16 @@ actual class FileUtils(private val context: Context) {
             openFile(uri?.toUri(), fileName)
           } else {
             result =
-              CommonRes.downloading_file_success_message.replace(
-                "%path",
-                Environment.DIRECTORY_PICTURES
-              )
+              getString(Res.string.downloading_file_success_message, Environment.DIRECTORY_PICTURES)
             updateMessage.invoke(result)
           }
         }
         .onFailure {
           result =
             if (shouldOpenFile) {
-              CommonRes.opening_file_failed_message
+              getString(Res.string.opening_file_failed_message)
             } else {
-              CommonRes.downloading_file_failed_message
+              getString(Res.string.downloading_file_failed_message)
             }
           updateMessage.invoke(result)
           it.printStackTrace()
@@ -105,7 +109,7 @@ actual class FileUtils(private val context: Context) {
     intent.setDataAndType(uri?.toAndroidUri(), "image/jpeg")
     intent.putExtra("mimeType", "image/jpeg")
     val chooserIntent =
-      Intent.createChooser(intent, CommonRes.wallpaper_chooser_title.replace("%fileName", fileName))
+      Intent.createChooser(intent, getString(Res.string.wallpaper_chooser_title, fileName))
     chooserIntent.addFlags(FLAG_ACTIVITY_NEW_TASK)
     context.startActivity(chooserIntent)
   }
@@ -131,11 +135,11 @@ actual class FileUtils(private val context: Context) {
           wallpaperManager.setBitmap(imageBitmap, null, true, flag)
         }
         .onSuccess {
-          result = CommonRes.applying_wallpaper_success_message
+          result = getString(Res.string.applying_wallpaper_success_message)
           updateMessage.invoke(result)
         }
         .onFailure {
-          result = CommonRes.applying_wallpaper_failed_message
+          result = getString(Res.string.applying_wallpaper_failed_message)
           showMessage(result)
           updateMessage.invoke(result)
         }

composeApp/src/commonMain/composeResources/values/strings.xml

@@ -0,0 +1,52 @@
+<resources>
+    <string name="app_name">Splashy</string>
+    <string name="lbl_filter">Filter by Categories</string>
+    <string name="save_to_photos">Save to Gallery</string>
+    <string name="lbl_download">Download</string>
+    <string name="lbl_apply_wallpaper">Set Wallpaper</string>
+    <string name="lbl_details_caps">DETAILS</string>
+    <string name="lbl_desc">Description:</string>
+    <string name="lbl_posted_on">Posted on:</string>
+    <string name="lbl_size">Size:</string>
+    <string name="lbl_likes">Likes:</string>
+    <string name="lbl_color">Color:</string>
+    <string name="lbl_topics">Categories:</string>
+    <string name="lbl_search">Search</string>
+
+    <string name="title_apply_wallpaper_dialog">Set Wallpaper</string>
+    <string name="desc_apply_wallpaper_dialog">Please select how you want to set the wallpaper</string>
+    <string name="lbl_apply_wall_other_app">Set using other app</string>
+    <string name="lbl_apply_wall_homescreen">Set on Homescreen</string>
+    <string name="lbl_apply_wall_lockscreen">Set on Lockscreen</string>
+    <string name="lbl_apply_wall_both">Set on both screens</string>
+
+    <string name="lbl_home">Home</string>
+    <string name="lbl_categories">Categories</string>
+    <string name="lbl_favourites">Favorites</string>
+    <string name="lbl_details">Photo Details</string>
+    <string name="lbl_categories_photos">Category Photos</string>
+    <string name="lbl_settings">Settings</string>
+
+    <string name="saved_success_message">Saved to gallery successfully</string>
+    <string name="saved_failure_message">Saving to gallery failed!</string>
+    <string name="opening_file_failed_message">Opening file failed!</string>
+    <string name="downloading_file_success_message">File saved successfully in %1$s</string>
+    <string name="downloading_file_failed_message">Saving file failed!</string>
+    <string name="applying_wallpaper_success_message">Wallpaper set successfully</string>
+    <string name="applying_wallpaper_failed_message">Setting wallpaper failed!</string>
+    <string name="wallpaper_chooser_title">Set %1$s as:</string>
+
+    <string name="lbl_collections_title">Collections</string>
+    <string name="lbl_topics_title">Categories</string>
+    <string name="lbl_photos_count">%1$d Photos</string>
+
+    <string name="lbl_select_theme">Select Theme</string>
+    <string name="lbl_material_you_title">Use Material You</string>
+    <string name="lbl_material_you_desc">Apply wallpaper based colors</string>
+    <string-array name="themes_array">
+        <item>System</item>
+        <item>Light</item>
+        <item>Dark</item>
+    </string-array>
+    <string name="lbl_back">back</string>
+</resources>

composeApp/src/commonMain/kotlin/dev/ishubhamsingh/splashy/core/navigation/TopLevelScreen.kt

@@ -58,13 +58,13 @@ import compose.icons.EvaIcons
 import compose.icons.evaicons.Outline
 import compose.icons.evaicons.outline.Menu2
 import compose.icons.evaicons.outline.Person
-import dev.ishubhamsingh.splashy.core.presentation.CommonRes
 import dev.ishubhamsingh.splashy.core.utils.isChristmasNewYearWeek
 import dev.ishubhamsingh.splashy.features.categories.ui.CategoriesTab
 import dev.ishubhamsingh.splashy.features.favourites.ui.FavouritesTab
 import dev.ishubhamsingh.splashy.features.home.ui.HomeTab
 import dev.ishubhamsingh.splashy.features.settings.ui.SettingsScreen
 import dev.ishubhamsingh.splashy.resources.Res
+import dev.ishubhamsingh.splashy.resources.app_name
 import dev.ishubhamsingh.splashy.resources.hat
 import dev.ishubhamsingh.splashy.ui.components.SnowFallComponent
 import dev.ishubhamsingh.splashy.ui.components.getKamelConfig
@@ -73,6 +73,7 @@ import dev.ishubhamsingh.splashy.ui.theme.getLobsterRegular
 import io.kamel.image.config.LocalKamelConfig
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
+import org.jetbrains.compose.resources.stringResource
 
 /** Created by Shubham Singh on 29/09/23. */
 class TopLevelScreen : Screen {
@@ -173,7 +174,7 @@ class TopLevelScreen : Screen {
         title = {
           Box {
             Text(
-              CommonRes.app_name,
+              stringResource(Res.string.app_name),
               fontFamily = getLobsterRegular(),
               fontSize = 32.sp,
               fontWeight = FontWeight.Normal

composeApp/src/commonMain/kotlin/dev/ishubhamsingh/splashy/core/presentation/CommonRes.kt

@@ -55,7 +55,6 @@ import compose.icons.evaicons.Fill
 import compose.icons.evaicons.Outline
 import compose.icons.evaicons.fill.Folder
 import compose.icons.evaicons.outline.Folder
-import dev.ishubhamsingh.splashy.core.presentation.CommonRes
 import dev.ishubhamsingh.splashy.core.utils.UpdateSystemBars
 import dev.ishubhamsingh.splashy.core.utils.getNonPremiumCollections
 import dev.ishubhamsingh.splashy.features.categories.CategoriesScreenModel
@@ -64,7 +63,13 @@ import dev.ishubhamsingh.splashy.features.categoriesPhotos.ui.CategoryType
 import dev.ishubhamsingh.splashy.isDarkThemeState
 import dev.ishubhamsingh.splashy.models.CollectionItem
 import dev.ishubhamsingh.splashy.models.Topic
+import dev.ishubhamsingh.splashy.resources.Res
+import dev.ishubhamsingh.splashy.resources.lbl_categories
+import dev.ishubhamsingh.splashy.resources.lbl_collections_title
+import dev.ishubhamsingh.splashy.resources.lbl_photos_count
+import dev.ishubhamsingh.splashy.resources.lbl_topics_title
 import dev.ishubhamsingh.splashy.ui.components.CategoriesCardItem
+import org.jetbrains.compose.resources.stringResource
 
 /** Created by Shubham Singh on 29/09/23. */
 object CategoriesTab : Tab {
@@ -73,7 +78,7 @@ object CategoriesTab : Tab {
     @Composable
     get() {
       val isSelected = LocalTabNavigator.current.current == this
-      val title = CommonRes.lbl_categories
+      val title = stringResource(Res.string.lbl_categories)
       val icon =
         rememberVectorPainter(if (isSelected) EvaIcons.Fill.Folder else EvaIcons.Outline.Folder)
 
@@ -141,7 +146,7 @@ object CategoriesTab : Tab {
       item(
         content = {
           Text(
-            text = CommonRes.lbl_collections_title,
+            text = stringResource(Res.string.lbl_collections_title),
             style = MaterialTheme.typography.displayMedium
           )
         }
@@ -150,7 +155,10 @@ object CategoriesTab : Tab {
       item(content = { Spacer(modifier = Modifier.size(16.dp)) })
       item(
         content = {
-          Text(text = CommonRes.lbl_topics_title, style = MaterialTheme.typography.displayMedium)
+          Text(
+            text = stringResource(Res.string.lbl_topics_title),
+            style = MaterialTheme.typography.displayMedium
+          )
         }
       )
       items(topics) {
@@ -166,7 +174,7 @@ object CategoriesTab : Tab {
           modifier = Modifier.fillMaxWidth(),
           shouldShowOverlay = true,
           overlayTitle = it.title ?: "",
-          overlaySubtitle = CommonRes.lbl_photos_count.replace("%count", it.totalPhotos.toString())
+          overlaySubtitle = stringResource(Res.string.lbl_photos_count, it.totalPhotos.toString())
         )
       }
     }