Change keyboard anims

AnkitSuda · Nov 15, 2022 · c7199a7 · c7199a7
1 parent c2dbab9
commit c7199a7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 15 deletions.
diff --git a/...i-keyboard/src/main/java/com/ankitsuda/rebound/ui/keyboard/ReboundSetKeyboardComponent.kt b/...i-keyboard/src/main/java/com/ankitsuda/rebound/ui/keyboard/ReboundSetKeyboardComponent.kt
@@ -18,8 +18,7 @@ import android.text.TextUtils
 import android.view.inputmethod.ExtractedTextRequest
 import android.view.inputmethod.InputConnection
 import androidx.activity.compose.BackHandler
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.*
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.*
@@ -73,7 +72,20 @@ fun ReboundSetKeyboardComponent(
     }
 
     Box {
-        AnimatedContent(targetState = currentMode) { mCurrentMode ->
+        AnimatedContent(
+            targetState = currentMode,
+            transitionSpec = {
+                if (targetState == KeyboardModeType.NUMBERS) {
+                    slideInVertically { height -> -height } + fadeIn() with
+                            slideOutVertically { height -> height } + fadeOut()
+                } else {
+                    slideInVertically { height -> height } + fadeIn() with
+                            slideOutVertically { height -> -height } + fadeOut()
+                }.using(
+                    SizeTransform(clip = false)
+                )
+            }
+        ) { mCurrentMode ->
             when (mCurrentMode) {
                 KeyboardModeType.NUMBERS -> {
                     NumKeysContainerComponent(

diff --git a/modules/ui-keyboard/src/main/java/com/ankitsuda/rebound/ui/keyboard/RightLayoutComponent.kt b/modules/ui-keyboard/src/main/java/com/ankitsuda/rebound/ui/keyboard/RightLayoutComponent.kt
@@ -14,6 +14,8 @@
 
 package com.ankitsuda.rebound.ui.keyboard
 
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
@@ -30,6 +32,7 @@ import com.ankitsuda.rebound.ui.keyboard.enums.KeyboardModeType
 import com.ankitsuda.rebound.ui.keyboard.enums.ReboundKeyboardType
 import com.ankitsuda.rebound.ui.theme.LocalThemeState
 
+@OptIn(ExperimentalAnimationApi::class)
 @Composable
 internal fun RightLayoutComponent(
     modifier: Modifier,
@@ -60,19 +63,23 @@ internal fun RightLayoutComponent(
                     }
                 )
             }) {
-                Icon(
-                    imageVector = if (currentLayoutMode == KeyboardModeType.NUMBERS) {
-                        Icons.Filled.Plates
-                    } else {
-                        Icons.Outlined.Dialpad
-                    }, contentDescription = if (currentLayoutMode == KeyboardModeType.NUMBERS) {
-                        stringResource(R.string.plate_calculator)
-                    } else {
-                        stringResource(R.string.keyboard)
-                    },
-                    tint = theme.keyboardContentColor
-                )
+
+                AnimatedContent(targetState = currentLayoutMode) {
+                    Icon(
+                        imageVector = if (it == KeyboardModeType.NUMBERS) {
+                            Icons.Filled.Plates
+                        } else {
+                            Icons.Outlined.Dialpad
+                        }, contentDescription = if (it == KeyboardModeType.NUMBERS) {
+                            stringResource(R.string.plate_calculator)
+                        } else {
+                            stringResource(R.string.keyboard)
+                        },
+                        tint = theme.keyboardContentColor
+                    )
+                }
             }
         }
     }
+
 }