Skip to content

Commit 064e3ed

Browse files
author
akurasov
committed
updating components and tutorials to latest Compose API
1 parent 291eef2 commit 064e3ed

File tree

5 files changed

+46
-47
lines changed

5 files changed

+46
-47
lines changed

‎components/SplitPane/demo/src/jvmMain/kotlin/org/jetbrains/compose/splitpane/demo/Main.kt

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.graphics.Color
1313
import androidx.compose.ui.graphics.SolidColor
1414
import androidx.compose.ui.input.pointer.PointerIcon
15-
import androidx.compose.ui.input.pointer.pointerIcon
15+
import androidx.compose.ui.input.pointer.pointerHoverIcon
1616
import androidx.compose.ui.unit.dp
1717
import androidx.compose.ui.window.singleWindowApplication
1818
import org.jetbrains.compose.splitpane.ExperimentalSplitPaneApi
@@ -23,53 +23,51 @@ import java.awt.Cursor
2323

2424
@OptIn(ExperimentalComposeUiApi::class)
2525
private fun Modifier.cursorForHorizontalResize(): Modifier =
26-
pointerIcon(PointerIcon(Cursor(Cursor.E_RESIZE_CURSOR)))
26+
pointerHoverIcon(PointerIcon(Cursor(Cursor.E_RESIZE_CURSOR)))
2727

2828
@OptIn(ExperimentalSplitPaneApi::class)
2929
fun main() = singleWindowApplication(
3030
title = "SplitPane demo"
3131
) {
3232
MaterialTheme {
33-
DesktopTheme {
34-
val splitterState = rememberSplitPaneState()
35-
val hSplitterState = rememberSplitPaneState()
36-
HorizontalSplitPane(
37-
splitPaneState = splitterState
38-
) {
39-
first(20.dp) {
40-
Box(Modifier.background(Color.Red).fillMaxSize())
41-
}
42-
second(50.dp) {
43-
VerticalSplitPane(splitPaneState = hSplitterState) {
44-
first(50.dp) {
45-
Box(Modifier.background(Color.Blue).fillMaxSize())
46-
}
47-
second(20.dp) {
48-
Box(Modifier.background(Color.Green).fillMaxSize())
49-
}
50-
}
51-
}
52-
splitter {
53-
visiblePart {
54-
Box(
55-
Modifier
56-
.width(1.dp)
57-
.fillMaxHeight()
58-
.background(MaterialTheme.colors.background)
59-
)
33+
val splitterState = rememberSplitPaneState()
34+
val hSplitterState = rememberSplitPaneState()
35+
HorizontalSplitPane(
36+
splitPaneState = splitterState
37+
) {
38+
first(20.dp) {
39+
Box(Modifier.background(Color.Red).fillMaxSize())
40+
}
41+
second(50.dp) {
42+
VerticalSplitPane(splitPaneState = hSplitterState) {
43+
first(50.dp) {
44+
Box(Modifier.background(Color.Blue).fillMaxSize())
6045
}
61-
handle {
62-
Box(
63-
Modifier
64-
.markAsHandle()
65-
.cursorForHorizontalResize()
66-
.background(SolidColor(Color.Gray), alpha = 0.50f)
67-
.width(9.dp)
68-
.fillMaxHeight()
69-
)
46+
second(20.dp) {
47+
Box(Modifier.background(Color.Green).fillMaxSize())
7048
}
7149
}
7250
}
51+
splitter {
52+
visiblePart {
53+
Box(
54+
Modifier
55+
.width(1.dp)
56+
.fillMaxHeight()
57+
.background(MaterialTheme.colors.background)
58+
)
59+
}
60+
handle {
61+
Box(
62+
Modifier
63+
.markAsHandle()
64+
.cursorForHorizontalResize()
65+
.background(SolidColor(Color.Gray), alpha = 0.50f)
66+
.width(9.dp)
67+
.fillMaxHeight()
68+
)
69+
}
70+
}
7371
}
7472
}
7573
}

‎components/SplitPane/library/src/desktopMain/kotlin/org/jetbrains/compose/splitpane/DesktopSplitter.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ import androidx.compose.runtime.Composable
88
import androidx.compose.ui.ExperimentalComposeUiApi
99
import androidx.compose.ui.Modifier
1010
import androidx.compose.ui.graphics.Color
11-
import androidx.compose.ui.input.pointer.PointerIcon
12-
import androidx.compose.ui.input.pointer.consumeAllChanges
13-
import androidx.compose.ui.input.pointer.pointerIcon
14-
import androidx.compose.ui.input.pointer.pointerInput
11+
import androidx.compose.ui.input.pointer.*
1512
import androidx.compose.ui.unit.dp
1613
import java.awt.Cursor
1714

1815
@OptIn(ExperimentalComposeUiApi::class)
1916
private fun Modifier.cursorForHorizontalResize(isHorizontal: Boolean): Modifier =
20-
pointerIcon(PointerIcon(Cursor(if (isHorizontal) Cursor.E_RESIZE_CURSOR else Cursor.S_RESIZE_CURSOR)))
17+
pointerHoverIcon(PointerIcon(Cursor(if (isHorizontal) Cursor.E_RESIZE_CURSOR else Cursor.S_RESIZE_CURSOR)))
2118

2219
@Composable
2320
private fun DesktopSplitPaneSeparator(

‎components/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ android.enableJetifier=true
44
kotlin.code.style=official
55

66
# __LATEST_COMPOSE_RELEASE_VERSION__
7-
compose.version=1.0.0-alpha4-build362
7+
compose.version=0.0.0-sync-2010-10-01-build393

‎tutorials/Mouse_Events/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,13 @@ import androidx.compose.runtime.mutableStateOf
7878
import androidx.compose.runtime.remember
7979
import androidx.compose.runtime.setValue
8080
import androidx.compose.ui.Alignment
81+
import androidx.compose.ui.ExperimentalComposeUiApi
8182
import androidx.compose.ui.Modifier
8283
import androidx.compose.ui.graphics.Color
8384
import androidx.compose.ui.input.pointer.pointerMoveFilter
8485
import androidx.compose.ui.window.singleWindowApplication
8586

87+
@OptIn(ExperimentalComposeUiApi::class)
8688
fun main() = singleWindowApplication {
8789
var color by remember { mutableStateOf(Color(0, 0, 0)) }
8890
Box(
@@ -115,6 +117,7 @@ import androidx.compose.runtime.getValue
115117
import androidx.compose.runtime.mutableStateOf
116118
import androidx.compose.runtime.remember
117119
import androidx.compose.runtime.setValue
120+
import androidx.compose.ui.ExperimentalComposeUiApi
118121
import androidx.compose.ui.Modifier
119122
import androidx.compose.ui.graphics.Color
120123
import androidx.compose.ui.input.pointer.pointerMoveFilter
@@ -123,6 +126,7 @@ import androidx.compose.ui.unit.dp
123126
import androidx.compose.ui.unit.sp
124127
import androidx.compose.ui.window.singleWindowApplication
125128

129+
@OptIn(ExperimentalComposeUiApi::class)
126130
fun main() = singleWindowApplication {
127131
Column(
128132
Modifier.background(Color.White),

‎tutorials/Window_API_new/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ fun main() = application {
160160
if (!isVisible) {
161161
Tray(
162162
TrayIcon,
163-
hint = "Counter",
163+
tooltip = "Counter",
164164
onAction = { isVisible = true },
165165
menu = {
166166
Item("Exit", onClick = ::exitApplication)
@@ -386,9 +386,9 @@ Reading the state in composition is useful when you need to update UI, but there
386386
```kotlin
387387
import androidx.compose.runtime.LaunchedEffect
388388
import androidx.compose.runtime.snapshotFlow
389+
import androidx.compose.ui.unit.DpSize
389390
import androidx.compose.ui.window.Window
390391
import androidx.compose.ui.window.WindowPosition
391-
import androidx.compose.ui.window.WindowSize
392392
import androidx.compose.ui.window.application
393393
import androidx.compose.ui.window.rememberWindowState
394394
import kotlinx.coroutines.flow.filterNot
@@ -414,7 +414,7 @@ fun main() = application {
414414
}
415415
}
416416

417-
private fun onWindowResize(size: WindowSize) {
417+
private fun onWindowResize(size: DpSize) {
418418
println("onWindowResize $size")
419419
}
420420

0 commit comments

Comments
 (0)