github
/
compose-jb
mirror of https://gitee.com/github-sync-mirror/compose-jb.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge pull request #340 from JetBrains/tutorials 

Tutorials. Migrate to 0.3.0-build146
pull/342/head
Igor Demin 4 years ago committed by GitHub
parent
ff73f8268a 2d9dc39d2b
commit
e760e789e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 50 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      tutorials/Getting_Started/README.md
  2. 10
      tutorials/Image_And_Icons_Manipulations/README.md
  3. 60
      tutorials/Scrollbars/README.md
  4. 12
      tutorials/Tray_Notifications_MenuBar/README.md
  5. 2
      tutorials/Window_API/README.md

4
tutorials/Getting_Started/README.md
Unescape View File

@ -61,8 +61,8 @@ Then create `build.gradle.kts` with the following content:
import org.jetbrains.compose.compose import org.jetbrains.compose.compose
plugins { plugins {
kotlin("jvm") version "1.4.20" kotlin("jvm") version "1.4.21-2"
id("org.jetbrains.compose") version "0.2.0-build132" id("org.jetbrains.compose") version "0.3.0-build146"
} }
repositories { repositories {

10
tutorials/Image_And_Icons_Manipulations/README.md
Unescape View File

@ -21,6 +21,7 @@ fun main() {
Window { Window {
Image( Image(
bitmap = imageResource("sample.png"), // ImageBitmap bitmap = imageResource("sample.png"), // ImageBitmap
contentDescription = "Sample",
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) )
} }
@ -49,6 +50,7 @@ fun main() {
val image = remember { imageFromFile(File("sample.png")) } val image = remember { imageFromFile(File("sample.png")) }
Image( Image(
bitmap = image, bitmap = image,
contentDescription = "Sample",
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) )
} }
@ -172,6 +174,7 @@ fun main() {
val imageAsset = remember { asImageAsset(image) } val imageAsset = remember { asImageAsset(image) }
Image( Image(
bitmap = imageAsset, bitmap = imageAsset,
contentDescription = "Icon",
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) )
} }
@ -223,6 +226,7 @@ fun main() {
val imageAsset = remember { asImageAsset(image) } val imageAsset = remember { asImageAsset(image) }
Image( Image(
bitmap = imageAsset, bitmap = imageAsset,
contentDescription = "Icon",
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) )
} }
@ -264,7 +268,7 @@ import androidx.compose.desktop.AppManager
import androidx.compose.desktop.Window import androidx.compose.desktop.Window
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.runtime.onActive import androidx.compose.runtime.DisposableEffect
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.asImageBitmap
@ -279,7 +283,7 @@ import javax.imageio.ImageIO
fun main() { fun main() {
val image = getWindowIcon() val image = getWindowIcon()
Window { Window {
onActive { DisposableEffect(Unit) {
val tray = Tray().apply { val tray = Tray().apply {
icon(getWindowIcon()) icon(getWindowIcon())
menu( menu(
@ -297,6 +301,7 @@ fun main() {
val imageAsset = asImageAsset(image) val imageAsset = asImageAsset(image)
Image( Image(
bitmap = imageAsset, bitmap = imageAsset,
contentDescription = "Icon",
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) )
} }
@ -355,6 +360,7 @@ fun main() {
Window { Window {
Image( Image(
imageVector = vectorXmlResource("images/compose-logo.xml"), imageVector = vectorXmlResource("images/compose-logo.xml"),
contentDescription = "Compose logo",
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) )
} }

60
tutorials/Scrollbars/README.md
Unescape View File

@ -10,29 +10,29 @@ You can apply scrollbars to scrollable components. The scrollbar and scrollable
```kotlin ```kotlin
import androidx.compose.desktop.Window import androidx.compose.desktop.Window
import androidx.compose.foundation.background
import androidx.compose.foundation.HorizontalScrollbar import androidx.compose.foundation.HorizontalScrollbar
import androidx.compose.foundation.VerticalScrollbar
import androidx.compose.foundation.background
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollbarAdapter
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.ScrollableColumn import androidx.compose.foundation.rememberScrollbarAdapter
import androidx.compose.foundation.ScrollableRow import androidx.compose.foundation.verticalScroll
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.foundation.VerticalScrollbar
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
fun main() { fun main() {
Window(title = "Scrollbars", size = IntSize(250, 400)) { Window(title = "Scrollbars", size = IntSize(250, 400)) {
@ -44,18 +44,18 @@ fun main() {
val stateVertical = rememberScrollState(0f) val stateVertical = rememberScrollState(0f)
val stateHorizontal = rememberScrollState(0f) val stateHorizontal = rememberScrollState(0f)
ScrollableColumn( Box(
modifier = Modifier.fillMaxSize() modifier = Modifier
.padding(end = 12.dp, bottom = 12.dp), .fillMaxSize()
scrollState = stateVertical .verticalScroll(stateVertical)
.padding(end = 12.dp, bottom = 12.dp)
.horizontalScroll(stateHorizontal)
) { ) {
ScrollableRow(scrollState = stateHorizontal) { Column {
Column { for (item in 0..30) {
for (item in 0..30) { TextBox("Item in ScrollableColumn #$item")
TextBox("Item in ScrollableColumn #$item") if (item < 30) {
if (item < 30) { Spacer(modifier = Modifier.height(5.dp))
Spacer(modifier = Modifier.height(5.dp))
}
} }
} }
} }
@ -97,20 +97,26 @@ You can use scrollbars with lazy scrollable components, for example, LazyColumn.
```kotlin ```kotlin
import androidx.compose.desktop.Window import androidx.compose.desktop.Window
import androidx.compose.foundation.background
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.VerticalScrollbar
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollbarAdapter import androidx.compose.foundation.rememberScrollbarAdapter
import androidx.compose.foundation.Text import androidx.compose.material.Text
import androidx.compose.foundation.VerticalScrollbar
import androidx.compose.foundation.layout.*
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
fun main() { fun main() {
Window(title = "Scrollbars", size = IntSize(250, 400)) { Window(title = "Scrollbars", size = IntSize(250, 400)) {
@ -131,7 +137,7 @@ fun LazyScrollable() {
val itemCount = 1000 val itemCount = 1000
LazyColumn(Modifier.fillMaxSize().padding(end = 12.dp), state) { LazyColumn(Modifier.fillMaxSize().padding(end = 12.dp), state) {
items((1..itemCount).toList()) { x -> items(itemCount) { x ->
TextBox("Item in ScrollableColumn #$x") TextBox("Item in ScrollableColumn #$x")
Spacer(modifier = Modifier.height(5.dp)) Spacer(modifier = Modifier.height(5.dp))
} }

12
tutorials/Tray_Notifications_MenuBar/README.md
Unescape View File

@ -15,15 +15,15 @@ You can add an application icon to the system tray. You can also send notificati
```kotlin ```kotlin
import androidx.compose.desktop.AppManager import androidx.compose.desktop.AppManager
import androidx.compose.desktop.Window import androidx.compose.desktop.Window
import androidx.compose.material.Text
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.Text
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.onActive
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.window.MenuItem import androidx.compose.ui.window.MenuItem
import androidx.compose.ui.window.Tray import androidx.compose.ui.window.Tray
import androidx.compose.ui.Modifier
import java.awt.Color import java.awt.Color
import java.awt.image.BufferedImage import java.awt.image.BufferedImage
@ -32,7 +32,7 @@ fun main() {
Window( Window(
icon = getMyAppIcon() icon = getMyAppIcon()
) { ) {
onActive { DisposableEffect(Unit) {
val tray = Tray().apply { val tray = Tray().apply {
icon(getTrayIcon()) icon(getTrayIcon())
menu( menu(
@ -71,7 +71,7 @@ fun main() {
} }
} }
fun getMyAppIcon() : BufferedImage { fun getMyAppIcon(): BufferedImage {
val size = 256 val size = 256
val image = BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB) val image = BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB)
val graphics = image.createGraphics() val graphics = image.createGraphics()
@ -85,7 +85,7 @@ fun getMyAppIcon() : BufferedImage {
return image return image
} }
fun getTrayIcon() : BufferedImage { fun getTrayIcon(): BufferedImage {
val size = 256 val size = 256
val image = BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB) val image = BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB)
val graphics = image.createGraphics() val graphics = image.createGraphics()

2
tutorials/Window_API/README.md
Unescape View File

@ -39,8 +39,8 @@ You can see an example of both types of window below.
```kotlin ```kotlin
import androidx.compose.desktop.Window import androidx.compose.desktop.Window
import androidx.compose.foundation.Text
import androidx.compose.material.Button import androidx.compose.material.Button
import androidx.compose.material.Text
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog

Write Preview
Loading…
Cancel
Save