@momo-kits/native-kits 0.162.2-test.2-debug → 0.162.2-test.3-debug

package/compose/src/commonMain/kotlin/vn/momo/kits/application/FontScaleStore.kt

@@ -9,8 +9,10 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import vn.momo.maxapi.IMaxApi
 
-const val KEY_USE_DEVICE_FONT_SCALE = "use_device_font_scale"
-const val KEY_APP_FONT_SCALE = "app_font_scale"
+private const val KEY_USE_DEVICE_FONT_SCALE = "use_device_font_scale"
+private const val KEY_APP_FONT_SCALE = "app_font_scale"
+private const val MIN_APP_FONT_SCALE = 1f
+private const val MAX_APP_FONT_SCALE = 1.5f
 
 /**
  * Single in-memory mirror of the Observer Storage font-scale source of truth
@@ -19,9 +21,11 @@ const val KEY_APP_FONT_SCALE = "app_font_scale"
  * scaleSize() reads this holder directly, so every Compose subtree across all
  * NavigationContainer roots reacts to a change at once — no per-root wiring.
  *
- * The subscription is started once (the first NavigationContainer that receives
- * a non-null [IMaxApi]) and lives on its own scope, independent of any screen
- * lifecycle, so it survives navigation between roots.
+ * [start] subscribes once to storage through the given [IMaxApi]: it seeds the
+ * current value (the observer Flow only replays emissions made after subscribe),
+ * then collects live changes. The subscription lives on its own scope, so it
+ * survives navigation between screens. The caller must pass a real (adapter-backed)
+ * IMaxApi — a NoopMaxApi emits a single error frame, which is ignored here.
  */
 object FontScaleStore {
 
@@ -37,41 +41,51 @@ object FontScaleStore {
         if (started) return
         started = true
 
-        // Seed the current persisted value first: the observer signal flow has no
-        // replay, so a fresh subscriber would otherwise stay at defaults until the
-        // next change (wrong scale on first paint).
+        // Seed current persisted value.
         maxApi.getDataObserver(KEY_USE_DEVICE_FONT_SCALE) { map ->
-            parseBool(map)?.let { useDeviceFontScale = it }
+            parseUseDevice(map)?.let { useDeviceFontScale = it }
         }
         maxApi.getDataObserver(KEY_APP_FONT_SCALE) { map ->
-            parseFloat(map)?.let { appFontScale = it }
+            parseScale(map)?.let { appFontScale = it }
         }
 
         // Live updates.
         scope.launch {
             maxApi.observer(KEY_USE_DEVICE_FONT_SCALE).collect { map ->
-                parseBool(map)?.let { useDeviceFontScale = it }
+                parseUseDevice(map)?.let { useDeviceFontScale = it }
             }
         }
         scope.launch {
             maxApi.observer(KEY_APP_FONT_SCALE).collect { map ->
-                parseFloat(map)?.let { appFontScale = it }
+                parseScale(map)?.let { appFontScale = it }
             }
         }
     }
 
-    private fun response(map: Map<String, Any?>?): Any? = map?.get("response")
+    /**
+     * Callback map = serialized MaxApiResponse flattened: { status, response, errorCode, ... }.
+     * A stored string scalar arrives under "response" as a String ("1.5" / "false").
+     * Returns null for error frames (e.g. adapter-not-bound) and unset keys.
+     */
+    private fun response(map: Map<String, Any?>?): Any? {
+        if (map == null) return null
+        val errorCode = (map["errorCode"] as? Number)?.toInt() ?: 0
+        if (errorCode != 0) return null
+        return map["response"]
+    }
 
-    private fun parseBool(map: Map<String, Any?>?): Boolean? = when (val v = response(map)) {
-        is Boolean -> v
-        is String -> v.toBooleanStrictOrNull() ?: v.equals("true", ignoreCase = true)
-        is Number -> v.toInt() != 0
-        else -> null
+    private fun parseScale(map: Map<String, Any?>?): Float? {
+        val value = when (val r = response(map)) {
+            is Number -> r.toFloat()
+            is String -> r.toFloatOrNull()
+            else -> null
+        } ?: return null
+        return value.coerceIn(MIN_APP_FONT_SCALE, MAX_APP_FONT_SCALE)
     }
 
-    private fun parseFloat(map: Map<String, Any?>?): Float? = when (val v = response(map)) {
-        is Number -> v.toFloat()
-        is String -> v.toFloatOrNull()
+    private fun parseUseDevice(map: Map<String, Any?>?): Boolean? = when (val r = response(map)) {
+        is Boolean -> r
+        is String -> r.toBooleanStrictOrNull()
         else -> null
     }
 }

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

@@ -37,10 +37,6 @@ fun NavigationContainer(
     val parentContext = ApplicationContext.current
     val mergedContext = MiniAppContext.merge(parentContext, applicationContext)
 
-    LaunchedEffect(maxApi) {
-        maxApi?.let { FontScaleStore.start(it) }
-    }
-
     val theme = remember { mutableStateOf(initialTheme) }
 
     LaunchedEffect(Unit) {

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.162.2-test.2
+version=0.162.2-test.3
 
 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.162.2-test.2-debug",
+  "version": "0.162.2-test.3-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},