Merge pull request #166 from code-payments/chore/delay-airdrop-toast

chore: sync up airdrop toast and badge animations more

Author: bmc08gt

app/src/main/java/com/getcode/ui/components/Badge.kt

@@ -1,6 +1,9 @@
 package com.getcode.ui.components
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
@@ -26,8 +29,10 @@ fun Badge(
     count: Int,
     color: Color = CodeTheme.colors.brand,
     contentColor: Color = Color.White,
+    enterTransition: EnterTransition = scaleIn(tween(durationMillis = 300)) + fadeIn(),
+    exitTransition: ExitTransition = fadeOut() + scaleOut(tween(durationMillis = 300))
 ) {
-    AnimatedVisibility(visible = count > 0, enter = scaleIn() + fadeIn(), exit = fadeOut() + scaleOut()) {
+    AnimatedVisibility(visible = count > 0, enter = enterTransition, exit = exitTransition) {
         val text = when {
             count in 1..99 -> "$count"
             else -> "99+"

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

@@ -115,6 +115,7 @@ import java.util.TimerTask
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.concurrent.schedule
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
@@ -212,7 +213,7 @@ class HomeViewModel @Inject constructor(
                     } ?: Completable.complete()
                     receiveWithinLimits.subscribe({}, {})
 
-                    showToast(amount = amount, isDeposit = true)
+                    showToast(amount = amount, isDeposit = true, initialDelay = 1.seconds)
 
                     historyController.fetchChats()
                 },
@@ -486,30 +487,34 @@ class HomeViewModel @Inject constructor(
 
     private fun showToast(
         amount: KinAmount,
-        isDeposit: Boolean = false
+        isDeposit: Boolean = false,
+        initialDelay: Duration = 500.milliseconds
     ) {
-        if (amount.kin.toKinTruncatingLong() == 0L) {
-            uiFlow.update { uiModel ->
-                val billState = uiModel.billState
-                uiModel.copy(
-                    billState = billState.copy(
-                        toast = null
+        viewModelScope.launch {
+            delay(initialDelay)
+            if (amount.kin.toKinTruncatingLong() == 0L) {
+                uiFlow.update { uiModel ->
+                    val billState = uiModel.billState
+                    uiModel.copy(
+                        billState = billState.copy(
+                            toast = null
+                        )
                     )
-                )
+                }
+                return@launch
             }
-            return
-        }
 
-        uiFlow.update {
-            it.copy(
-                billState = it.billState.copy(
-                    showToast = true,
-                    toast = BillToast(amount = amount, isDeposit = isDeposit)
+            uiFlow.update {
+                it.copy(
+                    billState = it.billState.copy(
+                        showToast = true,
+                        toast = BillToast(amount = amount, isDeposit = isDeposit)
+                    )
                 )
-            )
-        }
+            }
+
+            delay(5.seconds)
 
-        Timer().schedule(5.seconds.inWholeMilliseconds) {
             uiFlow.update { uiModel ->
                 val billState = uiModel.billState
                 uiModel.copy(
@@ -518,16 +523,16 @@ class HomeViewModel @Inject constructor(
                     )
                 )
             }
+
             // wait for animation to run
-            Timer().schedule(500.milliseconds.inWholeMilliseconds) {
-                uiFlow.update { uiModel ->
-                    val billState = uiModel.billState
-                    uiModel.copy(
-                        billState = billState.copy(
-                            toast = null
-                        )
+            delay(500.milliseconds)
+            uiFlow.update { uiModel ->
+                val billState = uiModel.billState
+                uiModel.copy(
+                    billState = billState.copy(
+                        toast = null
                     )
-                }
+                )
             }
         }
     }

app/src/main/java/com/getcode/view/main/home/components/HomeBottom.kt

@@ -1,5 +1,8 @@
 package com.getcode.view.main.home.components
 
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.scaleIn
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -23,12 +26,12 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.getcode.R
 import com.getcode.theme.CodeTheme
-import com.getcode.ui.utils.heightOrZero
-import com.getcode.ui.utils.rememberedClickable
-import com.getcode.ui.utils.widthOrZero
 import com.getcode.ui.components.Badge
 import com.getcode.ui.components.Row
 import com.getcode.ui.components.chat.ChatNodeDefaults
+import com.getcode.ui.utils.heightOrZero
+import com.getcode.ui.utils.rememberedClickable
+import com.getcode.ui.utils.widthOrZero
 import com.getcode.view.main.home.HomeBottomSheet
 import com.getcode.view.main.home.HomeUiModel
 
@@ -82,7 +85,8 @@ internal fun HomeBottom(
                 Badge(
                     modifier = Modifier.padding(top = 2.dp, end = 2.dp),
                     count = state.chatUnreadCount,
-                    color = ChatNodeDefaults.UnreadIndicator
+                    color = ChatNodeDefaults.UnreadIndicator,
+                    enterTransition = scaleIn(animationSpec = tween(durationMillis = 300, delayMillis = 1000)) + fadeIn()
                 )
             }
         )