Skip to content

Commit ebb08cd

Browse files
committed
library: Fix TopAppBar modifier refresh issue
1 parent b5715af commit ebb08cd

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -611,15 +611,15 @@ private fun TopAppBarLayout(
611611
val navigationBarsInsets = WindowInsets.navigationBars
612612

613613
val layoutModifier = remember(defaultWindowInsetsPadding, statusBarsInsets, captionBarInsets) {
614-
modifier
614+
Modifier
615615
.windowInsetsPadding(statusBarsInsets.only(WindowInsetsSides.Top))
616616
.windowInsetsPadding(captionBarInsets.only(WindowInsetsSides.Top))
617617
.then(
618618
if (defaultWindowInsetsPadding) {
619619
Modifier
620620
.windowInsetsPadding(displayCutoutInsets.only(WindowInsetsSides.Horizontal))
621621
.windowInsetsPadding(navigationBarsInsets.only(WindowInsetsSides.Horizontal))
622-
} else modifier
622+
} else Modifier
623623
)
624624
}
625625

@@ -666,7 +666,8 @@ private fun TopAppBarLayout(
666666
}
667667
}
668668
},
669-
modifier = layoutModifier
669+
modifier = modifier
670+
.then(layoutModifier)
670671
.clipToBounds()
671672
.pointerInput(Unit) { detectVerticalDragGestures { _, _ -> } }
672673
) { measurables, constraints ->
@@ -783,15 +784,15 @@ private fun SmallTopAppBarLayout(
783784
val navigationBarsInsets = WindowInsets.navigationBars
784785

785786
val layoutModifier = remember(defaultWindowInsetsPadding, statusBarsInsets, captionBarInsets) {
786-
modifier
787+
Modifier
787788
.windowInsetsPadding(statusBarsInsets.only(WindowInsetsSides.Top))
788789
.windowInsetsPadding(captionBarInsets.only(WindowInsetsSides.Top))
789790
.then(
790791
if (defaultWindowInsetsPadding) {
791792
Modifier
792793
.windowInsetsPadding(displayCutoutInsets.only(WindowInsetsSides.Horizontal))
793794
.windowInsetsPadding(navigationBarsInsets.only(WindowInsetsSides.Horizontal))
794-
} else modifier
795+
} else Modifier
795796
)
796797
}
797798

@@ -820,7 +821,8 @@ private fun SmallTopAppBarLayout(
820821
actions()
821822
}
822823
},
823-
modifier = layoutModifier
824+
modifier = modifier
825+
.then(layoutModifier)
824826
.heightIn(max = 56.dp)
825827
.pointerInput(Unit) { detectVerticalDragGestures { _, _ -> } }
826828
) { measurables, constraints ->

settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ dependencyResolutionManagement {
3232
}
3333

3434
plugins {
35-
id("com.android.settings") version ("8.10.0")
36-
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.4.0")
35+
id("com.android.settings") version ("8.10.1")
36+
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
3737
}
3838

3939
android {

0 commit comments

Comments
 (0)