hamystudio/muza
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Bump Jetpack Compose version

Browse Source
This commit is contained in:
vfsfitvnm
2022-07-04 17:20:05 +02:00
parent 2480fe52c0
commit 0655e3efd5
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt
View File

@@ -14,11 +14,7 @@ import androidx.compose.animation.core.LinearEasing
import androidx.compose.animation.core.RepeatMode import androidx.compose.animation.core.RepeatMode
import androidx.compose.animation.core.infiniteRepeatable import androidx.compose.animation.core.infiniteRepeatable
import androidx.compose.animation.core.tween import androidx.compose.animation.core.tween
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.*
import androidx.compose.foundation.LocalIndication
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.LocalOverScrollConfiguration
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.material.ripple.LocalRippleTheme
@@ -126,7 +122,7 @@ class MainActivity : ComponentActivity() {
} }
CompositionLocalProvider( CompositionLocalProvider(
LocalOverScrollConfiguration provides null, LocalOverscrollConfiguration provides null,
LocalIndication provides rememberRipple(bounded = false), LocalIndication provides rememberRipple(bounded = false),
LocalRippleTheme provides rippleTheme, LocalRippleTheme provides rippleTheme,
LocalPreferences provides preferences, LocalPreferences provides preferences,

6
compose-routing/src/main/kotlin/it/vfsfitvnm/route/Route.kt
View File

@@ -41,7 +41,7 @@ class Route0(
) : Route(tag) { ) : Route(tag) {
context(RouteHandlerScope) context(RouteHandlerScope)
@Composable @Composable
inline operator fun invoke(content: @Composable () -> Unit) { operator fun invoke(content: @Composable () -> Unit) {
if (this == route) { if (this == route) {
content() content()
} }
@@ -61,7 +61,7 @@ class Route1<P0>(
context(RouteHandlerScope) context(RouteHandlerScope)
@Composable @Composable
inline operator fun invoke(content: @Composable (P0) -> Unit) { operator fun invoke(content: @Composable (P0) -> Unit) {
if (this == route) { if (this == route) {
if (route is Route1<*>) { if (route is Route1<*>) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
@@ -90,7 +90,7 @@ class Route2<P0, P1>(
context(RouteHandlerScope) context(RouteHandlerScope)
@Composable @Composable
inline operator fun invoke(content: @Composable (P0, P1) -> Unit) { operator fun invoke(content: @Composable (P0, P1) -> Unit) {
if (this == route) { if (this == route) {
if (route is Route2<*, *>) { if (route is Route2<*, *>) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")

6
settings.gradle.kts
View File

@@ -11,14 +11,14 @@ dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
create("libs") { create("libs") {
version("kotlin", "1.6.21") version("kotlin", "1.7.0")
alias("kotlin-serialization").toPluginId("org.jetbrains.kotlin.plugin.serialization").versionRef("kotlin") alias("kotlin-serialization").toPluginId("org.jetbrains.kotlin.plugin.serialization").versionRef("kotlin")
alias("android-media").to("androidx.media", "media").version("1.6.0") alias("android-media").to("androidx.media", "media").version("1.6.0")
version("compose-compiler", "1.2.0-beta03") version("compose-compiler", "1.2.0")
version("compose", "1.2.0-beta03") version("compose", "1.3.0-alpha01")
alias("compose-foundation").to("androidx.compose.foundation", "foundation").versionRef("compose") alias("compose-foundation").to("androidx.compose.foundation", "foundation").versionRef("compose")
alias("compose-ui").to("androidx.compose.ui", "ui").versionRef("compose") alias("compose-ui").to("androidx.compose.ui", "ui").versionRef("compose")
alias("compose-ui-util").to("androidx.compose.ui", "ui-util").versionRef("compose") alias("compose-ui-util").to("androidx.compose.ui", "ui-util").versionRef("compose")