#496 - cleanup and goto file (hub)

Author: sentinelweb

domain/src/commonMain/kotlin/uk/co/sentinelweb/cuer/domain/NodeDomain.kt

@@ -3,7 +3,7 @@ package uk.co.sentinelweb.cuer.domain
 import kotlinx.serialization.Serializable
 
 @Serializable
-sealed interface NodeDomain : Domain {// fixme maybe interface or abstract
+sealed interface NodeDomain : Domain {
 
     // todo make isDesktop function (mac, win, linux)
     // todo make isMobile function (android, ios)

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ app-applicationId = "uk.co.sentinelweb.cuer.app"
 app-base = "uk.co.sentinelweb.cuer"
 app-versionCode = "12"
 app-versionName = "0.79"
-# todo change to 1.9.23
+
 kotlin = "2.1.21"
 jdk = "21"
 jvm = "21"

hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/filebrowser/FilesUiCoordinator.kt

@@ -35,7 +35,7 @@ class FilesUiCoordinator(
     private val log: LogWrapper
 ) : UiCoordinator<FilesContract.Model>,
     DesktopScopeComponent,
-    KoinComponent {// fixme check KoinComponent
+    KoinComponent {
 
     init {
         log.tag(this)
@@ -67,8 +67,8 @@ class FilesUiCoordinator(
         }
     }
 
-    fun openNode(node: NodeDomain?) {
-        viewModel.init(node, null)
+    fun openNode(node: NodeDomain?, path: String?) {
+        viewModel.init(node, path)
     }
 
     override fun destroy() {

hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/filebrowser/transfers/TransfersUiCoordinator.kt

@@ -21,6 +21,7 @@ import uk.co.sentinelweb.cuer.app.ui.remotes.selector.NodesDialogContract
 import uk.co.sentinelweb.cuer.core.wrapper.LogWrapper
 import uk.co.sentinelweb.cuer.hub.ui.filebrowser.dialog.FilesDialogLauncher
 import uk.co.sentinelweb.cuer.hub.ui.filebrowser.dialog.FilesDialogLauncherComposeables.ShowFilesDialogIfNecessary
+import uk.co.sentinelweb.cuer.hub.ui.home.HomeContract.HomeModel.DisplayRoute.Folders
 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
@@ -33,7 +34,7 @@ class TransfersUiCoordinator(
     private val log: LogWrapper
 ) : UiCoordinator<TransfersContract.Model>,
     DesktopScopeComponent,
-    KoinComponent {// fixme check KoinComponent
+    KoinComponent {
 
     init {
         log.tag(this)
@@ -59,6 +60,7 @@ class TransfersUiCoordinator(
                 when (it) {
                     is Effect.Back -> viewModel.onSelectTransfer(null)
                     is Effect.ErrorMessage -> parent.showError(it.message)
+                    is Effect.Folders -> parent.go(Folders(it.node, it.path))
                     else -> Unit
                 }
             }
@@ -93,7 +95,8 @@ class TransfersUiCoordinator(
                         nodesDialogLauncher = get(),
                         filesDialogLauncher = get(),
                         localRepository = get(),
-                        get(),
+                        deleteFileUseCase = get(),
+                        transferValidator = get(),
                         _effects = ViewModelEffects<Effect>(),
                     )
                 }

hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/home/HomeContract.kt

@@ -11,7 +11,7 @@ class HomeContract {
 
         sealed class DisplayRoute {
             object Settings : DisplayRoute()
-            data class Folders(val node: NodeDomain? = null) : DisplayRoute()
+            data class Folders(val node: NodeDomain? = null, val path: String? = null) : DisplayRoute()
             object ThemeTest : DisplayRoute()
             object LocalConfig : DisplayRoute()
             object Transfers : DisplayRoute()

hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/home/HomeUiCoordinator.kt

@@ -92,7 +92,7 @@ class HomeUiCoordinator(
 
     fun go(route: HomeContract.HomeModel.DisplayRoute) {
         when (route) {
-            is Folders -> filesUiCoordinator.openNode(route.node)
+            is Folders -> filesUiCoordinator.openNode(route.node, route.path)
             is Transfers -> transfersUiCoordinator.openList()
             else -> Unit
         }