Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update latest agp version #37

Merged
merged 4 commits into from
Dec 3, 2023
Merged

update latest agp version #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43d6df6
update latest agp version
kwmt Dec 3, 2023
7fa5cc0
withがdeprecatedになっていたのでtogetherWithに変更
kwmt Dec 3, 2023
db9ea01
experimental削除
kwmt Dec 3, 2023
39afd4d
update libs
kwmt Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions app/src/main/java/net/kwmt27/jetpackcomposeplayground/animation/AnimatedContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ 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
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
Expand Down Expand Up @@ -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 ->
Expand All @@ -127,14 +125,13 @@ private fun AnimatedContent1(count: Int) {
/**
* ローリングアニメーション
*/
@OptIn(ExperimentalAnimationApi::class)
@Composable
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)
)
Expand Down
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[versions]
androidGradlePlugin = "8.3.0-alpha13"
androidGradlePlugin = "8.3.0-alpha16"
cameraCore = "1.4.0-alpha02"
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" }
Expand Down
Loading