Skip to content

Commit 3026328

Browse files
bnormbnorm
committed
Update to material3
1 parent 0b8a7b4 commit 3026328

File tree

36 files changed

+142
-137
lines changed

36 files changed

+142
-137
lines changed

‎examples/basic/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ kotlin {
2929

3030
implementation(project(":examples:shared"))
3131

32-
implementation(compose.material)
32+
implementation(compose.material3)
3333
implementation(compose.components.resources)
3434
}
3535
}
3636
jvmMain {
3737
dependencies {
38-
implementation(compose.desktop.currentOs)
38+
runtimeOnly(compose.desktop.currentOs)
3939
}
4040
}
4141
}

‎examples/basic/src/commonMain/kotlin/AnimationScene.kt‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import androidx.compose.animation.*
22
import androidx.compose.animation.core.*
33
import androidx.compose.foundation.layout.*
4-
import androidx.compose.material.Divider
5-
import androidx.compose.material.MaterialTheme
6-
import androidx.compose.material.Text
4+
import androidx.compose.material3.HorizontalDivider
5+
import androidx.compose.material3.MaterialTheme
6+
import androidx.compose.material3.Text
77
import androidx.compose.ui.Alignment
88
import androidx.compose.ui.Modifier
99
import androidx.compose.ui.platform.LocalDensity
1010
import androidx.compose.ui.unit.IntOffset
1111
import androidx.compose.ui.unit.dp
1212
import dev.bnorm.storyboard.StoryboardBuilder
1313
import dev.bnorm.storyboard.easel.template.*
14-
import dev.bnorm.storyboard.easel.template.rememberAdvanceDirection
1514
import dev.bnorm.storyboard.toState
1615
import kotlin.math.roundToInt
1716

@@ -28,7 +27,7 @@ fun StoryboardBuilder.AnimationScene() = scene(
2827

2928
Column(verticalArrangement = Arrangement.spacedBy(16.dp), modifier = Modifier.padding(16.dp)) {
3029
Header { Text("Animation") }
31-
Divider(color = MaterialTheme.colors.primary)
30+
HorizontalDivider(color = MaterialTheme.colorScheme.primary)
3231
}
3332

3433
BoxWithConstraints(Modifier.fillMaxSize()) {
@@ -41,7 +40,7 @@ fun StoryboardBuilder.AnimationScene() = scene(
4140
enter = direction.enter(start = { fadeIn(quick()) }, end = { fadeIn() }),
4241
exit = fadeOut(),
4342
modifier = Modifier.align(Alignment.Center),
44-
content = { Text("Things can appear!", style = MaterialTheme.typography.h4) },
43+
content = { Text("Things can appear!", style = MaterialTheme.typography.headlineLarge) },
4544
)
4645

4746
// TODO there seems to be a Compose bug where the first time it goes through the animation
@@ -58,7 +57,7 @@ fun StoryboardBuilder.AnimationScene() = scene(
5857
end = { slideOutHorizontally { halfWidth + it / 2 } },
5958
),
6059
modifier = Modifier.align(Alignment.Center),
61-
content = { Text("Things can move!", style = MaterialTheme.typography.h4) },
60+
content = { Text("Things can move!", style = MaterialTheme.typography.headlineLarge) },
6261
)
6362

6463
state.AnimatedVisibility(
@@ -78,22 +77,22 @@ fun StoryboardBuilder.AnimationScene() = scene(
7877
modifier = Modifier.align(Alignment.Center),
7978
) {
8079
Column(horizontalAlignment = Alignment.CenterHorizontally) {
81-
Text("All using Compose animation!", style = MaterialTheme.typography.h4)
80+
Text("All using Compose animation!", style = MaterialTheme.typography.headlineLarge)
8281

8382
state.AnimatedVisibility(
8483
visible = { it >= 4 },
8584
enter = fadeIn() + expandVertically(),
8685
exit = fadeOut() + shrinkVertically(),
8786
) {
8887
Row {
89-
Text("With lots of configuration.", style = MaterialTheme.typography.h4)
88+
Text("With lots of configuration.", style = MaterialTheme.typography.headlineLarge)
9089

9190
state.AnimatedVisibility(
9291
visible = { it >= 5 },
9392
enter = fadeIn() + expandHorizontally(),
9493
exit = fadeOut() + shrinkHorizontally(),
9594
) {
96-
Text(" Like, a lot.", style = MaterialTheme.typography.h4)
95+
Text(" Like, a lot.", style = MaterialTheme.typography.headlineLarge)
9796
}
9897
}
9998
}

‎examples/basic/src/commonMain/kotlin/CodeScene.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import androidx.compose.foundation.layout.Arrangement
44
import androidx.compose.foundation.layout.Column
55
import androidx.compose.foundation.layout.fillMaxSize
66
import androidx.compose.foundation.layout.padding
7-
import androidx.compose.material.Divider
8-
import androidx.compose.material.MaterialTheme
9-
import androidx.compose.material.ProvideTextStyle
10-
import androidx.compose.material.Text
7+
import androidx.compose.material3.Divider
8+
import androidx.compose.material3.MaterialTheme
9+
import androidx.compose.material3.ProvideTextStyle
10+
import androidx.compose.material3.Text
1111
import androidx.compose.ui.Alignment
1212
import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.graphics.Color
@@ -84,7 +84,7 @@ fun StoryboardBuilder.CodeScene() = scene(
8484
) {
8585
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
8686
Header { Text("Code Scene") }
87-
Divider(color = MaterialTheme.colors.primary)
87+
Divider(color = MaterialTheme.colorScheme.primary)
8888
Body {
8989
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
9090
val currentState = transition.currentState.toState()

‎examples/basic/src/commonMain/kotlin/NavigationScene.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import androidx.compose.foundation.layout.Arrangement
22
import androidx.compose.foundation.layout.Column
33
import androidx.compose.foundation.layout.padding
4-
import androidx.compose.material.Divider
5-
import androidx.compose.material.MaterialTheme
6-
import androidx.compose.material.Text
4+
import androidx.compose.material3.HorizontalDivider
5+
import androidx.compose.material3.MaterialTheme
6+
import androidx.compose.material3.Text
77
import androidx.compose.ui.Alignment
88
import androidx.compose.ui.Modifier
99
import androidx.compose.ui.unit.dp
@@ -20,7 +20,7 @@ fun StoryboardBuilder.NavigationScene() = scene(
2020

2121
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
2222
Header { Text("Navigation") }
23-
Divider(color = MaterialTheme.colors.primary)
23+
HorizontalDivider(color = MaterialTheme.colorScheme.primary)
2424
Body {
2525
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
2626
Text("Advance scene with right and left arrow keys.")
@@ -30,7 +30,7 @@ fun StoryboardBuilder.NavigationScene() = scene(
3030
}
3131

3232
if (currentState >= 2) {
33-
Text("Down here!", style = MaterialTheme.typography.h6, modifier = Modifier.align(Alignment.BottomEnd))
33+
Text("Down here!", style = MaterialTheme.typography.headlineSmall, modifier = Modifier.align(Alignment.BottomEnd))
3434
}
3535
}
3636
}

‎examples/basic/src/commonMain/kotlin/StateScene.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import androidx.compose.foundation.layout.Arrangement
55
import androidx.compose.foundation.layout.Column
66
import androidx.compose.foundation.layout.Row
77
import androidx.compose.foundation.layout.padding
8-
import androidx.compose.material.Divider
9-
import androidx.compose.material.MaterialTheme
10-
import androidx.compose.material.Text
8+
import androidx.compose.material3.HorizontalDivider
9+
import androidx.compose.material3.MaterialTheme
10+
import androidx.compose.material3.Text
1111
import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.unit.dp
1313
import dev.bnorm.storyboard.Frame
@@ -58,7 +58,7 @@ fun StoryboardBuilder.StateScene() = scene(
5858
val index = currentState.index
5959
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
6060
Header { Text(currentState.title) }
61-
Divider(color = MaterialTheme.colors.primary)
61+
HorizontalDivider(color = MaterialTheme.colorScheme.primary)
6262
Body {
6363
transition.AnimatedVisibility(
6464
visible = { it != Frame.End },

‎examples/basic/src/commonMain/kotlin/basic.kt‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import androidx.compose.material.MaterialTheme
2-
import androidx.compose.material.Surface
3-
import androidx.compose.material.Typography
4-
import androidx.compose.material.darkColors
1+
import androidx.compose.material3.MaterialTheme
2+
import androidx.compose.material3.Surface
3+
import androidx.compose.material3.darkColorScheme
54
import androidx.compose.ui.graphics.Color
65
import dev.bnorm.storyboard.SceneDecorator
76
import dev.bnorm.storyboard.SceneFormat
@@ -21,18 +20,15 @@ fun createStoryboard(): Storyboard {
2120
}
2221

2322
private val theme = SceneDecorator { content ->
24-
val colors = darkColors(
23+
val colorScheme = darkColorScheme(
2524
background = Color.Black,
2625
surface = Color(0xFF1E1F22),
2726
onBackground = Color(0xFFBCBEC4),
2827
primary = Color(0xFF7F51FF),
29-
primaryVariant = Color(0xFF7E53FE),
3028
secondary = Color(0xFFFDB60D),
3129
)
3230

33-
val typography = Typography()
34-
35-
MaterialTheme(colors, typography) {
31+
MaterialTheme(colorScheme = colorScheme) {
3632
Surface {
3733
content()
3834
}

‎examples/basic/src/jvmMain/kotlin/main.desktop.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import androidx.compose.material.MaterialTheme
2-
import androidx.compose.material.darkColors
1+
import androidx.compose.material3.MaterialTheme
2+
import androidx.compose.material3.darkColorScheme
33
import androidx.compose.ui.window.application
44
import dev.bnorm.storyboard.easel.DesktopStoryEasel
55

66
fun main() {
77
val storyboard = createStoryboard()
88
application {
9-
MaterialTheme(colors = darkColors()) {
9+
MaterialTheme(colorScheme = darkColorScheme()) {
1010
DesktopStoryEasel(storyboard)
1111
}
1212
}

‎examples/basic/src/wasmJsMain/kotlin/main.web.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import androidx.compose.material.MaterialTheme
2-
import androidx.compose.material.darkColors
1+
import androidx.compose.material3.MaterialTheme
2+
import androidx.compose.material3.darkColorScheme
33
import androidx.compose.ui.ExperimentalComposeUiApi
44
import androidx.compose.ui.window.CanvasBasedWindow
55
import dev.bnorm.storyboard.easel.WebStoryEasel
@@ -12,7 +12,7 @@ fun main() {
1212
val element = document.getElementById("ComposeTarget") as HTMLCanvasElement
1313
element.focus() // Focus is required for keyboard navigation.
1414
CanvasBasedWindow(canvasElementId = element.id, title = storyboard.title) {
15-
MaterialTheme(colors = darkColors()) {
15+
MaterialTheme(colorScheme = darkColorScheme()) {
1616
WebStoryEasel(storyboard)
1717
}
1818
}

‎examples/interactive/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ kotlin {
3131

3232
implementation(project(":examples:shared"))
3333

34-
implementation(compose.material)
34+
implementation(compose.material3)
3535
implementation(compose.components.resources)
3636

3737
implementation(libs.ktor.client)
@@ -41,7 +41,7 @@ kotlin {
4141
}
4242
jvmMain {
4343
dependencies {
44-
implementation(compose.desktop.currentOs)
44+
runtimeOnly(compose.desktop.currentOs)
4545
implementation(libs.ktor.client.engine.okhttp)
4646
}
4747
}

‎examples/interactive/src/commonMain/kotlin/AppScene.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import androidx.compose.foundation.layout.Arrangement
44
import androidx.compose.foundation.layout.Column
55
import androidx.compose.foundation.layout.padding
66
import androidx.compose.foundation.layout.requiredSize
7-
import androidx.compose.material.Divider
8-
import androidx.compose.material.MaterialTheme
9-
import androidx.compose.material.Text
10-
import androidx.compose.material.darkColors
7+
import androidx.compose.material3.HorizontalDivider
8+
import androidx.compose.material3.MaterialTheme
9+
import androidx.compose.material3.Text
10+
import androidx.compose.material3.darkColorScheme
1111
import androidx.compose.runtime.remember
1212
import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.unit.dp
@@ -27,7 +27,7 @@ fun StoryboardBuilder.AppScene() {
2727
scene(stateCount = 4) {
2828
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
2929
Header { Text("Application") }
30-
Divider(color = MaterialTheme.colors.primary, thickness = 4.dp)
30+
HorizontalDivider(color = MaterialTheme.colorScheme.primary, thickness = 4.dp)
3131
Body {
3232
Column(
3333
Modifier.padding(vertical = 16.dp, horizontal = 16.dp),
@@ -40,7 +40,7 @@ fun StoryboardBuilder.AppScene() {
4040
item { Text("• Anything achievable with Compose, is possible in Storyboard!") }
4141
item { Text("• You could even embed a Storyboard, in a Storyboard!") }
4242
item {
43-
MaterialTheme(colors = darkColors()) {
43+
MaterialTheme(colorScheme = darkColorScheme()) {
4444
StoryOverlay(
4545
overlay = { OverlayNavigation(state) },
4646
modifier = Modifier.requiredSize(state.storyboard.format.toDpSize() / 3)

0 commit comments

Comments
 (0)