Merge pull request #1601 from DimensionDev/feature/language_settings

add in app language settings

Author: Tlaster

app/build.gradle.kts

@@ -108,6 +108,9 @@ android {
     lint {
         disable.add("MissingTranslation")
     }
+    androidResources {
+        generateLocaleConfig = true
+    }
 }
 
 dependencies {

app/src/main/java/dev/dimension/flare/ui/screen/settings/SettingsScreen.kt

@@ -1,5 +1,7 @@
 package dev.dimension.flare.ui.screen.settings
 
+import android.content.Intent
+import android.provider.Settings
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -19,8 +21,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
 import compose.icons.FontAwesomeIcons
 import compose.icons.fontawesomeicons.Solid
 import compose.icons.fontawesomeicons.solid.CircleInfo
@@ -30,6 +34,7 @@ import compose.icons.fontawesomeicons.solid.Database
 import compose.icons.fontawesomeicons.solid.Filter
 import compose.icons.fontawesomeicons.solid.Gear
 import compose.icons.fontawesomeicons.solid.Globe
+import compose.icons.fontawesomeicons.solid.Language
 import compose.icons.fontawesomeicons.solid.Palette
 import compose.icons.fontawesomeicons.solid.Robot
 import compose.icons.fontawesomeicons.solid.TableList
@@ -92,6 +97,7 @@ internal fun SettingsScreen(
     toAiConfig: () -> Unit,
     onBack: () -> Unit,
 ) {
+    val context = LocalContext.current
     val topAppBarScrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
     val state by producePresenter { settingsPresenter() }
     FlareScaffold(
@@ -231,6 +237,37 @@ internal fun SettingsScreen(
                                 toAppearance.invoke()
                             },
                 )
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+                    ListItem(
+                        headlineContent = {
+                            Text(text = stringResource(id = R.string.settings_language_title))
+                        },
+                        leadingContent = {
+                            ThemedIcon(
+                                imageVector = FontAwesomeIcons.Solid.Language,
+                                contentDescription = stringResource(id = R.string.settings_language_title),
+                                color = ThemeIconData.Color.SapphireBlue,
+                            )
+                        },
+                        supportingContent = {
+                            Text(text = stringResource(id = R.string.settings_language_description))
+                        },
+                        modifier =
+                            Modifier
+                                .listCardItem()
+                                .clickable {
+                                    try {
+                                        val intent =
+                                            Intent(Settings.ACTION_APP_LOCALE_SETTINGS).apply {
+                                                data = "package:${BuildConfig.APPLICATION_ID}".toUri()
+                                            }
+                                        context.startActivity(intent)
+                                    } catch (e: Exception) {
+                                        e.printStackTrace()
+                                    }
+                                },
+                    )
+                }
                 state.user.onSuccess {
                     ListItem(
                         headlineContent = {

app/src/main/java/dev/dimension/flare/ui/screen/splash/SplashScreen.kt

@@ -1,5 +1,6 @@
 package dev.dimension.flare.ui.screen.splash
 
+import android.os.Build
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -21,10 +22,12 @@ internal fun SplashScreen() {
                     .padding(it),
             contentAlignment = Alignment.Center,
         ) {
-            Image(
-                painterResource(id = R.drawable.ic_launcher_foreground),
-                contentDescription = null,
-            )
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
+                Image(
+                    painterResource(id = R.drawable.ic_launcher_foreground),
+                    contentDescription = null,
+                )
+            }
         }
     }
 }

app/src/main/res/resources.properties

@@ -0,0 +1 @@
+unqualifiedResLocale=en-US

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

@@ -67,6 +67,8 @@
     <string name="settings_ai_config_translation_description">Replace Google Translate with AI translation, might take longer time</string>
     <string name="settings_ai_config_enable_tldr">Enable AI Summarization</string>
     <string name="settings_ai_config_tldr_description">Enable AI summarization for long posts, only available in post that longer than 500 characters</string>
+    <string name="settings_language_title">Language</string>
+    <string name="settings_language_description">Change the language of the app</string>
 
     <string name="status_loadmore_error_retry">Retry</string>
     <string name="login_expired">Login session expired</string>

compose-ui/src/commonMain/kotlin/dev/dimension/flare/data/model/AppSettings.kt

@@ -16,6 +16,7 @@ import okio.BufferedSource
 public data class AppSettings(
     val version: String,
     val aiConfig: AiConfig = AiConfig(),
+    val language: String = "",
 ) {
     @Serializable
     public data class AiConfig(

compose-ui/src/jvmMain/kotlin/dev/dimension/flare/ui/component/DateTimeText.jvm.kt

@@ -6,9 +6,14 @@ import dev.dimension.flare.ui.render.UiDateTime
 import org.ocpsoft.prettytime.PrettyTime
 import java.time.format.DateTimeFormatter
 import java.util.Date
+import java.util.Locale
 
 private val prettyTime = PrettyTime(Date(0))
 
+public fun updateTimeFormatterLocale(locale: Locale) {
+    prettyTime.setLocale(locale)
+}
+
 @Composable
 internal actual fun rememberFormattedDateTime(
     data: UiDateTime,

desktopApp/build.gradle.kts

@@ -143,3 +143,56 @@ extra["nativeDestDir"] = "resources/macos-arm64"
 apply(from = File(projectDir, "install-native-libs.gradle.kts"))
 apply(from = File(projectDir, "build-swift.gradle.kts"))
 
+
+
+abstract class GenerateSupportedLocales : DefaultTask() {
+
+    @get:OutputDirectory
+    abstract val outputDir: DirectoryProperty
+
+    @TaskAction
+    fun run() {
+        val resRoot = project.file("src/main/composeResources")
+
+        val locales = resRoot.listFiles()
+            ?.filter { it.isDirectory && it.name.startsWith("values-") }
+            ?.map { it.name.removePrefix("values-") } // e.g. "ja", "zh", "zh-rCN"
+            ?.distinct()
+            ?.sorted()
+            ?.map { it.replace("-r", "-") }
+            ?: emptyList()
+
+        val pkg = "dev.dimension.flare"
+        val outDir = outputDir.get().asFile
+        val outFile = File(outDir, "SupportedLocales.kt")
+
+        outDir.mkdirs()
+        outFile.writeText(
+            """
+            package $pkg
+
+            object SupportedLocales {
+                val tags: List<String> = listOf(
+                    "en-US",
+                    ${locales.joinToString(",\n                    ") { "\"$it\"" }}
+                )
+            }
+            """.trimIndent()
+        )
+    }
+}
+
+val generateSupportedLocales = tasks.register<GenerateSupportedLocales>("generateSupportedLocales") {
+    outputDir.set(layout.buildDirectory.dir("generated/supportedLocales"))
+}
+kotlin {
+    sourceSets {
+        val main by getting {
+            kotlin.srcDir(generateSupportedLocales.map { it.outputDir })
+        }
+    }
+}
+
+tasks.named("compileKotlin") {
+    dependsOn(generateSupportedLocales)
+}

desktopApp/src/main/composeResources/values/strings.xml

@@ -205,6 +205,8 @@
     <string name="settings_appearance_theme_pure_color_description">Increase contrast between background and text</string>
     <string name="settings_appearance_full_width_post">Full width post</string>
     <string name="settings_appearance_full_width_post_description">Show the post in full width</string>
+    <string name="settings_language_title">Language</string>
+    <string name="settings_language_description">Change the language of the app</string>
 
     <string name="settings_about_source_code">Source code</string>
     <string name="settings_about_telegram">Telegram</string>

desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Route.kt

@@ -185,8 +185,6 @@ internal sealed interface Route {
 
     data object LocalCache : ScreenRoute
 
-    data object StorageUsage : ScreenRoute
-
     data class Following(
         val accountType: AccountType,
         val userKey: MicroBlogKey,