@momo-kits/native-kits 0.117.1-beta.15 → 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.
|
@@ -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.
|
|
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()
|
|
214
|
+
Modifier.fillMaxWidth()
|
|
215
|
+
.padding(bottom = bottom)
|
|
216
|
+
.padding(vertical = Spacing.S, horizontal = Spacing.M)
|
|
216
217
|
) {
|
|
217
218
|
footer?.invoke()
|
|
218
219
|
}
|
|
@@ -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.
|
|
50
|
-
"SFProText-200" to "sfprotext_ultralight.
|
|
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.
|
|
57
|
+
"SFProText-900" to "sfprotext_black.ttf",
|
|
58
58
|
|
|
59
59
|
"MoMoSignature-100" to "momosignature.otf",
|
|
60
60
|
"MoMoSignature-200" to "momosignature.otf",
|
|
@@ -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)
|
|
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
|
}
|