From c24a27c5b5332ffdd20cfcd58bcd90dda83a1de5 Mon Sep 17 00:00:00 2001 From: aro Date: Sat, 7 Jan 2023 09:28:01 +0100 Subject: [PATCH] refactoring: comprehensive packaging --- src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt | 2 +- .../wrench/components/server/ServerManagerDisplay.kt | 9 --------- .../wrench/{compose => data}/SnackBarDataHolder.kt | 2 +- .../atnrch/wrench/{components => gui}/AppBottomBar.kt | 4 ++-- .../atnrch/wrench/{components => gui}/WatcherDisplay.kt | 6 +++--- .../atnrch/wrench/{components => gui}/WrenchScaffold.kt | 8 ++++---- .../filemanager/FileManagerDisplay.kt | 8 ++++---- .../filemanager/bottom/AddOutputButton.kt | 4 ++-- .../filemanager/bottom/FileBottomRow.kt | 2 +- .../filemanager/bottom/FloatingAddButton.kt | 4 ++-- .../filemanager/bottom/MoveFilesButton.kt | 2 +- .../filemanager/bottom/RemoveOutputButton.kt | 2 +- .../filemanager/center/DummyTextEntry.kt | 4 ++-- .../{components => gui}/filemanager/center/FilePicker.kt | 2 +- .../filemanager/center/dialog/DialogButton.kt | 2 +- .../filemanager/center/dialog/EntryDialog.kt | 2 +- .../filemanager/center/empty/DefaultDisplay.kt | 2 +- .../filemanager/center/input/InputEntries.kt | 2 +- .../filemanager/center/input/InputTextEntry.kt | 4 ++-- .../filemanager/center/input/InputTopText.kt | 2 +- .../filemanager/center/output/OutputEntries.kt | 2 +- .../filemanager/center/output/OutputTopText.kt | 2 +- .../wrench/{components => gui}/filemanager/top/TopBar.kt | 2 +- .../xyz/atnrch/wrench/gui/server/ServerManagerDisplay.kt | 9 +++++++++ .../server/center/UnderConstrutrionView.kt | 2 +- src/main/kotlin/xyz/atnrch/wrench/watcher/Watcher.kt | 2 +- 26 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/server/ServerManagerDisplay.kt rename src/main/kotlin/xyz/atnrch/wrench/{compose => data}/SnackBarDataHolder.kt (84%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/AppBottomBar.kt (88%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/WatcherDisplay.kt (87%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/WrenchScaffold.kt (91%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/FileManagerDisplay.kt (86%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/bottom/AddOutputButton.kt (94%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/bottom/FileBottomRow.kt (94%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/bottom/FloatingAddButton.kt (91%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/bottom/MoveFilesButton.kt (96%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/bottom/RemoveOutputButton.kt (97%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/center/DummyTextEntry.kt (80%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/center/FilePicker.kt (95%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/center/dialog/DialogButton.kt (61%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/center/dialog/EntryDialog.kt (98%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/center/empty/DefaultDisplay.kt (95%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/center/input/InputEntries.kt (96%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/center/input/InputTextEntry.kt (93%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/center/input/InputTopText.kt (95%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/center/output/OutputEntries.kt (97%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/center/output/OutputTopText.kt (95%) rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/filemanager/top/TopBar.kt (95%) create mode 100644 src/main/kotlin/xyz/atnrch/wrench/gui/server/ServerManagerDisplay.kt rename src/main/kotlin/xyz/atnrch/wrench/{components => gui}/server/center/UnderConstrutrionView.kt (96%) diff --git a/src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt b/src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt index e0c7b4c..85a6c3e 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.gui.WrenchScaffold import xyz.atnrch.wrench.logger.Logger import javax.swing.UIManager diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/server/ServerManagerDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/components/server/ServerManagerDisplay.kt deleted file mode 100644 index aea17ad..0000000 --- a/src/main/kotlin/xyz/atnrch/wrench/components/server/ServerManagerDisplay.kt +++ /dev/null @@ -1,9 +0,0 @@ -package xyz.atnrch.wrench.components.server - -import androidx.compose.runtime.Composable -import xyz.atnrch.wrench.components.server.center.UnderConstructionView - -@Composable -fun ServerManagerDisplay() { - UnderConstructionView() -} \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/compose/SnackBarDataHolder.kt b/src/main/kotlin/xyz/atnrch/wrench/data/SnackBarDataHolder.kt similarity index 84% rename from src/main/kotlin/xyz/atnrch/wrench/compose/SnackBarDataHolder.kt rename to src/main/kotlin/xyz/atnrch/wrench/data/SnackBarDataHolder.kt index 2adb626..7ec4024 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/compose/SnackBarDataHolder.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/data/SnackBarDataHolder.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.compose +package xyz.atnrch.wrench.data import androidx.compose.material.ScaffoldState import kotlinx.coroutines.CoroutineScope diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/AppBottomBar.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/AppBottomBar.kt similarity index 88% rename from src/main/kotlin/xyz/atnrch/wrench/components/AppBottomBar.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/AppBottomBar.kt index 780bd92..1c12093 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/AppBottomBar.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/AppBottomBar.kt @@ -1,10 +1,10 @@ -package xyz.atnrch.wrench.components +package xyz.atnrch.wrench.gui import androidx.compose.foundation.shape.CornerSize import androidx.compose.material.BottomAppBar import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable -import xyz.atnrch.wrench.components.filemanager.bottom.FileBottomRow +import xyz.atnrch.wrench.gui.filemanager.bottom.FileBottomRow import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.watcher.Watcher import xyz.atnrch.wrench.watcher.WatcherManager diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/WatcherDisplay.kt similarity index 87% rename from src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/WatcherDisplay.kt index 94cfd16..7865c5b 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/WatcherDisplay.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components +package xyz.atnrch.wrench.gui import androidx.compose.foundation.layout.Column import androidx.compose.material.Tab @@ -6,8 +6,8 @@ import androidx.compose.material.TabRow import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import xyz.atnrch.wrench.components.filemanager.FileManagerDisplay -import xyz.atnrch.wrench.components.server.ServerManagerDisplay +import xyz.atnrch.wrench.gui.filemanager.FileManagerDisplay +import xyz.atnrch.wrench.gui.server.ServerManagerDisplay import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.watcher.WatcherManager import java.nio.file.Path diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/WrenchScaffold.kt similarity index 91% rename from src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/WrenchScaffold.kt index 2c68176..eea1552 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/WrenchScaffold.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components +package xyz.atnrch.wrench.gui import androidx.compose.material.Scaffold import androidx.compose.material.ScaffoldState @@ -7,9 +7,9 @@ import androidx.compose.material.rememberScaffoldState import androidx.compose.runtime.* import androidx.compose.ui.unit.dp import androidx.compose.ui.window.WindowState -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.gui.filemanager.bottom.FloatingButton +import xyz.atnrch.wrench.gui.filemanager.top.TopBar +import xyz.atnrch.wrench.data.SnackBarDataHolder import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.watcher.Watcher import xyz.atnrch.wrench.watcher.WatcherEntry diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/FileManagerDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/FileManagerDisplay.kt similarity index 86% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/FileManagerDisplay.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/FileManagerDisplay.kt index 3ddd26b..60dd1bc 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/FileManagerDisplay.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/FileManagerDisplay.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager +package xyz.atnrch.wrench.gui.filemanager import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -8,9 +8,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -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.gui.filemanager.center.empty.DefaultDisplay +import xyz.atnrch.wrench.gui.filemanager.center.input.InputEntries +import xyz.atnrch.wrench.gui.filemanager.center.output.OutputEntries import xyz.atnrch.wrench.watcher.WatcherManager import java.io.File import java.nio.file.Path diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/AddOutputButton.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/AddOutputButton.kt similarity index 94% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/AddOutputButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/AddOutputButton.kt index 11a0639..8702fec 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/AddOutputButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/AddOutputButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.bottom +package xyz.atnrch.wrench.gui.filemanager.bottom import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.PaddingValues @@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import xyz.atnrch.wrench.components.filemanager.center.showDirectoryPicker +import xyz.atnrch.wrench.gui.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/filemanager/bottom/FileBottomRow.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/FileBottomRow.kt similarity index 94% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FileBottomRow.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/FileBottomRow.kt index 16f914c..a8c6e0e 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FileBottomRow.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/FileBottomRow.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.bottom +package xyz.atnrch.wrench.gui.filemanager.bottom import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.width diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FloatingAddButton.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/FloatingAddButton.kt similarity index 91% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FloatingAddButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/FloatingAddButton.kt index 0417617..d690256 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FloatingAddButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/FloatingAddButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.bottom +package xyz.atnrch.wrench.gui.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.filemanager.center.showFilePicker +import xyz.atnrch.wrench.gui.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/filemanager/bottom/MoveFilesButton.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/MoveFilesButton.kt similarity index 96% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/MoveFilesButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/MoveFilesButton.kt index 87c5316..0870552 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/MoveFilesButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/MoveFilesButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.bottom +package xyz.atnrch.wrench.gui.filemanager.bottom import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.PaddingValues diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/RemoveOutputButton.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/RemoveOutputButton.kt similarity index 97% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/RemoveOutputButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/RemoveOutputButton.kt index daac13c..30d23f5 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/RemoveOutputButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/RemoveOutputButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.bottom +package xyz.atnrch.wrench.gui.filemanager.bottom import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.PaddingValues diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/DummyTextEntry.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/DummyTextEntry.kt similarity index 80% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/DummyTextEntry.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/DummyTextEntry.kt index 3ac6901..0a1f494 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/DummyTextEntry.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/DummyTextEntry.kt @@ -1,7 +1,7 @@ -package xyz.atnrch.wrench.components.filemanager.center +package xyz.atnrch.wrench.gui.filemanager.center import androidx.compose.runtime.Composable -import xyz.atnrch.wrench.components.filemanager.center.input.InputTextEntry +import xyz.atnrch.wrench.gui.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/filemanager/center/FilePicker.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/FilePicker.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/FilePicker.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/FilePicker.kt index e0868d8..9b285b2 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/FilePicker.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/FilePicker.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.center +package xyz.atnrch.wrench.gui.filemanager.center import java.io.File import javax.swing.JFileChooser diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/DialogButton.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/dialog/DialogButton.kt similarity index 61% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/DialogButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/dialog/DialogButton.kt index 8f84dba..2fbb0b2 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/DialogButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/dialog/DialogButton.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.center.dialog +package xyz.atnrch.wrench.gui.filemanager.center.dialog import androidx.compose.runtime.Composable diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/EntryDialog.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/dialog/EntryDialog.kt similarity index 98% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/EntryDialog.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/dialog/EntryDialog.kt index bb791a6..ffed1a6 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/dialog/EntryDialog.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/dialog/EntryDialog.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.center.dialog +package xyz.atnrch.wrench.gui.filemanager.center.dialog import androidx.compose.foundation.background import androidx.compose.foundation.layout.* diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/empty/DefaultDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/empty/DefaultDisplay.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/empty/DefaultDisplay.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/empty/DefaultDisplay.kt index e314f21..5c7090b 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/empty/DefaultDisplay.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/empty/DefaultDisplay.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.center.empty +package xyz.atnrch.wrench.gui.filemanager.center.empty import androidx.compose.foundation.layout.* import androidx.compose.material.Icon diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputEntries.kt similarity index 96% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputEntries.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputEntries.kt index 9694c9a..e6cc829 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputEntries.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputEntries.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.center.input +package xyz.atnrch.wrench.gui.filemanager.center.input import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.border diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTextEntry.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputTextEntry.kt similarity index 93% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTextEntry.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputTextEntry.kt index 3d6b1b8..828f1cc 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTextEntry.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputTextEntry.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.center.input +package xyz.atnrch.wrench.gui.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.filemanager.center.dialog.EntryDialog +import xyz.atnrch.wrench.gui.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/filemanager/center/input/InputTopText.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputTopText.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTopText.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputTopText.kt index 2a12f67..5ea2654 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/input/InputTopText.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputTopText.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.center.input +package xyz.atnrch.wrench.gui.filemanager.center.input import androidx.compose.foundation.layout.* import androidx.compose.material.ButtonDefaults diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/output/OutputEntries.kt similarity index 97% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputEntries.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/output/OutputEntries.kt index fccb2f0..8b9a090 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputEntries.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/output/OutputEntries.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.center.output +package xyz.atnrch.wrench.gui.filemanager.center.output import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.border diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputTopText.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/output/OutputTopText.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputTopText.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/output/OutputTopText.kt index 72224f1..1ce3388 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/center/output/OutputTopText.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/output/OutputTopText.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.center.output +package xyz.atnrch.wrench.gui.filemanager.center.output import androidx.compose.foundation.layout.* import androidx.compose.material.ButtonDefaults diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/top/TopBar.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBar.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/top/TopBar.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBar.kt index 5db098e..c1c3921 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/top/TopBar.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBar.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.top +package xyz.atnrch.wrench.gui.filemanager.top import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/server/ServerManagerDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/server/ServerManagerDisplay.kt new file mode 100644 index 0000000..127747b --- /dev/null +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/server/ServerManagerDisplay.kt @@ -0,0 +1,9 @@ +package xyz.atnrch.wrench.gui.server + +import androidx.compose.runtime.Composable +import xyz.atnrch.wrench.gui.server.center.UnderConstructionView + +@Composable +fun ServerManagerDisplay() { + UnderConstructionView() +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/server/center/UnderConstrutrionView.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/server/center/UnderConstrutrionView.kt similarity index 96% rename from src/main/kotlin/xyz/atnrch/wrench/components/server/center/UnderConstrutrionView.kt rename to src/main/kotlin/xyz/atnrch/wrench/gui/server/center/UnderConstrutrionView.kt index 656352f..6e1931a 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/server/center/UnderConstrutrionView.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/server/center/UnderConstrutrionView.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.server.center +package xyz.atnrch.wrench.gui.server.center import androidx.compose.foundation.layout.* import androidx.compose.material.Icon diff --git a/src/main/kotlin/xyz/atnrch/wrench/watcher/Watcher.kt b/src/main/kotlin/xyz/atnrch/wrench/watcher/Watcher.kt index 6386081..e0ae9d1 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/watcher/Watcher.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/watcher/Watcher.kt @@ -2,7 +2,7 @@ package xyz.atnrch.wrench.watcher import androidx.compose.material.SnackbarDuration import kotlinx.coroutines.launch -import xyz.atnrch.wrench.compose.SnackBarDataHolder +import xyz.atnrch.wrench.data.SnackBarDataHolder import xyz.atnrch.wrench.logger.Logger import java.io.IOException import java.nio.file.Files