From ccb083050b0d0539bc015451a749fad1941025fc Mon Sep 17 00:00:00 2001 From: aro Date: Mon, 26 Dec 2022 12:20:02 +0100 Subject: [PATCH] refactor: relocate to make space for server manager feature --- .../kotlin/xyz/atnrch/wrench/WrenchApp.kt | 2 +- .../{ => filemanager}/WatcherDisplay.kt | 42 ++++++++++++++++--- .../{ => filemanager}/WrenchScaffold.kt | 8 ++-- .../bottom/AddOutputButton.kt | 4 +- .../{ => filemanager}/bottom/BottomBar.kt | 2 +- .../bottom/FloatingAddButton.kt | 4 +- .../bottom/MoveFilesButton.kt | 2 +- .../bottom/RemoveOutputButton.kt | 2 +- .../bottom/WatcherStatusButton.kt | 2 +- .../center/DummyTextEntry.kt | 4 +- .../{ => filemanager}/center/FilePicker.kt | 2 +- .../center/dialog/DialogButton.kt | 2 +- .../center/dialog/EntryDialog.kt | 2 +- .../center/empty/DefaultDisplay.kt | 2 +- .../center/input/InputEntries.kt | 2 +- .../center/input/InputTextEntry.kt | 4 +- .../center/input/InputTopText.kt | 2 +- .../center/output/OutputEntries.kt | 2 +- .../center/output/OutputTopText.kt | 2 +- .../{ => filemanager}/top/TopBar.kt | 2 +- 20 files changed, 63 insertions(+), 31 deletions(-) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/WatcherDisplay.kt (56%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/WrenchScaffold.kt (85%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/bottom/AddOutputButton.kt (94%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/bottom/BottomBar.kt (93%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/bottom/FloatingAddButton.kt (91%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/bottom/MoveFilesButton.kt (96%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/bottom/RemoveOutputButton.kt (97%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/bottom/WatcherStatusButton.kt (94%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/center/DummyTextEntry.kt (80%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/center/FilePicker.kt (95%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/center/dialog/DialogButton.kt (61%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/center/dialog/EntryDialog.kt (98%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/center/empty/DefaultDisplay.kt (95%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/center/input/InputEntries.kt (96%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/center/input/InputTextEntry.kt (93%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/center/input/InputTopText.kt (95%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/center/output/OutputEntries.kt (97%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/center/output/OutputTopText.kt (95%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => filemanager}/top/TopBar.kt (95%) diff --git a/src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt b/src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt index e0c7b4c..c71cf9b 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt @@ -5,7 +5,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Window import androidx.compose.ui.window.application import androidx.compose.ui.window.rememberWindowState -import xyz.atnrch.wrench.components.WrenchScaffold +import xyz.atnrch.wrench.components.filemanager.WrenchScaffold import xyz.atnrch.wrench.logger.Logger import javax.swing.UIManager diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WatcherDisplay.kt similarity index 56% rename from src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WatcherDisplay.kt index fc1c627..3a0d49e 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WatcherDisplay.kt @@ -1,17 +1,21 @@ -package xyz.atnrch.wrench.components +package xyz.atnrch.wrench.components.filemanager import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding -import androidx.compose.runtime.Composable +import androidx.compose.material.Tab +import androidx.compose.material.TabRow +import androidx.compose.material.Text +import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.window.WindowState -import xyz.atnrch.wrench.components.center.empty.DefaultDisplay -import xyz.atnrch.wrench.components.center.input.InputEntries -import xyz.atnrch.wrench.components.center.output.OutputEntries +import xyz.atnrch.wrench.components.filemanager.center.empty.DefaultDisplay +import xyz.atnrch.wrench.components.filemanager.center.input.InputEntries +import xyz.atnrch.wrench.components.filemanager.center.output.OutputEntries +import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.watcher.WatcherManager import java.nio.file.Path @@ -22,6 +26,34 @@ fun WatcherDisplay( currentClick: Int, outputs: MutableList, onEntryClick: (id: Int) -> Unit +) { + var tabIndex by remember { mutableStateOf(0) } // 1. + val tabTitles = listOf("File Manager", "Servers") + Column { // 2. + TabRow( + selectedTabIndex = tabIndex, + backgroundColor = UIColors.ORANGE + ) { // 3. + tabTitles.forEachIndexed { index, title -> + Tab(selected = tabIndex == index, // 4. + onClick = { tabIndex = index }, + text = { Text(text = title) }) // 5. + } + } + when (tabIndex) { // 6. + 0 -> getDisplayDependingOnSize(state, watcherManager, currentClick, outputs, onEntryClick) + 1 -> Text("There content") + } + } +} + +@Composable +fun getDisplayDependingOnSize( + state: WindowState, + watcherManager: WatcherManager, + currentClick: Int, + outputs: MutableList, + onEntryClick: (id: Int) -> Unit ) { if (state.size.width <= 600.dp) { Column( diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WrenchScaffold.kt similarity index 85% rename from src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WrenchScaffold.kt index f13669d..9a9283a 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WrenchScaffold.kt @@ -1,13 +1,13 @@ -package xyz.atnrch.wrench.components +package xyz.atnrch.wrench.components.filemanager import androidx.compose.material.Scaffold import androidx.compose.material.ScaffoldState import androidx.compose.material.rememberScaffoldState import androidx.compose.runtime.* import androidx.compose.ui.window.WindowState -import xyz.atnrch.wrench.components.bottom.BottomAppBar -import xyz.atnrch.wrench.components.bottom.FloatingButton -import xyz.atnrch.wrench.components.top.TopBar +import xyz.atnrch.wrench.components.filemanager.bottom.BottomAppBar +import xyz.atnrch.wrench.components.filemanager.bottom.FloatingButton +import xyz.atnrch.wrench.components.filemanager.top.TopBar import xyz.atnrch.wrench.compose.SnackBarDataHolder import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.watcher.Watcher diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/AddOutputButton.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/AddOutputButton.kt similarity index 94% rename from src/main/kotlin/xyz/atnrch/wrench/components/bottom/AddOutputButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/AddOutputButton.kt index b5ba3bb..9d754bf 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/AddOutputButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/AddOutputButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.bottom +package xyz.atnrch.wrench.components.filemanager.bottom import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.PaddingValues @@ -18,7 +18,7 @@ import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.compose.ui.window.WindowState -import xyz.atnrch.wrench.components.center.showDirectoryPicker +import xyz.atnrch.wrench.components.filemanager.center.showDirectoryPicker import xyz.atnrch.wrench.logger.Logger import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.watcher.WatcherEntry diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/BottomBar.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/BottomBar.kt similarity index 93% rename from src/main/kotlin/xyz/atnrch/wrench/components/bottom/BottomBar.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/BottomBar.kt index 0208337..c2d02b7 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/BottomBar.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/BottomBar.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.bottom +package xyz.atnrch.wrench.components.filemanager.bottom import androidx.compose.foundation.shape.CornerSize import androidx.compose.material.MaterialTheme diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/FloatingAddButton.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FloatingAddButton.kt similarity index 91% rename from src/main/kotlin/xyz/atnrch/wrench/components/bottom/FloatingAddButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FloatingAddButton.kt index f89fa60..0417617 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/FloatingAddButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FloatingAddButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.bottom +package xyz.atnrch.wrench.components.filemanager.bottom import androidx.compose.foundation.border import androidx.compose.foundation.layout.size @@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import xyz.atnrch.wrench.components.center.showFilePicker +import xyz.atnrch.wrench.components.filemanager.center.showFilePicker import xyz.atnrch.wrench.logger.Logger import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.watcher.WatcherManager diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/MoveFilesButton.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/MoveFilesButton.kt similarity index 96% rename from src/main/kotlin/xyz/atnrch/wrench/components/bottom/MoveFilesButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/MoveFilesButton.kt index baf0ce6..ed5a135 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/MoveFilesButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/MoveFilesButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.bottom +package xyz.atnrch.wrench.components.filemanager.bottom import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.PaddingValues diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/RemoveOutputButton.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/RemoveOutputButton.kt similarity index 97% rename from src/main/kotlin/xyz/atnrch/wrench/components/bottom/RemoveOutputButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/RemoveOutputButton.kt index edbbcd5..9f39fa6 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/RemoveOutputButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/RemoveOutputButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.bottom +package xyz.atnrch.wrench.components.filemanager.bottom import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.PaddingValues diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/WatcherStatusButton.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/WatcherStatusButton.kt similarity index 94% rename from src/main/kotlin/xyz/atnrch/wrench/components/bottom/WatcherStatusButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/WatcherStatusButton.kt index def0556..32fa8a4 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/bottom/WatcherStatusButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/WatcherStatusButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.bottom +package xyz.atnrch.wrench.components.filemanager.bottom import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.width diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/DummyTextEntry.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/DummyTextEntry.kt similarity index 80% rename from src/main/kotlin/xyz/atnrch/wrench/components/center/DummyTextEntry.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/DummyTextEntry.kt index 5ed1092..3ac6901 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/DummyTextEntry.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/DummyTextEntry.kt @@ -1,7 +1,7 @@ -package xyz.atnrch.wrench.components.center +package xyz.atnrch.wrench.components.filemanager.center import androidx.compose.runtime.Composable -import xyz.atnrch.wrench.components.center.input.InputTextEntry +import xyz.atnrch.wrench.components.filemanager.center.input.InputTextEntry import xyz.atnrch.wrench.registery.RegisterComposable import xyz.atnrch.wrench.watcher.WatcherEntry import xyz.atnrch.wrench.watcher.WatcherManager diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/FilePicker.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/FilePicker.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/center/FilePicker.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/FilePicker.kt index 91d773f..e0868d8 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/FilePicker.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/FilePicker.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.center +package xyz.atnrch.wrench.components.filemanager.center import java.io.File import javax.swing.JFileChooser diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/DialogButton.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/DialogButton.kt similarity index 61% rename from src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/DialogButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/DialogButton.kt index a976d17..8f84dba 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/DialogButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/DialogButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.center.dialog +package xyz.atnrch.wrench.components.filemanager.center.dialog import androidx.compose.runtime.Composable diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/EntryDialog.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/EntryDialog.kt similarity index 98% rename from src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/EntryDialog.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/EntryDialog.kt index 1a5aced..bb791a6 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/EntryDialog.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/EntryDialog.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.center.dialog +package xyz.atnrch.wrench.components.filemanager.center.dialog import androidx.compose.foundation.background import androidx.compose.foundation.layout.* diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/empty/DefaultDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/empty/DefaultDisplay.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/center/empty/DefaultDisplay.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/empty/DefaultDisplay.kt index b79b593..e314f21 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/empty/DefaultDisplay.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/empty/DefaultDisplay.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.center.empty +package xyz.atnrch.wrench.components.filemanager.center.empty import androidx.compose.foundation.layout.* import androidx.compose.material.Icon diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputEntries.kt similarity index 96% rename from src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputEntries.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputEntries.kt index 36bd110..9694c9a 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputEntries.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputEntries.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.center.input +package xyz.atnrch.wrench.components.filemanager.center.input import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.border diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputTextEntry.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTextEntry.kt similarity index 93% rename from src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputTextEntry.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTextEntry.kt index dfb6289..3d6b1b8 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputTextEntry.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTextEntry.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.center.input +package xyz.atnrch.wrench.components.filemanager.center.input import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.PointerMatcher @@ -12,7 +12,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.ExperimentalUnitApi import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnitType -import xyz.atnrch.wrench.components.center.dialog.EntryDialog +import xyz.atnrch.wrench.components.filemanager.center.dialog.EntryDialog import xyz.atnrch.wrench.registery.ACTIVE_COMPOSABLE import xyz.atnrch.wrench.ui.Fonts import xyz.atnrch.wrench.ui.UIColors diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputTopText.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTopText.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputTopText.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTopText.kt index dbdbf1f..2a12f67 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputTopText.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTopText.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.center.input +package xyz.atnrch.wrench.components.filemanager.center.input import androidx.compose.foundation.layout.* import androidx.compose.material.ButtonDefaults diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputEntries.kt similarity index 97% rename from src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputEntries.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputEntries.kt index fd6ea59..3c56a38 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputEntries.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputEntries.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.center.output +package xyz.atnrch.wrench.components.filemanager.center.output import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.border diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputTopText.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputTopText.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputTopText.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputTopText.kt index da50c1c..72224f1 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputTopText.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputTopText.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.center.output +package xyz.atnrch.wrench.components.filemanager.center.output import androidx.compose.foundation.layout.* import androidx.compose.material.ButtonDefaults diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/top/TopBar.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/top/TopBar.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/top/TopBar.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/top/TopBar.kt index 086a2f3..5db098e 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/top/TopBar.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/top/TopBar.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.top +package xyz.atnrch.wrench.components.filemanager.top import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size