Skip to content

Commit bc81470

Browse files
YuKongAYuKongA
committed
Unified text
1 parent 23ffb1b commit bc81470

File tree

3 files changed

+54
-54
lines changed

3 files changed

+54
-54
lines changed

‎example/src/commonMain/kotlin/ThirdPage.kt‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ fun ThirdPage(
3333
onShowFPSMonitorChange: (Boolean) -> Unit,
3434
showTopAppBar: Boolean,
3535
onShowTopAppBarChange: (Boolean) -> Unit,
36-
showBottomBar: Boolean,
37-
onShowBottomBarChange: (Boolean) -> Unit,
38-
useFloatingBottomBar: Boolean,
39-
onUseFloatingBottomBarChange: (Boolean) -> Unit,
40-
floatingBottomBarShowMode: Int,
41-
onFloatingBottomBarShowModeChange: (Int) -> Unit,
42-
floatingBottomBarPosition: Int,
43-
onFloatingBottomBarPositionChange: (Int) -> Unit,
36+
showNavigationBar: Boolean,
37+
onShowNavigationBarChange: (Boolean) -> Unit,
38+
useFloatingNavigationBar: Boolean,
39+
onUseFloatingNavigationBarChange: (Boolean) -> Unit,
40+
floatingNavigationBarMode: Int,
41+
onFloatingNavigationBarModeChange: (Int) -> Unit,
42+
floatingNavigationBarPosition: Int,
43+
onFloatingNavigationBarPositionChange: (Int) -> Unit,
4444
showFloatingToolbar: Boolean,
4545
onShowFloatingToolbarChange: (Boolean) -> Unit,
4646
floatingToolbarPosition: Int,
@@ -74,46 +74,46 @@ fun ThirdPage(
7474
onCheckedChange = onShowFPSMonitorChange
7575
)
7676
SuperSwitch(
77-
title = "Show Top App Bar",
77+
title = "Show TopAppBar",
7878
checked = showTopAppBar,
7979
onCheckedChange = onShowTopAppBarChange
8080
)
8181
SuperSwitch(
82-
title = "Show Bottom Bar",
83-
checked = showBottomBar,
84-
onCheckedChange = onShowBottomBarChange
82+
title = "Show NavigationBar",
83+
checked = showNavigationBar,
84+
onCheckedChange = onShowNavigationBarChange
8585
)
8686
AnimatedVisibility(
87-
visible = showBottomBar
87+
visible = showNavigationBar
8888
) {
8989
Column {
9090
SuperSwitch(
91-
title = "Use Floating Bottom Bar",
92-
checked = useFloatingBottomBar,
93-
onCheckedChange = onUseFloatingBottomBarChange
91+
title = "Use FloatingNavigationBar",
92+
checked = useFloatingNavigationBar,
93+
onCheckedChange = onUseFloatingNavigationBarChange
9494
)
9595
AnimatedVisibility(
96-
visible = useFloatingBottomBar
96+
visible = useFloatingNavigationBar
9797
) {
9898
Column {
9999
SuperDropdown(
100-
title = "BottomBar Show Mode",
100+
title = "FloatingNavigationBar Mode",
101101
items = listOf("IconOnly", "IconAndText", "TextOnly"),
102-
selectedIndex = floatingBottomBarShowMode,
103-
onSelectedIndexChange = onFloatingBottomBarShowModeChange
102+
selectedIndex = floatingNavigationBarMode,
103+
onSelectedIndexChange = onFloatingNavigationBarModeChange
104104
)
105105
SuperDropdown(
106-
title = "Floating BottomBar Position",
106+
title = "FloatingNavigationBar Position",
107107
items = listOf("Center", "Start", "End"),
108-
selectedIndex = floatingBottomBarPosition,
109-
onSelectedIndexChange = onFloatingBottomBarPositionChange
108+
selectedIndex = floatingNavigationBarPosition,
109+
onSelectedIndexChange = onFloatingNavigationBarPositionChange
110110
)
111111
}
112112
}
113113
}
114114
}
115115
SuperSwitch(
116-
title = "Show Floating Toolbar Bar",
116+
title = "Show FloatingToolbar",
117117
checked = showFloatingToolbar,
118118
onCheckedChange = onShowFloatingToolbarChange
119119
)
@@ -122,7 +122,7 @@ fun ThirdPage(
122122
) {
123123
Column {
124124
SuperDropdown(
125-
title = "Floating Toolbar Position",
125+
title = "FloatingToolbar Position",
126126
items = listOf(
127127
"TopStart",
128128
"CenterStart",
@@ -137,23 +137,23 @@ fun ThirdPage(
137137
onSelectedIndexChange = onFloatingToolbarPositionChange
138138
)
139139
SuperDropdown(
140-
title = "Floating Toolbar Orientation",
140+
title = "FloatingToolbar Orientation",
141141
items = listOf("Horizontal", "Vertical"),
142142
selectedIndex = floatingToolbarOrientation,
143143
onSelectedIndexChange = onFloatingToolbarOrientationChange
144144
)
145145
}
146146
}
147147
SuperSwitch(
148-
title = "Show Floating Action Button",
148+
title = "Show FloatingActionButton",
149149
checked = showFloatingActionButton,
150150
onCheckedChange = onShowFloatingActionButtonChange
151151
)
152152
AnimatedVisibility(
153153
visible = showFloatingActionButton
154154
) {
155155
SuperDropdown(
156-
title = "Floating Action Button Position",
156+
title = "FloatingActionButton Position",
157157
items = listOf(
158158
"Start",
159159
"Center",

‎example/src/commonMain/kotlin/UITest.kt‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import kotlinx.coroutines.launch
4747
import top.yukonga.miuix.kmp.basic.FabPosition
4848
import top.yukonga.miuix.kmp.basic.FloatingActionButton
4949
import top.yukonga.miuix.kmp.basic.FloatingNavigationBar
50-
import top.yukonga.miuix.kmp.basic.FloatingNavigationBarShowMode
50+
import top.yukonga.miuix.kmp.basic.FloatingNavigationBarMode
5151
import top.yukonga.miuix.kmp.basic.FloatingToolbar
5252
import top.yukonga.miuix.kmp.basic.FloatingToolbarItem
5353
import top.yukonga.miuix.kmp.basic.FloatingToolbarOrientation
@@ -79,10 +79,10 @@ import utils.FPSMonitor
7979
data class UIState(
8080
val showFPSMonitor: Boolean = false,
8181
val showTopAppBar: Boolean = true,
82-
val showBottomBar: Boolean = true,
83-
val useFloatingBottomBar: Boolean = false,
84-
val floatingBottomBarShowMode: Int = 0,
85-
val floatingBottomBarPosition: Int = 0,
82+
val showNavigationBar: Boolean = true,
83+
val useFloatingNavigationBar: Boolean = false,
84+
val floatingNavigationBarMode: Int = 0,
85+
val floatingNavigationBarPosition: Int = 0,
8686
val showFloatingToolbar: Boolean = false,
8787
val floatingToolbarPosition: Int = 1,
8888
val floatingToolbarOrientation: Int = 1,
@@ -159,12 +159,12 @@ fun UITest(
159159
},
160160
bottomBar = {
161161
AnimatedVisibility(
162-
visible = uiState.showBottomBar,
162+
visible = uiState.showNavigationBar,
163163
enter = fadeIn() + expandVertically(),
164164
exit = fadeOut() + shrinkVertically()
165165
) {
166166
AnimatedVisibility(
167-
visible = !uiState.useFloatingBottomBar,
167+
visible = !uiState.useFloatingNavigationBar,
168168
enter = fadeIn() + expandVertically(expandFrom = Alignment.Top),
169169
exit = fadeOut() + shrinkVertically(shrinkTowards = Alignment.Top)
170170
) {
@@ -185,7 +185,7 @@ fun UITest(
185185
)
186186
}
187187
AnimatedVisibility(
188-
visible = uiState.useFloatingBottomBar,
188+
visible = uiState.useFloatingNavigationBar,
189189
enter = fadeIn() + expandVertically(expandFrom = Alignment.Top),
190190
exit = fadeOut() + shrinkVertically(shrinkTowards = Alignment.Top)
191191
) {
@@ -198,12 +198,12 @@ fun UITest(
198198
},
199199
items = navigationItem,
200200
selected = selectedPage,
201-
showMode = when (uiState.floatingBottomBarShowMode) {
202-
0 -> FloatingNavigationBarShowMode.IconOnly
203-
1 -> FloatingNavigationBarShowMode.IconAndText
204-
else -> FloatingNavigationBarShowMode.TextOnly
201+
mode = when (uiState.floatingNavigationBarMode) {
202+
0 -> FloatingNavigationBarMode.IconOnly
203+
1 -> FloatingNavigationBarMode.IconAndText
204+
else -> FloatingNavigationBarMode.TextOnly
205205
},
206-
horizontalAlignment = when (uiState.floatingBottomBarPosition) {
206+
horizontalAlignment = when (uiState.floatingNavigationBarPosition) {
207207
0 -> CenterHorizontally
208208
1 -> Alignment.Start
209209
else -> Alignment.End
@@ -455,16 +455,16 @@ fun AppHorizontalPager(
455455
onShowFPSMonitorChange = { onUiStateChange(uiState.copy(showFPSMonitor = it)) },
456456
showTopAppBar = uiState.showTopAppBar,
457457
onShowTopAppBarChange = { onUiStateChange(uiState.copy(showTopAppBar = it)) },
458-
showBottomBar = uiState.showBottomBar,
459-
onShowBottomBarChange = { onUiStateChange(uiState.copy(showBottomBar = it)) },
458+
showNavigationBar = uiState.showNavigationBar,
459+
onShowNavigationBarChange = { onUiStateChange(uiState.copy(showNavigationBar = it)) },
460460
showFloatingToolbar = uiState.showFloatingToolbar,
461461
onShowFloatingToolbarChange = { onUiStateChange(uiState.copy(showFloatingToolbar = it)) },
462-
useFloatingBottomBar = uiState.useFloatingBottomBar,
463-
onUseFloatingBottomBarChange = { onUiStateChange(uiState.copy(useFloatingBottomBar = it)) },
464-
floatingBottomBarShowMode = uiState.floatingBottomBarShowMode,
465-
onFloatingBottomBarShowModeChange = { onUiStateChange(uiState.copy(floatingBottomBarShowMode = it)) },
466-
floatingBottomBarPosition = uiState.floatingBottomBarPosition,
467-
onFloatingBottomBarPositionChange = { onUiStateChange(uiState.copy(floatingBottomBarPosition = it)) },
462+
useFloatingNavigationBar = uiState.useFloatingNavigationBar,
463+
onUseFloatingNavigationBarChange = { onUiStateChange(uiState.copy(useFloatingNavigationBar = it)) },
464+
floatingNavigationBarMode = uiState.floatingNavigationBarMode,
465+
onFloatingNavigationBarModeChange = { onUiStateChange(uiState.copy(floatingNavigationBarMode = it)) },
466+
floatingNavigationBarPosition = uiState.floatingNavigationBarPosition,
467+
onFloatingNavigationBarPositionChange = { onUiStateChange(uiState.copy(floatingNavigationBarPosition = it)) },
468468
floatingToolbarPosition = uiState.floatingToolbarPosition,
469469
onFloatingToolbarPositionChange = { onUiStateChange(uiState.copy(floatingToolbarPosition = it)) },
470470
floatingToolbarOrientation = uiState.floatingToolbarOrientation,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ fun NavigationBar(
165165
* @param horizontalAlignment The alignment of the [FloatingNavigationBar] within its parent, typically used to center it horizontally.
166166
* @param showBorder Whether to display a border around the [FloatingNavigationBar].
167167
* @param defaultWindowInsetsPadding whether to apply default window insets padding to the [FloatingNavigationBar].
168-
* @param showMode The mode for displaying items in the [FloatingNavigationBar]. It can show icons, text or both.
168+
* @param mode The mode for displaying items in the [FloatingNavigationBar]. It can show icons, text or both.
169169
*/
170170
@Composable
171171
fun FloatingNavigationBar(
@@ -178,7 +178,7 @@ fun FloatingNavigationBar(
178178
horizontalAlignment: Alignment.Horizontal = CenterHorizontally,
179179
showBorder: Boolean = true,
180180
defaultWindowInsetsPadding: Boolean = true,
181-
showMode: FloatingNavigationBarShowMode = FloatingNavigationBarShowMode.IconOnly
181+
mode: FloatingNavigationBarMode = FloatingNavigationBarMode.IconOnly
182182
) {
183183
require(items.size in 2..5) { "FloatingNavigationBar must have between 2 and 5 items" }
184184
Column(
@@ -244,7 +244,7 @@ fun FloatingNavigationBar(
244244
},
245245
horizontalAlignment = CenterHorizontally
246246
) {
247-
if (showMode == FloatingNavigationBarShowMode.IconAndText) {
247+
if (mode == FloatingNavigationBarMode.IconAndText) {
248248
Image(
249249
modifier = Modifier.padding(top = 6.dp).size(24.dp),
250250
imageVector = item.icon,
@@ -259,7 +259,7 @@ fun FloatingNavigationBar(
259259
fontSize = 12.sp,
260260
fontWeight = fontWeight
261261
)
262-
} else if (showMode == FloatingNavigationBarShowMode.TextOnly) {
262+
} else if (mode == FloatingNavigationBarMode.TextOnly) {
263263
Text(
264264
modifier = Modifier.padding(vertical = 16.dp, horizontal = 2.dp),
265265
text = item.label,
@@ -287,7 +287,7 @@ fun FloatingNavigationBar(
287287
*
288288
* This controls whether to show both icon and text, icon only, or text only.
289289
*/
290-
enum class FloatingNavigationBarShowMode {
290+
enum class FloatingNavigationBarMode {
291291
/** Show both icon and text. */
292292
IconAndText,
293293

0 commit comments

Comments
 (0)