review fixes

wireapp · Mar 27, 2024 · bdac706 · bdac706
1 parent 1dd135d
commit bdac706
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt
@@ -855,7 +855,7 @@ private fun ConversationScreenContent(
 }
 
 @Composable
-fun SnackBarMessage(
+private fun SnackBarMessage(
     composerMessages: SharedFlow<SnackBarMessage>,
     conversationMessages: SharedFlow<SnackBarMessage>
 ) {

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/ConversationMediaScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/ConversationMediaScreen.kt
@@ -39,6 +39,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.ramcosta.composedestinations.annotation.Destination
@@ -55,23 +56,22 @@ import com.wire.android.ui.common.calculateCurrentTab
 import com.wire.android.ui.common.colorsScheme
 import com.wire.android.ui.common.dialogs.PermissionPermanentlyDeniedDialog
 import com.wire.android.ui.common.scaffold.WireScaffold
+import com.wire.android.ui.common.snackbar.LocalSnackbarHostState
 import com.wire.android.ui.common.topBarElevation
 import com.wire.android.ui.common.topappbar.NavigationIconType
 import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
 import com.wire.android.ui.common.visbility.rememberVisibilityState
 import com.wire.android.ui.destinations.MediaGalleryScreenDestination
 import com.wire.android.ui.home.conversations.DownloadedAssetDialog
 import com.wire.android.ui.home.conversations.PermissionPermanentlyDeniedDialogState
-import com.wire.android.ui.home.conversations.SnackBarMessage
 import com.wire.android.ui.home.conversations.messages.ConversationMessagesViewModel
 import com.wire.android.ui.theme.WireTheme
 import com.wire.android.ui.theme.wireDimensions
 import com.wire.android.util.ui.PreviewMultipleThemes
 import com.wire.kalium.logic.data.id.ConversationId
 import kotlinx.collections.immutable.PersistentMap
 import kotlinx.collections.immutable.persistentMapOf
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.launch
 
 @RootNavGraph
@@ -130,10 +130,7 @@ fun ConversationMediaScreen(
         hideDialog = permissionPermanentlyDeniedDialogState::dismiss
     )
 
-    SnackBarMessage(
-        composerMessages = MutableSharedFlow<SnackBarMessage>().asSharedFlow(),
-        conversationMessages = conversationMessagesViewModel.infoMessage
-    )
+    SnackBarMessage(conversationMessagesViewModel.infoMessage)
 }
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -208,6 +205,20 @@ private fun Content(
     }
 }
 
+@Composable
+private fun SnackBarMessage(infoMessages: SharedFlow<SnackBarMessage>) {
+    val context = LocalContext.current
+    val snackbarHostState = LocalSnackbarHostState.current
+
+    LaunchedEffect(Unit) {
+        infoMessages.collect {
+            snackbarHostState.showSnackbar(
+                message = it.uiText.asString(context.resources)
+            )
+        }
+    }
+}
+
 enum class ConversationMediaScreenTabItem(@StringRes override val titleResId: Int) : TabItem {
     PICTURES(R.string.label_conversation_pictures),
     FILES(R.string.label_conversation_files);