Move composable utils to package

pipe01 · Mar 26, 2024 · c1b6205 · c1b6205
1 parent bd722af
commit c1b6205
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 24 deletions.
diff --git a/app/src/main/java/net/pipe01/pinepartner/pages/devices/FileBrowserPage.kt b/app/src/main/java/net/pipe01/pinepartner/pages/devices/FileBrowserPage.kt
@@ -5,21 +5,25 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.scrollable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.Description
@@ -28,6 +32,7 @@ import androidx.compose.material.icons.outlined.Folder
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LinearProgressIndicator
@@ -64,8 +69,8 @@ import net.pipe01.pinepartner.devices.blefs.File
 import net.pipe01.pinepartner.devices.blefs.joinPaths
 import net.pipe01.pinepartner.service.BackgroundService
 import net.pipe01.pinepartner.service.TransferProgress
-import net.pipe01.pinepartner.utils.BoxWithFAB
-import net.pipe01.pinepartner.utils.ExpandableFAB
+import net.pipe01.pinepartner.utils.composables.BoxWithFAB
+import net.pipe01.pinepartner.utils.composables.ExpandableFAB
 import net.pipe01.pinepartner.utils.toMinutesSeconds
 import java.time.Instant
 import kotlin.random.Random
@@ -87,6 +92,7 @@ fun FileBrowserPage(
     var showCreateFolderDialog by remember { mutableStateOf(false) }
     var showCreateFileDialog by remember { mutableStateOf(false) }
     var showUploadFileDialog by remember { mutableStateOf(false) }
+    var showOpenFileDialog by remember { mutableStateOf<File?>(null) }
 
     suspend fun reload() {
         isLoading = true
@@ -123,8 +129,7 @@ fun FileBrowserPage(
                 }
             },
         )
-    }
-    if (showUploadFileDialog) {
+    } else if (showUploadFileDialog) {
         UploadDialog(
             backgroundService = backgroundService,
             deviceAddress = deviceAddress,
@@ -136,6 +141,11 @@ fun FileBrowserPage(
             },
             onCancel = { showUploadFileDialog = false },
         )
+    } else if (showOpenFileDialog != null) {
+        OpenFileDialog(
+            file = showOpenFileDialog!!,
+            onDismissRequest = { showOpenFileDialog = null },
+        )
     }
 
     Box {
@@ -176,7 +186,8 @@ fun FileBrowserPage(
                             .sortedBy { it.name }
                             .sortedByDescending { it.isDirectory },
                         selected = selectedFiles,
-                        onOpenFolder = onOpenFolder,
+                        onOpenFolder = { onOpenFolder(it.fullPath) },
+                        onOpenFile = { showOpenFileDialog = it },
                         onToggleSelect = {
                             if (selectedFiles.contains(it)) {
                                 selectedFiles.remove(it)
@@ -247,7 +258,8 @@ private fun ActionBarPreview() {
 private fun FileList(
     files: List<File>,
     selected: List<File>,
-    onOpenFolder: (String) -> Unit = { },
+    onOpenFolder: (File) -> Unit = { },
+    onOpenFile: (File) -> Unit = { },
     onToggleSelect: (File) -> Unit = { },
 ) {
     Column(
@@ -260,7 +272,9 @@ private fun FileList(
                 isSelecting = selected.isNotEmpty(),
                 onOpen = {
                     if (file.isDirectory) {
-                        onOpenFolder(file.fullPath)
+                        onOpenFolder(file)
+                    } else {
+                        onOpenFile(file)
                     }
                 },
                 onToggleSelect = {
@@ -273,6 +287,20 @@ private fun FileList(
     }
 }
 
+@Preview(showBackground = true, widthDp = 320, heightDp = 640)
+@Composable
+private fun FileListPreview() {
+    FileList(
+        files = listOf(
+            File(".", "", true, Instant.now(), 0u),
+            File("..", "", true, Instant.now(), 0u),
+            File("test.txt", "test.txt", false, Instant.now(), 100u),
+            File("very-very-very-very-very-very-long-name.txt", "test.txt", false, Instant.now(), 100u),
+        ),
+        selected = emptyList(),
+    )
+}
+
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun FileListItem(
@@ -498,16 +526,46 @@ private fun UploadDialog(
     }
 }
 
-@Preview(showBackground = true, widthDp = 320, heightDp = 640)
 @Composable
-private fun FileListPreview() {
-    FileList(
-        files = listOf(
-            File(".", "", true, Instant.now(), 0u),
-            File("..", "", true, Instant.now(), 0u),
-            File("test.txt", "test.txt", false, Instant.now(), 100u),
-            File("very-very-very-very-very-very-long-name.txt", "test.txt", false, Instant.now(), 100u),
-        ),
-        selected = emptyList(),
+private fun OpenFileDialog(
+    file: File,
+    onDismissRequest: () -> Unit,
+) {
+    AlertDialog(
+        onDismissRequest = onDismissRequest,
+        confirmButton = { },
+        title = {
+            SelectionContainer {
+                Text(text = file.fullPath)
+            }
+        },
+        text = {
+            Column {
+                HorizontalDivider()
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .clickable { }
+                        .padding(16.dp),
+                ) {
+                    Icon(Icons.Filled.Download, contentDescription = "Download")
+                    Spacer(modifier = Modifier.width(16.dp))
+                    Text(text = "Download to phone")
+                }
+            }
+        },
     )
 }
+
+@Preview(widthDp = 320, heightDp = 640)
+@Composable
+private fun OpenFileDialogPreview() {
+    OpenFileDialog(
+        file = File("test.txt", "/foo/bar/test.txt", false, Instant.now(), 100u),
+        onDismissRequest = { },
+    )
+}
+
diff --git a/app/src/main/java/net/pipe01/pinepartner/pages/plugins/ImportPluginPage.kt b/app/src/main/java/net/pipe01/pinepartner/pages/plugins/ImportPluginPage.kt
@@ -34,8 +34,8 @@ import net.pipe01.pinepartner.data.Plugin
 import net.pipe01.pinepartner.data.PluginDao
 import net.pipe01.pinepartner.scripting.Permission
 import net.pipe01.pinepartner.scripting.downloadPlugin
-import net.pipe01.pinepartner.utils.BoxWithFAB
-import net.pipe01.pinepartner.utils.HeaderFrame
+import net.pipe01.pinepartner.utils.composables.BoxWithFAB
+import net.pipe01.pinepartner.utils.composables.HeaderFrame
 
 @Composable
 fun ImportPluginPage(

diff --git a/app/src/main/java/net/pipe01/pinepartner/pages/plugins/PluginsPage.kt b/app/src/main/java/net/pipe01/pinepartner/pages/plugins/PluginsPage.kt
@@ -41,8 +41,8 @@ import net.pipe01.pinepartner.data.AppDatabase
 import net.pipe01.pinepartner.data.Plugin
 import net.pipe01.pinepartner.scripting.BuiltInPlugins
 import net.pipe01.pinepartner.service.BackgroundService
-import net.pipe01.pinepartner.utils.BoxWithFAB
-import net.pipe01.pinepartner.utils.HeaderFrame
+import net.pipe01.pinepartner.utils.composables.BoxWithFAB
+import net.pipe01.pinepartner.utils.composables.HeaderFrame
 
 @Composable
 fun PluginsPage(

diff --git a/...et/pipe01/pinepartner/utils/BoxWithFAB.kt → ...nepartner/utils/composables/BoxWithFAB.kt b/...et/pipe01/pinepartner/utils/BoxWithFAB.kt → ...nepartner/utils/composables/BoxWithFAB.kt
@@ -1,4 +1,4 @@
-package net.pipe01.pinepartner.utils
+package net.pipe01.pinepartner.utils.composables
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize

diff --git a/...pipe01/pinepartner/utils/ExpandableFAB.kt → ...artner/utils/composables/ExpandableFAB.kt b/...pipe01/pinepartner/utils/ExpandableFAB.kt → ...artner/utils/composables/ExpandableFAB.kt
@@ -1,4 +1,4 @@
-package net.pipe01.pinepartner.utils
+package net.pipe01.pinepartner.utils.composables
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column

diff --git a/...t/pipe01/pinepartner/utils/HeaderFrame.kt → ...epartner/utils/composables/HeaderFrame.kt b/...t/pipe01/pinepartner/utils/HeaderFrame.kt → ...epartner/utils/composables/HeaderFrame.kt
@@ -1,4 +1,4 @@
-package net.pipe01.pinepartner.utils
+package net.pipe01.pinepartner.utils.composables
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.material3.ExperimentalMaterial3Api