#496 - transfers back nav

Author: sentinelweb

app/src/main/java/uk/co/sentinelweb/cuer/app/ui/filebrowser/FileBrowserFragment.kt

@@ -71,7 +71,6 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {
     // saves the data on back press (enabled in onResume)
     private val backCallback = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
-            //remotesMviView.dispatch(OnUpClicked)
             viewModel.onBackClick()
         }
     }
@@ -100,8 +99,13 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {
     private fun observeLabels(label: Effect) {
         when (label) {
             Effect.Init -> {}
-            Effect.Up -> {
-                navRouter.navigate(NavigationModel(NAV_BACK, mapOf(BACK_PARAMS to R.id.navigation_remotes)))
+            Effect.Back -> {
+                navRouter.navigate(
+                    NavigationModel(
+                        NAV_BACK,
+                        mapOf(BACK_PARAMS to R.id.navigation_remotes)
+                    )
+                )
             }
 
             Effect.Settings -> navigationProvider.navigate(R.id.navigation_settings_root)

app/src/main/java/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersFragment.kt

@@ -17,7 +17,6 @@ import uk.co.sentinelweb.cuer.app.R
 import uk.co.sentinelweb.cuer.app.databinding.FragmentComposeBinding
 import uk.co.sentinelweb.cuer.app.ui.common.ktx.bindFlow
 import uk.co.sentinelweb.cuer.app.ui.common.navigation.*
-import uk.co.sentinelweb.cuer.app.ui.common.navigation.NavigationModel.Param.BACK_PARAMS
 import uk.co.sentinelweb.cuer.app.ui.common.navigation.NavigationModel.Target.NAV_BACK
 import uk.co.sentinelweb.cuer.app.ui.common.viewmodel.ViewModelEffects
 import uk.co.sentinelweb.cuer.app.ui.filebrowser.transfers.TransfersContract.Effect
@@ -89,9 +88,8 @@ class TransfersFragment : Fragment(), AndroidScopeComponent {
     private fun observeLabels(label: Effect) {
         when (label) {
             Effect.Back -> {
-                navRouter.navigate(NavigationModel(NAV_BACK, mapOf(BACK_PARAMS to R.id.navigation_folders)))
+                navRouter.navigate(NavigationModel(NAV_BACK))
             }
-
             Effect.Settings -> navigationProvider.navigate(R.id.navigation_settings_root)
             else -> Unit
         }

app/src/main/java/uk/co/sentinelweb/cuer/app/ui/remotes/RemotesFragment.kt

@@ -155,18 +155,12 @@ class RemotesFragment : Fragment(), AndroidScopeComponent {
                         )
 
                         is ActionLocalFolders -> navigationProvider.navigate(
-                            NavigationModel(
-                                FOLDER_LIST,
-                                mapOf()
-                            )
+                            NavigationModel(FOLDER_LIST)
                         )
 
                         is ActionTransfers -> navigationProvider.navigate(
-                            NavigationModel(
-                                TRANSFERS,
-                                mapOf()
-                            )
-                        )
+                            NavigationModel(TRANSFERS)
+                        ).apply { log.d("gotoTransfers.fragment") }
 
                         is CuerConnected ->
                             snackbarWrapper.make(

hub/src/main/kotlin/uk/co/sentinelweb/cuer/net/wifi/PlatformWifiInfo.kt

@@ -50,7 +50,7 @@ class PlatformWifiInfo {
             var line: String?
             while (reader.readLine().also { line = it } != null) {
                 if (line!!.trim { it <= ' ' }.startsWith("SSID")) {
-                    return line!!.split(":")[1].trim { it <= ' ' }
+                    return line.split(":")[1].trim { it <= ' ' }
                 }
             }
         }

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/common/tag/Tag.kt

@@ -16,14 +16,14 @@ import uk.co.sentinelweb.cuer.app.ui.common.resources.scale
 
 @Composable
 fun Tag(
-    source: String,
+    text: String,
     color: Color = colorScaler(MaterialTheme.colorScheme.surface, 1.8f, 0.9f),
     modifier: Modifier = Modifier,
     style: TextStyle = MaterialTheme.typography.labelSmall,
     textColor: Color = MaterialTheme.colorScheme.onSurface,
 ) {
     Text(
-        source,
+        text,
         color = textColor,
         style = style,
         fontWeight = Bold,

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/FilesContract.kt

@@ -97,7 +97,7 @@ interface FilesContract {
     sealed class Effect {
         object None : Effect()
         object Init : Effect()
-        object Up : Effect()
+        object Back : Effect()
         data class Transfers(
             val id: OrchestratorContract.Identifier<GUID>? = null
         ) : Effect()

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/FilesViewModel.kt

@@ -113,11 +113,11 @@ class FilesViewModel(
     override fun onBackClick() {
         _stateObservable.value.upListItem
             ?.also { onClickFolder(it.second) }
-            ?: run { _effects.emit(Effect.Up, viewModelScope) }
+            ?: run { _effects.emit(Effect.Back, viewModelScope) }
     }
 
     override fun onUpClick() {
-        _effects.emit(Effect.Up, viewModelScope)
+        _effects.emit(Effect.Back, viewModelScope)
     }
 
     override fun onClickFolder(folder: PlaylistDomain) {

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersComposeables.kt

@@ -245,24 +245,31 @@ object TransfersComposeables {
 
                 Text(
                     text = transfer.directionText,
-                    style = MaterialTheme.typography.titleMedium,
+                    style = MaterialTheme.typography.titleSmall,
                     modifier = Modifier
                         .padding(4.dp)
                 )
 
-                Text(
+//                Text(
+//                    text = transfer.statusText,
+//                    style = MaterialTheme.typography.titleSmall,
+//                    modifier = Modifier
+//                        .padding(4.dp)
+//                )
+                Tag(
                     text = transfer.statusText,
-                    style = MaterialTheme.typography.titleMedium,
+                    color = Color.DarkGray,
                     modifier = Modifier
-                        .padding(4.dp)
+                        .padding(4.dp),
+                    style = MaterialTheme.typography.bodySmall,
+                    textColor = Color.White
                 )
 
                 Text(
                     text = transfer.progress,
-                    style = MaterialTheme.typography.titleMedium,
+                    style = MaterialTheme.typography.titleSmall,
                     modifier = Modifier
-                        .weight(1f)
-                        .padding(horizontal = 8.dp)
+                        .padding(horizontal = 4.dp)
                 )
             }
         }

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersViewModel.kt

@@ -36,6 +36,9 @@ class TransfersViewModel(
         .map { it.copy(validation = it.selectedTransfer?.let { transferValidator.validate(it) }) }
         .map { mapper.map(it) }
 
+    private val selectedTransfer: TransferDomain?
+        get() = _stateObservable.value.selectedTransfer
+
     private val log: LogWrapper by createLogger()
 
     override val effects: Flow<Effect>
@@ -60,7 +63,11 @@ class TransfersViewModel(
     }
 
     override fun onBackClick() {
-        _effects.emit(Effect.Back, viewModelScope)
+        if (selectedTransfer != null) {
+            onSelectTransfer(null)
+        } else {
+            _effects.emit(Effect.Back, viewModelScope)
+        }
     }
 
     override fun onDelete(id: OrchestratorContract.Identifier<GUID>?) {

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/remotes/RemotesStoreFactory.kt

@@ -105,15 +105,15 @@ class RemotesStoreFactory(
                 is Intent.RemoteDelete -> deleteRemote(intent)
                 is Intent.RemoteSync -> syncRemote(intent)
                 is Intent.RemotePlaylists -> getRemotePlaylists(intent)
-                is Intent.RemoteFolders -> getRemoteFolders(intent)
+                is Intent.RemoteFolders -> gotoRemoteFolders(intent)
                 is Intent.LocalUpdate -> dispatch(Result.UpdateServerState)
                 is Intent.CuerConnect -> cuerConnect(intent)
                 is Intent.CuerConnectScreen -> cuerConnectScreen(intent)
                 is Intent.ActionSendTo -> sendTo(intent)
                 is Intent.ActionSendToSelected -> sendToSelected(intent)
                 is Intent.EditAddress -> editAddress(intent)
-                Intent.ActionFolders -> publish(Label.ActionLocalFolders)
-                Intent.ActionTransfers -> publish(Label.ActionTransfers)
+                Intent.ActionFolders -> gotoLocalFolders()
+                Intent.ActionTransfers -> gotoTransfers()
             }
 
         private fun editAddress(intent: Intent.EditAddress) {
@@ -257,10 +257,21 @@ class RemotesStoreFactory(
             }
         }
 
-        private fun getRemoteFolders(intent: Intent.RemoteFolders) {
+        private fun gotoRemoteFolders(intent: Intent.RemoteFolders) {
             intent.remote
-                .run { publish(Label.ActionFolders(this)) }
-                .run { publish(Label.None) } // stops label re-firing on back from folders
+                .apply { publish(Label.ActionFolders(this)) }
+                .also { publish(Label.None) } // stops label re-firing on back from folders
+        }
+
+        private fun gotoLocalFolders() {
+            publish(Label.ActionLocalFolders)
+                .also { publish(Label.None) } // stops label re-firing on back from folders
+        }
+
+        private fun gotoTransfers() {
+            log.d("gotoTransfers")
+            publish(Label.ActionTransfers)
+                .also { publish(Label.None) } // stops label re-firing on back from folders
         }
     }