Refactor: Improve String resources

designSystem/src/main/res/values-ar/strings.xml

@@ -24,9 +24,6 @@
     <string name="season">موسم</string>
     <string name="unsuitable_eye_icon">ايقونه محتوي غير لائق</string>
     <string name="unsuitable_eye_content">صوره غير مناسبه</string>
-    <string name="no_internet">صوره لا يوجد انترنت</string>
-    <string name="you_are_offline">يبدو انك غير متصل بالانترنت</string>
-    <string name="check_your_connection">تحقق من اتصالك وحاول مرة أخرى، سننتظرك مع أفلامك والفشار</string>
     <string name="movies">أفلام</string>
     <string name="tv_shows">مسلسلات</string>
     <string name="incorrect_password">كلمة المرور غير صحيحة</string>
@@ -41,4 +38,4 @@
     <string name="login">تسجيل الدخول</string>
     <string name="rated_successfully">تم التقييم بنجاح</string>
     <string name="rated_fail">حدث خطأ اثناء التقييم</string>
-</resources>
+</resources>

designSystem/src/main/res/values/strings.xml

@@ -24,9 +24,6 @@
     <string name="season">Season</string>
     <string name="unsuitable_eye_icon">Unsuitable Eye Icon</string>
     <string name="unsuitable_eye_content">Unsuitable image</string>
-    <string name="no_internet">NO internet image</string>
-    <string name="you_are_offline">Oops! It looks like you’re offline.</string>
-    <string name="check_your_connection">Check your connection and try again, we’ll be \n waiting with your movies and popcorn</string>
     <string name="movies">Movies</string>
     <string name="tv_shows">TV shows</string>
     <string name="incorrect_password">Incorrect password</string>
@@ -42,4 +39,4 @@
     <string name="login">login</string>
     <string name="rated_successfully">Item rated successfully</string>
     <string name="rated_fail">Failed to rate the item</string>
-</resources>
+</resources>

presentation/src/main/java/com/london/presentation/feature/account/bottomsheet/ContentRestrictionBottomSheet.kt

@@ -47,7 +47,7 @@ fun ContentRestrictionBottomSheet(
         ContentRestrictionOption(
             level = ContentRestrictionLevel.STRICT,
             title = stringResource(R.string.strict),
-            description = stringResource(R.string.blurs_all_sensitive_content),
+            description = stringResource(R.string.strict_description),
             isSelected = selectedLevel == ContentRestrictionLevel.STRICT,
             onSelected = { selectedLevel = it },
             modifier = Modifier.padding(top = 24.dp)
@@ -56,7 +56,7 @@ fun ContentRestrictionBottomSheet(
         ContentRestrictionOption(
             level = ContentRestrictionLevel.MODERATE,
             title = stringResource(R.string.moderate),
-            description = stringResource(R.string.blurs_explicit_scenes_only),
+            description = stringResource(R.string.moderate_description),
             isSelected = selectedLevel == ContentRestrictionLevel.MODERATE,
             onSelected = { selectedLevel = it },
             modifier = Modifier.padding(top = 16.dp)
@@ -65,7 +65,7 @@ fun ContentRestrictionBottomSheet(
         ContentRestrictionOption(
             level = ContentRestrictionLevel.OFF,
             title = stringResource(R.string.off),
-            description = stringResource(R.string.no_content_is_blurred),
+            description = stringResource(R.string.off_description),
             isSelected = selectedLevel == ContentRestrictionLevel.OFF,
             onSelected = { selectedLevel = it },
             modifier = Modifier.padding(top = 16.dp, bottom = 32.dp)

presentation/src/main/java/com/london/presentation/feature/account/bottomsheet/LogoutBottomSheet.kt

@@ -31,7 +31,7 @@ fun LogoutBottomSheet(
         )
     ) {
         Text(
-            text = stringResource(R.string.are_you_sure_to_continue),
+            text = stringResource(R.string.confirm_action),
             style = NovixTheme.typography.body.medium,
             color = NovixTheme.colors.body,
             modifier = Modifier.padding(top = 24.dp, bottom = 24.dp)

presentation/src/main/java/com/london/presentation/feature/account/components/LoggedInContent.kt

@@ -15,7 +15,6 @@ import com.london.designsystem.theme.NovixTheme
 import com.london.presentation.R
 import com.london.presentation.feature.account.AccountContract
 import com.london.presentation.feature.account.AccountUiState
-import com.london.designsystem.R as dsR
 
 @Composable
 fun LoggedInContent(
@@ -46,31 +45,31 @@ fun LoggedInContent(
         AccountMenuDivider()
 
         AccountMenuItem(
-            icon = painterResource(dsR.drawable.star_square),
-            title = stringResource(R.string.my_rating),
+            icon = painterResource(R.drawable.star_square),
+            title = stringResource(R.string.my_ratings),
             onClick = accountContract::onMyRatingClick,
         )
 
         AccountMenuDivider()
 
         AccountMenuItem(
-            icon = painterResource(dsR.drawable.shield_energy),
+            icon = painterResource(R.drawable.shield_energy),
             title = stringResource(R.string.content_restriction),
             onClick = accountContract::onContentRestrictionClick
         )
 
         AccountMenuDivider()
 
         AccountMenuItem(
-            icon = painterResource(dsR.drawable.lock_key),
+            icon = painterResource(R.drawable.lock_key),
             title = stringResource(R.string.change_password),
             onClick = accountContract::onChangePasswordClick
         )
 
         AccountMenuDivider()
 
         AccountMenuItem(
-            icon = painterResource(dsR.drawable.moon),
+            icon = painterResource(R.drawable.moon),
             title = stringResource(R.string.appearance),
             endText = uiState.currentAppearance,
             onClick = accountContract::onAppearanceClick
@@ -79,7 +78,7 @@ fun LoggedInContent(
         AccountMenuDivider()
 
         AccountMenuItem(
-            icon = painterResource(dsR.drawable.language_circle),
+            icon = painterResource(R.drawable.language_circle),
             title = stringResource(R.string.language),
             endText = uiState.currentLanguage,
             onClick = accountContract::onLanguageClick

presentation/src/main/java/com/london/presentation/feature/account/components/UserProfileSection.kt

@@ -94,15 +94,15 @@ private fun UserProfileIcon(avatarPath: String? = null) {
                 contentRestrictionLevel = ContentRestrictionLevel.OFF,
                 loadingContent = {
                     Icon(
-                        painter = painterResource(dsR.drawable.user),
+                        painter = painterResource(R.drawable.user),
                         contentDescription = stringResource(R.string.user_profile),
                         modifier = Modifier.size(28.dp),
                         tint = NovixTheme.colors.title
                     )
                 },
                 errorContent = {
                     Icon(
-                        painter = painterResource(dsR.drawable.user),
+                        painter = painterResource(R.drawable.user),
                         contentDescription = stringResource(R.string.user_profile),
                         modifier = Modifier.size(28.dp),
                         tint = NovixTheme.colors.title
@@ -111,7 +111,7 @@ private fun UserProfileIcon(avatarPath: String? = null) {
             )
         } else {
             Icon(
-                painter = painterResource(dsR.drawable.user),
+                painter = painterResource(R.drawable.user),
                 contentDescription = stringResource(R.string.user_profile),
                 modifier = Modifier.size(28.dp),
                 tint = NovixTheme.colors.title

presentation/src/main/java/com/london/presentation/feature/account/rating/MyRatingScreen.kt

@@ -98,7 +98,7 @@ private fun Content(
             ) {
                 TopBar(
                     modifier = Modifier.detailsTopBar(1f),
-                    title = stringResource(R.string.my_rating),
+                    title = stringResource(R.string.my_ratings),
                     onBackClick = contract::onBackClick
                 )
 
@@ -110,7 +110,7 @@ private fun Content(
 
                 if (items.isEmpty()) {
                     EmptyGenreLayout(
-                        message = stringResource(R.string.there_is_no_items),
+                        message = stringResource(R.string.no_ratings),
                         modifier = Modifier.fillMaxSize()
                     )
                 } else {

presentation/src/main/java/com/london/presentation/feature/account/rating/RatingCategory.kt

@@ -5,6 +5,6 @@ import com.london.presentation.R
 
 enum class RatingCategory(@StringRes val title: Int) {
     All(R.string.all),
-    Movies(R.string.Movies),
-    TvShows(R.string.TV_Shows)
+    Movies(R.string.movies),
+    TvShows(R.string.tv_shows)
 }

presentation/src/main/java/com/london/presentation/feature/authentication/login/LoginScreen.kt

@@ -1,6 +1,5 @@
 package com.london.presentation.feature.authentication.login
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -14,7 +13,6 @@ import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBars
-import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
@@ -145,7 +143,7 @@ private fun Content(
                 passwordHiddenIcon = painterResource(id = dsR.drawable.icon_hide_password),
                 interactionSource = interactionSourcePassword,
                 leadingIcon = if (uiState.password.text.isNotEmpty()) {
-                    painterResource(dsR.drawable.lock_key)
+                    painterResource(R.drawable.lock_key)
                 } else {
                     painterResource(dsR.drawable.light_lock_key)
                 },
@@ -187,7 +185,7 @@ private fun Content(
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Text(
-                    stringResource(R.string.don_t_have_an_account),
+                    stringResource(R.string.no_account),
                     style = NovixTheme.typography.body.small,
                     color = NovixTheme.colors.body,
                     modifier = Modifier.padding(end = 4.dp)

presentation/src/main/java/com/london/presentation/feature/category/movie/MovieCategoryScreen.kt

@@ -64,7 +64,7 @@ private fun Content(
         isLoading = moviesLazyList.isLoading(),
         isError = moviesLazyList.loadState.refresh is LoadState.Error,
         onRetry = moviesLazyList::refresh,
-        emptyLayoutMessage = R.string.there_is_no_items_for_this_genre,
+        emptyLayoutMessage = R.string.no_movies_in_genre,
         emptyLayoutImage = R.drawable.empty
     ) {
         Box(

presentation/src/main/java/com/london/presentation/feature/category/tvshow/TvShowCategoryScreen.kt

@@ -62,7 +62,7 @@ private fun Content(
         isLoading = tvShowLazyList.isLoading(),
         isError = tvShowLazyList.loadState.refresh is LoadState.Error,
         onRetry = tvShowLazyList::refresh,
-        emptyLayoutMessage = R.string.there_is_no_items_for_this_genre,
+        emptyLayoutMessage = R.string.no_shows_in_genre,
         emptyLayoutImage = R.drawable.empty
     ) {
         Box(

presentation/src/main/java/com/london/presentation/feature/details/actor/info/gallery/ActorsGalleryScreen.kt

@@ -113,7 +113,7 @@ private fun GalleryContent(
         items(uiState.images) { imageUrl ->
             ImageView(
                 model = imageUrl,
-                contentDescription = stringResource(R.string.actor_photos),
+                contentDescription = stringResource(R.string.actor_images),
                 modifier = Modifier
                     .size(width = 104.dp, height = 101.dp)
                     .border(

presentation/src/main/java/com/london/presentation/feature/details/tvshow/episode/EpisodeDetailScreen.kt

@@ -156,7 +156,7 @@ private fun Content(
                 if (guestStars.isNotEmpty()) {
                     item {
                         Text(
-                            text = stringResource(R.string.guests_of_honor),
+                            text = stringResource(R.string.featured_guests),
                             style = NovixTheme.typography.title.medium,
                             color = NovixTheme.colors.title,
                             modifier = Modifier

presentation/src/main/java/com/london/presentation/feature/home/trending/TrendingCategories.kt

@@ -53,7 +53,7 @@ fun TrendingSection(
     ) {
         if (!isLoading)
             Text(
-                text = stringResource(R.string.What_you_want_to_watch),
+                text = stringResource(R.string.what_to_watch),
                 style = NovixTheme.typography.headline.small,
                 color = NovixTheme.colors.title,
                 modifier = Modifier
@@ -80,7 +80,7 @@ fun TrendingSection(
             verticalAlignment = Alignment.Bottom
         ) {
             CategoryCard(
-                title = stringResource(R.string.Movies),
+                title = stringResource(R.string.movies),
                 icon = painterResource(id = R.drawable.icon_movie),
                 startColor = NovixTheme.colors.primary,
                 endColor = NovixTheme.colors.darkCocoa,
@@ -91,7 +91,7 @@ fun TrendingSection(
             )
 
             CategoryCard(
-                title = stringResource(R.string.TV_Shows),
+                title = stringResource(R.string.tv_shows),
                 icon = painterResource(id = R.drawable.icon_tvshow),
                 startColor = NovixTheme.colors.secondary,
                 endColor = NovixTheme.colors.deepCrimson,
@@ -102,7 +102,7 @@ fun TrendingSection(
             )
 
             CategoryCard(
-                title = stringResource(R.string.actors),
+                title = stringResource(R.string.celebrities),
                 icon = painterResource(id = R.drawable.icon_actor),
                 startColor = NovixTheme.colors.tealBlue,
                 endColor = NovixTheme.colors.oceanDark,

presentation/src/main/java/com/london/presentation/feature/home/trending/actor/TrendingActorsScreen.kt

@@ -3,19 +3,14 @@ package com.london.presentation.feature.home.trending.actor
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -68,7 +63,7 @@ private fun Content(
         isError = actorsLazyItems.loadState.refresh is LoadState.Error,
         onBack = contract::onBackClick,
         onRetry = contract::onRetryClick,
-        emptyLayoutMessage = R.string.no_trending_actors_in_genre,
+        emptyLayoutMessage = R.string.no_trending_people,
         emptyLayoutImage = R.drawable.img_no_result,
         pagingFlow = actorsLazyItems
     ) {

presentation/src/main/java/com/london/presentation/feature/home/trending/movie/TrendingMoviesScreen.kt

@@ -69,7 +69,7 @@ private fun Content(
         isError = state.moviesFlow.collectAsLazyPagingItems().loadState.refresh is LoadState.Error,
         onBack = contract::onBackClick,
         onRetry = contract::onRetryClick,
-        emptyLayoutMessage = R.string.no_trending_movies_in_genre,
+        emptyLayoutMessage = R.string.no_movies_in_genre,
         emptyLayoutImage = R.drawable.img_no_result,
     ) {
         Box(

presentation/src/main/java/com/london/presentation/feature/home/trending/tvshow/TrendingTvShowsScreen.kt

@@ -68,7 +68,7 @@ private fun Content(
         isLoading = state.isLoading,
         isError = state.tvShowsFlow.collectAsLazyPagingItems().loadState.refresh is LoadState.Error,
         onBack = contract::onBackClick,
-        emptyLayoutMessage = R.string.no_trending_shows_in_genre,
+        emptyLayoutMessage = R.string.no_shows_in_genre,
         emptyLayoutImage = R.drawable.img_no_result,
     ) {
         Box(