Skip to content

Commit 46f9e6e

Browse files
YuKongAYuKongA
committed
1
1 parent ade661c commit 46f9e6e

File tree

8 files changed

+31
-25
lines changed

8 files changed

+31
-25
lines changed

‎composeApp/src/commonMain/kotlin/MainPage.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fun MainPage(
6565
label = "Search",
6666
leadingIcon = {
6767
Icon(
68-
modifier = Modifier.padding(horizontal = 16.dp),
68+
modifier = Modifier.padding(start = 12.dp, end = 8.dp),
6969
imageVector = MiuixIcons.Search,
7070
tint = MiuixTheme.colorScheme.onSurfaceContainer,
7171
contentDescription = "Search"

‎composeApp/src/commonMain/kotlin/component/OtherComponent.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ fun OtherComponent(padding: PaddingValues) {
141141
.padding(horizontal = 12.dp)
142142
.padding(bottom = 12.dp),
143143
color = MiuixTheme.colorScheme.primaryVariant,
144-
insideMargin = DpSize(16.dp, 16.dp)
144+
insideMargin = PaddingValues(16.dp)
145145
) {
146146
Text(
147147
color = MiuixTheme.colorScheme.onPrimary,
@@ -156,7 +156,7 @@ fun OtherComponent(padding: PaddingValues) {
156156
.fillMaxWidth()
157157
.padding(horizontal = 12.dp)
158158
.padding(bottom = 12.dp + padding.calculateBottomPadding()),
159-
insideMargin = DpSize(16.dp, 16.dp)
159+
insideMargin = PaddingValues(16.dp)
160160
) {
161161
Text(
162162
color = MiuixTheme.colorScheme.onSurface,

‎composeApp/src/commonMain/kotlin/component/TextComponent.kt‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,14 @@ fun TextComponent() {
7272
title = "Title",
7373
summary = "Summary",
7474
leftAction = {
75-
Text(text = "Left")
75+
Text(
76+
text = "Left",
77+
modifier = Modifier.padding(end = 16.dp)
78+
)
7679
},
7780
rightActions = {
7881
Text(text = "Right1")
79-
Spacer(Modifier.width(6.dp))
82+
Spacer(Modifier.width(10.dp))
8083
Text(text = "Right2")
8184
},
8285
onClick = {},
@@ -88,6 +91,7 @@ fun TextComponent() {
8891
leftAction = {
8992
Text(
9093
text = "Left",
94+
modifier = Modifier.padding(end = 16.dp),
9195
color = MiuixTheme.colorScheme.disabledOnSecondaryVariant
9296
)
9397
},
@@ -96,7 +100,7 @@ fun TextComponent() {
96100
text = "Right1",
97101
color = MiuixTheme.colorScheme.disabledOnSecondaryVariant
98102
)
99-
Spacer(Modifier.width(6.dp))
103+
Spacer(Modifier.width(10.dp))
100104
Text(
101105
text = "Right2",
102106
color = MiuixTheme.colorScheme.disabledOnSecondaryVariant
@@ -116,6 +120,7 @@ fun TextComponent() {
116120
leftAction = {
117121
Box(
118122
contentAlignment = Alignment.TopStart,
123+
modifier = Modifier.padding(end = 16.dp)
119124
) {
120125
Icon(
121126
imageVector = Icons.Rounded.AccountBox,
@@ -154,7 +159,7 @@ fun TextComponent() {
154159
Row(
155160
modifier = Modifier
156161
.fillMaxWidth()
157-
.padding(horizontal = 12.dp, vertical = 12.dp),
162+
.padding(horizontal = 16.dp, vertical = 16.dp),
158163
horizontalArrangement = Arrangement.SpaceBetween
159164
) {
160165
Checkbox(
@@ -186,7 +191,7 @@ fun TextComponent() {
186191
checked = miuixSuperRightCheckboxState,
187192
rightActions = {
188193
Text(
189-
modifier = Modifier.padding(end = 6.dp),
194+
modifier = Modifier.padding(end = 10.dp),
190195
text = miuixSuperRightCheckbox,
191196
color = MiuixTheme.colorScheme.onSurfaceVariantActions
192197
)
@@ -224,7 +229,7 @@ fun TextComponent() {
224229
Row(
225230
modifier = Modifier
226231
.fillMaxWidth()
227-
.padding(horizontal = 12.dp, vertical = 12.dp),
232+
.padding(horizontal = 16.dp, vertical = 16.dp),
228233
horizontalArrangement = Arrangement.SpaceBetween
229234
) {
230235
Switch(

‎miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Button.kt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package top.yukonga.miuix.kmp.basic
22

33
import androidx.compose.foundation.layout.Arrangement
4+
import androidx.compose.foundation.layout.PaddingValues
45
import androidx.compose.foundation.layout.Row
56
import androidx.compose.foundation.layout.RowScope
67
import androidx.compose.foundation.layout.defaultMinSize
@@ -42,7 +43,7 @@ fun Button(
4243
minWidth: Dp = ButtonDefaults.MinWidth,
4344
minHeight: Dp = ButtonDefaults.MinHeight,
4445
colors: ButtonColors = ButtonDefaults.buttonColors(),
45-
insideMargin: DpSize = ButtonDefaults.InsideMargin,
46+
insideMargin: PaddingValues = ButtonDefaults.InsideMargin,
4647
content: @Composable RowScope.() -> Unit
4748
) {
4849
Surface(
@@ -57,7 +58,7 @@ fun Button(
5758
Row(
5859
Modifier
5960
.defaultMinSize(minWidth = minWidth, minHeight = minHeight)
60-
.padding(insideMargin.width, insideMargin.height),
61+
.padding(insideMargin),
6162
horizontalArrangement = Arrangement.Center,
6263
verticalAlignment = Alignment.CenterVertically,
6364
content = content
@@ -88,7 +89,7 @@ fun TextButton(
8889
cornerRadius: Dp = ButtonDefaults.ConorRadius,
8990
minWidth: Dp = ButtonDefaults.MinWidth,
9091
minHeight: Dp = ButtonDefaults.MinHeight,
91-
insideMargin: DpSize = ButtonDefaults.InsideMargin,
92+
insideMargin: PaddingValues = ButtonDefaults.InsideMargin,
9293
) {
9394
Surface(
9495
onClick = {
@@ -102,7 +103,7 @@ fun TextButton(
102103
Row(
103104
Modifier
104105
.defaultMinSize(minWidth = minWidth, minHeight = minHeight)
105-
.padding(insideMargin.width, insideMargin.height),
106+
.padding(insideMargin),
106107
horizontalArrangement = Arrangement.Center,
107108
verticalAlignment = Alignment.CenterVertically,
108109
content = {
@@ -138,7 +139,7 @@ object ButtonDefaults {
138139
/**
139140
* The default inside margin applied for all buttons.
140141
*/
141-
val InsideMargin = DpSize(16.dp, 16.dp)
142+
val InsideMargin = PaddingValues(16.dp)
142143

143144
/**
144145
* The default [ButtonColors] for all buttons.

‎miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Card.kt‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package top.yukonga.miuix.kmp.basic
22

33
import androidx.compose.foundation.layout.Column
44
import androidx.compose.foundation.layout.ColumnScope
5+
import androidx.compose.foundation.layout.PaddingValues
56
import androidx.compose.foundation.layout.padding
67
import androidx.compose.runtime.Composable
78
import androidx.compose.runtime.remember
89
import androidx.compose.ui.Modifier
910
import androidx.compose.ui.graphics.Color
1011
import androidx.compose.ui.unit.Dp
11-
import androidx.compose.ui.unit.DpSize
1212
import androidx.compose.ui.unit.dp
1313
import top.yukonga.miuix.kmp.theme.MiuixTheme
1414
import top.yukonga.miuix.kmp.utils.SmoothRoundedCornerShape
@@ -29,22 +29,19 @@ import top.yukonga.miuix.kmp.utils.SmoothRoundedCornerShape
2929
fun Card(
3030
modifier: Modifier = Modifier,
3131
cornerRadius: Dp = CardDefaults.ConorRadius,
32-
insideMargin: DpSize = CardDefaults.InsideMargin,
32+
insideMargin: PaddingValues = CardDefaults.InsideMargin,
3333
color: Color = CardDefaults.DefaultColor(),
3434
content: @Composable ColumnScope.() -> Unit
3535
) {
3636
val shape = remember { SmoothRoundedCornerShape(cornerRadius) }
37-
val paddingModifier = remember(insideMargin) {
38-
Modifier.padding(vertical = insideMargin.height, horizontal = insideMargin.width)
39-
}
4037

4138
Surface(
4239
modifier = modifier,
4340
shape = shape,
4441
color = color,
4542
) {
4643
Column(
47-
modifier = paddingModifier,
44+
modifier = Modifier.padding(insideMargin),
4845
content = content
4946
)
5047
}
@@ -60,7 +57,7 @@ object CardDefaults {
6057
/**
6158
* The default margin inside the [Card].
6259
*/
63-
val InsideMargin = DpSize(0.dp, 0.dp)
60+
val InsideMargin = PaddingValues(0.dp)
6461

6562
/**
6663
* The default color width of the [Card].

‎miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/SearchBar.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ fun InputField(
129129
val interactionSource = interactionSource ?: remember { MutableInteractionSource() }
130130

131131
val paddingModifier = remember(insideMargin, leadingIcon, trailingIcon) {
132-
if (leadingIcon == null && trailingIcon == null) Modifier.padding(insideMargin.width, vertical = insideMargin.height)
132+
if (leadingIcon == null && trailingIcon == null) Modifier.padding(horizontal = insideMargin.width, vertical = insideMargin.height)
133133
else if (leadingIcon == null) Modifier.padding(start = insideMargin.width).padding(vertical = insideMargin.height)
134134
else if (trailingIcon == null) Modifier.padding(end = insideMargin.width).padding(vertical = insideMargin.height)
135135
else Modifier.padding(vertical = insideMargin.height)

‎miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/SmallTitle.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package top.yukonga.miuix.kmp.basic
22

3+
import androidx.compose.foundation.layout.PaddingValues
34
import androidx.compose.foundation.layout.padding
45
import androidx.compose.runtime.Composable
56
import androidx.compose.runtime.remember
67
import androidx.compose.ui.Modifier
78
import androidx.compose.ui.graphics.Color
89
import androidx.compose.ui.text.font.FontWeight
9-
import androidx.compose.ui.unit.DpSize
1010
import androidx.compose.ui.unit.dp
1111
import top.yukonga.miuix.kmp.theme.MiuixTheme
1212

@@ -23,10 +23,10 @@ fun SmallTitle(
2323
text: String,
2424
modifier: Modifier = Modifier,
2525
textColor: Color = MiuixTheme.colorScheme.onBackgroundVariant,
26-
insideMargin: DpSize = DpSize(28.dp, 8.dp)
26+
insideMargin: PaddingValues = PaddingValues(28.dp, 8.dp)
2727
) {
2828
val paddingModifier = remember(insideMargin) {
29-
Modifier.padding(horizontal = insideMargin.width, vertical = insideMargin.height)
29+
Modifier.padding(insideMargin)
3030
}
3131
Text(
3232
modifier = modifier.then(paddingModifier),

‎miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperCheckbox.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ package top.yukonga.miuix.kmp.extra
22

33
import androidx.compose.foundation.layout.PaddingValues
44
import androidx.compose.foundation.layout.RowScope
5+
import androidx.compose.foundation.layout.padding
56
import androidx.compose.runtime.Composable
67
import androidx.compose.runtime.getValue
78
import androidx.compose.runtime.mutableStateOf
89
import androidx.compose.runtime.remember
910
import androidx.compose.runtime.rememberUpdatedState
1011
import androidx.compose.runtime.setValue
1112
import androidx.compose.ui.Modifier
13+
import androidx.compose.ui.unit.dp
1214
import top.yukonga.miuix.kmp.basic.BasicComponent
1315
import top.yukonga.miuix.kmp.basic.BasicComponentColors
1416
import top.yukonga.miuix.kmp.basic.BasicComponentDefaults
@@ -61,6 +63,7 @@ fun SuperCheckbox(
6163
leftAction = if (checkboxLocation == CheckboxLocation.Left) {
6264
{
6365
Checkbox(
66+
modifier = Modifier.padding(end = 16.dp),
6467
checked = isChecked,
6568
onCheckedChange = updatedOnCheckedChange,
6669
enabled = enabled,

0 commit comments

Comments
 (0)