Merge branch 'master' into add-claude-github-actions-1765328398459

Author: ovitrif

app/src/main/java/to/bitkit/di/ViewModelModule.kt

@@ -5,6 +5,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import to.bitkit.ui.shared.toast.ToastQueueManager
 import javax.inject.Singleton
 
 @Module
@@ -15,4 +17,9 @@ object ViewModelModule {
     fun provideFirebaseMessaging(): FirebaseMessaging {
         return FirebaseMessaging.getInstance()
     }
+
+    @Provides
+    fun provideToastManagerProvider(): (CoroutineScope) -> ToastQueueManager {
+        return ::ToastQueueManager
+    }
 }

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -1089,7 +1089,6 @@ private fun NavGraphBuilder.activityItem(
     }
     composableWithDefaultTransitions<Routes.ActivityExplore> {
         ActivityExploreScreen(
-            listViewModel = activityListViewModel,
             route = it.toRoute(),
             onBackClick = { navController.popBackStack() },
         )

app/src/main/java/to/bitkit/ui/MainActivity.kt

@@ -166,12 +166,13 @@ class MainActivity : FragmentActivity() {
                     }
                 }
 
+                val currentToast by appViewModel.currentToast.collectAsStateWithLifecycle()
                 ToastOverlay(
-                    toast = appViewModel.currentToast,
+                    toast = currentToast,
                     hazeState = hazeState,
-                    onDismiss = {
-                        appViewModel.hideToast()
-                    }
+                    onDismiss = { appViewModel.hideToast() },
+                    onDragStart = { appViewModel.pauseToast() },
+                    onDragEnd = { appViewModel.resumeToast() }
                 )
 
                 val transactionSheetDetails by appViewModel.transactionSheet.collectAsStateWithLifecycle()

app/src/main/java/to/bitkit/ui/components/ActivityBanner.kt

@@ -37,6 +37,7 @@ import to.bitkit.R
 import to.bitkit.models.ActivityBannerType
 import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.shared.util.outerGlow
+import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 
 private const val GLOW_ANIMATION_MILLIS = 1200
@@ -174,18 +175,20 @@ fun ActivityBanner(
 @Preview(showSystemUi = true)
 @Composable
 private fun Preview() {
-    LazyColumn(
-        verticalArrangement = Arrangement.spacedBy(4.dp),
-        modifier = Modifier.fillMaxSize(),
-    ) {
-        items(items = ActivityBannerType.entries) { item ->
-            ActivityBanner(
-                gradientColor = item.color,
-                title = stringResource(R.string.activity_banner__transfer_in_progress),
-                icon = item.icon,
-                onClick = {},
-                modifier = Modifier.fillMaxWidth()
-            )
+    AppThemeSurface {
+        LazyColumn(
+            verticalArrangement = Arrangement.spacedBy(4.dp),
+            modifier = Modifier.fillMaxSize(),
+        ) {
+            items(items = ActivityBannerType.entries) { item ->
+                ActivityBanner(
+                    gradientColor = item.color,
+                    title = stringResource(R.string.activity_banner__transfer_in_progress),
+                    icon = item.icon,
+                    onClick = {},
+                    modifier = Modifier.fillMaxWidth()
+                )
+            }
         }
     }
 }

app/src/main/java/to/bitkit/ui/components/ToastView.kt

@@ -5,6 +5,7 @@ import androidx.compose.animation.SizeTransform
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
@@ -126,7 +127,14 @@ fun ToastView(
                                 val isHorizontalSwipe = horizontalSwipeDistance > verticalSwipeDistance
 
                                 if (isHorizontalSwipe && horizontalSwipeDistance > dismissThreshold.toPx()) {
-                                    // Horizontal swipe dismiss
+                                    // Horizontal swipe dismiss - animate off-screen horizontally
+                                    val swipeDirection = if (dragOffsetX.value > 0) 1f else -1f
+                                    val targetOffsetX = swipeDirection * 1200.dp.toPx()
+
+                                    dragOffsetX.animateTo(
+                                        targetValue = targetOffsetX,
+                                        animationSpec = tween(durationMillis = 200)
+                                    )
                                     onDismiss()
                                 } else if (!isHorizontalSwipe && dragOffsetY.value < -dismissThreshold.toPx()) {
                                     // Vertical swipe up dismiss
@@ -285,9 +293,9 @@ private fun ToastHost(
 @Composable
 fun ToastOverlay(
     toast: Toast?,
+    onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
     hazeState: HazeState = rememberHazeState(blurEnabled = true),
-    onDismiss: () -> Unit,
     onDragStart: () -> Unit = {},
     onDragEnd: () -> Unit = {},
 ) {
@@ -312,7 +320,6 @@ private fun ToastViewPreview() {
         ScreenColumn(
             verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
-
             ToastView(
                 toast = Toast(
                     type = Toast.ToastType.WARNING,

app/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt

@@ -8,7 +8,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -217,14 +216,13 @@ class HomeViewModel @Inject constructor(
 
     private suspend fun createBannersFlow() {
         transferRepo.activeTransfers
-            .distinctUntilChanged()
             .collect { transfers ->
                 val banners = listOfNotNull(
                     ActivityBannerType.SPENDING.takeIf {
-                        transfers.any { it.type == TransferType.TO_SPENDING || it.type == TransferType.MANUAL_SETUP }
+                        transfers.any { it.type.isToSpending() }
                     },
                     ActivityBannerType.SAVINGS.takeIf {
-                        transfers.any { it.type == TransferType.COOP_CLOSE || it.type == TransferType.FORCE_CLOSE }
+                        transfers.any { it.type.isToSavings() }
                     },
                 )
                 _uiState.update { it.copy(banners = banners) }