@momo-kits/native-kits 0.161.2-beta.26-debug → 0.161.2-beta.27-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.161.2-beta.26-debug"
+        version = "0.161.2-beta.27-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.162.1'
+    spec.version                  = '0.161.2-beta.26'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt

@@ -8,25 +8,22 @@ import android.graphics.PorterDuffColorFilter
 import android.os.Build
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ProvidedValue
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.airbnb.lottie.LottieProperty
-import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieCompositionSpec
-import com.airbnb.lottie.compose.LottieConstants
-import com.airbnb.lottie.compose.rememberLottieComposition
-import com.airbnb.lottie.compose.rememberLottieDynamicProperties
-import com.airbnb.lottie.compose.rememberLottieDynamicProperty
+import com.airbnb.lottie.compose.*
 import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.utils.readJson
-import java.util.Locale
+import java.util.*
 import androidx.activity.compose.BackHandler as AndroidBackHandler
 
 actual fun getPlatformName(): String = "Android"
@@ -121,7 +118,19 @@ actual fun NativePaint.setColor(color: Color){
     this.color = color.toArgb()
 }
 
-actual fun setLocale(language: String) {
-    val locale = Locale(language)
-    Locale.setDefault(locale)
+actual object LocalAppLocale {
+    actual val current: String
+        @Composable
+        get() = Locale.getDefault().toString()
+
+    @Composable
+    actual infix fun provides(value: String?): ProvidedValue<*> {
+        val configuration = LocalConfiguration.current
+        val new = Locale(value ?: DEFAULT_LANGUAGE)
+        Locale.setDefault(new)
+        configuration.setLocale(new)
+        val resources = LocalResources.current
+        resources.updateConfiguration(configuration, resources.displayMetrics)
+        return LocalConfiguration.provides(configuration)
+    }
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt

@@ -11,8 +11,9 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import vn.momo.kits.application.*
 import vn.momo.kits.const.*
+import vn.momo.kits.platform.DEFAULT_LANGUAGE
+import vn.momo.kits.platform.ProvideAppLocale
 import vn.momo.kits.platform.ProvideNavigationEventDispatcherOwner
-import vn.momo.kits.platform.setLocale
 import vn.momo.kits.utils.getAppStatusBarHeight
 import vn.momo.kits.utils.getNavigationBarHeight
 import vn.momo.maxapi.IMaxApi
@@ -39,12 +40,13 @@ fun NavigationContainer(
     val mergedContext = MiniAppContext.merge(parentContext, applicationContext)
 
     val theme = remember { mutableStateOf(initialTheme) }
+    val appLanguage = remember { mutableStateOf(language ?: DEFAULT_LANGUAGE) }
 
     LaunchedEffect(Unit) {
-        language?.let { setLocale(it) }
-        maxApi?.getLanguage { response ->
-            val lang = response?.get("response") as? String ?: "vi"
-            setLocale(lang)
+        if (language == null) {
+            maxApi?.getLanguage { response ->
+                (response?.get("response") as? String)?.let { appLanguage.value = it }
+            }
         }
         val headerBar = config?.headerBar
         if (headerBar != null && theme.value.assets.headerBackground == null) {
@@ -69,69 +71,71 @@ fun NavigationContainer(
             AppNavigationBar provides navigationBarHeight,
             ApplicationContext provides mergedContext,
             AppConfig provides config,
-            AppLanguage provides language,
+            AppLanguage provides appLanguage.value,
             ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
         ) {
             LaunchedEffect(Unit) {
                 setNavigator?.invoke(navigator)
             }
 
-            NavHost(navController, startDestination = startDestination) {
-                composable<DynamicScreenRoute>(
-                    enterTransition = {
-                        slideInHorizontally(
-                            animationSpec = tween(300),
-                            initialOffsetX = { it }
-                        )
-                    },
-                    exitTransition = null,
-                    popEnterTransition = { fadeIn(animationSpec = tween(0)) },
-                    popExitTransition = {
-                        slideOutHorizontally(
-                            animationSpec = tween(300),
-                            targetOffsetX = { it }
-                        )
-                    }
-                ) { backStackEntry ->
-                    val route = backStackEntry.toRoute<DynamicScreenRoute>()
-                    val screen = DynamicScreenRegistry.getScreen(route.id)
+            ProvideAppLocale(appLanguage.value) {
+                NavHost(navController, startDestination = startDestination) {
+                    composable<DynamicScreenRoute>(
+                        enterTransition = {
+                            slideInHorizontally(
+                                animationSpec = tween(300),
+                                initialOffsetX = { it }
+                            )
+                        },
+                        exitTransition = null,
+                        popEnterTransition = { fadeIn(animationSpec = tween(0)) },
+                        popExitTransition = {
+                            slideOutHorizontally(
+                                animationSpec = tween(300),
+                                targetOffsetX = { it }
+                            )
+                        }
+                    ) { backStackEntry ->
+                        val route = backStackEntry.toRoute<DynamicScreenRoute>()
+                        val screen = DynamicScreenRegistry.getScreen(route.id)
 
-                    if (screen != null) {
-                        StackScreen(
-                            id = route.id,
-                            name = screen.name,
-                            content = screen.content,
-                            navigationOptions = screen.options
-                        )
+                        if (screen != null) {
+                            StackScreen(
+                                id = route.id,
+                                name = screen.name,
+                                content = screen.content,
+                                navigationOptions = screen.options
+                            )
+                        }
                     }
-                }
 
-                composable<DynamicDialogRoute>(
-                    enterTransition = {
-                        slideInVertically(
-                            animationSpec = tween(300),
-                            initialOffsetY = { it }
-                        )
-                    },
-                    exitTransition = null,
-                    popEnterTransition = { fadeIn(animationSpec = tween(0)) },
-                    popExitTransition = {
-                        slideOutVertically(
-                            animationSpec = tween(300),
-                            targetOffsetY = { it }
-                        )
-                    }
-                ) { backStackEntry ->
-                    val route = backStackEntry.toRoute<DynamicDialogRoute>()
-                    val screen = DynamicScreenRegistry.getScreen(route.id)
+                    composable<DynamicDialogRoute>(
+                        enterTransition = {
+                            slideInVertically(
+                                animationSpec = tween(300),
+                                initialOffsetY = { it }
+                            )
+                        },
+                        exitTransition = null,
+                        popEnterTransition = { fadeIn(animationSpec = tween(0)) },
+                        popExitTransition = {
+                            slideOutVertically(
+                                animationSpec = tween(300),
+                                targetOffsetY = { it }
+                            )
+                        }
+                    ) { backStackEntry ->
+                        val route = backStackEntry.toRoute<DynamicDialogRoute>()
+                        val screen = DynamicScreenRegistry.getScreen(route.id)
 
-                    if (screen != null) {
-                        StackScreen(
-                            id = route.id,
-                            name = screen.name,
-                            content = screen.content,
-                            navigationOptions = screen.options
-                        )
+                        if (screen != null) {
+                            StackScreen(
+                                id = route.id,
+                                name = screen.name,
+                                content = screen.content,
+                                navigationOptions = screen.options
+                            )
+                        }
                     }
                 }
             }

package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt

@@ -1,6 +1,9 @@
 package vn.momo.kits.platform
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.ProvidedValue
+import androidx.compose.runtime.key
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
@@ -65,4 +68,34 @@ expect fun NativePaint.setColor(
     color: Color = Color.Black
 )
 
-expect fun setLocale(language: String)
+/** Ngôn ngữ fallback mặc định của kit khi không xác định được ngôn ngữ: tiếng Việt. */
+const val DEFAULT_LANGUAGE = "vi"
+
+/**
+ * Platform override cho ngôn ngữ mà Compose Resources (stringResource) sử dụng.
+ * Pattern theo tài liệu:
+ * https://kotlinlang.org/docs/multiplatform/compose-resource-environment.html
+ */
+expect object LocalAppLocale {
+    val current: String
+        @Composable get
+
+    @Composable
+    infix fun provides(value: String?): ProvidedValue<*>
+}
+
+/**
+ * Bọc [content] để ép Compose Resources resolve theo [language].
+ *
+ * `key(language)` buộc recompose toàn bộ subtree khi ngôn ngữ thay đổi, nhờ đó
+ * các lời gọi stringResource() đã render trước đó được resolve lại đúng ngôn ngữ.
+ * `language == null` nghĩa là dùng locale mặc định của thiết bị.
+ */
+@Composable
+fun ProvideAppLocale(language: String?, content: @Composable () -> Unit) {
+    CompositionLocalProvider(LocalAppLocale provides language) {
+        key(language) {
+            content()
+        }
+    }
+}

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -8,10 +8,12 @@ import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.ProvidedValue
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -186,6 +188,18 @@ actual fun NativePaint.setColor(color: Color){
     this.color = color.toArgb()
 }
 
-actual fun setLocale(language: String) {
-    NSUserDefaults.standardUserDefaults.setObject(arrayListOf(language), "AppleLanguages")
+actual object LocalAppLocale {
+    private const val LANG_KEY = "AppleLanguages"
+    private val localAppLocale = staticCompositionLocalOf { DEFAULT_LANGUAGE }
+
+    actual val current: String
+        @Composable
+        get() = localAppLocale.current
+
+    @Composable
+    actual infix fun provides(value: String?): ProvidedValue<*> {
+        val new = value ?: DEFAULT_LANGUAGE
+        NSUserDefaults.standardUserDefaults.setObject(arrayListOf(new), LANG_KEY)
+        return localAppLocale.provides(new)
+    }
 }

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.161.2-beta.26
+version=0.161.2-beta.27
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.161.2-beta.26-debug",
+  "version": "0.161.2-beta.27-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},