@momo-kits/native-kits 0.162.4-debug → 0.162.5-debug

package/compose/src/commonMain/kotlin/vn/momo/kits/components/datetimepicker/WheelPicker.kt

@@ -10,13 +10,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -25,6 +19,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.debounce
@@ -36,12 +31,14 @@ import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Typography
 import kotlin.math.abs
+import kotlin.time.Duration.Companion.milliseconds
 
 private val wheelItemHeight = 42.dp
 private val wheelPickerBorderWidth = 1.dp
 
+@OptIn(FlowPreview::class)
 @Composable
-fun WheelPicker(
+internal fun WheelPicker(
     name: String,
     data: List<String>,
     selectedData: String,
@@ -68,7 +65,7 @@ fun WheelPicker(
     LaunchedEffect(paddedData) {
         snapshotFlow { selectedIndex }
             .distinctUntilChanged()
-            .debounce(50)
+            .debounce(50.milliseconds)
             .onEach {
                 val value = paddedData.getOrNull(it)
                 if (!value.isNullOrEmpty()) {
@@ -95,7 +92,7 @@ fun WheelPicker(
                 } else {
                     -abs(firstItemOffset)
                 }
-                delay(50)
+                delay(50.milliseconds)
                 listState.animateScrollBy(offset.toFloat())
                 val centeredIndex = firstItemIdx + (if (isScrollUp) 1 else 0) + 2
                 if (centeredIndex in 2 until paddedData.size - 2) {
@@ -145,7 +142,7 @@ fun WheelPicker(
 }
 
 @Composable
-fun WheelPickerItem(
+internal fun WheelPickerItem(
     text: String,
     isSelected: Boolean,
     index: Int,

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Theme.kt

@@ -64,7 +64,7 @@ data class Theme(
     val assets: ThemeAssets
 ) {
     fun isHeaderImage(): Boolean {
-        return assets.headerBackground != null && assets.headerBackground.isNotEmpty()
+        return !assets.headerBackground.isNullOrEmpty()
     }
 }
 val defaultTheme = Theme(

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -7,28 +7,13 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.TextUnitType
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
+import androidx.compose.ui.unit.*
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
-import vn.momo.kits.application.ScaleSizeMaxRate
+import vn.momo.kits.application.LocalFontScaleConfig
 import vn.momo.kits.platform.getScreenDimensions
-import vn.momo.uikits.resources.Res
-import vn.momo.uikits.resources.momosignature
-import vn.momo.uikits.resources.momotrustdisplay
-import vn.momo.uikits.resources.sfprotext_black
-import vn.momo.uikits.resources.sfprotext_bold
-import vn.momo.uikits.resources.sfprotext_heavy
-import vn.momo.uikits.resources.sfprotext_light
-import vn.momo.uikits.resources.sfprotext_medium
-import vn.momo.uikits.resources.sfprotext_regular
-import vn.momo.uikits.resources.sfprotext_semibold
-import vn.momo.uikits.resources.sfprotext_thin
-import vn.momo.uikits.resources.sfprotext_ultralight
+import vn.momo.uikits.resources.*
 import kotlin.math.max
 import kotlin.math.min
 
@@ -37,59 +22,58 @@ const val MAX_FONT_SCALE = 1.5f
 const val MAX_DEVICE_SCALE = 5
 
 @Composable
-fun scaleSize(size: Float): Float {
-    val scaleSizeMaxRate: Float = ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
-    val deviceWidth = getScreenDimensions().width
-    val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
+fun scaleSize(size: Float, userScaleRate: Float? = null): Float {
+    val fontScaleConfig = LocalFontScaleConfig.current
+    val useOSFontScale = fontScaleConfig.useOSFontScale
+    val customRate = userScaleRate ?: fontScaleConfig.userScaleRate ?: 1f
 
-    val density = LocalDensity.current
-    val fontScale = density.fontScale
+    val deviceScale = getScreenDimensions().width / DEFAULT_SCREEN_SIZE
+    val fontScale = fontScaleConfig.osFontScale ?: LocalDensity.current.fontScale
+
+    if (!useOSFontScale) {
+        return if (customRate > 1f) customRate * size else size
+    }
 
     var fontSizeScaleDevice = size
     var fontSizeScaleOS = size
-
     if (deviceScale > 1) {
         fontSizeScaleDevice =
             min(deviceScale * fontSizeScaleDevice, fontSizeScaleDevice + MAX_DEVICE_SCALE)
     }
-
-    if (fontScale > 1) {
-        fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * scaleSizeMaxRate)
+    if (fontScale > 1f) {
+        fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * MAX_FONT_SCALE)
     }
 
-    return max(
-        fontSizeScaleDevice,
-        fontSizeScaleOS
-    )
+    return max(fontSizeScaleDevice, fontSizeScaleOS)
 }
 
 @Composable
-fun scaleSize(size: TextUnit): TextUnit {
+fun scaleSize(size: TextUnit, userScaleRate: Float? = null): TextUnit {
     if (!size.isSp) return size
 
     val density = LocalDensity.current
 
-    val scaled = scaleSize(size.value)
+    val scaled = scaleSize(size.value, userScaleRate)
     val spValue = scaled / density.fontScale
 
     return TextUnit(value = spValue, type = TextUnitType.Sp)
 }
 
 @Composable
-fun scaleSize(size: Dp): Dp {
-    return scaleSize(size.value).dp
+fun scaleSize(size: Dp, userScaleRate: Float? = null): Dp {
+    return scaleSize(size.value, userScaleRate).dp
 }
 
 @Composable
-fun scaleSize(textStyle: TextStyle): TextStyle {
+fun scaleSize(textStyle: TextStyle, userScaleRate: Float? = null): TextStyle {
     return textStyle.copy(
         fontSize = if (textStyle.fontSize != TextUnit.Unspecified)
-            scaleSize(textStyle.fontSize)
+            scaleSize(textStyle.fontSize, userScaleRate)
         else
             TextUnit.Unspecified,
 
         lineHeight = if (textStyle.lineHeight != TextUnit.Unspecified)
-            scaleSize(textStyle.lineHeight)
+            scaleSize(textStyle.lineHeight, userScaleRate)
         else
             TextUnit.Unspecified,
     )
@@ -98,7 +82,7 @@ fun scaleSize(textStyle: TextStyle): TextStyle {
 
 @OptIn(InternalResourceApi::class)
 @Composable
-fun getFont(font: FontResource): FontFamily {
+internal fun getFont(font: FontResource): FontFamily {
     return FontFamily(Font(font))
 }
 

package/compose/src/commonMain/kotlin/vn/momo/kits/layout/Item.kt

@@ -18,7 +18,7 @@ data class GridContext(
 fun Item(
     heightSpan: Number = 1,
     widthSpan: Number = 1,
-    content: @Composable() () -> Unit,
+    content: @Composable () -> Unit,
     modifier: Modifier = Modifier,
     grid: GridContext
 ) {

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/AutomationId.kt

@@ -20,11 +20,6 @@ fun Modifier.setAutomationId(accessibilityId: String, mergeDescendants: Boolean
         }
     }}
 
-/**
- * Alternative for [setAutomationId]
- *
- * reason: [link](https://developer.android.com/develop/ui/compose/custom-modifiers#composable_function_modifiers_are_never_skipped)
- * */
 fun Modifier.kitsAutomationId(accessibilityId: String, label: String? = null) =
     this then KitsAutomationIdElement(accessibilityId, label)
 

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Clickable.kt

@@ -53,8 +53,6 @@ fun Modifier.activeOpacityClickable(
             onClick
         )
 }
-
-
 fun Modifier.hideKeyboardOnTap() = composed {
     val focusManager = LocalFocusManager.current
     val keyboardManager = LocalSoftwareKeyboardController.current

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/DeprecatedModifier.kt

@@ -1,14 +1,104 @@
 package vn.momo.kits.modifier
 
-import androidx.compose.foundation.background
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.clipRect
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.drawText
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.rememberTextMeasurer
+import androidx.compose.ui.unit.sp
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Colors
 
+@Suppress("ExperimentalAnnotationRetention")
+@RequiresOptIn(
+    message = "This is internal API of native-kits, become internal in next sprint",
+    level = RequiresOptIn.Level.WARNING,
+)
+@Retention(AnnotationRetention.BINARY)
+@Target(
+    AnnotationTarget.CLASS,
+    AnnotationTarget.FUNCTION,
+    AnnotationTarget.PROPERTY,
+)
+annotation class InternalApi
+
+@Composable
+fun DeprecatedModifier(text: String = "Deprecated component"): Modifier = debugMarker(
+    label = text,
+    background = Colors.red_04.copy(alpha = 0.7f),
+    textColor = Colors.red_01,
+    animationLabel = "deprecatedMarquee",
+)
+
 @Composable
-fun DeprecatedModifier(): Modifier {
-    return Modifier.conditional(IsShowBaseLineDebug) {
-        background(Colors.red_01.copy(alpha = 0.5f))
+private fun debugMarker(
+    label: String,
+    background: Color,
+    textColor: Color,
+    animationLabel: String,
+): Modifier {
+    if (!IsShowBaseLineDebug) return Modifier
+
+    val textMeasurer = rememberTextMeasurer()
+    val marquee = rememberInfiniteTransition(label = animationLabel)
+    val progress by marquee.animateFloat(
+        initialValue = 0f,
+        targetValue = 1f,
+        animationSpec = infiniteRepeatable(
+            animation = tween(durationMillis = 4000, easing = LinearEasing),
+            repeatMode = RepeatMode.Restart,
+        ),
+        label = "${animationLabel}Progress",
+    )
+
+    return Modifier.drawWithContent {
+        drawContent()
+        drawRect(color = background)
+
+        if (size.width <= 0f || size.height <= 0f) return@drawWithContent
+
+        val fontPx = (size.width * 0.1f).coerceIn(12.sp.toPx(), 20.sp.toPx())
+        val style = TextStyle(
+            color = textColor,
+            fontSize = fontPx.toSp(),
+            fontWeight = FontWeight.Bold,
+        )
+
+        val intrinsic = textMeasurer.measure(
+            text = label,
+            style = style,
+            maxLines = 1,
+            softWrap = false,
+        )
+        val textW = intrinsic.size.width
+        val textH = intrinsic.size.height
+        val y = (size.height - textH) / 2f
+
+        if (textW <= size.width) {
+            drawText(
+                textLayoutResult = intrinsic,
+                topLeft = Offset((size.width - textW) / 2f, y),
+            )
+        } else {
+            clipRect(right = size.width, bottom = size.height) {
+                val gap = textW * 0.5f
+                val travel = textW + gap
+                val x = -progress * travel
+                drawText(textLayoutResult = intrinsic, topLeft = Offset(x, y))
+                drawText(textLayoutResult = intrinsic, topLeft = Offset(x + travel, y))
+            }
+        }
     }
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Shadow.kt

@@ -9,8 +9,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.platform.setColor
 import vn.momo.kits.platform.setMaskFilter
-
-
 fun Modifier.shadow(
     color: Color = Color.Black,
     borderRadius: Dp = 0.dp,

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

@@ -10,11 +10,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha

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

@@ -1,24 +1,16 @@
 package vn.momo.kits.navigation
 
 import androidx.compose.foundation.gestures.ScrollableState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.runtime.*
 import androidx.compose.ui.graphics.Color
 import vn.momo.kits.navigation.bottomtab.setBottomTabOption
-import vn.momo.kits.navigation.component.FloatingButtonProps
-import vn.momo.kits.navigation.component.HeaderBackProps
-import vn.momo.kits.navigation.component.HeaderRight
-import vn.momo.kits.navigation.component.HeaderTitle
-import vn.momo.kits.navigation.component.HeaderType
-import vn.momo.kits.navigation.component.TitlePosition
+import vn.momo.kits.navigation.component.*
 
 class Navigation(
     val id: Int = -1,
     val bottomTabIndex: Int = -1,
-    val initOptions: NavigationOptions? = null
+    val initOptions: NavigationOptions? = null,
+    private val registry: DynamicScreenRegistry? = null
 ) {
     private val _options = mutableStateOf(initOptions ?: NavigationOptions())
     val currentOptions: State<NavigationOptions> get() = _options
@@ -65,7 +57,7 @@ class Navigation(
     private fun updateOptions(updated: NavigationOptions) {
         _options.value = updated
         if (bottomTabIndex != -1) setBottomTabOption(bottomTabIndex, updated)
-        if (id != -1) DynamicScreenRegistry.setOptions(id, updated)
+        if (id != -1) registry?.setOptions(id, updated)
     }
 }
 
@@ -95,8 +87,6 @@ data class KeyboardOptions(
     val keyboardShouldPersistTaps: Boolean = false,
     val useAvoidKeyboard: Boolean = true
 )
-
-
 data class ScrollData(
     val scrollable: Boolean = true,
     val scrollState: ScrollableState? = null,

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

@@ -9,6 +9,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
+import kotlinx.coroutines.flow.collect
 import vn.momo.kits.application.*
 import vn.momo.kits.const.*
 import vn.momo.kits.platform.ProvideNavigationEventDispatcherOwner
@@ -30,13 +31,24 @@ fun NavigationContainer(
     language: String? = null
 ){
     val navController = rememberNavController()
-    val navigator = remember { Navigator(navController = navController, maxApi = maxApi) }
+    val registry = remember { DynamicScreenRegistry() }
+    val navigator = remember { Navigator(navController = navController, maxApi = maxApi, registry = registry) }
     val statusBarHeight = statusBarHeight ?: getAppStatusBarHeight()
     val navigationBarHeight = getNavigationBarHeight()
 
     val parentContext = ApplicationContext.current
     val mergedContext = MiniAppContext.merge(parentContext, applicationContext)
 
+    var observerFontScaleConfig by remember { mutableStateOf(mergedContext?.fontScaleConfig) }
+    LaunchedEffect(maxApi) {
+        val api = maxApi ?: return@LaunchedEffect
+        runCatching {
+            api.observer(FONT_SCALE_OBSERVER_KEY).collect { data ->
+                observerFontScaleConfig = parseFontScaleConfig(data)
+            }
+        }
+    }
+
     val theme = remember { mutableStateOf(initialTheme) }
 
     LaunchedEffect(Unit) {
@@ -50,13 +62,14 @@ fun NavigationContainer(
         }
     }
 
-    val screenId = rememberSaveable { DynamicScreenRegistry.nextId() }
-    DynamicScreenRegistry.bind(screenId, initialScreenName, initialScreen, options)
+    val screenId = rememberSaveable { registry.nextId() }
+    registry.bind(screenId, initialScreenName, initialScreen, options)
     val startDestination = remember(screenId) { DynamicScreenRoute(screenId) }
 
     ProvideNavigationEventDispatcherOwner {
         CompositionLocalProvider(
             LocalNavigator provides navigator,
+            LocalDynamicScreenRegistry provides registry,
             LocalMaxApi provides maxApi,
             AppTheme provides theme.value,
             AppStatusBar provides statusBarHeight,
@@ -64,7 +77,7 @@ fun NavigationContainer(
             ApplicationContext provides mergedContext,
             AppConfig provides config,
             AppLanguage provides language,
-            ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
+            LocalFontScaleConfig provides (observerFontScaleConfig ?: LocalFontScaleConfig.current),
         ) {
             LaunchedEffect(Unit) {
                 setNavigator?.invoke(navigator)
@@ -88,7 +101,7 @@ fun NavigationContainer(
                     }
                 ) { backStackEntry ->
                     val route = backStackEntry.toRoute<DynamicScreenRoute>()
-                    val screen = DynamicScreenRegistry.getScreen(route.id)
+                    val screen = registry.getScreen(route.id)
 
                     if (screen != null) {
                         StackScreen(
@@ -117,7 +130,7 @@ fun NavigationContainer(
                     }
                 ) { backStackEntry ->
                     val route = backStackEntry.toRoute<DynamicDialogRoute>()
-                    val screen = DynamicScreenRegistry.getScreen(route.id)
+                    val screen = registry.getScreen(route.id)
 
                     if (screen != null) {
                         StackScreen(
@@ -135,7 +148,7 @@ fun NavigationContainer(
     DisposableEffect(Unit) {
         onDispose {
             navigator.dispose()
-            DynamicScreenRegistry.unregisterScreen(screenId)
+            registry.unregisterScreen(screenId)
         }
     }
 }
@@ -143,3 +156,31 @@ fun NavigationContainer(
 val LocalMaxApi = staticCompositionLocalOf<IMaxApi?> {
     error("No MaxApi provided")
 }
+
+private const val FONT_SCALE_OBSERVER_KEY = "font_scale_config"
+
+private fun parseFontScaleConfig(raw: Map<String, Any?>?): FontScaleConfig? {
+    if (raw.isNullOrEmpty()) return null
+    @Suppress("UNCHECKED_CAST")
+    val data = (raw["response"] as? Map<String, Any?>)
+        ?: (raw["data"] as? Map<String, Any?>)
+        ?: raw
+    if (!data.containsKey("useOSFontScale") && !data.containsKey("userScaleRate")) return null
+    val useOS = when (val v = data["useOSFontScale"]) {
+        is Boolean -> v
+        is String -> v.equals("true", ignoreCase = true)
+        is Number -> v.toInt() != 0
+        else -> true
+    }
+    val rate = when (val v = data["userScaleRate"]) {
+        is Number -> v.toFloat()
+        is String -> v.toFloatOrNull()
+        else -> null
+    }
+    val osScale = when (val v = data["osFontScale"]) {
+        is Number -> v.toFloat()
+        is String -> v.toFloatOrNull()
+        else -> null
+    }
+    return FontScaleConfig(useOSFontScale = useOS, userScaleRate = rate, osFontScale = osScale)
+}