Update Kotlin and Jetpack Compose
This commit is contained in:
parent
5cc7fc32a9
commit
70575376fb
@ -41,8 +41,8 @@ dependencyResolutionManagement {
|
|||||||
version("targetSdk", "32")
|
version("targetSdk", "32")
|
||||||
}
|
}
|
||||||
create("libs") {
|
create("libs") {
|
||||||
version("kotlin", "1.7.0")
|
version("kotlin", "1.7.10")
|
||||||
version("kotlinx.coroutines", "1.6.3")
|
version("kotlinx.coroutines", "1.6.4")
|
||||||
alias("kotlin.stdlib")
|
alias("kotlin.stdlib")
|
||||||
.to("org.jetbrains.kotlin", "kotlin-stdlib")
|
.to("org.jetbrains.kotlin", "kotlin-stdlib")
|
||||||
.versionRef("kotlin")
|
.versionRef("kotlin")
|
||||||
@ -60,40 +60,40 @@ dependencyResolutionManagement {
|
|||||||
listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android")
|
listOf("kotlin.stdlib", "kotlinx.coroutines.core", "kotlinx.coroutines.android")
|
||||||
)
|
)
|
||||||
|
|
||||||
version("androidx.compose.compiler", "1.3.0-beta01")
|
version("androidx.compose.compiler", "1.3.0-rc01")
|
||||||
alias("androidx.compose.runtime")
|
alias("androidx.compose.runtime")
|
||||||
.to("androidx.compose.runtime", "runtime")
|
.to("androidx.compose.runtime", "runtime")
|
||||||
.version("1.2.0-rc03")
|
.version("1.3.0-alpha02")
|
||||||
alias("androidx.compose.livedata")
|
alias("androidx.compose.livedata")
|
||||||
.to("androidx.compose.runtime", "runtime-livedata")
|
.to("androidx.compose.runtime", "runtime-livedata")
|
||||||
.version("1.2.0-rc03")
|
.version("1.3.0-alpha02")
|
||||||
alias("androidx.compose.foundation")
|
alias("androidx.compose.foundation")
|
||||||
.to("androidx.compose.foundation", "foundation")
|
.to("androidx.compose.foundation", "foundation")
|
||||||
.version("1.2.0-rc03")
|
.version("1.3.0-alpha02")
|
||||||
alias("androidx.compose.foundationlayout")
|
alias("androidx.compose.foundationlayout")
|
||||||
.to("androidx.compose.foundation", "foundation-layout")
|
.to("androidx.compose.foundation", "foundation-layout")
|
||||||
.version("1.2.0-rc03")
|
.version("1.3.0-alpha02")
|
||||||
alias("androidx.compose.ui")
|
alias("androidx.compose.ui")
|
||||||
.to("androidx.compose.ui", "ui")
|
.to("androidx.compose.ui", "ui")
|
||||||
.version("1.2.0-rc03")
|
.version("1.3.0-alpha02")
|
||||||
alias("androidx.compose.uitooling")
|
alias("androidx.compose.uitooling")
|
||||||
.to("androidx.compose.ui", "ui-tooling")
|
.to("androidx.compose.ui", "ui-tooling")
|
||||||
.version("1.2.0-rc03")
|
.version("1.3.0-alpha02")
|
||||||
alias("androidx.compose.material")
|
alias("androidx.compose.material")
|
||||||
.to("androidx.compose.material", "material")
|
.to("androidx.compose.material", "material")
|
||||||
.version("1.2.0-rc03")
|
.version("1.3.0-alpha02")
|
||||||
alias("androidx.compose.materialicons")
|
alias("androidx.compose.materialicons")
|
||||||
.to("androidx.compose.material", "material-icons-extended")
|
.to("androidx.compose.material", "material-icons-extended")
|
||||||
.version("1.2.0-rc03")
|
.version("1.3.0-alpha02")
|
||||||
alias("androidx.compose.animation")
|
alias("androidx.compose.animation")
|
||||||
.to("androidx.compose.animation", "animation")
|
.to("androidx.compose.animation", "animation")
|
||||||
.version("1.2.0-rc03")
|
.version("1.3.0-alpha02")
|
||||||
alias("androidx.compose.animationgraphics")
|
alias("androidx.compose.animationgraphics")
|
||||||
.to("androidx.compose.animation", "animation-graphics")
|
.to("androidx.compose.animation", "animation-graphics")
|
||||||
.version("1.2.0-rc03")
|
.version("1.3.0-alpha02")
|
||||||
alias("androidx.compose.material3")
|
alias("androidx.compose.material3")
|
||||||
.to("androidx.compose.material3", "material3")
|
.to("androidx.compose.material3", "material3")
|
||||||
.version("1.0.0-alpha14")
|
.version("1.0.0-alpha15")
|
||||||
|
|
||||||
version("androidx.lifecycle", "2.4.1")
|
version("androidx.lifecycle", "2.4.1")
|
||||||
alias("androidx.lifecycle.viewmodel")
|
alias("androidx.lifecycle.viewmodel")
|
||||||
|
|||||||
@ -23,6 +23,7 @@ import de.mm20.launcher2.ui.component.BottomSheetDialog
|
|||||||
import de.mm20.launcher2.ui.component.SmallMessage
|
import de.mm20.launcher2.ui.component.SmallMessage
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun WeatherLocationSearchDialog(
|
fun WeatherLocationSearchDialog(
|
||||||
onDismissRequest: () -> Unit
|
onDismissRequest: () -> Unit
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.*
|
|||||||
import androidx.compose.foundation.shape.CornerSize
|
import androidx.compose.foundation.shape.CornerSize
|
||||||
import androidx.compose.material.*
|
import androidx.compose.material.*
|
||||||
import androidx.compose.material3.CenterAlignedTopAppBar
|
import androidx.compose.material3.CenterAlignedTopAppBar
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
@ -28,7 +29,9 @@ import de.mm20.launcher2.ui.ktx.toDp
|
|||||||
import de.mm20.launcher2.ui.ktx.toPixels
|
import de.mm20.launcher2.ui.ktx.toPixels
|
||||||
import kotlin.math.roundToInt
|
import kotlin.math.roundToInt
|
||||||
|
|
||||||
@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterialApi::class)
|
@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterialApi::class,
|
||||||
|
ExperimentalMaterial3Api::class
|
||||||
|
)
|
||||||
@Composable
|
@Composable
|
||||||
fun BottomSheetDialog(
|
fun BottomSheetDialog(
|
||||||
onDismissRequest: () -> Unit,
|
onDismissRequest: () -> Unit,
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import androidx.compose.ui.unit.dp
|
|||||||
import com.godaddy.android.colorpicker.ClassicColorPicker
|
import com.godaddy.android.colorpicker.ClassicColorPicker
|
||||||
import de.mm20.launcher2.ui.ktx.toHexString
|
import de.mm20.launcher2.ui.ktx.toHexString
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun ColorPreference(
|
fun ColorPreference(
|
||||||
title: String,
|
title: String,
|
||||||
|
|||||||
@ -1,13 +1,10 @@
|
|||||||
package de.mm20.launcher2.ui.component.preferences
|
package de.mm20.launcher2.ui.component.preferences
|
||||||
|
|
||||||
import androidx.compose.material3.OutlinedTextField
|
import androidx.compose.material3.*
|
||||||
import androidx.compose.material3.TextButton
|
|
||||||
import androidx.compose.material3.AlertDialog
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun TextPreference(
|
fun TextPreference(
|
||||||
title: String,
|
title: String,
|
||||||
|
|||||||
@ -48,7 +48,8 @@ import de.mm20.launcher2.ui.utils.rememberNotificationShadeController
|
|||||||
import kotlin.math.roundToInt
|
import kotlin.math.roundToInt
|
||||||
|
|
||||||
@OptIn(
|
@OptIn(
|
||||||
ExperimentalMaterialApi::class, ExperimentalFoundationApi::class
|
ExperimentalMaterialApi::class, ExperimentalFoundationApi::class,
|
||||||
|
ExperimentalMaterial3Api::class
|
||||||
)
|
)
|
||||||
@Composable
|
@Composable
|
||||||
fun PagerScaffold(
|
fun PagerScaffold(
|
||||||
|
|||||||
@ -45,7 +45,7 @@ import de.mm20.launcher2.ui.modifier.verticalFadingEdges
|
|||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlin.math.roundToInt
|
import kotlin.math.roundToInt
|
||||||
|
|
||||||
@OptIn(ExperimentalFoundationApi::class)
|
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun PullDownScaffold(
|
fun PullDownScaffold(
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
|
|||||||
@ -35,6 +35,7 @@ import de.mm20.launcher2.ui.ktx.toPixels
|
|||||||
import de.mm20.launcher2.ui.locals.LocalGridColumns
|
import de.mm20.launcher2.ui.locals.LocalGridColumns
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun CustomizeSearchableSheet(
|
fun CustomizeSearchableSheet(
|
||||||
searchable: Searchable,
|
searchable: Searchable,
|
||||||
|
|||||||
@ -36,7 +36,7 @@ fun LicenseScreen(library: OpenSourceLibrary) {
|
|||||||
val scrollBehavior =
|
val scrollBehavior =
|
||||||
TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
|
TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
|
||||||
rememberSplineBasedDecay(),
|
rememberSplineBasedDecay(),
|
||||||
rememberTopAppBarScrollState()
|
rememberTopAppBarState()
|
||||||
)
|
)
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
topBar = {
|
||||||
|
|||||||
@ -431,6 +431,7 @@ fun EditWebsearchDialog(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
private fun ColorPicker(
|
private fun ColorPicker(
|
||||||
value: Int,
|
value: Int,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user