Update dependencies

terrakok · terrakok · commit 0401e008a451 · 2024-04-25T14:34:28.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 *.iml
 .gradle
 .idea
+.kotlin
 .DS_Store
 build
 */build
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -39,11 +39,6 @@ kotlin {
     }
 
     sourceSets {
-        all {
-            languageSettings {
-                optIn("org.jetbrains.compose.resources.ExperimentalResourceApi")
-            }
-        }
         commonMain {
             dependencies {
                 implementation(compose.runtime)
diff --git a/composeApp/src/commonMain/kotlin/com/github/terrakok/App.kt b/composeApp/src/commonMain/kotlin/com/github/terrakok/App.kt
@@ -2,6 +2,7 @@ package com.github.terrakok
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.TextSnippet
 import androidx.compose.material.icons.filled.DarkMode
 import androidx.compose.material.icons.filled.DocumentScanner
 import androidx.compose.material.icons.filled.FormatPaint
@@ -73,7 +74,7 @@ data class Screen(
 val screens = listOf(
     Screen("Components", Icons.Filled.Widgets) { ComponentScreen() },
     Screen("Color", Icons.Filled.FormatPaint) { ColorScreen() },
-    Screen("Typography", Icons.Filled.TextSnippet) { TypographyScreen() },
+    Screen("Typography", Icons.AutoMirrored.Filled.TextSnippet) { TypographyScreen() },
     Screen("Elevation", Icons.Filled.Opacity) { ElevationScreen() },
 )
 
diff --git a/composeApp/src/commonMain/kotlin/com/github/terrakok/Communication.kt b/composeApp/src/commonMain/kotlin/com/github/terrakok/Communication.kt
@@ -21,7 +21,6 @@ import androidx.compose.material.icons.outlined.Videocam
 import androidx.compose.material3.Badge
 import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LinearProgressIndicator
@@ -65,7 +64,6 @@ fun Communication() {
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun Badges() {
     OutlinedCard {
@@ -171,9 +169,12 @@ fun ProgressIndicators() {
                 Spacer(modifier = Modifier.size(16.dp))
                 LinearProgressIndicator(modifier = Modifier.weight(1f))
             } else {
-                CircularProgressIndicator(0.7f)
+                CircularProgressIndicator(progress = { 0.7f})
                 Spacer(modifier = Modifier.size(16.dp))
-                LinearProgressIndicator(modifier = Modifier.weight(1f), progress = 0.7f)
+                LinearProgressIndicator(
+                    progress = { 0.7f },
+                    modifier = Modifier.weight(1f),
+                )
             }
         }
     }
diff --git a/composeApp/src/commonMain/kotlin/com/github/terrakok/Containment.kt b/composeApp/src/commonMain/kotlin/com/github/terrakok/Containment.kt
@@ -5,15 +5,13 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -23,16 +21,16 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import kotlinx.coroutines.launch
 
-private val modalBottomSheetInfoUrl =
+private const val modalBottomSheetInfoUrl =
     "https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary?hl=en#ModalBottomSheet(kotlin.Function0,androidx.compose.ui.Modifier,androidx.compose.material3.SheetState,androidx.compose.ui.unit.Dp,androidx.compose.ui.graphics.Shape,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.unit.Dp,androidx.compose.ui.graphics.Color,kotlin.Function0,androidx.compose.foundation.layout.WindowInsets,androidx.compose.ui.window.SecureFlagPolicy,kotlin.Function1)"
 
-private val cardsInfoUrl =
+private const val cardsInfoUrl =
     "https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#Card(androidx.compose.ui.Modifier,androidx.compose.ui.graphics.Shape,androidx.compose.material3.CardColors,androidx.compose.material3.CardElevation,androidx.compose.foundation.BorderStroke,kotlin.Function1)"
 
-private val dialogsInfoUrl =
+private const val dialogsInfoUrl =
     "https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#AlertDialog(kotlin.Function0,kotlin.Function0,androidx.compose.ui.Modifier,kotlin.Function0,kotlin.Function0,kotlin.Function0,kotlin.Function0,androidx.compose.ui.graphics.Shape,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.unit.Dp,androidx.compose.ui.window.DialogProperties)"
 
-private val dividersInfoUrl =
+private const val dividersInfoUrl =
     "https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#Divider(androidx.compose.ui.Modifier,androidx.compose.ui.unit.Dp,androidx.compose.ui.graphics.Color)"
 
 @Composable
@@ -77,7 +75,7 @@ private fun DividersDemo() {
                 .width(600.dp)
                 .padding(16.dp, 32.dp, 16.dp, 32.dp)
         ) {
-            Divider()
+            HorizontalDivider()
         }
     }
 }
diff --git a/composeApp/src/commonMain/kotlin/com/github/terrakok/ElevationScreen.kt b/composeApp/src/commonMain/kotlin/com/github/terrakok/ElevationScreen.kt
@@ -9,19 +9,15 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
diff --git a/composeApp/src/commonMain/kotlin/com/github/terrakok/Navigation.kt b/composeApp/src/commonMain/kotlin/com/github/terrakok/Navigation.kt
@@ -1,78 +1,15 @@
 package com.github.terrakok
 
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.requiredWidthIn
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AccountBox
-import androidx.compose.material.icons.filled.AccountCircle
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material.icons.filled.AttachFile
-import androidx.compose.material.icons.filled.Bookmark
-import androidx.compose.material.icons.filled.BookmarkBorder
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.filled.Event
-import androidx.compose.material.icons.filled.Explore
-import androidx.compose.material.icons.filled.Favorite
-import androidx.compose.material.icons.filled.FavoriteBorder
-import androidx.compose.material.icons.filled.Image
-import androidx.compose.material.icons.filled.Inbox
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.filled.MusicNote
-import androidx.compose.material.icons.filled.Pets
-import androidx.compose.material.icons.filled.Search
-import androidx.compose.material.icons.filled.Send
-import androidx.compose.material.icons.filled.Videocam
-import androidx.compose.material.icons.outlined.AccountBox
-import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material.icons.outlined.Explore
-import androidx.compose.material.icons.outlined.Inbox
-import androidx.compose.material.icons.outlined.Pets
-import androidx.compose.material.icons.outlined.Send
-import androidx.compose.material3.BottomAppBar
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.Divider
-import androidx.compose.material3.DividerDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.MediumTopAppBar
-import androidx.compose.material3.NavigationBar
-import androidx.compose.material3.NavigationBarItem
-import androidx.compose.material3.NavigationDrawerItem
-import androidx.compose.material3.NavigationRail
-import androidx.compose.material3.NavigationRailItem
-import androidx.compose.material3.OutlinedCard
-import androidx.compose.material3.PermanentDrawerSheet
-import androidx.compose.material3.PermanentNavigationDrawer
-import androidx.compose.material3.ScrollableTabRow
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Tab
-import androidx.compose.material3.TabRow
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.Send
+import androidx.compose.material.icons.automirrored.outlined.Send
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -263,7 +200,7 @@ fun NavigationDrawerContent() {
             onClick = { selected = 1 },
             icon = {
                 Icon(
-                    imageVector = if (selected == 1) Icons.Default.Send else Icons.Outlined.Send,
+                    imageVector = if (selected == 1) Icons.AutoMirrored.Default.Send else Icons.AutoMirrored.Outlined.Send,
                     contentDescription = null
                 )
             },
@@ -291,7 +228,7 @@ fun NavigationDrawerContent() {
             },
             label = { Text("Trash") }
         )
-        Divider(Modifier.padding(8.dp))
+        HorizontalDivider(Modifier.padding(8.dp))
         Text("Labels", modifier = Modifier.padding(16.dp))
         NavigationDrawerItem(
             selected = selected == 4,
@@ -370,7 +307,7 @@ private fun GalleryNavigationRail() {
                         onClick = { selected = 1 },
                         icon = {
                             Icon(
-                                imageVector = if (selected == 1) Icons.Default.Send else Icons.Outlined.Send,
+                                imageVector = if (selected == 1) Icons.AutoMirrored.Filled.Send else Icons.AutoMirrored.Outlined.Send,
                                 contentDescription = null
                             )
                         },
@@ -490,7 +427,7 @@ private fun GalleryTopAppBars() {
                         onClick = {}
                     ) {
                         Icon(
-                            imageVector = Icons.Default.ArrowBack,
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                             contentDescription = null
                         )
                     }
@@ -545,7 +482,7 @@ private fun GalleryTopAppBars() {
                         onClick = {}
                     ) {
                         Icon(
-                            imageVector = Icons.Default.ArrowBack,
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                             contentDescription = null
                         )
                     }
@@ -563,7 +500,7 @@ private fun GalleryTopAppBars() {
                         onClick = {}
                     ) {
                         Icon(
-                            imageVector = Icons.Default.ArrowBack,
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                             contentDescription = null
                         )
                     }
@@ -581,7 +518,7 @@ private fun GalleryTopAppBars() {
                         onClick = {}
                     ) {
                         Icon(
-                            imageVector = Icons.Default.ArrowBack,
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                             contentDescription = null
                         )
                     }
diff --git a/composeApp/src/commonMain/kotlin/com/github/terrakok/SelectColorExtractionImage.kt b/composeApp/src/commonMain/kotlin/com/github/terrakok/SelectColorExtractionImage.kt
@@ -38,7 +38,6 @@ import com.github.terrakok.theme.LocalAppColor
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.imageResource
 
 @Composable
diff --git a/composeApp/src/commonMain/kotlin/com/github/terrakok/Selection.kt b/composeApp/src/commonMain/kotlin/com/github/terrakok/Selection.kt
@@ -1,6 +1,5 @@
 package com.github.terrakok
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.selection.selectable
@@ -18,27 +17,27 @@ import androidx.compose.ui.state.ToggleableState
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 
-private val checkboxesInfoUrl =
+private const val checkboxesInfoUrl =
     "https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#Checkbox(kotlin.Boolean,kotlin.Function1,androidx.compose.ui.Modifier,kotlin.Boolean,androidx.compose.material3.CheckboxColors,androidx.compose.foundation.interaction.MutableInteractionSource)"
 
-private val chipsInfoUrl = "https://developer.android.com/jetpack/compose/components/chip"
+private const val chipsInfoUrl = "https://developer.android.com/jetpack/compose/components/chip"
 
-private val datePickerInfoUrl =
+private const val datePickerInfoUrl =
     "https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#DatePicker(androidx.compose.material3.DatePickerState,androidx.compose.ui.Modifier,androidx.compose.material3.DatePickerFormatter,kotlin.Function0,kotlin.Function0,kotlin.Boolean,androidx.compose.material3.DatePickerColors)"
 
-private val menusInfoUrl =
+private const val menusInfoUrl =
     "https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#DropdownMenu(kotlin.Boolean,kotlin.Function0,androidx.compose.ui.Modifier,androidx.compose.ui.unit.DpOffset,androidx.compose.foundation.ScrollState,androidx.compose.ui.window.PopupProperties,kotlin.Function1)"
 
-private val radioButtonInfoUrl =
+private const val radioButtonInfoUrl =
     "https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#RadioButton(kotlin.Boolean,kotlin.Function0,androidx.compose.ui.Modifier,kotlin.Boolean,androidx.compose.material3.RadioButtonColors,androidx.compose.foundation.interaction.MutableInteractionSource)"
 
-private val sliderInfoUrl =
+private const val sliderInfoUrl =
     "https://developer.android.com/jetpack/compose/components/slider"
 
-private val switchInfoUrl =
+private const val switchInfoUrl =
     "https://developer.android.com/jetpack/compose/components/switch"
 
-private val timePickerInfoUrl =
+private const val timePickerInfoUrl =
     "https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#TimePicker(androidx.compose.material3.TimePickerState,androidx.compose.ui.Modifier,androidx.compose.material3.TimePickerColors,androidx.compose.material3.TimePickerLayoutType)"
 
 
@@ -58,6 +57,7 @@ private val sectionsList = listOf(
     ChildSectionItem("Switches", switchInfoUrl) { SwtichesDemo() },
     ChildSectionItem("Time picker", timePickerInfoUrl) { TimePickerDemo() },
 )
+
 @Composable
 fun Selection() {
     ParentSection("Selection") {
@@ -134,14 +134,14 @@ private fun MenuDemo() {
             }) {
                 Icon(Icons.Default.MoreVert, contentDescription = null)
             }
-            val items = (1 .. 3).map { "Menu $it" }
+            val items = (1..3).map { "Menu $it" }
             DropdownMenu(
                 expanded = menuExpanded,
                 onDismissRequest = { menuExpanded = false }
             ) {
                 items.forEachIndexed { ix, item ->
                     key(item) {
-                        if (ix == 2) Divider()
+                        if (ix == 2) HorizontalDivider()
                         DropdownMenuItem(
                             text = { Text(item) },
                             onClick = {},
@@ -305,16 +305,16 @@ private fun TimePickerDemo() {
 
         // TODO: Use TimePickerDialog when we update to a newer version of material3. It's not available in 1.1.2
         Dialog(onDismissRequest = { openDialog = false }) {
-            Card(Modifier.background(MaterialTheme.colorScheme.background).size(400.dp, height = 500.dp)) {
-                Box(modifier = Modifier.fillMaxSize().padding(16.dp)) {
+            Card(shape = MaterialTheme.shapes.extraLarge) {
+                Column(Modifier.padding(16.dp)) {
                     TimePicker(
                         state,
                         layoutType = TimePickerLayoutType.Vertical,
-                        modifier = Modifier.align(Alignment.Center)
+                        modifier = Modifier.align(Alignment.CenterHorizontally)
                     )
 
                     Row(
-                        modifier = Modifier.align(Alignment.BottomStart).fillMaxWidth(),
+                        modifier = Modifier.align(Alignment.End),
                         horizontalArrangement = Arrangement.End
                     ) {
                         TextButton(onClick = { openDialog = false }) {
@@ -527,7 +527,6 @@ private fun DatePickerDemo() {
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun ChipsDemo() {
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew.bat b/gradlew.bat

-Original file line number
+Diff line change
 *.iml
 .gradle
 .idea
 +.kotlin
 .DS_Store
 build
 */build
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import androidx.compose.material.icons.outlined.Videocam`
`21`	`21`	`import androidx.compose.material3.Badge`
`22`	`22`	`import androidx.compose.material3.BadgedBox`
`23`	`23`	`import androidx.compose.material3.CircularProgressIndicator`
`24`		`-import androidx.compose.material3.ExperimentalMaterial3Api`
`25`	`24`	`import androidx.compose.material3.Icon`
`26`	`25`	`import androidx.compose.material3.IconButton`
`27`	`26`	`import androidx.compose.material3.LinearProgressIndicator`
`@@ -65,7 +64,6 @@ fun Communication() {`
`65`	`64`	`}`
`66`	`65`	`}`
`67`	`66`
`68`		`-@OptIn(ExperimentalMaterial3Api::class)`
`69`	`67`	`@Composable`
`70`	`68`	`fun Badges() {`
`71`	`69`	`OutlinedCard {`
`@@ -171,9 +169,12 @@ fun ProgressIndicators() {`
`171`	`169`	`Spacer(modifier = Modifier.size(16.dp))`
`172`	`170`	`LinearProgressIndicator(modifier = Modifier.weight(1f))`
`173`	`171`	`} else {`
`174`		`- CircularProgressIndicator(0.7f)`
	`172`	`+ CircularProgressIndicator(progress = { 0.7f})`
`175`	`173`	`Spacer(modifier = Modifier.size(16.dp))`
`176`		`- LinearProgressIndicator(modifier = Modifier.weight(1f), progress = 0.7f)`
	`174`	`+ LinearProgressIndicator(`
	`175`	`+ progress = { 0.7f },`
	`176`	`+ modifier = Modifier.weight(1f),`
	`177`	`+ )`
`177`	`178`	`}`
`178`	`179`	`}`
`179`	`180`	`}`