Merge pull request #528 from code-payments/feat/splat-tipcard-if-unseen

feat: splat "Receive" (Tip Card) if unseen

Author: bmc08gt

api/src/main/java/com/getcode/model/PrefBool.kt

@@ -25,6 +25,7 @@ sealed class PrefsBool(val value: String) {
     data object IS_ELIGIBLE_GET_FIRST_KIN_AIRDROP: PrefsBool("is_eligible_get_first_kin_airdrop"), InternalRouting
     data object IS_ELIGIBLE_GIVE_FIRST_KIN_AIRDROP: PrefsBool("is_eligible_give_first_kin_airdrop"), InternalRouting
     data object HAS_REMOVED_LOCAL_CURRENCY: PrefsBool("removed_local_currency"), InternalRouting
+    data object DISMISSED_TIP_CARD_BANNER : PrefsBool("dismissed_tip_card_banner"), InternalRouting
     data object SEEN_TIP_CARD : PrefsBool("seen_tip_card"), InternalRouting
     data object STARTED_TIP_CONNECT: PrefsBool("started_tip_connect"), InternalRouting
 

api/src/main/java/com/getcode/network/ChatHistoryController.kt

@@ -116,7 +116,7 @@ class ChatHistoryController @Inject constructor(
             chatFlows[chatId] = it
         }
 
-    val unreadCount = notifications
+    val notificationsUnreadCount = notifications
         .filterNotNull()
         // Ignore muted chats and unsubscribed chats
         .map { it.filter { c -> !c.isMuted && c.isSubscribed } }

api/src/main/java/com/getcode/network/TipController.kt

@@ -164,9 +164,13 @@ class TipController @Inject constructor(
         userMetadata = null
     }
 
+    fun seenTipCardBanner() {
+        prefRepository.set(PrefsBool.DISMISSED_TIP_CARD_BANNER, true)
+        endVerification()
+    }
+
     fun clearTwitterSplat() {
         prefRepository.set(PrefsBool.SEEN_TIP_CARD, true)
-        endVerification()
     }
 
     fun generateTipVerification(): String? {

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

@@ -29,8 +29,9 @@ fun Badge(
     exitTransition: ExitTransition = fadeOut() + scaleOut(tween(durationMillis = 300))
 ) {
     AnimatedVisibility(modifier = modifier, visible = count > 0, enter = enterTransition, exit = exitTransition) {
-        val text = when {
-            count in 1..99 -> "$count"
+        val text = when (count) {
+            0 -> ""
+            in 1..99 -> "$count"
             else -> "99+"
         }
 

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

@@ -151,7 +151,8 @@ data class HomeUiModel(
     val billState: BillState = BillState.Default,
     val restrictionType: RestrictionType? = null,
     val isRemoteSendLoading: Boolean = false,
-    val chatUnreadCount: Int = 0,
+    val splatTipCard: Boolean = false,
+    val notificationUnreadCount: Int = 0,
     val buyModule: Feature = BuyModuleFeature(),
     val requestKin: Feature = RequestKinFeature(),
     val actions: List<HomeAction> = listOf(HomeAction.GIVE_KIN, HomeAction.TIP_CARD, HomeAction.BALANCE),
@@ -238,6 +239,18 @@ class HomeViewModel @Inject constructor(
             }.launchIn(viewModelScope)
 
         tipController.showTwitterSplat
+            .onEach { splat ->
+                viewModelScope.launch {
+                    if (splat) {
+                        delay(300)
+                    } else {
+                        delay(500)
+                    }
+                    uiFlow.update {
+                        it.copy(splatTipCard = splat)
+                    }
+                }
+            }
             .filter { it }
             .onEach { delay(500) }
             .flatMapLatest { tipController.connectedAccount }
@@ -258,7 +271,7 @@ class HomeViewModel @Inject constructor(
                                 primaryAction = ::presentShareableTipCard,
                                 secondaryText = resources.getString(R.string.action_later),
                                 secondaryAction = {
-                                    tipController.clearTwitterSplat()
+                                    tipController.seenTipCardBanner()
                                 }
                             )
                         )
@@ -333,11 +346,11 @@ class HomeViewModel @Inject constructor(
             }
         }.launchIn(viewModelScope)
 
-        historyController.unreadCount
+        historyController.notificationsUnreadCount
             .distinctUntilChanged()
             .map { it }
             .onEach { count ->
-                uiFlow.update { it.copy(chatUnreadCount = count) }
+                uiFlow.update { it.copy(notificationUnreadCount = count) }
             }.launchIn(viewModelScope)
 
         prefRepository.observeOrDefault(PrefsBool.LOG_SCAN_TIMES, false)

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

@@ -79,7 +79,7 @@ internal fun HomeBottom(
                         badge = {
                             Badge(
                                 modifier = Modifier.padding(top = 6.dp, end = 1.dp),
-                                count = state.chatUnreadCount,
+                                count = state.notificationUnreadCount,
                                 color = ChatNodeDefaults.UnreadIndicator,
                                 enterTransition = scaleIn(
                                     animationSpec = tween(
@@ -98,6 +98,19 @@ internal fun HomeBottom(
                         label = stringResource(R.string.action_receive),
                         painter = painterResource(R.drawable.ic_tip_card),
                         onClick = { onPress(action) },
+                        badge = {
+                            Badge(
+                                modifier = Modifier.padding(top = 6.dp, end = 1.dp),
+                                count = if (state.splatTipCard) 1 else 0,
+                                color = ChatNodeDefaults.UnreadIndicator,
+                                enterTransition = scaleIn(
+                                    animationSpec = tween(
+                                        durationMillis = 300,
+                                        delayMillis = 1000
+                                    )
+                                ) + fadeIn()
+                            )
+                        }
                     )
                 }