Skip to content

Commit 1ae7601

Browse files
committed
library: TopAppBar: Change default horizontalPadding
1 parent 36b09f7 commit 1ae7601

File tree

2 files changed

+5
-7
lines changed
  • example/src/commonMain/kotlin
  • miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic

2 files changed

+5
-7
lines changed

example/src/commonMain/kotlin/UITest.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.captionBarPadding
1111
import androidx.compose.foundation.layout.fillMaxSize
1212
import androidx.compose.foundation.layout.imePadding
1313
import androidx.compose.foundation.layout.padding
14-
import androidx.compose.foundation.layout.size
1514
import androidx.compose.foundation.layout.statusBarsPadding
1615
import androidx.compose.foundation.pager.PagerState
1716
import androidx.compose.foundation.pager.rememberPagerState
@@ -183,7 +182,7 @@ fun UITest(
183182
showTopPopup.value = true
184183
}
185184
IconButton(
186-
modifier = Modifier.padding(end = 21.dp).size(40.dp),
185+
modifier = Modifier.padding(end = 20.dp),
187186
onClick = {
188187
isTopPopupExpanded.value = true
189188
},
@@ -240,7 +239,7 @@ fun UITest(
240239
showTopPopup.value = true
241240
}
242241
IconButton(
243-
modifier = Modifier.padding(end = 21.dp).size(40.dp),
242+
modifier = Modifier.padding(end = 20.dp),
244243
onClick = {
245244
isTopPopupExpanded.value = true
246245
},

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/TopAppBar.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package top.yukonga.miuix.kmp.basic
33
import androidx.compose.animation.core.AnimationSpec
44
import androidx.compose.animation.core.AnimationState
55
import androidx.compose.animation.core.DecayAnimationSpec
6-
import androidx.compose.animation.core.Spring
76
import androidx.compose.animation.core.animateDecay
87
import androidx.compose.animation.core.animateFloatAsState
98
import androidx.compose.animation.core.animateTo
@@ -87,7 +86,7 @@ fun TopAppBar(
8786
actions: @Composable RowScope.() -> Unit = {},
8887
scrollBehavior: ScrollBehavior? = null,
8988
defaultWindowInsetsPadding: Boolean = true,
90-
horizontalPadding: Dp = 28.dp
89+
horizontalPadding: Dp = 26.dp
9190
) {
9291
val density = LocalDensity.current
9392
val expandedHeightPx by rememberUpdatedState(
@@ -148,7 +147,7 @@ fun SmallTopAppBar(
148147
actions: @Composable RowScope.() -> Unit = {},
149148
scrollBehavior: ScrollBehavior? = null,
150149
defaultWindowInsetsPadding: Boolean = true,
151-
horizontalPadding: Dp = 28.dp
150+
horizontalPadding: Dp = 26.dp
152151
) {
153152
SideEffect {
154153
// Sets the height offset limit of the SmallTopAppBar to 0f
@@ -213,7 +212,7 @@ fun SmallTopAppBar(
213212
fun MiuixScrollBehavior(
214213
state: TopAppBarState = rememberTopAppBarState(),
215214
canScroll: () -> Boolean = { true },
216-
snapAnimationSpec: AnimationSpec<Float>? = spring(stiffness = Spring.StiffnessMedium),
215+
snapAnimationSpec: AnimationSpec<Float>? = spring(stiffness = 3000f),
217216
flingAnimationSpec: DecayAnimationSpec<Float>? = rememberSplineBasedDecay()
218217
): ScrollBehavior =
219218
remember(state, canScroll, snapAnimationSpec, flingAnimationSpec) {

0 commit comments

Comments
 (0)