@momo-kits/native-kits 0.113.1-beta.9 → 0.113.2-beta.10
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.
- package/compose/src/commonMain/kotlin/vn/momo/kits/application/NavigationContainer.kt +1 -1
- package/compose/src/commonMain/kotlin/vn/momo/kits/application/Screen.kt +8 -4
- package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt +3 -3
- package/ios/Popup/PopupDisplay.swift +11 -5
- package/ios/Typography/Typography.swift +2 -1
- package/local.properties +2 -2
- package/package.json +1 -1
|
@@ -74,7 +74,7 @@ data class KitConfig(
|
|
|
74
74
|
fun ApplicationContainer(
|
|
75
75
|
theme: Theme = defaultTheme,
|
|
76
76
|
composeApi: ComposeApi? = null,
|
|
77
|
-
statusBarHeight: Dp? =
|
|
77
|
+
statusBarHeight: Dp? = AppStatusBar.current,
|
|
78
78
|
applicationContext: MiniAppContext? = null,
|
|
79
79
|
config: KitConfig? = null,
|
|
80
80
|
content: @Composable () -> Unit,
|
|
@@ -94,14 +94,14 @@ fun Screen(
|
|
|
94
94
|
|
|
95
95
|
Box(
|
|
96
96
|
Modifier.fillMaxSize()
|
|
97
|
-
.background(
|
|
97
|
+
.background(AppTheme.current.colors.background.surface)
|
|
98
98
|
) {
|
|
99
99
|
|
|
100
100
|
if (animatedHeader === null) {
|
|
101
101
|
HeaderBackground(
|
|
102
102
|
headerType = headerType,
|
|
103
103
|
scrollState = scrollState.value,
|
|
104
|
-
inputSearchProps= inputSearchProps,
|
|
104
|
+
inputSearchProps = inputSearchProps,
|
|
105
105
|
useAnimationSearch = useAnimationSearch
|
|
106
106
|
)
|
|
107
107
|
} else {
|
|
@@ -114,7 +114,7 @@ fun Screen(
|
|
|
114
114
|
isBack = isBack,
|
|
115
115
|
headerType = headerType,
|
|
116
116
|
scrollState = scrollState.value,
|
|
117
|
-
inputSearchProps= inputSearchProps,
|
|
117
|
+
inputSearchProps = inputSearchProps,
|
|
118
118
|
useAnimationSearch = useAnimationSearch
|
|
119
119
|
)
|
|
120
120
|
}
|
|
@@ -155,7 +155,11 @@ fun Screen(
|
|
|
155
155
|
verticalArrangement = verticalArrangement,
|
|
156
156
|
horizontalAlignment = horizontalAlignment
|
|
157
157
|
) {
|
|
158
|
-
Box
|
|
158
|
+
Box(
|
|
159
|
+
modifier = Modifier.background(
|
|
160
|
+
backgroundColor ?: AppTheme.current.colors.background.default
|
|
161
|
+
)
|
|
162
|
+
) {
|
|
159
163
|
headerAnimated()
|
|
160
164
|
Column {
|
|
161
165
|
if (animatedHeader !== null) {
|
|
@@ -140,8 +140,8 @@ fun PopupNotify(
|
|
|
140
140
|
|
|
141
141
|
Box(
|
|
142
142
|
Modifier
|
|
143
|
-
.width(
|
|
144
|
-
.height(
|
|
143
|
+
.width(22.dp)
|
|
144
|
+
.height(22.dp)
|
|
145
145
|
.offset(x = Spacing.S, y = -Spacing.S)
|
|
146
146
|
.background(
|
|
147
147
|
color = AppTheme.current.colors.text.default,
|
|
@@ -163,7 +163,7 @@ fun PopupNotify(
|
|
|
163
163
|
Icon(
|
|
164
164
|
source = "navigation_close",
|
|
165
165
|
color = AppTheme.current.colors.background.surface,
|
|
166
|
-
size =
|
|
166
|
+
size = 16.dp,
|
|
167
167
|
modifier = Modifier.semantics {
|
|
168
168
|
testTag = "ic_popup_close"
|
|
169
169
|
}
|
|
@@ -42,25 +42,31 @@ public struct PopupDisplay: View {
|
|
|
42
42
|
SwiftUI.Button(action: onPressClose) {
|
|
43
43
|
Image(systemName: "xmark.circle.fill")
|
|
44
44
|
.resizable()
|
|
45
|
-
.frame(width:
|
|
46
|
-
.overlay(RoundedRectangle(cornerRadius: Radius.
|
|
45
|
+
.frame(width: 22, height: 22)
|
|
46
|
+
.overlay(RoundedRectangle(cornerRadius: Radius.L).stroke(Colors.black01, lineWidth: 1))
|
|
47
47
|
}.foregroundColor(Colors.black20)
|
|
48
|
-
.background(Colors.black01.cornerRadius(
|
|
48
|
+
.background(Colors.black01.cornerRadius(15))
|
|
49
49
|
.offset(x: 6, y: -6)
|
|
50
50
|
.zIndex(1)
|
|
51
51
|
|
|
52
52
|
VStack {
|
|
53
|
+
if(!url.isEmpty) {
|
|
53
54
|
WebImage(url: URL(string: url), isAnimating: .constant(true))
|
|
54
55
|
.resizable()
|
|
56
|
+
.placeholder {
|
|
57
|
+
Rectangle()
|
|
58
|
+
.fill(Color.gray.opacity(0.3))
|
|
59
|
+
.frame(maxWidth: .infinity, maxHeight: 184)
|
|
60
|
+
}
|
|
55
61
|
.scaledToFill()
|
|
56
62
|
.frame(maxWidth: .infinity)
|
|
57
63
|
.clipShape(RoundedCorner(radius: 8, corners: [.topLeft, .topRight]))
|
|
58
64
|
.aspectRatio(2, contentMode: .fit)
|
|
59
|
-
|
|
65
|
+
}
|
|
60
66
|
VStack(alignment: .leading) {
|
|
61
67
|
Text(title)
|
|
62
68
|
.foregroundColor(.black)
|
|
63
|
-
.font(.
|
|
69
|
+
.font(.header_default_semibold)
|
|
64
70
|
.padding(.top, 16)
|
|
65
71
|
.padding(.bottom, 8)
|
|
66
72
|
.lineLimit(2)
|
|
@@ -2,13 +2,14 @@ import SwiftUI
|
|
|
2
2
|
|
|
3
3
|
public extension Font {
|
|
4
4
|
static func appFont(size: CGFloat) -> Font {
|
|
5
|
-
return Font.
|
|
5
|
+
return Font.system(size: size)
|
|
6
6
|
}
|
|
7
7
|
|
|
8
8
|
// New supported typography styles
|
|
9
9
|
static let headline_default_bold = appFont(size: 24).weight(.bold)
|
|
10
10
|
static let header_m_bold = appFont(size: 18).weight(.bold)
|
|
11
11
|
static let header_default_bold = appFont(size: 16).weight(.bold)
|
|
12
|
+
static let header_default_semibold = appFont(size: 16).weight(.semibold)
|
|
12
13
|
static let header_s_semibold = appFont(size: 14).weight(.semibold)
|
|
13
14
|
static let header_xs_semibold = appFont(size: 12).weight(.semibold)
|
|
14
15
|
static let body_default_regular = appFont(size: 14).weight(.regular)
|
package/local.properties
CHANGED
|
@@ -4,5 +4,5 @@
|
|
|
4
4
|
# Location of the SDK. This is only used by Gradle.
|
|
5
5
|
# For customization when using a Version Control System, please read the
|
|
6
6
|
# header note.
|
|
7
|
-
#
|
|
8
|
-
sdk.dir=/Users/
|
|
7
|
+
#Tue Apr 23 16:40:15 ICT 2024
|
|
8
|
+
sdk.dir=/Users/hung.dao1/Library/Android/sdk
|