From bc9bb01673274cf744a5cb6300a7a8cefaa65331 Mon Sep 17 00:00:00 2001
From: aro <pantoine.rochas@gmail.com>
Date: Sat, 7 Jan 2023 09:30:18 +0100
Subject: [PATCH] refactor: move styling classes

---
 src/main/kotlin/xyz/atnrch/wrench/gui/AppBottomBar.kt         | 2 +-
 src/main/kotlin/xyz/atnrch/wrench/gui/WatcherDisplay.kt       | 2 +-
 src/main/kotlin/xyz/atnrch/wrench/gui/WrenchScaffold.kt       | 2 +-
 .../atnrch/wrench/gui/filemanager/bottom/AddOutputButton.kt   | 2 +-
 .../atnrch/wrench/gui/filemanager/bottom/FloatingAddButton.kt | 2 +-
 .../atnrch/wrench/gui/filemanager/bottom/MoveFilesButton.kt   | 2 +-
 .../wrench/gui/filemanager/bottom/RemoveOutputButton.kt       | 2 +-
 .../wrench/gui/filemanager/center/empty/DefaultDisplay.kt     | 4 ++--
 .../wrench/gui/filemanager/center/input/InputEntries.kt       | 2 +-
 .../wrench/gui/filemanager/center/input/InputTextEntry.kt     | 4 ++--
 .../wrench/gui/filemanager/center/output/OutputEntries.kt     | 2 +-
 .../kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBar.kt    | 4 ++--
 .../atnrch/wrench/gui/server/center/UnderConstrutrionView.kt  | 4 ++--
 src/main/kotlin/xyz/atnrch/wrench/{ui => gui/style}/Fonts.kt  | 2 +-
 .../kotlin/xyz/atnrch/wrench/{ui => gui/style}/UIColors.kt    | 2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)
 rename src/main/kotlin/xyz/atnrch/wrench/{ui => gui/style}/Fonts.kt (96%)
 rename src/main/kotlin/xyz/atnrch/wrench/{ui => gui/style}/UIColors.kt (89%)

diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/AppBottomBar.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/AppBottomBar.kt
index 1c12093..01708a1 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/AppBottomBar.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/AppBottomBar.kt
@@ -5,7 +5,7 @@ import androidx.compose.material.BottomAppBar
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import xyz.atnrch.wrench.gui.filemanager.bottom.FileBottomRow
-import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.gui.style.UIColors
 import xyz.atnrch.wrench.watcher.Watcher
 import xyz.atnrch.wrench.watcher.WatcherManager
 import java.nio.file.Path
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/WatcherDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/WatcherDisplay.kt
index 7865c5b..4fdb7f1 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/WatcherDisplay.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/WatcherDisplay.kt
@@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import xyz.atnrch.wrench.gui.filemanager.FileManagerDisplay
 import xyz.atnrch.wrench.gui.server.ServerManagerDisplay
-import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.gui.style.UIColors
 import xyz.atnrch.wrench.watcher.WatcherManager
 import java.nio.file.Path
 
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/WrenchScaffold.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/WrenchScaffold.kt
index eea1552..ee823f4 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/WrenchScaffold.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/WrenchScaffold.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.window.WindowState
 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.gui.style.UIColors
 import xyz.atnrch.wrench.watcher.Watcher
 import xyz.atnrch.wrench.watcher.WatcherEntry
 import xyz.atnrch.wrench.watcher.WatcherManager
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/AddOutputButton.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/AddOutputButton.kt
index 8702fec..5a4497a 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/AddOutputButton.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/AddOutputButton.kt
@@ -18,7 +18,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import xyz.atnrch.wrench.gui.filemanager.center.showDirectoryPicker
 import xyz.atnrch.wrench.logger.Logger
-import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.gui.style.UIColors
 import xyz.atnrch.wrench.watcher.WatcherEntry
 import xyz.atnrch.wrench.watcher.WatcherManager
 import java.nio.file.Path
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/FloatingAddButton.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/FloatingAddButton.kt
index d690256..8913ec4 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/FloatingAddButton.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/FloatingAddButton.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import xyz.atnrch.wrench.gui.filemanager.center.showFilePicker
 import xyz.atnrch.wrench.logger.Logger
-import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.gui.style.UIColors
 import xyz.atnrch.wrench.watcher.WatcherManager
 
 @Composable
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/MoveFilesButton.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/MoveFilesButton.kt
index 0870552..18a96ea 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/MoveFilesButton.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/MoveFilesButton.kt
@@ -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.ui.UIColors
+import xyz.atnrch.wrench.gui.style.UIColors
 import xyz.atnrch.wrench.watcher.Watcher
 
 @Composable
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/RemoveOutputButton.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/RemoveOutputButton.kt
index 30d23f5..0c514c2 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/RemoveOutputButton.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/bottom/RemoveOutputButton.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import xyz.atnrch.wrench.registery.ACTIVE_COMPOSABLE
-import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.gui.style.UIColors
 import xyz.atnrch.wrench.watcher.WatcherManager
 import java.nio.file.Path
 
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/empty/DefaultDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/empty/DefaultDisplay.kt
index 5c7090b..8ccdab2 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/empty/DefaultDisplay.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/empty/DefaultDisplay.kt
@@ -13,8 +13,8 @@ import androidx.compose.ui.unit.ExperimentalUnitApi
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.TextUnitType
 import androidx.compose.ui.unit.dp
-import xyz.atnrch.wrench.ui.Fonts
-import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.gui.style.Fonts
+import xyz.atnrch.wrench.gui.style.UIColors
 
 @OptIn(ExperimentalUnitApi::class)
 @Composable
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputEntries.kt
index e6cc829..f6ddcf8 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputEntries.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputEntries.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.unit.dp
 import xyz.atnrch.wrench.registery.ACTIVE_COMPOSABLE
 import xyz.atnrch.wrench.registery.RegisterComposable
-import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.gui.style.UIColors
 import xyz.atnrch.wrench.watcher.WatcherManager
 
 @Composable
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputTextEntry.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputTextEntry.kt
index 828f1cc..70d3ab8 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputTextEntry.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/input/InputTextEntry.kt
@@ -14,8 +14,8 @@ import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.TextUnitType
 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
+import xyz.atnrch.wrench.gui.style.Fonts
+import xyz.atnrch.wrench.gui.style.UIColors
 import xyz.atnrch.wrench.watcher.WatcherEntry
 
 @OptIn(ExperimentalUnitApi::class, ExperimentalFoundationApi::class)
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/output/OutputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/output/OutputEntries.kt
index 8b9a090..d02190f 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/output/OutputEntries.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/center/output/OutputEntries.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.unit.ExperimentalUnitApi
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.TextUnitType
 import androidx.compose.ui.unit.dp
-import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.gui.style.UIColors
 import xyz.atnrch.wrench.watcher.WatcherEntry
 import xyz.atnrch.wrench.watcher.WatcherManager
 import java.nio.file.Path
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBar.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBar.kt
index c1c3921..cb5edc7 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBar.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBar.kt
@@ -12,8 +12,8 @@ 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.ui.Fonts
-import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.gui.style.Fonts
+import xyz.atnrch.wrench.gui.style.UIColors
 
 @Composable
 fun TopBar() {
diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/server/center/UnderConstrutrionView.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/server/center/UnderConstrutrionView.kt
index 6e1931a..515ddc5 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/gui/server/center/UnderConstrutrionView.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/server/center/UnderConstrutrionView.kt
@@ -13,8 +13,8 @@ import androidx.compose.ui.unit.ExperimentalUnitApi
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.TextUnitType
 import androidx.compose.ui.unit.dp
-import xyz.atnrch.wrench.ui.Fonts
-import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.gui.style.Fonts
+import xyz.atnrch.wrench.gui.style.UIColors
 
 @OptIn(ExperimentalUnitApi::class)
 @Composable
diff --git a/src/main/kotlin/xyz/atnrch/wrench/ui/Fonts.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/style/Fonts.kt
similarity index 96%
rename from src/main/kotlin/xyz/atnrch/wrench/ui/Fonts.kt
rename to src/main/kotlin/xyz/atnrch/wrench/gui/style/Fonts.kt
index 4d64bbe..3f59cc0 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/ui/Fonts.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/style/Fonts.kt
@@ -1,4 +1,4 @@
-package xyz.atnrch.wrench.ui
+package xyz.atnrch.wrench.gui.style
 
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
diff --git a/src/main/kotlin/xyz/atnrch/wrench/ui/UIColors.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/style/UIColors.kt
similarity index 89%
rename from src/main/kotlin/xyz/atnrch/wrench/ui/UIColors.kt
rename to src/main/kotlin/xyz/atnrch/wrench/gui/style/UIColors.kt
index 37785e2..dc28971 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/ui/UIColors.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/gui/style/UIColors.kt
@@ -1,4 +1,4 @@
-package xyz.atnrch.wrench.ui
+package xyz.atnrch.wrench.gui.style
 
 import androidx.compose.ui.graphics.Color