#487 chnage snackbar to material3 use scaffold

sentinelweb · sentinelweb · commit 76e8a0c30c0c · 2024-11-02T13:46:26.000+01:00
diff --git a/app/src/main/java/uk/co/sentinelweb/cuer/app/ui/filebrowser/FileBrowserFragment.kt b/app/src/main/java/uk/co/sentinelweb/cuer/app/ui/filebrowser/FileBrowserFragment.kt
@@ -88,7 +88,6 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {
         super.onViewCreated(view, savedInstanceState)
         binding.composeView.setContent {
             FilesComposeables.FileBrowserAppUi(
-                modelObservable = viewModel.modelObservable,
                 viewModel = viewModel
             )
         }
@@ -102,9 +101,7 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {
             Label.Up -> {
                 navRouter.navigate(NavigationModel(NAV_BACK, mapOf(BACK_PARAMS to R.id.navigation_remotes)))
             }
-            is Label.ErrorMessage -> {
-
-            }
+            else -> Unit
         }
     }
 
diff --git a/hub/build.gradle.kts b/hub/build.gradle.kts
@@ -27,10 +27,10 @@ dependencies {
     implementation(project(":remote"))
     implementation(project(":net"))
     implementation(compose.desktop.currentOs)
-    implementation(compose.desktop.common)
+    implementation(compose.desktop.common) // needed for viewModel
     implementation(libs.kotlinx.coroutines.swing)
-//    implementation(libs.androidx.lifecycle.viewmodel.compose.desktop)
     implementation(libs.androidx.lifecycle.viewmodel.compose.desktop)
+    implementation(compose.material3)
 
     implementation(libs.koinCore)
     implementation(libs.kotlinxCoroutinesCore)
diff --git a/hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/filebrowser/FilesUiCoordinator.kt b/hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/filebrowser/FilesUiCoordinator.kt
@@ -1,27 +1,23 @@
 package uk.co.sentinelweb.cuer.hub.ui.filebrowser
 
 import androidx.compose.runtime.Composable
-import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import org.koin.core.component.KoinComponent
 import org.koin.core.qualifier.named
 import org.koin.core.scope.Scope
 import org.koin.dsl.module
 import uk.co.sentinelweb.cuer.app.ui.cast.CastController
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesComposeables.FileBrowserDesktopUi
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract
-import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Label
+import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Label.ErrorMessage
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Model.Companion.Initial
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.State
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesViewModel
 import uk.co.sentinelweb.cuer.app.ui.remotes.selector.RemotesDialogContract
 import uk.co.sentinelweb.cuer.core.wrapper.LogWrapper
 import uk.co.sentinelweb.cuer.domain.NodeDomain
-import uk.co.sentinelweb.cuer.domain.ext.name
 import uk.co.sentinelweb.cuer.hub.ui.home.HomeUiCoordinator
 import uk.co.sentinelweb.cuer.hub.ui.remotes.selector.RemotesDialogLauncher
 import uk.co.sentinelweb.cuer.hub.ui.remotes.selector.RemotesDialogLauncherComposeables.ShowRemotesDialogIfNecessary
@@ -34,17 +30,18 @@ class FilesUiCoordinator(
     private val log: LogWrapper
 ) : UiCoordinator<FilesContract.Model>,
     DesktopScopeComponent,
-    KoinComponent {
+    KoinComponent {// fixme check KoinComponent
 
     init {
         log.tag(this)
     }
 
-    private val job = SupervisorJob()
-    private val coordinatorScope = CoroutineScope(Dispatchers.Main + job)
+    private val supervisorJob = SupervisorJob()
+    private val coordinatorScope = CoroutineScope(Dispatchers.Main + supervisorJob)
 
     override val scope: Scope = desktopScopeWithSource(this)
     override val modelObservable = MutableStateFlow(Initial)
+
     private val viewModel: FilesViewModel by scope.inject()
     private val remotesDialogLauncher: RemotesDialogContract.Launcher by scope.inject()
 
@@ -57,7 +54,7 @@ class FilesUiCoordinator(
         coordinatorScope.launch {
             viewModel.labels.collectLatest {
                 when (it) {
-                    is Label.ErrorMessage -> parent.showError(it.message)
+                    is ErrorMessage -> parent.showError(it.message)
                     else -> Unit
                 }
             }
@@ -114,7 +111,6 @@ class FilesUiCoordinator(
                     )
                 }
             }
-
         }
     }
 }
diff --git a/hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/home/HomeComposeables.kt b/hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/home/HomeComposeables.kt
@@ -3,14 +3,15 @@ package uk.co.sentinelweb.cuer.hub.ui.home
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
@@ -81,14 +82,13 @@ fun Home(coordinator: HomeUiCoordinator) {
                     ),
                 )
             },
-            scaffoldState = rememberScaffoldState(snackbarHostState = snackbarHostState),
-            snackbarHost = { state ->
-                SnackbarHost(state, modifier = Modifier.padding(8.dp)) { data ->
+            snackbarHost = {
+                SnackbarHost(snackbarHostState, modifier = Modifier.padding(8.dp)) { data ->
                     CustomSnackbar(snackbarData = data)
                 }
-            }
-        ) {
-            Row {
+            },
+        ) { padding ->
+            Row(modifier = Modifier.padding(padding)) {
                 Box(modifier = Modifier.width(400.dp)) {
                     coordinator.remotesCoordinator.RemotesDesktopUi()
                 }
@@ -109,27 +109,3 @@ fun Home(coordinator: HomeUiCoordinator) {
         }
     }
 }
-
-@Composable
-fun CustomSnackbar(snackbarData: SnackbarData) {
-    Snackbar(
-        modifier = Modifier.background(MaterialTheme.colors.error),
-        action = {
-            TextButton(
-                onClick = { snackbarData.dismiss() },
-                elevation = ButtonDefaults.elevation(4.dp, 2.dp, 0.dp),
-                colors = ButtonDefaults.buttonColors(backgroundColor = MaterialTheme.colors.onError),
-                shape = MaterialTheme.shapes.medium,
-                modifier = Modifier,
-            ) {
-                Text(
-                    text = snackbarData.actionLabel ?: "DISMISS",
-                    color = MaterialTheme.colors.error
-                )
-            }
-        },
-        backgroundColor = MaterialTheme.colors.error,
-    ) {
-        Text(text = snackbarData.message, color = MaterialTheme.colors.onError)
-    }
-}
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -72,7 +72,7 @@ kotlin {
 
                 implementation(compose.runtime)
                 implementation(compose.foundation)
-                implementation(compose.material)
+                implementation(compose.material)// fixme try to remove this
                 implementation(compose.material3)
                 implementation(compose.materialIconsExtended)
                 implementation(compose.ui)
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/common/compose/CuerSharedAppBarComposables.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/common/compose/CuerSharedAppBarComposables.kt
@@ -1,5 +1,6 @@
 package uk.co.sentinelweb.cuer.app.ui.common.compose
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
@@ -174,3 +175,36 @@ fun TopAppBarOverflowMenu(
         }
     }
 }
+
+@Composable
+fun CustomSnackbar(snackbarData: SnackbarData) {
+    Snackbar(
+        modifier = Modifier.background(MaterialTheme.colorScheme.error),
+        containerColor = MaterialTheme.colorScheme.error,
+        contentColor = MaterialTheme.colorScheme.onError,
+        shape = MaterialTheme.shapes.medium,
+        action = {
+            TextButton(
+                onClick = { snackbarData.dismiss() },
+                elevation = ButtonDefaults.elevatedButtonElevation(4.dp, 2.dp, 0.dp),
+                colors = ButtonDefaults.buttonColors(
+                    contentColor = MaterialTheme.colorScheme.error,
+                    containerColor = MaterialTheme.colorScheme.onError,
+                ),
+                shape = MaterialTheme.shapes.small,
+                modifier = Modifier,
+            ) {
+                Text(
+                    text = snackbarData.visuals.actionLabel ?: "DISMISS",
+                    color = MaterialTheme.colorScheme.error,
+                    style = MaterialTheme.typography.bodyMedium,
+                )
+            }
+        },
+    ) {
+        Text(
+            text = snackbarData.visuals.message,
+            color = MaterialTheme.colorScheme.onError
+        )
+    }
+}
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/FilesComposeables.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/FilesComposeables.kt
@@ -2,27 +2,28 @@ package uk.co.sentinelweb.cuer.app.ui.filebrowser
 
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.flow.Flow
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 import uk.co.sentinelweb.cuer.app.ui.common.compose.Action
 import uk.co.sentinelweb.cuer.app.ui.common.compose.CuerMenuItem.*
 import uk.co.sentinelweb.cuer.app.ui.common.compose.CuerSharedAppBarComposables.CuerSharedAppBar
 import uk.co.sentinelweb.cuer.app.ui.common.compose.CuerSharedTheme
+import uk.co.sentinelweb.cuer.app.ui.common.compose.CustomSnackbar
 import uk.co.sentinelweb.cuer.app.ui.common.compose.colorTransparentYellow
+import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Label
+import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Label.None
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.ListItemType.*
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Model.Companion.Initial
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Sort.Alpha
@@ -36,15 +37,24 @@ object FilesComposeables {
 
     // todo use scaffold - move up to app
     @Composable
-    fun FileBrowserAppUi(modelObservable: Flow<FilesContract.Model>, viewModel: FilesContract.ViewModel) {
-        val model = modelObservable.collectAsState(initial = Initial)
+    fun FileBrowserAppUi(viewModel: FilesContract.ViewModel) {
+        val model = viewModel.modelObservable.collectAsState(initial = Initial)
+        val snackbarHostState = remember { SnackbarHostState() }
+        val label = viewModel.labels.collectAsState(initial = None)
+
+        LaunchedEffect(label.value) {
+            when (label.value) {
+                is Label.ErrorMessage -> snackbarHostState.showSnackbar(
+                    message = (label.value as Label.ErrorMessage).message,
+                    actionLabel = "DISMISS",
+                )
+
+                else -> Unit
+            }
+        }
         CuerSharedTheme {
-            Surface {
-                Column(
-                    modifier = Modifier
-                        .fillMaxHeight()
-                        .padding(bottom = 60.dp)
-                ) {
+            Scaffold(
+                topBar = {
                     Box(
                         contentAlignment = Alignment.TopStart,
                         modifier = Modifier
@@ -71,14 +81,20 @@ object FilesComposeables {
                                 Action(item = Reload, action = { viewModel.onRefreshClick() }),
                             ),
                             overflowActions = listOf(
-                                Action(Help, {  }),
-                                Action(Settings, {  }),
+                                Action(Help, { }),
+                                Action(Settings, { }),
                             ),
                             modifier = Modifier.fillMaxSize().align(Alignment.CenterStart)
                         )
                     }
-                    FilesView(model = model.value, viewModel = viewModel)
+                },
+                snackbarHost = {
+                    SnackbarHost(snackbarHostState, modifier = Modifier.padding(8.dp)) { data ->
+                        CustomSnackbar(snackbarData = data)
+                    }
                 }
+            ) {
+                FilesView(model = model.value, viewModel = viewModel)
             }
         }
     }
@@ -95,15 +111,13 @@ object FilesComposeables {
                     Box(
                         contentAlignment = Alignment.TopStart,
                         modifier = Modifier
-                            .height(60.dp)
                     ) {
                         Image(
                             painter = painterResource(Res.drawable.header_files_smoke),
                             contentDescription = "",
                             contentScale = ContentScale.Crop,
                             modifier = Modifier
-                                .fillMaxSize()
-                                .wrapContentHeight(),
+                                .matchParentSize()
                         )
                         CuerSharedAppBar(
                             title = stringResource(Res.string.files_title) + ": " + (model.value.nodeName ?: "No host"),
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/FilesContract.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/FilesContract.kt
@@ -10,6 +10,7 @@ interface FilesContract {
 
     interface ViewModel {
         val modelObservable: Flow<Model>
+        val labels: Flow<Label>
 
         fun onClickFolder(folder: PlaylistDomain)
 
diff --git a/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/FilesViewModel.kt b/shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/FilesViewModel.kt
@@ -47,7 +47,7 @@ class FilesViewModel(
     override val modelObservable: Flow<Model> = _modelObservable
 
     private val _labels = MutableStateFlow<Label>(None)
-    val labels: Flow<Label>
+    override val labels: Flow<Label>
         get() = _labels
 
     init {

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {`
`88`	`88`	`super.onViewCreated(view, savedInstanceState)`
`89`	`89`	`binding.composeView.setContent {`
`90`	`90`	`FilesComposeables.FileBrowserAppUi(`
`91`		`- modelObservable = viewModel.modelObservable,`
`92`	`91`	`viewModel = viewModel`
`93`	`92`	`)`
`94`	`93`	`}`
`@@ -102,9 +101,7 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {`
`102`	`101`	`Label.Up -> {`
`103`	`102`	`navRouter.navigate(NavigationModel(NAV_BACK, mapOf(BACK_PARAMS to R.id.navigation_remotes)))`
`104`	`103`	`}`
`105`		`- is Label.ErrorMessage -> {`
`106`		`-`
`107`		`- }`
	`104`	`+ else -> Unit`
`108`	`105`	`}`
`109`	`106`	`}`
`110`	`107`