Split UiText into data struct and Vanilla Android parts

dachlatten-android/build.gradle.kts

@@ -6,12 +6,14 @@ plugins {
 }
 
 dependencies {
+    compileOnly(project(":dachlatten-text"))
     compileOnly(libs.androidx.activity)
 
     implementation(libs.androidx.annotation)
     implementation(libs.androidx.lifecycle.process)
     implementation(libs.kotlinx.coroutines)
 
+    testImplementation(project(":dachlatten-text"))
     testImplementation(libs.androidx.activity)
     testImplementation(libs.androidx.core)
 }

dachlatten-android/src/main/kotlin/de/sipgate/dachlatten/android/text/UiTextExt.kt

@@ -0,0 +1,33 @@
+package de.sipgate.dachlatten.android.text
+
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.os.Build
+import de.sipgate.dachlatten.text.TranslatedText
+import de.sipgate.dachlatten.text.UiText
+import java.util.Locale
+
+fun UiText.asString(resources: Resources) = when (this) {
+    is UiText.DynamicString -> value
+    is UiText.StringResource -> resources.getString(resId, *(args.toTypedArray()))
+    is UiText.MultiLangString -> {
+        val arguments = args.toTypedArray()
+        resources.configuration.getStringForLocales(language)?.format(*arguments)
+            ?: fallbackResource?.let { resources.getString(it, *arguments) }
+            ?: throw Resources.NotFoundException("Could not find multilang string")
+    }
+}
+
+private fun Configuration.getStringForLocales(translations: TranslatedText): String? {
+    val locale = resolveLocale(translations.keys)
+    return translations[locale?.language?.lowercase()] ?: translations[locale?.language?.uppercase()]
+}
+
+private fun Configuration.resolveLocale(supportedLanguages: Set<String>): Locale? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        locales.getFirstMatch(supportedLanguages.toTypedArray())
+    } else {
+        @Suppress("DEPRECATION")
+        locale
+    }
+}

dachlatten-android/src/test/kotlin/de/sipgate/dachlatten/android/text/UiTextTest.kt

@@ -2,6 +2,7 @@ package de.sipgate.dachlatten.android.text
 
 import android.content.res.Resources
 import androidx.core.R
+import de.sipgate.dachlatten.text.UiText
 import org.junit.Test
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.assertThrows

dachlatten-compose/build.gradle.kts

@@ -6,10 +6,10 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":dachlatten-android"))
+    compileOnly(project(":dachlatten-text"))
     compileOnly(libs.androidx.compose.ui)
 
-    testImplementation(project(":dachlatten-android"))
+    testImplementation(project(":dachlatten-text"))
     testImplementation(libs.bundles.androidx.compose.ui.test)
 }
 

dachlatten-compose/src/main/kotlin/de/sipgate/dachlatten/compose/text/UiTextExt.kt

@@ -1,19 +1,37 @@
 package de.sipgate.dachlatten.compose.text
 
+import android.content.res.Configuration
 import android.content.res.Resources
+import android.os.Build
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
-import de.sipgate.dachlatten.android.text.UiText
+import de.sipgate.dachlatten.text.TranslatedText
+import de.sipgate.dachlatten.text.UiText
+import java.util.Locale
 
 @Composable
 fun UiText.asString() = when (this) {
     is UiText.DynamicString -> value
     is UiText.StringResource -> stringResource(id = resId, formatArgs = args.toTypedArray())
     is UiText.MultiLangString -> {
         val arguments = args.toTypedArray()
-        LocalConfiguration.current.getStringForLocales() ?.format(*arguments)
+        LocalConfiguration.current.getStringForLocales(language) ?.format(*arguments)
             ?: fallbackResource?.let { stringResource(id = it, formatArgs = arguments) }
             ?: throw Resources.NotFoundException("Could not find multilang string")
     }
 }
+
+private fun Configuration.getStringForLocales(translations: TranslatedText): String? {
+    val locale = resolveLocale(translations.keys)
+    return translations[locale?.language?.lowercase()] ?: translations[locale?.language?.uppercase()]
+}
+
+private fun Configuration.resolveLocale(supportedLanguages: Set<String>): Locale? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        locales.getFirstMatch(supportedLanguages.toTypedArray())
+    } else {
+        @Suppress("DEPRECATION")
+        locale
+    }
+}

dachlatten-compose/src/test/kotlin/de/sipgate/dachlatten/compose/text/UiTextTest.kt

@@ -3,7 +3,7 @@ package de.sipgate.dachlatten.compose.text
 import android.content.res.Resources
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.core.R
-import de.sipgate.dachlatten.android.text.UiText
+import de.sipgate.dachlatten.text.UiText
 import org.junit.Rule
 import org.junit.Test
 import org.junit.jupiter.api.Assertions.assertEquals

dachlatten-text/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("android-library-base")
+    id("android-library-unit-test")
+    id("android-library-release")
+}
+
+dependencies {
+    implementation(libs.androidx.annotation)
+}

dachlatten-text/src/main/kotlin/de/sipgate/dachlatten/text/UiText.kt

@@ -0,0 +1,30 @@
+package de.sipgate.dachlatten.text
+
+import androidx.annotation.StringRes
+
+typealias TranslatedText = Map<String, String>
+
+sealed interface UiText {
+    data class DynamicString(val value: String) : UiText
+
+    data class StringResource(
+        @StringRes val resId: Int,
+        val args: List<Any>,
+    ) : UiText {
+        constructor(
+            @StringRes resId: Int,
+            vararg args: Any) : this(resId, args.asList())
+    }
+
+    data class MultiLangString(
+        val language: TranslatedText,
+        @StringRes val fallbackResource: Int? = null,
+        val args: List<Any>,
+    ) : UiText {
+        constructor(
+            language: TranslatedText,
+            @StringRes fallbackResource: Int? = null,
+            vararg args: Any,
+        ) : this(language, fallbackResource, args.asList())
+    }
+}

settings.gradle.kts

@@ -29,3 +29,4 @@ include(":dachlatten-flow")
 include(":dachlatten-google")
 include(":dachlatten-primitives")
 include(":dachlatten-retrofit")
+include(":dachlatten-text")