From 006f037bb444b90865ee476b809bd93c863e340c Mon Sep 17 00:00:00 2001 From: imashnake0 Date: Wed, 28 Feb 2024 18:53:36 -0500 Subject: [PATCH 1/7] Updated deps --- gradle/libs.versions.toml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 766ae3d6..fba2f352 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,15 +17,15 @@ desugaring = "2.0.4" # Android Gradle Plugin # https://developer.android.com/studio/releases/gradle-plugin. -agp = "8.2.1" +agp = "8.2.2" # AndroidX # https://androidx.tech. activity = "1.8.2" -core = "1.13.0-alpha03" +core = "1.13.0-alpha05" lifecycle = "2.7.0" -extJunit = "1.2.0-alpha02" -espresso = "3.6.0-alpha02" +extJunit = "1.2.0-alpha03" +espresso = "3.6.0-alpha03" # TODO: Breaking changes; review release notes and update. # Apollo Kotlin @@ -46,9 +46,6 @@ composeDestinations = "1.9.59" # Compose # https://developer.android.com/jetpack/androidx/releases/compose. -composeAnimation = "1.6.0-rc01" -composeCompiler = "1.5.8" -composeFoundation = "1.6.0-rc01" composeMaterial = "1.6.0-rc01" composeMaterial3 = "1.2.0-beta02" composeRuntime = "1.6.0-rc01" From 8d2fa2b813248e4ec152f1b45b49bd493074a3c0 Mon Sep 17 00:00:00 2001 From: imashnake0 Date: Wed, 28 Feb 2024 18:57:07 -0500 Subject: [PATCH 2/7] Updated Compose Material Ripple APIs were updated: https://developer.android.com/jetpack/compose/touch-input/user-interactions/migrate-indication-ripple#change-color-alpha-ripple --- .../imashnake/animite/features/theme/Theme.kt | 32 ++++++++----------- gradle/libs.versions.toml | 1 - 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/imashnake/animite/features/theme/Theme.kt b/app/src/main/java/com/imashnake/animite/features/theme/Theme.kt index 14f744e4..9958d34e 100644 --- a/app/src/main/java/com/imashnake/animite/features/theme/Theme.kt +++ b/app/src/main/java/com/imashnake/animite/features/theme/Theme.kt @@ -2,21 +2,22 @@ package com.imashnake.animite.features.theme import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material.ExperimentalMaterialApi +import androidx.compose.material.LocalRippleConfiguration +import androidx.compose.material.RippleConfiguration import androidx.compose.material.ripple.RippleAlpha -import androidx.compose.material.ripple.RippleTheme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.runtime.Immutable import androidx.compose.ui.platform.LocalContext import com.imashnake.animite.core.ui.LocalPaddings import com.imashnake.animite.core.ui.Paddings import com.imashnake.animite.core.ui.rememberDefaultPaddings import com.imashnake.animite.dev.ext.pastelize +@OptIn(ExperimentalMaterialApi::class) @Composable fun AnimiteTheme( paddings: Paddings = rememberDefaultPaddings(), @@ -32,29 +33,24 @@ fun AnimiteTheme( darkTheme -> KimiNoDarkColorScheme else -> KimiNoLightColorScheme.pastelize(backgroundToPrimary = 0.05f) } + val animiteRippleTheme = RippleConfiguration( + color = MaterialTheme.colorScheme.primary, + rippleAlpha = RippleAlpha( + draggedAlpha = 0.16f, + focusedAlpha = 0.12f, + hoveredAlpha = 0.08f, + pressedAlpha = 0.12f + ) + ) MaterialTheme( colorScheme = animiteColorScheme, typography = AnimiteTypography ) { CompositionLocalProvider( - LocalRippleTheme provides AnimiteRippleTheme, + LocalRippleConfiguration provides animiteRippleTheme, LocalPaddings provides paddings, content = content ) } } - -@Immutable -private object AnimiteRippleTheme : RippleTheme { - @Composable - override fun defaultColor() = MaterialTheme.colorScheme.primary - - @Composable - override fun rippleAlpha() = RippleAlpha( - draggedAlpha = 0.16f, - focusedAlpha = 0.12f, - hoveredAlpha = 0.08f, - pressedAlpha = 0.12f - ) -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fba2f352..dbec0b96 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -46,7 +46,6 @@ composeDestinations = "1.9.59" # Compose # https://developer.android.com/jetpack/androidx/releases/compose. -composeMaterial = "1.6.0-rc01" composeMaterial3 = "1.2.0-beta02" composeRuntime = "1.6.0-rc01" composeUi = "1.6.0-rc01" From 9789be62c5454176105b3447a45d9fb3b145d433 Mon Sep 17 00:00:00 2001 From: imashnake0 Date: Wed, 28 Feb 2024 20:22:15 -0500 Subject: [PATCH 3/7] Updated Compose Material3 --- .../java/com/imashnake/animite/features/theme/Theme.kt | 8 ++++---- gradle/libs.versions.toml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/imashnake/animite/features/theme/Theme.kt b/app/src/main/java/com/imashnake/animite/features/theme/Theme.kt index 9958d34e..6091ea6a 100644 --- a/app/src/main/java/com/imashnake/animite/features/theme/Theme.kt +++ b/app/src/main/java/com/imashnake/animite/features/theme/Theme.kt @@ -2,11 +2,11 @@ package com.imashnake.animite.features.theme import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material.ExperimentalMaterialApi -import androidx.compose.material.LocalRippleConfiguration -import androidx.compose.material.RippleConfiguration import androidx.compose.material.ripple.RippleAlpha +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.RippleConfiguration import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.runtime.Composable @@ -17,7 +17,7 @@ import com.imashnake.animite.core.ui.Paddings import com.imashnake.animite.core.ui.rememberDefaultPaddings import com.imashnake.animite.dev.ext.pastelize -@OptIn(ExperimentalMaterialApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Composable fun AnimiteTheme( paddings: Paddings = rememberDefaultPaddings(), diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dbec0b96..890e28d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -46,9 +46,10 @@ composeDestinations = "1.9.59" # Compose # https://developer.android.com/jetpack/androidx/releases/compose. -composeMaterial3 = "1.2.0-beta02" composeRuntime = "1.6.0-rc01" composeUi = "1.6.0-rc01" +composeMaterial = "1.7.0-alpha03" +composeMaterial3 = "1.3.0-alpha01" # Dagger # https://github.com/google/dagger/releases. From c66de298e4f377f19e111f9d1588379d1951a50c Mon Sep 17 00:00:00 2001 From: imashnake0 Date: Wed, 28 Feb 2024 20:22:46 -0500 Subject: [PATCH 4/7] Update Compose deps --- gradle/libs.versions.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 890e28d7..5e2b8adf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -48,6 +48,9 @@ composeDestinations = "1.9.59" # https://developer.android.com/jetpack/androidx/releases/compose. composeRuntime = "1.6.0-rc01" composeUi = "1.6.0-rc01" +composeAnimation = "1.7.0-alpha03" +composeCompiler = "1.5.10" +composeFoundation = "1.7.0-alpha03" composeMaterial = "1.7.0-alpha03" composeMaterial3 = "1.3.0-alpha01" From e86b331a706fa17f62aa4e0143c7f3720e8f77e3 Mon Sep 17 00:00:00 2001 From: imashnake0 Date: Wed, 28 Feb 2024 20:26:48 -0500 Subject: [PATCH 5/7] Updated Compose deps --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5e2b8adf..70dde5ba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -46,13 +46,13 @@ composeDestinations = "1.9.59" # Compose # https://developer.android.com/jetpack/androidx/releases/compose. -composeRuntime = "1.6.0-rc01" -composeUi = "1.6.0-rc01" composeAnimation = "1.7.0-alpha03" composeCompiler = "1.5.10" composeFoundation = "1.7.0-alpha03" composeMaterial = "1.7.0-alpha03" composeMaterial3 = "1.3.0-alpha01" +composeRuntime = "1.7.0-alpha03" +composeUi = "1.7.0-alpha03" # Dagger # https://github.com/google/dagger/releases. From 8316859b8f850b0eb4e2d21c71fa77442e0ca35f Mon Sep 17 00:00:00 2001 From: imashnake0 Date: Wed, 28 Feb 2024 20:34:39 -0500 Subject: [PATCH 6/7] Updated all deps --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 70dde5ba..fccb646d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -60,7 +60,7 @@ dagger = "2.50" # Hilt # https://developer.android.com/jetpack/androidx/releases/hilt. -hilt = "1.1.0" +hilt = "1.2.0" # Kotlin # https://kotlinlang.org/docs/releases.html#release-details. From d62e78079e59d2c5c382807d595e3ed2004001cb Mon Sep 17 00:00:00 2001 From: imashnake0 Date: Wed, 28 Feb 2024 20:35:01 -0500 Subject: [PATCH 7/7] Updated all deps: Re --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fccb646d..794c4b3f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -69,7 +69,7 @@ coroutines = "1.8.0-RC2" # KSP # https://github.com/google/ksp/releases. -ksp = "1.9.22-1.0.16" +ksp = "1.9.22-1.0.17" # Test # https://github.com/junit-team/junit4/releases. @@ -77,11 +77,11 @@ junit = "4.13.2" # detekt # https://github.com/detekt/detekt/releases. -detekt = "1.23.4" +detekt = "1.23.5" # Compose Markdown # https://github.com/boswelja/compose-markdown. -composeMarkdown = "1.0.3" +composeMarkdown = "1.0.4" [libraries]