Merge pull request #100 from code-payments/chore/grabbed-bill-aniamtion

feat: tweak bill grabbed animation to match iOS

Author: bmc08gt

app/src/main/java/com/getcode/util/AnimationUtils.kt

@@ -2,34 +2,41 @@ package com.getcode.util
 
 import androidx.compose.animation.*
 import androidx.compose.animation.core.*
-import androidx.navigation.NavBackStackEntry
 
 
 object AnimationUtils {
     const val animationTime = 350
 
 
-    val animationBillEnter = slideInVertically(
+    val animationBillEnterGive = slideInVertically(
         initialOffsetY = { it },
         animationSpec = spring(
             dampingRatio = 0.6f,
             stiffness = 400f
         )
     )
 
-    val animationBillEnterSpring = scaleIn(
+    val animationBillEnterGrabbed = scaleIn(
         animationSpec = spring(
             dampingRatio = Spring.DampingRatioMediumBouncy,
             stiffness = 1500f
         ),
         initialScale = 0.5f
     )
 
-    val animationBillExit = slideOutVertically(
+    val animationBillExitReturned = slideOutVertically(
         targetOffsetY = { it },
         animationSpec = tween(
             durationMillis = 600,
             easing = FastOutSlowInEasing
         )
     )
+
+    val animationBillExitGrabbed = fadeOut(tween(durationMillis = 400)) + scaleOut(
+        animationSpec = spring(
+            dampingRatio = 0.4f,
+            stiffness = 400f
+        ),
+        targetScale = 1.1f
+    )
 }

app/src/main/java/com/getcode/view/main/home/HomeScan.kt

@@ -2,7 +2,6 @@ package com.getcode.view.main.home
 
 import android.Manifest
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
@@ -68,7 +67,6 @@ import com.getcode.navigation.screens.GiveKinModal
 import com.getcode.theme.Brand
 import com.getcode.theme.CodeTheme
 import com.getcode.util.AnimationUtils
-import com.getcode.util.ChromeTabsUtils
 import com.getcode.util.addIf
 import com.getcode.util.flagResId
 import com.getcode.util.formatted
@@ -401,7 +399,7 @@ private fun BillContainer(
         val showManagementOptions by remember(updatedState.billState) {
             derivedStateOf {
                 billDismissState.targetValue == DismissValue.Default &&
-                        updatedState.billState.bill != null &&
+                        updatedState.billState.valuation != null &&
                         !updatedState.billState.hideBillButtons
             }
         }
@@ -420,13 +418,13 @@ private fun BillContainer(
                 bill = updatedState.billState.bill,
                 transitionSpec = {
                     if (updatedState.presentationStyle is PresentationStyle.Slide) {
-                        AnimationUtils.animationBillEnter
+                        AnimationUtils.animationBillEnterGive
                     } else {
-                        AnimationUtils.animationBillEnterSpring
+                        AnimationUtils.animationBillEnterGrabbed
                     } togetherWith if (updatedState.presentationStyle is PresentationStyle.Slide) {
-                        AnimationUtils.animationBillExit
+                        AnimationUtils.animationBillExitReturned
                     } else {
-                        fadeOut()
+                        AnimationUtils.animationBillExitGrabbed
                     }
                 }
             )

app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt

@@ -351,6 +351,7 @@ class HomeViewModel @Inject constructor(
                                 amount = bill.amount,
                                 didReceive = bill.didReceive
                             ),
+                            valuation = Valuation(bill.amount),
                             showToast = bill.didReceive
                         )
                     )
@@ -385,12 +386,26 @@ class HomeViewModel @Inject constructor(
                 presentationStyle = style,
                 billState = it.billState.copy(
                     bill = null,
-                    valuation = null,
-                    hideBillButtons = false,
                 )
             )
         }
 
+        viewModelScope.launch {
+            if (shown) {
+                delay(300)
+            }
+            withContext(Dispatchers.Main) {
+                uiFlow.update {
+                    it.copy(
+                        billState = it.billState.copy(
+                            valuation = null,
+                            hideBillButtons = false
+                        )
+                    )
+                }
+            }
+        }
+
         viewModelScope.launch {
             if (shown) {
                 delay(5.seconds.inWholeMilliseconds)