improvements.

Author: commandiron

animatable-compose/src/main/java/com/commandiron/animatable_compose/state/AnimatableState.kt

@@ -50,8 +50,8 @@ data class SharedAnimatableState(
 @Composable
 fun rememberAnimatableTextState(
     index: Int = 0,
-    initialFontSize: TextUnit,
-    targetFontSize: TextUnit,
+    initialFontSize: TextUnit? = null,
+    targetFontSize: TextUnit? = null,
     toTargetFontSizeAnimationSpec: AnimationSpec<Float> = tween(500),
     toInitialFontSizeAnimationSpec: AnimationSpec<Float> = tween(500),
     onFontSizeAnimation: (AnimationState) -> Unit = {},
@@ -632,11 +632,11 @@ data class AnimatableState(
                                 if(initialOffset.x == Dp.Infinity
                                     || initialOffset.x == - Dp.Infinity
                                     || initialOffset.y == Dp.Infinity
-                                    || initialOffset.x == - Dp.Infinity
+                                    || initialOffset.y == - Dp.Infinity
                                     || targetOffset.x == Dp.Infinity
                                     || targetOffset.x == - Dp.Infinity
                                     || targetOffset.y == Dp.Infinity
-                                    || targetOffset.x == - Dp.Infinity
+                                    || targetOffset.y == - Dp.Infinity
                                 ){
                                     throw IllegalArgumentException(
                                         "Please specify size in state for use Dp.Infinity in offset animation"

app/src/main/java/com/commandiron/animatablecompose/MainActivity.kt

@@ -21,7 +21,7 @@ class MainActivity : ComponentActivity() {
                     color = MaterialTheme.colorScheme.background
                 ) {}
                 Box(Modifier.fillMaxSize(), Alignment.Center) {
-                    Show4()
+                    Show1AnimatableText()
                 }
             }
         }

…m/commandiron/animatablecompose/Show1.kt …animatablecompose/Show1AnimatableText.ktapp/src/main/java/com/commandiron/animatablecompose/Show1.kt renamed to app/src/main/java/com/commandiron/animatablecompose/Show1AnimatableText.kt app/src/main/java/com/commandiron/animatablecompose/Show1.kt renamed to app/src/main/java/com/commandiron/animatablecompose/Show1AnimatableText.kt

@@ -12,7 +12,7 @@ import com.commandiron.animatable_compose.AnimatableText
 import com.commandiron.animatable_compose.state.rememberAnimatableTextState
 
 @Composable
-fun Show1() {
+fun Show1AnimatableText() {
     // Simply create state and pass it to AnimatableText
     val state = rememberAnimatableTextState(
         initialFontSize = 12.sp,

…m/commandiron/animatablecompose/Show2.kt …/animatablecompose/Show2AnimatableBox.ktapp/src/main/java/com/commandiron/animatablecompose/Show2.kt renamed to app/src/main/java/com/commandiron/animatablecompose/Show2AnimatableBox.kt app/src/main/java/com/commandiron/animatablecompose/Show2.kt renamed to app/src/main/java/com/commandiron/animatablecompose/Show2AnimatableBox.kt

@@ -7,7 +7,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
@@ -18,7 +17,7 @@ import com.commandiron.animatable_compose.AnimatableBox
 import com.commandiron.animatable_compose.state.rememberAnimatableBoxState
 
 @Composable
-fun Show2() {
+fun Show2AnimatableBox() {
     val state = rememberAnimatableBoxState(
         initialSize = DpSize(60.dp, 60.dp), // set initial size
         targetSize = DpSize(Dp.Infinity, 120.dp), // set target size

…m/commandiron/animatablecompose/Show3.kt …animatablecompose/Show3AnimatableCard.ktapp/src/main/java/com/commandiron/animatablecompose/Show3.kt renamed to app/src/main/java/com/commandiron/animatablecompose/Show3AnimatableCard.kt app/src/main/java/com/commandiron/animatablecompose/Show3.kt renamed to app/src/main/java/com/commandiron/animatablecompose/Show3AnimatableCard.kt

@@ -17,7 +17,7 @@ import com.commandiron.animatable_compose.AnimatableCard
 import com.commandiron.animatable_compose.state.rememberAnimatableCardState
 
 @Composable
-fun Show3() {
+fun Show3AnimatableCard() {
     val animatableCardState = rememberAnimatableCardState(
         initialSize = DpSize(width = 70.dp, height = 70.dp),
         targetSize = DpSize(width = 200.dp, height = 70.dp),

app/src/main/java/com/commandiron/animatablecompose/Show4AnimatableCardWithText.kt

@@ -0,0 +1,8 @@
+package com.commandiron.animatablecompose
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun Show4AnimatableCardWithText() {
+
+}

…m/commandiron/animatablecompose/Show4.kt …blecompose/Show5ExpandablePhoneNumber.ktapp/src/main/java/com/commandiron/animatablecompose/Show4.kt renamed to app/src/main/java/com/commandiron/animatablecompose/Show5ExpandablePhoneNumber.kt app/src/main/java/com/commandiron/animatablecompose/Show4.kt renamed to app/src/main/java/com/commandiron/animatablecompose/Show5ExpandablePhoneNumber.kt

@@ -22,7 +22,7 @@ import com.commandiron.animatable_compose.state.rememberAnimatableTextState
 import com.commandiron.animatable_compose.state.rememberSharedAnimatableState
 
 @Composable
-fun Show4() {
+fun Show5ExpandablePhoneNumber() {
     //Create components state
     val animatableCardState = rememberAnimatableCardState(
         initialSize = DpSize(80.dp, 80.dp),
@@ -39,8 +39,6 @@ fun Show4() {
         initialSize = DpSize(40.dp, 40.dp),
         targetSize = DpSize(80.dp, 80.dp),
         toTargetSizeAnimationSpec = tween(500,500),
-        initialAlpha = 0.3f,
-        targetAlpha = 1f,
         toTargetAlphaAnimationSpec = tween(5000, 500),
         initialOffset = DpOffset(0.dp, 0.dp),
         targetOffset = DpOffset((-50).dp, 0.dp),

app/src/main/java/com/commandiron/animatablecompose/Show6CardDealer.kt

@@ -0,0 +1,88 @@
+package com.commandiron.animatablecompose
+
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.*
+import com.commandiron.animatable_compose.AnimatableCard
+import com.commandiron.animatable_compose.AnimatableText
+import com.commandiron.animatable_compose.state.AnimatableState
+import com.commandiron.animatable_compose.state.rememberAnimatableCardState
+import com.commandiron.animatable_compose.state.rememberAnimatableTextState
+import com.commandiron.animatable_compose.state.rememberSharedAnimatableState
+
+@Composable
+fun Show6CardDealer() {
+
+    val cards by remember  { 
+        mutableStateOf(listOf("A","K","Q","J","10","9","8","7","6","5","4","3","2"))
+    }
+    var deck by remember {
+        mutableStateOf(cards + cards + cards + cards)
+    }
+
+    val animatableCardState = rememberAnimatableCardState(
+        initialSize = DpSize(64.dp, 64.dp),
+        targetSize = DpSize(64.dp, 64.dp),
+        initialOffset = DpOffset(0.dp, 120.dp),
+        targetOffset = DpOffset(-Dp.Infinity, -Dp.Infinity)
+    )
+    val animatableTextState = rememberAnimatableTextState(
+        initialFontSize = 0.sp,
+        targetFontSize = 24.sp
+    )
+
+    val cardStates = mutableListOf<AnimatableState>()
+    val textStates = mutableListOf<AnimatableState>()
+
+    deck.indices.forEach {
+        cardStates.add(
+            animatableCardState.copy(
+                index = it,
+                toTargetOffsetAnimationSpec = tween(400, (it * 400)),
+                targetOffset = DpOffset(if(it % 2 == 0) (-100).dp else 100.dp, (-150).dp)
+            )
+        )
+        textStates.add(
+            animatableTextState.copy(
+                index = it,
+                toTargetFontSizeAnimationSpec = tween(400, (it * 400))
+            )
+        )
+
+    }
+    
+    val sharedAnimatableState = rememberSharedAnimatableState(cardStates + textStates)
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .clickable {
+                deck = deck.shuffled()
+                sharedAnimatableState.animate()
+            },
+        contentAlignment = Alignment.Center
+    ) {
+        deck.indices.forEach {
+            AnimatableCard(
+                onClick = {},
+                state = sharedAnimatableState,
+                stateIndex = it,
+                fixedShape = RoundedCornerShape(16.dp)
+            ) {
+                Box(Modifier.fillMaxSize(), Alignment.Center) {
+                    AnimatableText(
+                        text = deck[it],
+                        state = sharedAnimatableState,
+                        stateIndex = it
+                    )
+                }
+            }
+        }
+    }
+}