#496 - switch on transport edit and up buttons on files

Author: sentinelweb

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

@@ -89,11 +89,42 @@ class FilesDialogFragment(
                 },
                 onClickConfirm = { path ->
                     selectedNode?.also { selectedListener.invoke(it, path) }
-                }
+                },
+                onUp = {
+                    val parent = viewModel.path?.getParentPath()
+                    log.d("onUp: $parent")
+                    viewModel.setPath(
+                        node = null,
+                        path = parent
+                    )
+                },
             )
         }
     }
 
+    fun String.getParentPath(): String? {
+        // Handle special cases
+        if (this.isEmpty()) return null
+        if (this == "/" || this == "\\") return null
+
+        // Normalize path by removing trailing slashes
+        val normalizedPath = this.trimEnd('/', '\\')
+        if (normalizedPath.isEmpty()) return null
+
+        // Find the last separator
+        val lastSeparatorIndex = normalizedPath.lastIndexOfAny(charArrayOf('/', '\\'))
+
+        // If no separator found, there's no parent path
+        if (lastSeparatorIndex == -1) return null
+
+        // If separator is at the beginning, return root path
+        if (lastSeparatorIndex == 0) return "/"
+
+        // Return the parent path
+        return normalizedPath.substring(0, lastSeparatorIndex)
+    }
+
+
     override fun onAttach(context: Context) {
         super.onAttach(context)
         requireActivity().onBackPressedDispatcher.addCallback(this, upCallback)

app/src/main/java/uk/co/sentinelweb/cuer/app/ui/playlist_edit/PlaylistEditFragment.kt

@@ -159,7 +159,7 @@ class PlaylistEditFragment : DialogFragment(), AndroidScopeComponent {
         binding.peImage.setOnTouchListener { iv, e ->
             when (e.actionMasked) {
                 MotionEvent.ACTION_DOWN -> {
-                    viewModel.onImageClick(e.x > iv.width / 2)
+                    viewModel.onImageClick()// e.x > iv.width / 2
                     true
                 }
 

app/src/main/java/uk/co/sentinelweb/cuer/app/ui/playlist_edit/PlaylistEditViewModel.kt

@@ -262,7 +262,7 @@ class PlaylistEditViewModel constructor(
             )
     }
 
-    private fun onParentSelected(parent: PlaylistDomain?) = viewModelScope.launch {
+    private fun onParentSelected(parent: PlaylistDomain?, checked: Boolean) = viewModelScope.launch {
         if (parent == ADD_PLAYLIST_DUMMY) {
             return@launch
         }

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

@@ -1,7 +1,8 @@
 package uk.co.sentinelweb.cuer.app.ui.filebrowser.dialog
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -16,6 +17,7 @@ import uk.co.sentinelweb.cuer.domain.PlaylistDomain
 import uk.co.sentinelweb.cuer.domain.PlaylistItemDomain
 import uk.co.sentinelweb.cuer.shared.generated.resources.Res
 import uk.co.sentinelweb.cuer.shared.generated.resources.ic_tick
+import uk.co.sentinelweb.cuer.shared.generated.resources.ic_up
 
 object FilesDialogComposeables {
 
@@ -25,6 +27,7 @@ object FilesDialogComposeables {
         onClickFile: (PlaylistItemDomain) -> Unit,
         onClickFolder: (PlaylistDomain) -> Unit,
         onClickConfirm: (PlaylistDomain) -> Unit,
+        onUp: () -> Unit,
     ) {
         val model = viewModel.model.collectAsState(initial = FilesContract.Model.Initial)
         CuerSharedTheme {
@@ -33,6 +36,7 @@ object FilesDialogComposeables {
                 onClickFile = onClickFile,
                 onClickFolder = onClickFolder,
                 onClickConfirm = onClickConfirm,
+                onUp = onUp,
             )
         }
     }
@@ -44,17 +48,27 @@ object FilesDialogComposeables {
         onClickFile: (PlaylistItemDomain) -> Unit,
         onClickFolder: (PlaylistDomain) -> Unit,
         onClickConfirm: (PlaylistDomain) -> Unit,
+        onUp: () -> Unit,
     ) {
         Column(horizontalAlignment = androidx.compose.ui.Alignment.End) {
             FilesView(model, onClickFile, onClickFolder, viewModel, modifier = Modifier.weight(1f))
+            Row(horizontalArrangement = Arrangement.End) {
+                HeaderButton(
+                    text = "Up",
+                    icon = Res.drawable.ic_up,
+                    modifier = Modifier
+                        .weight(0.3f)
+                        .padding(4.dp)
+                ) { viewModel.currentFolder?.playlist?.also { onUp() } }
 
-            HeaderButton(
-                text = "Select",
-                icon = Res.drawable.ic_tick,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(4.dp)
-            ) { viewModel.currentFolder?.playlist?.also { onClickConfirm(it) } }
+                HeaderButton(
+                    text = "OK",
+                    icon = Res.drawable.ic_tick,
+                    modifier = Modifier
+                        .weight(0.4f)
+                        .padding(4.dp)
+                ) { viewModel.currentFolder?.playlist?.also { onClickConfirm(it) } }
+            }
         }
     }
 }

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

@@ -129,7 +129,7 @@ object TransfersComposeables {
 
     @Composable
     fun TransfersQueueView(queue: List<Transfer>, viewModel: ViewModel) {
-        LazyColumn() {
+        LazyColumn {
             itemsIndexed(
                 items = queue,
                 key = { _, item -> item.domain?.id?.id?.value ?: "noid" } // fixme
@@ -260,15 +260,23 @@ object TransfersComposeables {
                 }
             }
             Row(
+                horizontalArrangement = Arrangement.End,
                 modifier = Modifier
                     .padding(2.dp)
                     .align(BottomCenter)
             ) {
+                HeaderButton(
+                    text = "Switch",
+                    icon = Res.drawable.ic_refresh,
+                    modifier = Modifier
+                        .padding(4.dp)
+                ) { viewModel.onSwitchSourceTarget() }
+
+
                 HeaderButton(
                     text = "Select",
                     icon = Res.drawable.ic_tick,
                     modifier = Modifier
-                        .fillMaxWidth()
                         .padding(4.dp)
 
                 ) { viewModel.onSelectTransfer(null) }
@@ -302,14 +310,14 @@ object TransfersComposeables {
         Row(
             verticalAlignment = Alignment.CenterVertically,
             modifier = modifier
-                .padding(4.dp)
+                .padding(horizontal = 4.dp)
         ) {
             Image(
                 painter = painterResource(resId),
                 contentDescription = null,
                 colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
                 modifier = Modifier
-                    .padding(8.dp)
+                    .padding(horizontal = 4.dp)
                     .size(iconSize)
                     .align(CenterVertically)
             )
@@ -320,7 +328,7 @@ object TransfersComposeables {
                 maxLines = 3,
                 modifier = Modifier
                     .weight(1f)
-                    .padding(4.dp)
+                    .padding(horizontal = 4.dp)
             )
         }
     }

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

@@ -116,7 +116,15 @@ class TransfersViewModel(
     }
 
     override fun onSwitchSourceTarget() {
-
+        val newValue = _stateObservable.value.selectedTransfer?.let {
+            it.copy(
+                source = it.target,
+                target = it.source
+            )
+        }?.also { service.replaceTransfer(it) }
+        _stateObservable.update { last ->
+            last.copy(selectedTransfer = newValue)
+        }
     }
 
     override fun onSelectTransfer(path: TransferDomain?) {
@@ -126,12 +134,12 @@ class TransfersViewModel(
     }
 
     override fun onSelectTransfer(index: Int) {
-        val newValue = index
+        val newQueueValue = index
             .takeIf { it < _stateObservable.value.queue.size && it >= 0 }
             ?.let { _stateObservable.value.queue[it] }
 
         _stateObservable.update { last ->
-            last.copy(selectedTransfer = newValue)
+            last.copy(selectedTransfer = newQueueValue)
         }
     }
 }

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/playlists/dialog/PlaylistsMviDialogContract.kt

@@ -55,4 +55,4 @@ interface PlaylistsMviDialogContract {
         val ROOT_LEVEL_PLAYLIST_ID = Identifier("root-level".toGUID(), MEMORY)
         val ROOT_PLAYLIST_DUMMY = PlaylistDomain.createDummy(id = ROOT_LEVEL_PLAYLIST_ID, title = "Top level")
     }
-}
+}