Skip to content

Commit 2b4d1e8

Browse files
authored
Merge branch 'dev' into component/font_icon_primitives
2 parents 52a84fd + 38894c4 commit 2b4d1e8

File tree

4 files changed

+26
-66
lines changed

4 files changed

+26
-66
lines changed

.github/workflows/multiplatform_snapshot_build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ jobs:
4343
os: macos-latest
4444
- type: iOS
4545
iOS: ipa
46-
os: macos-latest
46+
# workaround runner version for iPhoneOS sdk 18.2
47+
os: macos-15
4748
- type: WasmJs
4849
js: wasmJs
4950
os: windows-latest

fluent/src/commonMain/kotlin/com/konyaco/fluent/component/TopNav.kt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -170,24 +170,24 @@ fun TopNavItem(
170170
)
171171
) {
172172
FlyoutAnchorScope {
173-
MenuFlyout(
174-
visible = flyoutVisible && items != null,
175-
onDismissRequest = {
176-
onFlyoutVisibleChanged(false)
177-
},
178-
placement = FlyoutPlacement.Bottom,
179-
modifier = Modifier.flyoutSize()
180-
) {
181-
items?.invoke(
182-
rememberNavigationItemsFlyoutScope(
183-
flyoutVisible,
184-
onFlyoutVisibleChanged
185-
)
186-
)
187-
}
188173
Box {
174+
MenuFlyout(
175+
visible = flyoutVisible && items != null,
176+
onDismissRequest = {
177+
onFlyoutVisibleChanged(false)
178+
},
179+
placement = FlyoutPlacement.Bottom,
180+
modifier = Modifier.flyoutSize()
181+
) {
182+
items?.invoke(
183+
rememberNavigationItemsFlyoutScope(
184+
flyoutVisible,
185+
onFlyoutVisibleChanged
186+
)
187+
)
188+
}
189189
HorizontalIndicatorContentLayout(
190-
modifier = Modifier.height(40.dp),
190+
modifier = Modifier.height(40.dp).flyoutAnchor(),
191191
text = text,
192192
icon = icon,
193193
trailing = items?.let {

gallery/src/commonMain/kotlin/com/konyaco/fluent/gallery/component/CopyButton.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.konyaco.fluent.gallery.component
22

33
import androidx.compose.animation.AnimatedContent
44
import androidx.compose.foundation.ExperimentalFoundationApi
5+
import androidx.compose.foundation.layout.Box
56
import androidx.compose.runtime.Composable
67
import androidx.compose.runtime.LaunchedEffect
78
import androidx.compose.runtime.getValue

gallery/src/commonMain/kotlin/com/konyaco/fluent/gallery/screen/design/ColorScreen.kt

Lines changed: 7 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import androidx.compose.foundation.layout.width
2929
import androidx.compose.foundation.layout.widthIn
3030
import androidx.compose.foundation.layout.wrapContentWidth
3131
import androidx.compose.foundation.rememberScrollState
32-
import androidx.compose.foundation.shape.CircleShape
3332
import androidx.compose.foundation.shape.RoundedCornerShape
3433
import androidx.compose.runtime.Composable
3534
import androidx.compose.runtime.Stable
@@ -57,7 +56,8 @@ import com.konyaco.fluent.component.AccentButton
5756
import com.konyaco.fluent.component.Button
5857
import com.konyaco.fluent.component.ButtonColor
5958
import com.konyaco.fluent.component.ButtonColorScheme
60-
import com.konyaco.fluent.component.Icon
59+
import com.konyaco.fluent.component.InfoBar
60+
import com.konyaco.fluent.component.InfoBarSeverity
6161
import com.konyaco.fluent.component.Scrollbar
6262
import com.konyaco.fluent.component.ScrollbarContainer
6363
import com.konyaco.fluent.component.Slider
@@ -72,8 +72,6 @@ import com.konyaco.fluent.gallery.annotation.Component
7272
import com.konyaco.fluent.gallery.component.ComponentPagePath
7373
import com.konyaco.fluent.gallery.component.CopyButton
7474
import com.konyaco.fluent.gallery.component.GalleryPage
75-
import com.konyaco.fluent.icons.Icons
76-
import com.konyaco.fluent.icons.regular.Dismiss
7775
import com.konyaco.fluent.scheme.PentaVisualScheme
7876
import com.konyaco.fluent.source.generated.FluentSourceFile
7977
import com.konyaco.fluent.surface.Card
@@ -1340,51 +1338,11 @@ private fun SignalColorPage() {
13401338
section = "System",
13411339
description = "Used for accent fills on controls",
13421340
sample = {
1343-
//TODO InfoBar
1344-
Layer(
1345-
color = FluentTheme.colors.system.criticalBackground,
1346-
backgroundSizing = BackgroundSizing.InnerBorderEdge
1347-
) {
1348-
Row(
1349-
verticalAlignment = Alignment.CenterVertically,
1350-
modifier = Modifier
1351-
.sizeIn(minHeight = 48.dp)
1352-
.padding(horizontal = 16.dp)
1353-
) {
1354-
Box(
1355-
contentAlignment = Alignment.Center,
1356-
modifier = Modifier
1357-
.size(16.dp)
1358-
.background(
1359-
color = FluentTheme.colors.system.critical,
1360-
shape = CircleShape
1361-
)
1362-
) {
1363-
Icon(
1364-
imageVector = Icons.Default.Dismiss,
1365-
contentDescription = null,
1366-
tint = FluentTheme.colors.text.onAccent.primary,
1367-
modifier = Modifier.size(12.dp)
1368-
)
1369-
}
1370-
1371-
Text(
1372-
text = "Title",
1373-
style = FluentTheme.typography.bodyStrong,
1374-
modifier = Modifier.padding(horizontal = 12.dp)
1375-
)
1376-
1377-
Text(
1378-
text = "This is body text. Windows 11 is faster and more intuitive."
1379-
)
1380-
1381-
Icon(
1382-
imageVector = Icons.Default.Dismiss,
1383-
contentDescription = null,
1384-
modifier = Modifier.padding(start = 16.dp).size(16.dp)
1385-
)
1386-
}
1387-
}
1341+
InfoBar(
1342+
title = { Text("Title") },
1343+
message = { Text("This is body text. Windows 11 is faster and more intuitive.") },
1344+
severity = InfoBarSeverity.Critical
1345+
)
13881346
},
13891347
groups = arrayOf(
13901348
arrayOf(

0 commit comments

Comments
 (0)