@momo-kits/native-kits 0.157.14-debug → 0.157.15-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.157.14-debug"
+        version = "0.157.15-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.157.1-beta.3'
+    spec.version                  = '0.159.1-beta.7'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''
@@ -10,27 +10,20 @@ Pod::Spec.new do |spec|
     spec.libraries                = 'c++'
     spec.ios.deployment_target    = '15.0'
     spec.dependency 'lottie-ios', '4.4.3'
-                
     if !Dir.exist?('build/cocoapods/framework/kits.framework') || Dir.empty?('build/cocoapods/framework/kits.framework')
         raise "
-
         Kotlin framework 'kits' doesn't exist yet, so a proper Xcode project can't be generated.
         'pod install' should be executed after running ':generateDummyFramework' Gradle task:
-
             ./gradlew :compose:generateDummyFramework
-
         Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
     end
-                
     spec.xcconfig = {
         'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
     }
-                
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':compose',
         'PRODUCT_MODULE_NAME' => 'kits',
     }
-                
     spec.script_phases = [
         {
             :name => 'Build compose',
@@ -38,8 +31,8 @@ Pod::Spec.new do |spec|
             :shell_path => '/bin/sh',
             :script => <<-SCRIPT
                 if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
-                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
-                  exit 0
+                    echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
+                    exit 0
                 fi
                 set -ev
                 REPO_ROOT="$PODS_TARGET_SRCROOT"
@@ -51,4 +44,4 @@ Pod::Spec.new do |spec|
         }
     ]
     spec.resources = ['build/compose/cocoapods/compose-resources']
-end
+end

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

@@ -18,9 +18,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
@@ -43,7 +43,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.min
 import androidx.compose.ui.zIndex
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -103,8 +102,8 @@ fun Screen(
     val keyboardController = LocalSoftwareKeyboardController.current
 
     val isKeyboardVisible = isKeyboardVisible()
-    val indicator = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
-    val bottomPadding = min(indicator, if (isKeyboardVisible) 0.dp else 21.dp)
+    val indicator = getAppStatusBarHeight()
+    val bottomPadding = if (isKeyboardVisible) 0.dp else indicator
 
     val headerHeight = if (animatedHeader !== null)
         with(LocalDensity.current) { layoutOffset.roundToPx() }
@@ -343,7 +342,7 @@ fun ScreenSnackBarHost(footerHeightPx: Int) {
             footerHeightPx
     } else {
         with(density) {
-            min(navigationBar, 21.dp).toPx()
+            navigationBar.toPx()
         }
     }.toInt()
 
@@ -401,4 +400,3 @@ fun ScreenSnackBarHost(footerHeightPx: Int) {
 
 
 
-

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

@@ -33,7 +33,7 @@ import kotlin.math.max
 import kotlin.math.min
 
 const val DEFAULT_SCREEN_SIZE = 375f
-const val MAX_FONT_SCALE = 1.2f
+const val MAX_FONT_SCALE = 1.5f
 const val MAX_DEVICE_SCALE = 5
 
 @Composable

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

@@ -1,41 +1,18 @@
 package vn.momo.kits.navigation
 
+import androidx.compose.animation.*
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.runtime.*
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import vn.momo.kits.application.AppConfig
-import vn.momo.kits.application.AppLanguage
-import vn.momo.kits.application.ApplicationContext
-import vn.momo.kits.application.KitConfig
-import vn.momo.kits.application.MiniAppContext
-import vn.momo.kits.application.ScaleSizeMaxRate
-import vn.momo.kits.const.AppNavigationBar
-import vn.momo.kits.const.AppStatusBar
-import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.Theme
-import vn.momo.kits.const.ThemeAssets
-import vn.momo.kits.const.defaultTheme
+import vn.momo.kits.application.*
+import vn.momo.kits.const.*
 import vn.momo.kits.platform.ProvideNavigationEventDispatcherOwner
 import vn.momo.kits.utils.getAppStatusBarHeight
+import vn.momo.kits.utils.getNavigationBarHeight
 import vn.momo.maxapi.IMaxApi
 
 @Composable
@@ -54,11 +31,7 @@ fun NavigationContainer(
     val navController = rememberNavController()
     val navigator = remember { Navigator(navController = navController, maxApi = maxApi) }
     val statusBarHeight = statusBarHeight ?: getAppStatusBarHeight()
-    val navigationBarHeight = if (AppNavigationBar.current == 0.dp) {
-        WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
-    } else {
-        AppNavigationBar.current
-    }
+    val navigationBarHeight = getNavigationBarHeight()
 
     val parentContext = ApplicationContext.current
     val mergedContext = MiniAppContext.merge(parentContext, applicationContext)

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

@@ -289,7 +289,7 @@ fun FooterContent(){
         val imeBottom = ime.getBottom(density)
         val thresholdPx = with(density) { 50.dp.toPx() }
         val isKeyboardVisible = imeBottom > thresholdPx
-        val bottomPadding = min(AppNavigationBar.current, if (isKeyboardVisible) 0.dp else 21.dp)
+        val bottomPadding = if (isKeyboardVisible) 0.dp else AppNavigationBar.current
         Footer(footerComponent = options.footerComponent, bottomPadding = bottomPadding)
     }
 }

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

@@ -18,7 +18,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.min
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -139,7 +138,7 @@ fun BottomTab(
                     }
                 }
             )
-            Spacer(modifier = Modifier.fillMaxWidth().height(min(AppNavigationBar.current, 21.dp) + Spacing.S).background(AppTheme.current.colors.background.surface))
+            Spacer(modifier = Modifier.fillMaxWidth().height(AppNavigationBar.current + Spacing.S).background(AppTheme.current.colors.background.surface))
         }
     }
 }

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

@@ -19,7 +19,6 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.min
 import kotlinx.coroutines.delay
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Colors
@@ -56,7 +55,7 @@ fun SnackBar(
     val footerHeight = if (options.footerComponent != null) {
         footerHeightPxState.value
     } else {
-        with(density){ min(navigationBar, 21.dp).toPx() }
+        with(density){ navigationBar.toPx() }
     }.toInt()
 
     var startPosition by remember { mutableStateOf(Float.MAX_VALUE) }
@@ -129,4 +128,4 @@ fun SnackBar(
             is SnackBar.Toast -> {}
         }
     }
-}
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Utils.kt

@@ -12,7 +12,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.min
+import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppStatusBar
+import vn.momo.kits.platform.getPlatformName
 import kotlin.math.abs
 
 
@@ -86,3 +89,17 @@ fun getAppStatusBarHeight(): Dp {
         AppStatusBar.current
     }
 }
+
+@Composable
+fun getNavigationBarHeight(): Dp {
+    return if (AppNavigationBar.current == 0.dp) {
+        val systemBottomPadding = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
+        if (getPlatformName() == "iOS") {
+            min(systemBottomPadding, 21.dp)
+        } else {
+            systemBottomPadding
+        }
+    } else {
+        AppNavigationBar.current
+    }
+}

package/gradle.properties

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

package/ios/Typography/Text.swift

@@ -2,7 +2,7 @@ import SwiftUI
 
 public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
     let defaultScreenSize: CGFloat = 375
-    let maxFontScale: CGFloat = scaleRate ?? 1.2
+    let maxFontScale: CGFloat = scaleRate ?? 1.5
     let maxDeviceScale: CGFloat = 5
 
     let deviceWidth = UIScreen.main.bounds.width

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.157.14-debug",
+  "version": "0.157.15-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},