@momo-kits/native-kits 0.160.1-beta.6-debug → 0.160.1-lottie.2-debug

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 (29) hide show
  1. package/compose/build.gradle.kts +1 -1
  2. package/compose/compose.podspec +1 -1
  3. package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt +1 -0
  4. package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt +8 -7
  5. package/compose/src/commonMain/kotlin/vn/momo/kits/components/BaselineView.kt +4 -0
  6. package/compose/src/commonMain/kotlin/vn/momo/kits/components/ScaleSizeScope.kt +17 -0
  7. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt +27 -12
  8. package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt +1 -0
  9. package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt +1 -0
  10. package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt +8 -4
  11. package/gradle/libs.versions.toml +1 -1
  12. package/gradle.properties +1 -1
  13. package/ios/Application/ApplicationEnvironment.swift +2 -6
  14. package/ios/Input/Input.swift +20 -20
  15. package/ios/Input/InputPhoneNumber.swift +17 -17
  16. package/ios/Typography/Text.swift +19 -14
  17. package/ios/Typography/Typography.swift +22 -1
  18. package/package.json +1 -1
  19. package/.claude/settings.local.json +0 -8
  20. package/example/ios/Example.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/xcschememanagement.plist +0 -14
  21. package/example/ios/Example.xcworkspace/xcuserdata/huynhdung.xcuserdatad/UserInterfaceState.xcuserstate +0 -0
  22. package/example/ios/Example.xcworkspace/xcuserdata/huynhdung.xcuserdatad/xcschemes/xcschememanagement.plist +0 -5
  23. package/example/ios/Pods/Pods.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/MoMoUIKits.xcscheme +0 -58
  24. package/example/ios/Pods/Pods.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/Pods-Example.xcscheme +0 -58
  25. package/example/ios/Pods/Pods.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/SDWebImage.xcscheme +0 -58
  26. package/example/ios/Pods/Pods.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/SDWebImageSwiftUI.xcscheme +0 -58
  27. package/example/ios/Pods/Pods.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/SkeletonUI.xcscheme +0 -58
  28. package/example/ios/Pods/Pods.xcodeproj/xcuserdata/huynhdung.xcuserdatad/xcschemes/xcschememanagement.plist +0 -46
  29. package/local.properties +0 -8
@@ -40,7 +40,7 @@ kotlin {
40
40
  }
41
41
 
42
42
  cocoapods {
43
- version = "0.160.1-beta.6-debug"
43
+ version = "0.160.1-lottie.2-debug"
44
44
  summary = "IOS Shared module"
45
45
  homepage = "https://momo.vn"
46
46
  ios.deploymentTarget = "15.0"
@@ -1,6 +1,6 @@
1
1
  Pod::Spec.new do |spec|
2
2
  spec.name = 'compose'
3
- spec.version = '0.159.1-beta.7'
3
+ spec.version = '0.159.1-beta.12'
4
4
  spec.homepage = 'https://momo.vn'
5
5
  spec.source = { :http=> ''}
6
6
  spec.authors = ''
@@ -77,6 +77,7 @@ actual fun LottieAnimation(
77
77
  path: String,
78
78
  tintColor: Color?,
79
79
  bgColor: Color?,
80
+ placedAsOverlay: Boolean,
80
81
  modifier: Modifier
81
82
  ) {
82
83
  val json = readJson(path)
@@ -6,9 +6,7 @@ import vn.momo.kits.components.TrustBannerData
6
6
 
7
7
  @Immutable
8
8
  data class FeatureFlags(
9
- val isBaselineEnabled: Boolean? = false,
10
- val isWhiteList: Boolean? = false,
11
- val allowFontScale: Boolean? = true,
9
+ val showBaseLineDebug: Boolean? = false,
12
10
  )
13
11
 
14
12
  @Immutable
@@ -30,6 +28,7 @@ data class MiniAppContext(
30
28
  val providerId: String = "",
31
29
  val permissions: List<Map<String, Any>>? = emptyList(),
32
30
  val features: FeatureFlags? = null,
31
+ val scaleSizeMaxRate: Float? = null,
33
32
  ) {
34
33
  companion object {
35
34
 
@@ -61,6 +60,7 @@ data class MiniAppContext(
61
60
  providerId = parent.providerId.ifBlank { child.providerId },
62
61
  permissions = if (!parent.permissions.isNullOrEmpty()) parent.permissions else child.permissions,
63
62
  features = mergeFeatureFlags(parent.features, child.features),
63
+ scaleSizeMaxRate = parent.scaleSizeMaxRate ?: child.scaleSizeMaxRate,
64
64
  )
65
65
  }
66
66
 
@@ -74,7 +74,7 @@ data class MiniAppContext(
74
74
  if (child == null) return parent
75
75
 
76
76
  return FeatureFlags(
77
- isBaselineEnabled = parent.isBaselineEnabled ?: child.isBaselineEnabled
77
+ showBaseLineDebug = parent.showBaseLineDebug ?: child.showBaseLineDebug
78
78
  )
79
79
  }
80
80
  }
@@ -88,13 +88,12 @@ data class ComponentInformation(
88
88
  val action: String? = null
89
89
  )
90
90
 
91
+ var IsShowBaseLineDebug = false
92
+
91
93
  val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
92
94
  null
93
95
  }
94
96
 
95
- var IsShowBaseLineDebug = false
96
-
97
- var UseFontScaleSystem = true
98
97
  val AppConfig = staticCompositionLocalOf<KitConfig?> {
99
98
  null
100
99
  }
@@ -106,3 +105,5 @@ val AppLanguage = staticCompositionLocalOf<String?> {
106
105
  val LocalComponentInformation = staticCompositionLocalOf<ComponentInformation?> {
107
106
  null
108
107
  }
108
+
109
+ val ScaleSizeMaxRate = staticCompositionLocalOf<Float?> { null }
@@ -21,6 +21,10 @@ import androidx.compose.ui.graphics.Color
21
21
  import androidx.compose.ui.graphics.PathEffect
22
22
  import androidx.compose.ui.graphics.StrokeCap
23
23
  import androidx.compose.ui.unit.dp
24
+ import io.ktor.util.Platform
25
+ import vn.momo.kits.application.IsShowBaseLineDebug
26
+ import vn.momo.kits.const.Colors
27
+ import vn.momo.kits.modifier.conditional
24
28
  import vn.momo.kits.platform.getPlatformName
25
29
  import vn.momo.kits.platform.getStatusBarHeight
26
30
 
@@ -0,0 +1,17 @@
1
+ package vn.momo.kits.components
2
+
3
+ import androidx.compose.runtime.Composable
4
+ import androidx.compose.runtime.CompositionLocalProvider
5
+ import vn.momo.kits.application.ScaleSizeMaxRate
6
+
7
+ @Composable
8
+ fun ScaleSizeScope(
9
+ scaleSizeMaxRate: Float? = null,
10
+ content: @Composable () -> Unit
11
+ ) {
12
+ CompositionLocalProvider(
13
+ ScaleSizeMaxRate provides scaleSizeMaxRate,
14
+ ) {
15
+ content()
16
+ }
17
+ }
@@ -7,11 +7,15 @@ import androidx.compose.ui.text.TextStyle
7
7
  import androidx.compose.ui.text.font.FontFamily
8
8
  import androidx.compose.ui.text.font.FontWeight
9
9
  import androidx.compose.ui.text.style.TextDecoration
10
- import androidx.compose.ui.unit.*
10
+ import androidx.compose.ui.unit.Dp
11
+ import androidx.compose.ui.unit.TextUnit
12
+ import androidx.compose.ui.unit.TextUnitType
13
+ import androidx.compose.ui.unit.dp
14
+ import androidx.compose.ui.unit.sp
11
15
  import org.jetbrains.compose.resources.Font
12
16
  import org.jetbrains.compose.resources.FontResource
13
17
  import org.jetbrains.compose.resources.InternalResourceApi
14
- import vn.momo.kits.application.UseFontScaleSystem
18
+ import vn.momo.kits.application.ScaleSizeMaxRate
15
19
  import vn.momo.kits.platform.getScreenDimensions
16
20
  import vn.momo.uikits.resources.Res
17
21
  import vn.momo.uikits.resources.momosignature
@@ -29,23 +33,34 @@ import kotlin.math.max
29
33
  import kotlin.math.min
30
34
 
31
35
  const val DEFAULT_SCREEN_SIZE = 375f
32
- const val MAX_FONT_SCALE = 1.2f
36
+ const val MAX_FONT_SCALE = 1.5f
37
+ const val MAX_DEVICE_SCALE = 5
33
38
 
34
39
  @Composable
35
40
  fun scaleSize(size: Float): Float {
36
- if (UseFontScaleSystem) {
37
- val deviceWidth = getScreenDimensions().width
38
- val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
39
- val fontScale = LocalDensity.current.fontScale
41
+ val scaleSizeMaxRate: Float = ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
42
+ val deviceWidth = getScreenDimensions().width
43
+ val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
40
44
 
41
- val maxSize = size * MAX_FONT_SCALE
42
- val fontSizeScaleDevice = if (deviceScale > 1) deviceScale * size else size
43
- val fontSizeScaleOS = if (fontScale > 1) fontScale * size else size
45
+ val density = LocalDensity.current
46
+ val fontScale = density.fontScale
47
+
48
+ var fontSizeScaleDevice = size
49
+ var fontSizeScaleOS = size
44
50
 
45
- return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
51
+ if (deviceScale > 1) {
52
+ fontSizeScaleDevice =
53
+ min(deviceScale * fontSizeScaleDevice, fontSizeScaleDevice + MAX_DEVICE_SCALE)
46
54
  }
47
55
 
48
- return size
56
+ if (fontScale > 1) {
57
+ fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * scaleSizeMaxRate)
58
+ }
59
+
60
+ return max(
61
+ fontSizeScaleDevice,
62
+ fontSizeScaleOS
63
+ )
49
64
  }
50
65
 
51
66
  @Composable
@@ -61,6 +61,7 @@ fun NavigationContainer(
61
61
  ApplicationContext provides mergedContext,
62
62
  AppConfig provides config,
63
63
  AppLanguage provides language,
64
+ ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
64
65
  ) {
65
66
  LaunchedEffect(Unit) {
66
67
  setNavigator?.invoke(navigator)
@@ -37,6 +37,7 @@ expect fun LottieAnimation(
37
37
  path: String,
38
38
  tintColor: Color? = null,
39
39
  bgColor: Color? = null,
40
+ placedAsOverlay: Boolean = false,
40
41
  modifier: Modifier = Modifier
41
42
  )
42
43
 
@@ -12,17 +12,19 @@ import androidx.compose.runtime.getValue
12
12
  import androidx.compose.runtime.mutableStateOf
13
13
  import androidx.compose.runtime.remember
14
14
  import androidx.compose.runtime.setValue
15
+ import androidx.compose.ui.ExperimentalComposeUiApi
15
16
  import androidx.compose.ui.InternalComposeUiApi
16
17
  import androidx.compose.ui.Modifier
17
18
  import androidx.compose.ui.backhandler.LocalCompatNavigationEventDispatcherOwner
18
19
  import androidx.compose.ui.graphics.Color
19
20
  import androidx.compose.ui.graphics.NativePaint
20
21
  import androidx.compose.ui.graphics.toArgb
21
- import androidx.compose.ui.interop.UIKitView
22
22
  import androidx.compose.ui.semantics.SemanticsPropertyKey
23
23
  import androidx.compose.ui.semantics.semantics
24
24
  import androidx.compose.ui.unit.Dp
25
25
  import androidx.compose.ui.unit.dp
26
+ import androidx.compose.ui.viewinterop.UIKitInteropProperties
27
+ import androidx.compose.ui.viewinterop.UIKitView
26
28
  import cocoapods.lottie_ios.CompatibleAnimation
27
29
  import cocoapods.lottie_ios.CompatibleAnimationKeypath
28
30
  import cocoapods.lottie_ios.CompatibleAnimationView
@@ -89,12 +91,13 @@ actual fun getOSVersion(): Int {
89
91
  return UIDevice.currentDevice.systemVersion.substringBefore(".").toIntOrNull() ?: 0
90
92
  }
91
93
 
92
- @OptIn(ExperimentalForeignApi::class)
94
+ @OptIn(ExperimentalForeignApi::class, ExperimentalComposeUiApi::class)
93
95
  @Composable
94
96
  actual fun LottieAnimation(
95
97
  path: String,
96
98
  tintColor: Color?,
97
99
  bgColor: Color?,
100
+ placedAsOverlay: Boolean,
98
101
  modifier: Modifier
99
102
  ) {
100
103
  var animation by remember { mutableStateOf<CompatibleAnimation?>(null) }
@@ -112,11 +115,12 @@ actual fun LottieAnimation(
112
115
  Box(modifier) {
113
116
  UIKitView(
114
117
  modifier = Modifier.fillMaxSize(),
118
+ properties = UIKitInteropProperties(placedAsOverlay = placedAsOverlay),
115
119
  factory = {
116
120
  CompatibleAnimationView(value).apply {
117
121
  translatesAutoresizingMaskIntoConstraints = true
118
122
 
119
- setBackgroundColor(bgColor?.toUIColor() ?: UIColor.whiteColor)
123
+ setBackgroundColor(bgColor?.toUIColor() ?: UIColor.clearColor)
120
124
 
121
125
  setLoopAnimationCount(-1.0)
122
126
  setAnimationSpeed(1.0)
@@ -137,7 +141,7 @@ actual fun LottieAnimation(
137
141
  },
138
142
 
139
143
  update = { view ->
140
- view.setBackgroundColor(bgColor?.toUIColor() ?: UIColor.whiteColor)
144
+ view.setBackgroundColor(bgColor?.toUIColor() ?: UIColor.clearColor)
141
145
 
142
146
  if (tintColor != null) {
143
147
  val uiColor = tintColor.toUIColor()
@@ -18,7 +18,7 @@ androidx-appcompat = "1.7.0"
18
18
  material = "1.10.0"
19
19
  maxapi = "0.1.1"
20
20
  vanniktechMavenPublish = "0.34.0"
21
- kits = "0.160.1-beta.6"
21
+ kits = "0.159.1-beta.7"
22
22
  nativemaxapi = "0.0.6"
23
23
 
24
24
  [libraries]
package/gradle.properties CHANGED
@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
18
18
  name="ComposeKits"
19
19
  group=vn.momo.kits
20
20
  artifact.id=kits
21
- version=0.160.1-beta.6
21
+ version=0.159.1-beta.13
22
22
 
23
23
  repo=GitLab
24
24
  url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven
@@ -17,7 +17,7 @@ public class MiniAppContext {
17
17
  public var toolkitConfig: [String: Any] = [:]
18
18
  public var providerId: String = "momo"
19
19
  public var permissions: [[String: Any]] = []
20
-
20
+
21
21
  public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: [String: Any] = [:], toolkitConfig: [String: Any] = [:], providerId: String = "momo", permissions: [[String: Any]] = []) {
22
22
  self.appId = appId
23
23
  self.appCode = appCode
@@ -37,15 +37,11 @@ public class KitConfig {
37
37
  public var headerGradient: String? = nil
38
38
  }
39
39
 
40
- public var IsShowBaseLineDebug = false
41
-
42
- public var UseFontScaleSystem = true
43
-
44
40
  public class ApplicationEnvironment: ObservableObject {
45
41
  let applicationContext: MiniAppContext?
46
42
  let composeApi: KitComposeApi?
47
43
  let config: KitConfig?
48
-
44
+
49
45
  public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
50
46
  self.applicationContext = applicationContext
51
47
  self.composeApi = composeApi
@@ -4,7 +4,7 @@ import Combine
4
4
 
5
5
  public struct Input: View {
6
6
  @Binding public var text: String
7
-
7
+
8
8
  public var placeholder: String
9
9
  public var floatingValue: String
10
10
  public var floatingIcon: String
@@ -29,10 +29,10 @@ public struct Input: View {
29
29
  public var onFocus: (() -> Void)?
30
30
  public var onBlur: (() -> Void)?
31
31
  public var onRightIconPressed: (() -> Void)?
32
-
32
+
33
33
  @State private var isFocused: Bool = false
34
34
  @State private var isPasswordHidden: Bool = true
35
-
35
+
36
36
  public init(
37
37
  text: Binding<String>,
38
38
  placeholder: String = "",
@@ -96,7 +96,7 @@ public struct Input: View {
96
96
  self.onChangeText?(newValue)
97
97
  }
98
98
  )
99
-
99
+
100
100
  VStack(alignment: .leading, spacing: 4) {
101
101
  ZStack(alignment: .topLeading) {
102
102
  // Floating label
@@ -115,7 +115,7 @@ public struct Input: View {
115
115
  .offset(x: Spacing.S, y: -8)
116
116
  .zIndex(10)
117
117
  }
118
-
118
+
119
119
  // Input container
120
120
  HStack(alignment: .center, spacing: 0) {
121
121
  // Leading icon
@@ -123,7 +123,7 @@ public struct Input: View {
123
123
  Icon(source: leadingIcon, size: size == .small ? 24 : 32, color: leadingIconColor)
124
124
  .padding(.trailing, Spacing.M)
125
125
  }
126
-
126
+
127
127
  // Text input field
128
128
  ZStack(alignment: .leading) {
129
129
  if text.isEmpty {
@@ -133,7 +133,7 @@ public struct Input: View {
133
133
  color: getPlaceholderColor()
134
134
  )
135
135
  }
136
-
136
+
137
137
  if secureTextEntry && isPasswordHidden {
138
138
  SecureInputField(
139
139
  text: $text,
@@ -158,7 +158,7 @@ public struct Input: View {
158
158
  .applyPrimaryCursorColor()
159
159
  }
160
160
  }
161
-
161
+
162
162
  // Clear button (only show when focused and has text)
163
163
  if isFocused && !text.isEmpty {
164
164
  SwiftUI.Button(action: {
@@ -169,14 +169,14 @@ public struct Input: View {
169
169
  .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
170
170
  }
171
171
  }
172
-
172
+
173
173
  // Loading indicator
174
174
  if loading {
175
175
  ActivityIndicator(isAnimating: .constant(true), style: .medium)
176
176
  .frame(width: 16, height: 16)
177
177
  .padding(.leading, Spacing.S)
178
178
  }
179
-
179
+
180
180
  // Right icon (password toggle or custom icon)
181
181
  if secureTextEntry {
182
182
  if !text.isEmpty {
@@ -197,7 +197,7 @@ public struct Input: View {
197
197
  }
198
198
  }
199
199
  .padding(.horizontal, Spacing.M)
200
- .frame(height: scaleSize(size == .small ? 48 : 56))
200
+ .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
201
201
  .background(
202
202
  RoundedRectangle(cornerRadius: Radius.S)
203
203
  .fill(Colors.black01)
@@ -207,7 +207,7 @@ public struct Input: View {
207
207
  .stroke(borderColor(), lineWidth: 1)
208
208
  )
209
209
  }
210
-
210
+
211
211
  // Error or hint
212
212
  ErrorView(
213
213
  errorMessage: error,
@@ -223,9 +223,9 @@ public struct Input: View {
223
223
  }
224
224
  }
225
225
  }
226
-
226
+
227
227
  // MARK: - Helpers
228
-
228
+
229
229
  private func handleFocusChange(_ focused: Bool) {
230
230
  isFocused = focused
231
231
  if focused {
@@ -234,12 +234,12 @@ public struct Input: View {
234
234
  onBlur?()
235
235
  }
236
236
  }
237
-
237
+
238
238
  private func togglePasswordVisibility() {
239
239
  isPasswordHidden.toggle()
240
240
  onRightIconPressed?()
241
241
  }
242
-
242
+
243
243
  private func borderColor() -> Color {
244
244
  if disabled {
245
245
  return Colors.black04 // border.disable
@@ -252,19 +252,19 @@ public struct Input: View {
252
252
  }
253
253
  return Colors.black04 // border.default
254
254
  }
255
-
255
+
256
256
  private func getTextColor() -> Color {
257
257
  return disabled ? Colors.black09 : Colors.black17
258
258
  }
259
-
259
+
260
260
  private func getPlaceholderColor() -> Color {
261
261
  return disabled ? Colors.black09 : Colors.black12
262
262
  }
263
-
263
+
264
264
  private func getFloatingColor() -> Color {
265
265
  return disabled ? Colors.black09 : Colors.black12
266
266
  }
267
-
267
+
268
268
  private func getFloatingIconColor() -> Color {
269
269
  return disabled ? Colors.black09 : floatingIconColor
270
270
  }
@@ -8,7 +8,7 @@
8
8
  import SwiftUI
9
9
  public struct InputPhoneNumber: View {
10
10
  @Binding public var text: String
11
-
11
+
12
12
  public var placeholder: String
13
13
  public var size: InputSize
14
14
  public var hintText: String
@@ -22,9 +22,9 @@ public struct InputPhoneNumber: View {
22
22
  public var onBlur: (() -> Void)?
23
23
  public var onRightIconPressed: (() -> Void)?
24
24
  public var accessibilityLabel: String?
25
-
25
+
26
26
  @State private var isFocused: Bool = false
27
-
27
+
28
28
  public init(
29
29
  text: Binding<String>,
30
30
  placeholder: String = "0123456789",
@@ -57,7 +57,7 @@ public struct InputPhoneNumber: View {
57
57
  self.onRightIconPressed = onRightIconPressed
58
58
  self.accessibilityLabel = accessibilityLabel
59
59
  }
60
-
60
+
61
61
  // MARK: - Body
62
62
  public var body: some View {
63
63
  let textBinding = Binding<String>(
@@ -67,28 +67,28 @@ public struct InputPhoneNumber: View {
67
67
  self.onChangeText?(newValue)
68
68
  }
69
69
  )
70
-
70
+
71
71
  VStack(alignment: .leading, spacing: 4) {
72
72
  HStack(spacing: 0) {
73
73
  // 🇻🇳 Flag
74
74
  ImageView("https://static.momocdn.net/app/img/icon/ic-qrcode-package/ic_vn_flag.png")
75
75
  .frame(width: 24, height: 24)
76
76
  .padding(.trailing, Spacing.XS)
77
-
77
+
78
78
  MomoText("+84", typography: size == .small ? .headerSSemibold : .headerMBold)
79
79
  .foregroundColor(Colors.black17)
80
-
80
+
81
81
  Rectangle()
82
82
  .fill(Colors.black04)
83
83
  .frame(width: 1, height: size == .small ? 24 : 32)
84
84
  .padding(.horizontal, Spacing.M)
85
-
85
+
86
86
  // Text input
87
87
  ZStack(alignment: .leading) {
88
88
  if text.isEmpty {
89
89
  MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black12)
90
90
  }
91
-
91
+
92
92
  TextField("", text: textBinding, onEditingChanged: { focused in
93
93
  handleFocusChange(focused)
94
94
  })
@@ -100,7 +100,7 @@ public struct InputPhoneNumber: View {
100
100
  .accessibility(identifier: accessibilityLabel ?? "")
101
101
  .accessibilityValue(textBinding.wrappedValue.isEmpty ? placeholder : textBinding.wrappedValue)
102
102
  }
103
-
103
+
104
104
  // Clear button
105
105
  if isFocused && !text.isEmpty {
106
106
  SwiftUI.Button(action: {
@@ -111,13 +111,13 @@ public struct InputPhoneNumber: View {
111
111
  .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
112
112
  }
113
113
  }
114
-
114
+
115
115
  // Loading indicator
116
116
  if loading {
117
117
  ActivityIndicator(isAnimating: .constant(true), style: .medium)
118
118
  .frame(width: 16, height: 16)
119
119
  }
120
-
120
+
121
121
  // ✅ Right icon
122
122
  if !rightIcon.isEmpty {
123
123
  SwiftUI.Button(action: { onRightIconPressed?() }) {
@@ -127,7 +127,7 @@ public struct InputPhoneNumber: View {
127
127
  }
128
128
  }
129
129
  .padding(.horizontal, Spacing.M)
130
- .frame(height: scaleSize(size == .small ? 48 : 56))
130
+ .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
131
131
  .background(
132
132
  RoundedRectangle(cornerRadius: Radius.S)
133
133
  .fill(Colors.black01)
@@ -136,7 +136,7 @@ public struct InputPhoneNumber: View {
136
136
  RoundedRectangle(cornerRadius: Radius.S)
137
137
  .stroke(borderColor(), lineWidth: isFocused ? 1.5 : 1)
138
138
  )
139
-
139
+
140
140
  // Error or hint
141
141
  ErrorView(
142
142
  errorMessage: error,
@@ -145,9 +145,9 @@ public struct InputPhoneNumber: View {
145
145
  )
146
146
  }
147
147
  }
148
-
148
+
149
149
  // MARK: - Helpers
150
-
150
+
151
151
  private func handleFocusChange(_ focused: Bool) {
152
152
  isFocused = focused
153
153
  if focused {
@@ -156,7 +156,7 @@ public struct InputPhoneNumber: View {
156
156
  onBlur?()
157
157
  }
158
158
  }
159
-
159
+
160
160
  private func borderColor() -> Color {
161
161
  if !error.isEmpty { return Colors.red03 }
162
162
  if isFocused { return Colors.primary }
@@ -1,25 +1,30 @@
1
1
  import SwiftUI
2
2
 
3
- private let DEFAULT_SCREEN_SIZE: CGFloat = 375
4
- private let MAX_FONT_SCALE: CGFloat = 1.2
3
+ public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
4
+ let defaultScreenSize: CGFloat = 375
5
+ let maxFontScale: CGFloat = scaleRate ?? 1.5
6
+ let maxDeviceScale: CGFloat = 5
5
7
 
6
- public func scaleSize(_ size: CGFloat) -> CGFloat {
7
- if UseFontScaleSystem {
8
- let deviceWidth = UIScreen.main.bounds.width
9
- let deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
8
+ let deviceWidth = UIScreen.main.bounds.width
9
+ let deviceScale = deviceWidth / defaultScreenSize
10
10
 
11
- let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
12
- let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
13
- let fontScale = scaledFont.pointSize / defaultFont.pointSize
11
+ let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
12
+ let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
13
+ let fontScale = scaledFont.pointSize / defaultFont.pointSize
14
14
 
15
- let maxSize = size * MAX_FONT_SCALE
16
- let fontSizeScaleDevice = deviceScale > 1 ? deviceScale * size : size
17
- let fontSizeScaleOS = fontScale > 1 ? fontScale * size : size
15
+ var fontSizeDeviceScale = size
16
+ var fontSizeOSScale = size
18
17
 
19
- return min(max(fontSizeScaleDevice, fontSizeScaleOS), maxSize)
18
+
19
+ if deviceScale > 1 {
20
+ fontSizeDeviceScale = min(fontSizeDeviceScale * deviceScale, fontSizeDeviceScale + maxDeviceScale)
21
+ }
22
+
23
+ if fontScale > 1 {
24
+ fontSizeOSScale = min(fontSizeOSScale * fontScale, fontSizeOSScale * maxFontScale)
20
25
  }
21
26
 
22
- return size
27
+ return max(fontSizeDeviceScale, fontSizeOSScale)
23
28
  }
24
29
 
25
30
  public enum TypographyStyle {
@@ -2,7 +2,28 @@ import SwiftUI
2
2
 
3
3
  public extension Font {
4
4
  static func appFont(size: CGFloat) -> Font {
5
- return Font.system(size: scaleSize(size))
5
+ let defaultScreenSize: CGFloat = 375
6
+ let maxFontScale: CGFloat = 1.5
7
+ let maxDeviceScale: CGFloat = 5
8
+
9
+ let deviceWidth = UIScreen.main.bounds.width
10
+ let deviceScale = deviceWidth / defaultScreenSize
11
+
12
+ let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
13
+ let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
14
+ let fontScale = scaledFont.pointSize / defaultFont.pointSize
15
+
16
+ var fontSize = size
17
+
18
+ if deviceScale > 1 {
19
+ fontSize = min(fontSize * deviceScale, fontSize + maxDeviceScale)
20
+ }
21
+
22
+ if fontScale > 1 {
23
+ fontSize = min(fontSize * fontScale, fontSize * maxFontScale)
24
+ }
25
+
26
+ return Font.system(size: fontSize)
6
27
  }
7
28
 
8
29
  // New supported typography styles
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@momo-kits/native-kits",
3
- "version": "0.160.1-beta.6-debug",
3
+ "version": "0.160.1-lottie.2-debug",
4
4
  "private": false,
5
5
  "dependencies": {},
6
6
  "devDependencies": {},
@@ -1,8 +0,0 @@
1
- {
2
- "permissions": {
3
- "allow": [
4
- "Bash(which glab:*)",
5
- "WebFetch(domain:gitlab.mservice.com.vn)"
6
- ]
7
- }
8
- }
@@ -1,14 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
- <plist version="1.0">
4
- <dict>
5
- <key>SchemeUserState</key>
6
- <dict>
7
- <key>Example.xcscheme_^#shared#^_</key>
8
- <dict>
9
- <key>orderHint</key>
10
- <integer>0</integer>
11
- </dict>
12
- </dict>
13
- </dict>
14
- </plist>
@@ -1,5 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
- <plist version="1.0">
4
- <dict />
5
- </plist>
@@ -1,58 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <Scheme
3
- LastUpgradeVersion = "1600"
4
- version = "1.3">
5
- <BuildAction
6
- parallelizeBuildables = "YES"
7
- buildImplicitDependencies = "YES">
8
- <BuildActionEntries>
9
- <BuildActionEntry
10
- buildForTesting = "YES"
11
- buildForRunning = "YES"
12
- buildForProfiling = "YES"
13
- buildForArchiving = "YES"
14
- buildForAnalyzing = "YES">
15
- <BuildableReference
16
- BuildableIdentifier = "primary"
17
- BlueprintIdentifier = "3B6FB503A75BF5BC1FA6F30BC06B9D28"
18
- BuildableName = "MoMoUIKits.framework"
19
- BlueprintName = "MoMoUIKits"
20
- ReferencedContainer = "container:Pods.xcodeproj">
21
- </BuildableReference>
22
- </BuildActionEntry>
23
- </BuildActionEntries>
24
- </BuildAction>
25
- <TestAction
26
- buildConfiguration = "Debug"
27
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29
- shouldUseLaunchSchemeArgsEnv = "YES">
30
- <Testables>
31
- </Testables>
32
- </TestAction>
33
- <LaunchAction
34
- buildConfiguration = "Debug"
35
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37
- launchStyle = "0"
38
- useCustomWorkingDirectory = "NO"
39
- ignoresPersistentStateOnLaunch = "NO"
40
- debugDocumentVersioning = "YES"
41
- debugServiceExtension = "internal"
42
- allowLocationSimulation = "YES">
43
- </LaunchAction>
44
- <ProfileAction
45
- buildConfiguration = "Release"
46
- shouldUseLaunchSchemeArgsEnv = "YES"
47
- savedToolIdentifier = ""
48
- useCustomWorkingDirectory = "NO"
49
- debugDocumentVersioning = "YES">
50
- </ProfileAction>
51
- <AnalyzeAction
52
- buildConfiguration = "Debug">
53
- </AnalyzeAction>
54
- <ArchiveAction
55
- buildConfiguration = "Release"
56
- revealArchiveInOrganizer = "YES">
57
- </ArchiveAction>
58
- </Scheme>
@@ -1,58 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <Scheme
3
- LastUpgradeVersion = "1600"
4
- version = "1.3">
5
- <BuildAction
6
- parallelizeBuildables = "YES"
7
- buildImplicitDependencies = "YES">
8
- <BuildActionEntries>
9
- <BuildActionEntry
10
- buildForTesting = "YES"
11
- buildForRunning = "YES"
12
- buildForProfiling = "YES"
13
- buildForArchiving = "YES"
14
- buildForAnalyzing = "YES">
15
- <BuildableReference
16
- BuildableIdentifier = "primary"
17
- BlueprintIdentifier = "0AEE99A309977BD12A049FF48AF9BA4B"
18
- BuildableName = "Pods_Example.framework"
19
- BlueprintName = "Pods-Example"
20
- ReferencedContainer = "container:Pods.xcodeproj">
21
- </BuildableReference>
22
- </BuildActionEntry>
23
- </BuildActionEntries>
24
- </BuildAction>
25
- <TestAction
26
- buildConfiguration = "Debug"
27
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29
- shouldUseLaunchSchemeArgsEnv = "YES">
30
- <Testables>
31
- </Testables>
32
- </TestAction>
33
- <LaunchAction
34
- buildConfiguration = "Debug"
35
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37
- launchStyle = "0"
38
- useCustomWorkingDirectory = "NO"
39
- ignoresPersistentStateOnLaunch = "NO"
40
- debugDocumentVersioning = "YES"
41
- debugServiceExtension = "internal"
42
- allowLocationSimulation = "YES">
43
- </LaunchAction>
44
- <ProfileAction
45
- buildConfiguration = "Release"
46
- shouldUseLaunchSchemeArgsEnv = "YES"
47
- savedToolIdentifier = ""
48
- useCustomWorkingDirectory = "NO"
49
- debugDocumentVersioning = "YES">
50
- </ProfileAction>
51
- <AnalyzeAction
52
- buildConfiguration = "Debug">
53
- </AnalyzeAction>
54
- <ArchiveAction
55
- buildConfiguration = "Release"
56
- revealArchiveInOrganizer = "YES">
57
- </ArchiveAction>
58
- </Scheme>
@@ -1,58 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <Scheme
3
- LastUpgradeVersion = "1600"
4
- version = "1.3">
5
- <BuildAction
6
- parallelizeBuildables = "YES"
7
- buildImplicitDependencies = "YES">
8
- <BuildActionEntries>
9
- <BuildActionEntry
10
- buildForTesting = "YES"
11
- buildForRunning = "YES"
12
- buildForProfiling = "YES"
13
- buildForArchiving = "YES"
14
- buildForAnalyzing = "YES">
15
- <BuildableReference
16
- BuildableIdentifier = "primary"
17
- BlueprintIdentifier = "3847153A6E5EEFB86565BA840768F429"
18
- BuildableName = "SDWebImage.framework"
19
- BlueprintName = "SDWebImage"
20
- ReferencedContainer = "container:Pods.xcodeproj">
21
- </BuildableReference>
22
- </BuildActionEntry>
23
- </BuildActionEntries>
24
- </BuildAction>
25
- <TestAction
26
- buildConfiguration = "Debug"
27
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29
- shouldUseLaunchSchemeArgsEnv = "YES">
30
- <Testables>
31
- </Testables>
32
- </TestAction>
33
- <LaunchAction
34
- buildConfiguration = "Debug"
35
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37
- launchStyle = "0"
38
- useCustomWorkingDirectory = "NO"
39
- ignoresPersistentStateOnLaunch = "NO"
40
- debugDocumentVersioning = "YES"
41
- debugServiceExtension = "internal"
42
- allowLocationSimulation = "YES">
43
- </LaunchAction>
44
- <ProfileAction
45
- buildConfiguration = "Release"
46
- shouldUseLaunchSchemeArgsEnv = "YES"
47
- savedToolIdentifier = ""
48
- useCustomWorkingDirectory = "NO"
49
- debugDocumentVersioning = "YES">
50
- </ProfileAction>
51
- <AnalyzeAction
52
- buildConfiguration = "Debug">
53
- </AnalyzeAction>
54
- <ArchiveAction
55
- buildConfiguration = "Release"
56
- revealArchiveInOrganizer = "YES">
57
- </ArchiveAction>
58
- </Scheme>
@@ -1,58 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <Scheme
3
- LastUpgradeVersion = "1600"
4
- version = "1.3">
5
- <BuildAction
6
- parallelizeBuildables = "YES"
7
- buildImplicitDependencies = "YES">
8
- <BuildActionEntries>
9
- <BuildActionEntry
10
- buildForTesting = "YES"
11
- buildForRunning = "YES"
12
- buildForProfiling = "YES"
13
- buildForArchiving = "YES"
14
- buildForAnalyzing = "YES">
15
- <BuildableReference
16
- BuildableIdentifier = "primary"
17
- BlueprintIdentifier = "92EBFA3E7005B4C18A9C0B44324EB80F"
18
- BuildableName = "SDWebImageSwiftUI.framework"
19
- BlueprintName = "SDWebImageSwiftUI"
20
- ReferencedContainer = "container:Pods.xcodeproj">
21
- </BuildableReference>
22
- </BuildActionEntry>
23
- </BuildActionEntries>
24
- </BuildAction>
25
- <TestAction
26
- buildConfiguration = "Debug"
27
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29
- shouldUseLaunchSchemeArgsEnv = "YES">
30
- <Testables>
31
- </Testables>
32
- </TestAction>
33
- <LaunchAction
34
- buildConfiguration = "Debug"
35
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37
- launchStyle = "0"
38
- useCustomWorkingDirectory = "NO"
39
- ignoresPersistentStateOnLaunch = "NO"
40
- debugDocumentVersioning = "YES"
41
- debugServiceExtension = "internal"
42
- allowLocationSimulation = "YES">
43
- </LaunchAction>
44
- <ProfileAction
45
- buildConfiguration = "Release"
46
- shouldUseLaunchSchemeArgsEnv = "YES"
47
- savedToolIdentifier = ""
48
- useCustomWorkingDirectory = "NO"
49
- debugDocumentVersioning = "YES">
50
- </ProfileAction>
51
- <AnalyzeAction
52
- buildConfiguration = "Debug">
53
- </AnalyzeAction>
54
- <ArchiveAction
55
- buildConfiguration = "Release"
56
- revealArchiveInOrganizer = "YES">
57
- </ArchiveAction>
58
- </Scheme>
@@ -1,58 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <Scheme
3
- LastUpgradeVersion = "1600"
4
- version = "1.3">
5
- <BuildAction
6
- parallelizeBuildables = "YES"
7
- buildImplicitDependencies = "YES">
8
- <BuildActionEntries>
9
- <BuildActionEntry
10
- buildForTesting = "YES"
11
- buildForRunning = "YES"
12
- buildForProfiling = "YES"
13
- buildForArchiving = "YES"
14
- buildForAnalyzing = "YES">
15
- <BuildableReference
16
- BuildableIdentifier = "primary"
17
- BlueprintIdentifier = "6510766A9670BFA3B251E2A62446FC5D"
18
- BuildableName = "SkeletonUI.framework"
19
- BlueprintName = "SkeletonUI"
20
- ReferencedContainer = "container:Pods.xcodeproj">
21
- </BuildableReference>
22
- </BuildActionEntry>
23
- </BuildActionEntries>
24
- </BuildAction>
25
- <TestAction
26
- buildConfiguration = "Debug"
27
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29
- shouldUseLaunchSchemeArgsEnv = "YES">
30
- <Testables>
31
- </Testables>
32
- </TestAction>
33
- <LaunchAction
34
- buildConfiguration = "Debug"
35
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37
- launchStyle = "0"
38
- useCustomWorkingDirectory = "NO"
39
- ignoresPersistentStateOnLaunch = "NO"
40
- debugDocumentVersioning = "YES"
41
- debugServiceExtension = "internal"
42
- allowLocationSimulation = "YES">
43
- </LaunchAction>
44
- <ProfileAction
45
- buildConfiguration = "Release"
46
- shouldUseLaunchSchemeArgsEnv = "YES"
47
- savedToolIdentifier = ""
48
- useCustomWorkingDirectory = "NO"
49
- debugDocumentVersioning = "YES">
50
- </ProfileAction>
51
- <AnalyzeAction
52
- buildConfiguration = "Debug">
53
- </AnalyzeAction>
54
- <ArchiveAction
55
- buildConfiguration = "Release"
56
- revealArchiveInOrganizer = "YES">
57
- </ArchiveAction>
58
- </Scheme>
@@ -1,46 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
- <plist version="1.0">
4
- <dict>
5
- <key>SchemeUserState</key>
6
- <dict>
7
- <key>MoMoUIKits.xcscheme</key>
8
- <dict>
9
- <key>isShown</key>
10
- <false />
11
- <key>orderHint</key>
12
- <integer>0</integer>
13
- </dict>
14
- <key>Pods-Example.xcscheme</key>
15
- <dict>
16
- <key>isShown</key>
17
- <false />
18
- <key>orderHint</key>
19
- <integer>1</integer>
20
- </dict>
21
- <key>SDWebImage.xcscheme</key>
22
- <dict>
23
- <key>isShown</key>
24
- <false />
25
- <key>orderHint</key>
26
- <integer>2</integer>
27
- </dict>
28
- <key>SDWebImageSwiftUI.xcscheme</key>
29
- <dict>
30
- <key>isShown</key>
31
- <false />
32
- <key>orderHint</key>
33
- <integer>3</integer>
34
- </dict>
35
- <key>SkeletonUI.xcscheme</key>
36
- <dict>
37
- <key>isShown</key>
38
- <false />
39
- <key>orderHint</key>
40
- <integer>4</integer>
41
- </dict>
42
- </dict>
43
- <key>SuppressBuildableAutocreation</key>
44
- <dict />
45
- </dict>
46
- </plist>
package/local.properties DELETED
@@ -1,8 +0,0 @@
1
- ## This file must *NOT* be checked into Version Control Systems,
2
- # as it contains information specific to your local configuration.
3
- #
4
- # Location of the SDK. This is only used by Gradle.
5
- # For customization when using a Version Control System, please read the
6
- # header note.
7
- #Wed Aug 21 14:20:12 ICT 2024
8
- sdk.dir=/Users/huynhdung/Library/Android/sdk