From 43d6df63cd61176379cad8cbf4a696bba14661f8 Mon Sep 17 00:00:00 2001 From: Yasutaka Kawamoto Date: Sun, 3 Dec 2023 21:52:54 +0900 Subject: [PATCH 1/4] update latest agp version --- 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 f7eb1dc..0317433 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -androidGradlePlugin = "8.3.0-alpha13" +androidGradlePlugin = "8.3.0-alpha16" cameraCore = "1.4.0-alpha02" kotlin = "1.9.10" compose = "1.4.3" From 7fa5cc053d802de5f4e73a07f7d0090ffa148213 Mon Sep 17 00:00:00 2001 From: Yasutaka Kawamoto Date: Sun, 3 Dec 2023 22:00:51 +0900 Subject: [PATCH 2/4] =?UTF-8?q?with=E3=81=8Cdeprecated=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7togetherW?= =?UTF-8?q?ith=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jetpackcomposeplayground/animation/AnimatedContent.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/net/kwmt27/jetpackcomposeplayground/animation/AnimatedContent.kt b/app/src/main/java/net/kwmt27/jetpackcomposeplayground/animation/AnimatedContent.kt index 5f59b31..9032057 100644 --- a/app/src/main/java/net/kwmt27/jetpackcomposeplayground/animation/AnimatedContent.kt +++ b/app/src/main/java/net/kwmt27/jetpackcomposeplayground/animation/AnimatedContent.kt @@ -11,7 +11,7 @@ import androidx.compose.animation.fadeOut import androidx.compose.animation.shrinkHorizontally import androidx.compose.animation.slideInVertically import androidx.compose.animation.slideOutVertically -import androidx.compose.animation.with +import androidx.compose.animation.togetherWith import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -132,9 +132,9 @@ private fun AnimatedContent1(count: Int) { private fun AnimatedContent2(count: Int) { AnimatedContent(targetState = count, label = "AnimatedContent2", transitionSpec = { if (targetState > initialState) { - slideInVertically { height -> height } + fadeIn() with slideOutVertically { height -> -height } + fadeOut() + slideInVertically { height -> height } + fadeIn() togetherWith slideOutVertically { height -> -height } + fadeOut() } else { - slideInVertically { height -> -height } + fadeIn() with slideOutVertically { height -> height } + fadeOut() + slideInVertically { height -> -height } + fadeIn() togetherWith slideOutVertically { height -> height } + fadeOut() }.using( SizeTransform(clip = false) ) From db9ea01ef56ef6b844e8febb2f4ba4c45f3b67b4 Mon Sep 17 00:00:00 2001 From: Yasutaka Kawamoto Date: Sun, 3 Dec 2023 22:06:00 +0900 Subject: [PATCH 3/4] =?UTF-8?q?experimental=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jetpackcomposeplayground/animation/AnimatedContent.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/net/kwmt27/jetpackcomposeplayground/animation/AnimatedContent.kt b/app/src/main/java/net/kwmt27/jetpackcomposeplayground/animation/AnimatedContent.kt index 9032057..9b8dfdc 100644 --- a/app/src/main/java/net/kwmt27/jetpackcomposeplayground/animation/AnimatedContent.kt +++ b/app/src/main/java/net/kwmt27/jetpackcomposeplayground/animation/AnimatedContent.kt @@ -3,7 +3,6 @@ package net.kwmt27.jetpackcomposeplayground.animation import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.Crossfade -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.SizeTransform import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn @@ -116,7 +115,6 @@ private fun AnimatedContent0(count: Int) { /** * AnimatedContent デフォルトアニメーション */ -@OptIn(ExperimentalAnimationApi::class) @Composable private fun AnimatedContent1(count: Int) { AnimatedContent(targetState = count, label = "AnimatedContent1") { targetCount -> @@ -127,7 +125,6 @@ private fun AnimatedContent1(count: Int) { /** * ローリングアニメーション */ -@OptIn(ExperimentalAnimationApi::class) @Composable private fun AnimatedContent2(count: Int) { AnimatedContent(targetState = count, label = "AnimatedContent2", transitionSpec = { From 39afd4d93f51f9e54471abbf7e7d228dbda34a6b Mon Sep 17 00:00:00 2001 From: Yasutaka Kawamoto Date: Sun, 3 Dec 2023 22:14:05 +0900 Subject: [PATCH 4/4] update libs --- .idea/gradle.xml | 1 + gradle/libs.versions.toml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 3a1ea64..ea5f322 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,6 +13,7 @@ + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0317433..7d601a9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,16 +5,16 @@ kotlin = "1.9.10" compose = "1.4.3" composeCompiler = "1.5.3" composeBom = "2023.10.01" -androidxCoreKtx = "1.10.0" -androidxAppcompat = "1.7.0-alpha02" -googleMaterial = "1.8.0" -activityCompose = "1.7.1" -androidxLifecycle = "2.6.1" -coil = "2.4.0" +androidxCoreKtx = "1.12.0" +androidxAppcompat = "1.7.0-alpha03" +googleMaterial = "1.10.0" +activityCompose = "1.8.1" +androidxLifecycle = "2.6.2" +coil = "2.5.0" accompanist = "0.31.3-beta" -androidxNavigation = "2.6.0-beta01" -junit = "1.1.2" -espresso = "3.3.0" +androidxNavigation = "2.7.5" +junit = "1.1.5" +espresso = "3.5.1" constraintlayout = "2.1.4" [libraries] androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "cameraCore" }