@momo-kits/native-kits 0.117.1-beta.14 → 0.117.1-beta.16

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/Screen.kt +4 -3
  2. package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt +1 -1
  3. package/compose/src/commonMain/kotlin/vn/momo/kits/components/Switch.kt +0 -2
  4. package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt +3 -3
  5. package/ios/Application/Screen.swift +4 -1
  6. package/ios/Popup/PopupDisplay.swift +3 -5
  7. package/package.json +1 -1
package/compose/src/commonMain/kotlin/vn/momo/kits/application/Screen.kt CHANGED
@@ -200,9 +200,8 @@ fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp, bo
200
200
  Box(
201
201
  Modifier
202
202
  .offset(y = -keyboardSize)
203
- .padding(bottom = bottom)
204
203
  .shadow(
205
- Colors.black_20.copy(alpha = 0.1f),
204
+ Colors.black_20.copy(alpha = 0.2f),
206
205
  borderRadius = 0.dp,
207
206
  10f,
208
207
  offsetX = 0.dp,
@@ -212,7 +211,9 @@ fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp, bo
212
211
  .background(AppTheme.current.colors.background.surface)
213
212
  ) {
214
213
  Box(
215
- Modifier.fillMaxWidth().padding(vertical = Spacing.S, horizontal = Spacing.M)
214
+ Modifier.fillMaxWidth()
215
+ .padding(bottom = bottom)
216
+ .padding(vertical = Spacing.S, horizontal = Spacing.M)
216
217
  ) {
217
218
  footer?.invoke()
218
219
  }
package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt CHANGED
@@ -125,7 +125,7 @@ fun PopupNotify(
125
125
  content(Modifier.padding(top = Spacing.S))
126
126
  if (error.isNotEmpty()) {
127
127
  Text(
128
- text = error,
128
+ text = "Mã lỗi: " + error,
129
129
  style = Typography.descriptionXsRegular,
130
130
  color = AppTheme.current.colors.text.hint,
131
131
  maxLines = 1,
package/compose/src/commonMain/kotlin/vn/momo/kits/components/Switch.kt CHANGED
@@ -4,7 +4,6 @@ import androidx.compose.foundation.background
4
4
  import androidx.compose.foundation.border
5
5
  import androidx.compose.foundation.clickable
6
6
  import androidx.compose.foundation.layout.Box
7
- import androidx.compose.foundation.layout.Row
8
7
  import androidx.compose.foundation.layout.height
9
8
  import androidx.compose.foundation.layout.padding
10
9
  import androidx.compose.foundation.layout.size
@@ -18,7 +17,6 @@ import androidx.compose.ui.graphics.Color
18
17
  import androidx.compose.ui.unit.dp
19
18
  import vn.momo.kits.const.Colors
20
19
  import vn.momo.kits.const.Spacing
21
- import vn.momo.kits.const.Typography
22
20
  import vn.momo.kits.modifier.setAutomationId
23
21
  import vn.momo.kits.utils.ifTrue
24
22
 
package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt CHANGED
@@ -46,15 +46,15 @@ fun getFont(font: String): FontFamily {
46
46
  fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
47
47
  val key = "$fontFamily-${fontWeight?.weight}"
48
48
  val fontMap = mapOf(
49
- "SFProText-100" to "sfprotext_thin.otf",
50
- "SFProText-200" to "sfprotext_ultralight.otf",
49
+ "SFProText-100" to "sfprotext_thin.ttf",
50
+ "SFProText-200" to "sfprotext_ultralight.ttf",
51
51
  "SFProText-300" to "sfprotext_light.ttf",
52
52
  "SFProText-400" to "sfprotext_regular.ttf",
53
53
  "SFProText-500" to "sfprotext_medium.ttf",
54
54
  "SFProText-600" to "sfprotext_semibold.ttf",
55
55
  "SFProText-700" to "sfprotext_bold.ttf",
56
56
  "SFProText-800" to "sfprotext_heavy.ttf",
57
- "SFProText-900" to "sfprotext_black.otf",
57
+ "SFProText-900" to "sfprotext_black.ttf",
58
58
 
59
59
  "MoMoSignature-100" to "momosignature.otf",
60
60
  "MoMoSignature-200" to "momosignature.otf",
package/ios/Application/Screen.swift CHANGED
@@ -88,7 +88,8 @@ public struct Screen<Content: View>: View {
88
88
  let screenHeight = height + topInset + bottomInset
89
89
 
90
90
  ZStack {
91
- (backgroundColor ?? Color.white).edgesIgnoringSafeArea(.all)
91
+ (backgroundColor ?? Color.white)
92
+ .edgesIgnoringSafeArea(.top)
92
93
 
93
94
  VStack(spacing: 0) {
94
95
  ZStack(alignment: .top) {
@@ -184,6 +185,8 @@ struct Footer: View {
184
185
  VStack {
185
186
  footerView
186
187
  }
188
+ .padding(.vertical, Spacing.S)
189
+ .padding(.horizontal, Spacing.M)
187
190
  .padding(.bottom, keyboardSize)
188
191
  .background(Colors.black01)
189
192
  }
package/ios/Popup/PopupDisplay.swift CHANGED
@@ -88,8 +88,7 @@ public struct PopupDisplay: View {
88
88
  ScrollView(showsIndicators: false) {
89
89
  Text(description)
90
90
  .font(.paragraph)
91
- .foregroundColor(.black)
92
- .opacity(0.6)
91
+ .foregroundColor(Colors.black17)
93
92
  .multilineTextAlignment(.leading)
94
93
  .background(GeometryReader { geo in
95
94
  Color.clear
@@ -102,8 +101,7 @@ public struct PopupDisplay: View {
102
101
  } else {
103
102
  Text(description)
104
103
  .font(.paragraph)
105
- .foregroundColor(.black)
106
- .opacity(0.6)
104
+ .foregroundColor(Colors.black17)
107
105
  .multilineTextAlignment(.leading)
108
106
  .background(GeometryReader { geo in
109
107
  Color.clear
@@ -116,7 +114,7 @@ public struct PopupDisplay: View {
116
114
  }.padding(.bottom, 8)
117
115
 
118
116
  if(!errorCode.isEmpty) {
119
- Text(errorCode)
117
+ Text("Mã lỗi: " + errorCode)
120
118
  .foregroundColor(Colors.black12)
121
119
  .font(.description_xs_regular)
122
120
  .lineLimit(1)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@momo-kits/native-kits",
3
- "version": "0.117.1-beta.14",
3
+ "version": "0.117.1-beta.16",
4
4
  "private": false,
5
5
  "dependencies": {},
6
6
  "devDependencies": {},