Merge pull request #78 from AnyGogin31/feature/localization-russian

Feature/localization russian
AnyGogin31 · Dec 14, 2024 · 26a53ad · 26a53ad
2 parents 0c51c6c + 7fdfe33
commit 26a53ad
Show file tree

Hide file tree

Showing 17 changed files with 219 additions and 37 deletions.
diff --git a/core/desingsystem/build.gradle.kts b/core/desingsystem/build.gradle.kts
@@ -12,6 +12,8 @@ kotlin {
 
                 implementation(projects.core.navigation.navigationApi)
 
+                implementation(projects.resources)
+
                 implementation(libs.coil.compose)
             }
         }

diff --git a/...em/src/commonMain/kotlin/neilt/mobile/pixiv/desingsystem/components/search/SearchInput.kt b/...em/src/commonMain/kotlin/neilt/mobile/pixiv/desingsystem/components/search/SearchInput.kt
@@ -44,6 +44,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
+import neilt.mobile.pixiv.resources.Res
+import neilt.mobile.pixiv.resources.search_placeholder
+import org.jetbrains.compose.resources.stringResource
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -88,7 +91,7 @@ fun SearchInput(
                 onSearch = onExecuteSearch,
                 expanded = isExpanded,
                 onExpandedChange = {},
-                placeholder = { Text("Search illustrations...") },
+                placeholder = { Text(text = stringResource(Res.string.search_placeholder)) },
             )
         },
         expanded = isExpanded,

diff --git a/...Main/kotlin/neilt/mobile/pixiv/desingsystem/components/settings/SettingsCardComponents.kt b/...Main/kotlin/neilt/mobile/pixiv/desingsystem/components/settings/SettingsCardComponents.kt
@@ -40,6 +40,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import org.jetbrains.compose.resources.stringResource
 
 fun LazyListScope.displaySettingsElements(
     elements: List<SettingsElement>,
@@ -107,11 +108,11 @@ private fun SettingItemCard(
             )
             Column {
                 Text(
-                    text = item.title,
+                    text = stringResource(item.title),
                     style = MaterialTheme.typography.titleMedium,
                 )
                 Text(
-                    text = item.subtitle,
+                    text = stringResource(item.subtitle),
                     style = MaterialTheme.typography.bodyMedium,
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )

diff --git a/.../commonMain/kotlin/neilt/mobile/pixiv/desingsystem/components/settings/SettingsElement.kt b/.../commonMain/kotlin/neilt/mobile/pixiv/desingsystem/components/settings/SettingsElement.kt
@@ -26,15 +26,16 @@ package neilt.mobile.pixiv.desingsystem.components.settings
 
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.vector.ImageVector
+import org.jetbrains.compose.resources.StringResource
 
 @Stable
 sealed interface SettingsElement
 
 data class SettingGroup(val items: List<SettingItem>) : SettingsElement
 
 data class SettingItem(
-    val title: String,
-    val subtitle: String,
+    val title: StringResource,
+    val subtitle: StringResource,
     val icon: ImageVector,
     val onClick: () -> Unit = {},
 ) : SettingsElement
diff --git a/features/auth/build.gradle.kts b/features/auth/build.gradle.kts
@@ -16,6 +16,8 @@ kotlin {
 
                 implementation(projects.features.main)
 
+                implementation(projects.resources)
+
                 implementation(libs.koin.core)
                 implementation(libs.koin.compose)
                 implementation(libs.koin.compose.viewmodel)

diff --git a/...auth/src/commonMain/kotlin/neilt/mobile/pixiv/features/auth/presentation/auth/AuthView.kt b/...auth/src/commonMain/kotlin/neilt/mobile/pixiv/features/auth/presentation/auth/AuthView.kt
@@ -42,6 +42,9 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import neilt.mobile.pixiv.core.state.whenState
 import neilt.mobile.pixiv.desingsystem.components.views.LoadingView
+import neilt.mobile.pixiv.resources.Res
+import neilt.mobile.pixiv.resources.error_back
+import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
@@ -92,7 +95,7 @@ private fun ErrorView(
             modifier = Modifier.padding(bottom = 16.dp),
         )
         Button(onClick = onBack) {
-            Text("Back")
+            Text(text = stringResource(Res.string.error_back))
         }
     }
 }
diff --git a/...th/src/commonMain/kotlin/neilt/mobile/pixiv/features/auth/presentation/login/LoginView.kt b/...th/src/commonMain/kotlin/neilt/mobile/pixiv/features/auth/presentation/login/LoginView.kt
@@ -37,6 +37,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import neilt.mobile.pixiv.resources.Res
+import neilt.mobile.pixiv.resources.login_button
+import neilt.mobile.pixiv.resources.login_title
+import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
@@ -51,7 +55,7 @@ internal fun LoginView(
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Text(
-            text = "Pixiv Authorization",
+            text = stringResource(Res.string.login_title),
             style = MaterialTheme.typography.headlineMedium,
             textAlign = TextAlign.Center,
             modifier = Modifier.padding(bottom = 32.dp),
@@ -63,7 +67,7 @@ internal fun LoginView(
                 .fillMaxWidth()
                 .padding(horizontal = 16.dp),
         ) {
-            Text(text = "Login with Pixiv")
+            Text(text = stringResource(Res.string.login_button))
         }
     }
 }
diff --git a/features/illustration/build.gradle.kts b/features/illustration/build.gradle.kts
@@ -14,6 +14,8 @@ kotlin {
                 implementation(projects.core.desingsystem)
                 implementation(projects.core.state)
 
+                implementation(projects.resources)
+
                 implementation(libs.koin.core)
                 implementation(libs.koin.compose)
                 implementation(libs.koin.compose.viewmodel)

diff --git a/.../neilt/mobile/pixiv/features/illustration/presentation/details/IllustrationDetailsView.kt b/.../neilt/mobile/pixiv/features/illustration/presentation/details/IllustrationDetailsView.kt
@@ -60,6 +60,10 @@ import neilt.mobile.pixiv.core.state.whenState
 import neilt.mobile.pixiv.desingsystem.components.views.ErrorView
 import neilt.mobile.pixiv.desingsystem.components.views.LoadingView
 import neilt.mobile.pixiv.domain.models.details.illustration.IllustrationDetails
+import neilt.mobile.pixiv.resources.Res
+import neilt.mobile.pixiv.resources.author_avatar
+import neilt.mobile.pixiv.resources.views_and_bookmarks
+import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
@@ -134,7 +138,7 @@ private fun IllustrationDetailsContent(
             ) {
                 AsyncImage(
                     model = illustration.user.profileImageUrl,
-                    contentDescription = "Author avatar",
+                    contentDescription = stringResource(Res.string.author_avatar),
                     modifier = Modifier.clip(CircleShape),
                     contentScale = ContentScale.Crop,
                 )
@@ -146,7 +150,11 @@ private fun IllustrationDetailsContent(
         Spacer(modifier = Modifier.height(16.dp))
 
         Text(
-            text = "Views: ${illustration.views}, Bookmarks: ${illustration.bookmarks}",
+            text = stringResource(
+                Res.string.views_and_bookmarks,
+                illustration.views,
+                illustration.bookmarks,
+            ),
             modifier = Modifier.padding(horizontal = 16.dp),
             style = MaterialTheme.typography.bodyMedium,
         )

diff --git a/...t/mobile/pixiv/features/illustration/presentation/details/IllustrationDetailsViewModel.kt b/...t/mobile/pixiv/features/illustration/presentation/details/IllustrationDetailsViewModel.kt
@@ -39,6 +39,10 @@ import neilt.mobile.pixiv.core.state.LoadingState
 import neilt.mobile.pixiv.core.state.ViewState
 import neilt.mobile.pixiv.domain.repositories.details.illustration.IllustrationRepository
 import neilt.mobile.pixiv.features.illustration.provider.ToastProvider
+import neilt.mobile.pixiv.resources.Res
+import neilt.mobile.pixiv.resources.toast_download_complete
+import neilt.mobile.pixiv.resources.toast_downloading
+import org.jetbrains.compose.resources.getString
 
 internal class IllustrationDetailsViewModel(
     private val illustrationRepository: IllustrationRepository,
@@ -69,9 +73,9 @@ internal class IllustrationDetailsViewModel(
         }
 
         viewModelScope.launch {
-            toastProvider.showToast("Downloading...")
+            toastProvider.showToast(getString(Res.string.toast_downloading))
             illustrationRepository.downloadIllustration(url, fileName)
-            toastProvider.showToast("Download complete")
+            toastProvider.showToast(getString(Res.string.toast_download_complete))
         }
     }
 }
diff --git a/features/main/build.gradle.kts b/features/main/build.gradle.kts
@@ -16,6 +16,8 @@ kotlin {
 
                 implementation(projects.features.illustration)
 
+                implementation(projects.resources)
+
                 implementation(libs.koin.core)
                 implementation(libs.koin.compose)
                 implementation(libs.koin.compose.viewmodel)

diff --git a/...main/src/commonMain/kotlin/neilt/mobile/pixiv/features/main/presentation/home/HomeView.kt b/...main/src/commonMain/kotlin/neilt/mobile/pixiv/features/main/presentation/home/HomeView.kt
@@ -59,6 +59,10 @@ import neilt.mobile.pixiv.desingsystem.components.views.ErrorView
 import neilt.mobile.pixiv.desingsystem.components.views.LoadingView
 import neilt.mobile.pixiv.domain.models.details.illustration.Tag
 import neilt.mobile.pixiv.domain.models.home.Illustration
+import neilt.mobile.pixiv.resources.Res
+import neilt.mobile.pixiv.resources.illustration_description
+import neilt.mobile.pixiv.resources.no_illustrations_found
+import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.koinInject
 import org.koin.compose.viewmodel.koinViewModel
 
@@ -101,7 +105,7 @@ internal fun HomeView(
 
     state.whenStateExtended<List<Illustration>>(
         onLoading = { LoadingView() },
-        onEmpty = { EmptyView(message = "No illustrations found") },
+        onEmpty = { EmptyView(message = stringResource(Res.string.no_illustrations_found)) },
         onError = { ErrorView(message = it) },
         onLoaded = {
             IllustrationsGallery(
@@ -151,12 +155,14 @@ private fun IllustrationItem(
     illustration: Illustration,
     onClick: () -> Unit,
 ) {
+    val contentDescription = stringResource(Res.string.illustration_description, illustration.title)
+
     Card(
         modifier = modifier
             .padding(contentPadding)
             .fillMaxWidth()
             .aspectRatio(.75f)
-            .semantics { contentDescription = "Illustration: ${illustration.title}" },
+            .semantics { this.contentDescription = contentDescription },
         onClick = onClick,
     ) {
         Column(

diff --git a/...rc/commonMain/kotlin/neilt/mobile/pixiv/features/main/presentation/profile/ProfileView.kt b/...rc/commonMain/kotlin/neilt/mobile/pixiv/features/main/presentation/profile/ProfileView.kt
@@ -53,6 +53,15 @@ import neilt.mobile.pixiv.desingsystem.components.views.ErrorView
 import neilt.mobile.pixiv.desingsystem.components.views.LoadingView
 import neilt.mobile.pixiv.domain.models.profile.Profile
 import neilt.mobile.pixiv.domain.models.profile.UserDetail
+import neilt.mobile.pixiv.resources.Res
+import neilt.mobile.pixiv.resources.profile_birth_date
+import neilt.mobile.pixiv.resources.profile_followers
+import neilt.mobile.pixiv.resources.profile_image_description
+import neilt.mobile.pixiv.resources.profile_job
+import neilt.mobile.pixiv.resources.profile_region
+import neilt.mobile.pixiv.resources.twitter_handle
+import neilt.mobile.pixiv.resources.website_button
+import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
@@ -88,7 +97,7 @@ private fun ProfileContent(userDetail: UserDetail) {
         Row(verticalAlignment = Alignment.CenterVertically) {
             AsyncImage(
                 model = user.profileImageUrls,
-                contentDescription = "Profile Image",
+                contentDescription = stringResource(Res.string.profile_image_description),
                 modifier = Modifier
                     .size(72.dp)
                     .clip(CircleShape),
@@ -129,13 +138,13 @@ private fun ProfileContent(userDetail: UserDetail) {
         Row {
             profile.twitterAccount?.let {
                 TextButton(onClick = { /* Open Twitter */ }) {
-                    Text("Twitter: @$it")
+                    Text(text = stringResource(Res.string.twitter_handle, it))
                 }
             }
             Spacer(modifier = Modifier.width(8.dp))
             profile.webpage?.let {
                 TextButton(onClick = { /* Open webpage */ }) {
-                    Text("Website")
+                    Text(text = stringResource(Res.string.website_button))
                 }
             }
         }
@@ -145,10 +154,22 @@ private fun ProfileContent(userDetail: UserDetail) {
 @Composable
 fun ProfileInfoSection(profile: Profile) {
     Column {
-        ProfileInfoItem(label = "Birth Date", value = profile.birthDay)
-        ProfileInfoItem(label = "Region", value = profile.region)
-        ProfileInfoItem(label = "Job", value = profile.job)
-        ProfileInfoItem(label = "Followers", value = profile.totalFollowUsers.toString())
+        ProfileInfoItem(
+            label = stringResource(Res.string.profile_birth_date),
+            value = profile.birthDay,
+        )
+        ProfileInfoItem(
+            label = stringResource(Res.string.profile_region),
+            value = profile.region,
+        )
+        ProfileInfoItem(
+            label = stringResource(Res.string.profile_job),
+            value = profile.job,
+        )
+        ProfileInfoItem(
+            label = stringResource(Res.string.profile_followers),
+            value = profile.totalFollowUsers.toString(),
+        )
     }
 }
 

diff --git a/features/settings/build.gradle.kts b/features/settings/build.gradle.kts
@@ -14,6 +14,8 @@ kotlin {
                 implementation(projects.core.navigation.navigationApi)
                 implementation(projects.core.state)
 
+                implementation(projects.resources)
+
                 implementation(libs.koin.core)
                 implementation(libs.koin.compose)
                 implementation(libs.koin.compose.viewmodel)
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,8 @@ kotlin { @@
                     implementation(projects.core.navigation.navigationApi)
+                    implementation(projects.resources)
                     implementation(libs.coil.compose)
                 }
             }
@@ Expand Down @@