refactoring: comprehensive packaging

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
 

src/main/kotlin/xyz/atnrch/wrench/components/server/ServerManagerDisplay.kt

@@ -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()
-}

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

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

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.gui.filemanager.FileManagerDisplay
-import xyz.atnrch.wrench.components.server.ServerManagerDisplay
+import xyz.atnrch.wrench.gui.server.ServerManagerDisplay
 import xyz.atnrch.wrench.ui.UIColors
 import xyz.atnrch.wrench.watcher.WatcherManager
 import java.nio.file.Path

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.gui.filemanager.bottom.FloatingButton
-import xyz.atnrch.wrench.components.filemanager.top.TopBar
+import xyz.atnrch.wrench.gui.filemanager.top.TopBar
-import xyz.atnrch.wrench.compose.SnackBarDataHolder
+import xyz.atnrch.wrench.data.SnackBarDataHolder
 import xyz.atnrch.wrench.ui.UIColors
 import xyz.atnrch.wrench.watcher.Watcher
 import xyz.atnrch.wrench.watcher.WatcherEntry

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.gui.filemanager.center.empty.DefaultDisplay
-import xyz.atnrch.wrench.components.filemanager.center.input.InputEntries
+import xyz.atnrch.wrench.gui.filemanager.center.input.InputEntries
-import xyz.atnrch.wrench.components.filemanager.center.output.OutputEntries
+import xyz.atnrch.wrench.gui.filemanager.center.output.OutputEntries
 import xyz.atnrch.wrench.watcher.WatcherManager
 import java.io.File
 import java.nio.file.Path

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

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

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

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

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

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

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

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
 

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.*

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

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

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

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

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

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

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

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()
+}

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

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