@momo-kits/native-kits 0.122.0-beta.2 → 0.122.0-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderRight.kt +6 -11
  2. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt +2 -3
  3. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt +6 -2
  4. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigator.kt +3 -0
  5. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/PlatformApi.kt +13 -0
  6. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/header/HeaderRight.kt +5 -4
  7. package/package.json +1 -1
package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderRight.kt CHANGED
@@ -23,14 +23,14 @@ import androidx.compose.ui.Modifier
23
23
  import androidx.compose.ui.draw.clip
24
24
  import androidx.compose.ui.graphics.Color
25
25
  import androidx.compose.ui.unit.dp
26
- import vn.momo.kits.components.BadgeDot
27
- import vn.momo.kits.components.DotSize
28
- import vn.momo.kits.components.Icon
29
- import vn.momo.kits.const.Colors
30
26
  import kotlinx.serialization.json.Json
31
27
  import kotlinx.serialization.json.jsonObject
32
28
  import kotlinx.serialization.json.jsonPrimitive
29
+ import vn.momo.kits.components.BadgeDot
30
+ import vn.momo.kits.components.DotSize
31
+ import vn.momo.kits.components.Icon
33
32
  import vn.momo.kits.const.AppTheme
33
+ import vn.momo.kits.const.Colors
34
34
 
35
35
  data class HeaderRightData(
36
36
  val useShortcut: Boolean = false,
@@ -151,12 +151,7 @@ private fun ToolkitHeaderRight(
151
151
  }
152
152
 
153
153
  fun onPressClose() {
154
- if(DesignSystemWhiteList == true) {
155
- api?.request("dismissAll", "", { _ -> })
156
- }
157
- else {
158
- api?.request("dismiss", "", { _ -> })
159
- }
154
+ api?.request("dismissAll", "", { _ -> })
160
155
  }
161
156
 
162
157
  fun onPressMore() {
@@ -254,7 +249,7 @@ private fun ToolkitHeaderRight(
254
249
  }
255
250
 
256
251
  Icon(
257
- source = if(DesignSystemWhiteList == true) "16_basic_home" else "16_navigation_close_circle",
252
+ source = "16_basic_home",
258
253
  size = 20.dp,
259
254
  color = tintIconColor,
260
255
  modifier = Modifier.padding(4.dp).clickable { onPressClose() }
package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt CHANGED
@@ -26,7 +26,6 @@ import vn.momo.uikits.resources.sfprotext_regular
26
26
  import vn.momo.uikits.resources.sfprotext_semibold
27
27
  import vn.momo.uikits.resources.sfprotext_thin
28
28
  import vn.momo.uikits.resources.sfprotext_ultralight
29
- import vn.momo.kits.application.DesignSystemWhiteList
30
29
 
31
30
  const val DEFAULT_SCREEN_SIZE = 375f
32
31
  const val MAX_FONT_SCALE = 1.5f
@@ -53,10 +52,10 @@ fun scaleSize(size: Float): Float {
53
52
  fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * MAX_FONT_SCALE)
54
53
  }
55
54
 
56
- return if (DesignSystemWhiteList == true) max(
55
+ return max(
57
56
  fontSizeScaleDevice,
58
57
  fontSizeScaleOS
59
- ) else fontSizeScaleDevice
58
+ )
60
59
  }
61
60
 
62
61
  @OptIn(InternalResourceApi::class)
package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt CHANGED
@@ -24,7 +24,11 @@ import vn.momo.kits.const.AppStatusBar
24
24
  import vn.momo.kits.platform.ConfigureDialog
25
25
 
26
26
  @Composable
27
- fun NavigationContainer(initialScreen: @Composable () -> Unit, initialScreenTitle: String?, options: NavigationOptions? = null){
27
+ fun NavigationContainer(
28
+ initialScreen: @Composable () -> Unit,
29
+ initialScreenTitle: String?,
30
+ options: NavigationOptions? = null
31
+ ){
28
32
  val navController = rememberNavController()
29
33
  val navigator = remember { Navigator(navController) }
30
34
  val statusBarHeight = if (AppStatusBar.current == 0.dp) {
@@ -43,7 +47,7 @@ fun NavigationContainer(initialScreen: @Composable () -> Unit, initialScreenTitl
43
47
  CompositionLocalProvider(
44
48
  LocalNavigator provides navigator,
45
49
  AppStatusBar provides statusBarHeight,
46
- AppNavigationBar provides navigationBarHeight,
50
+ AppNavigationBar provides navigationBarHeight
47
51
  ) {
48
52
  NavHost(navController, startDestination = startDestination) {
49
53
  composable<DynamicScreenRoute>(
package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigator.kt CHANGED
@@ -11,6 +11,7 @@ import kotlinx.coroutines.cancel
11
11
  import kotlinx.coroutines.delay
12
12
  import kotlinx.coroutines.launch
13
13
  import kotlinx.serialization.Serializable
14
+ import vn.momo.kits.navigation.PlatformApi
14
15
 
15
16
  class Navigator(
16
17
  private val navController: NavController
@@ -35,6 +36,8 @@ class Navigator(
35
36
  delay(350)
36
37
  DynamicScreenRegistry.unregisterLatestScreen()
37
38
  }
39
+ } else {
40
+ PlatformApi.instance.onDismiss.invoke()
38
41
  }
39
42
  }
40
43
  }
package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/PlatformApi.kt ADDED
@@ -0,0 +1,13 @@
1
+ package vn.momo.kits.navigation
2
+
3
+ interface IPlatformApi {
4
+ var onDismiss: () -> Unit
5
+ }
6
+
7
+
8
+ class PlatformApi : IPlatformApi {
9
+ override var onDismiss: () -> Unit = { }
10
+ companion object {
11
+ val instance = PlatformApi()
12
+ }
13
+ }
package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/header/HeaderRight.kt CHANGED
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Arrangement
6
6
  import androidx.compose.foundation.layout.Box
7
7
  import androidx.compose.foundation.layout.Row
8
8
  import androidx.compose.foundation.layout.fillMaxHeight
9
- import androidx.compose.foundation.layout.fillMaxWidth
10
9
  import androidx.compose.foundation.layout.height
11
10
  import androidx.compose.foundation.layout.offset
12
11
  import androidx.compose.foundation.layout.padding
@@ -21,7 +20,6 @@ import androidx.compose.ui.draw.clip
21
20
  import androidx.compose.ui.graphics.Color
22
21
  import androidx.compose.ui.unit.Dp
23
22
  import androidx.compose.ui.unit.dp
24
- import vn.momo.kits.application.DesignSystemWhiteList
25
23
  import vn.momo.kits.application.Spacing
26
24
  import vn.momo.kits.application.ToolGroup
27
25
  import vn.momo.kits.components.BadgeDot
@@ -29,6 +27,7 @@ import vn.momo.kits.components.DotSize
29
27
  import vn.momo.kits.components.Icon
30
28
  import vn.momo.kits.const.Colors
31
29
  import vn.momo.kits.modifier.noFeedbackClickable
30
+ import vn.momo.kits.navigation.PlatformApi
32
31
 
33
32
  @Composable
34
33
  fun HeaderRight(
@@ -100,10 +99,12 @@ fun Toolkit(
100
99
  .background(tintColor ?: Colors.black_20)
101
100
  )
102
101
  Icon(
103
- source = if(DesignSystemWhiteList == true) "16_basic_home" else "16_navigation_close_circle",
102
+ source = "16_basic_home",
104
103
  size = 20.dp,
105
104
  color = headerColor.tintIconColor,
106
- modifier = Modifier.padding(4.dp).noFeedbackClickable { }
105
+ modifier = Modifier.padding(4.dp).noFeedbackClickable {
106
+ PlatformApi.instance.onDismiss.invoke()
107
+ }
107
108
  )
108
109
  }
109
110
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@momo-kits/native-kits",
3
- "version": "0.122.0-beta.2",
3
+ "version": "0.122.0-beta.4",
4
4
  "private": false,
5
5
  "dependencies": {},
6
6
  "devDependencies": {},