refactoring: comprehensive packaging
This commit is contained in:
parent
a10d703363
commit
c24a27c5b5
26 changed files with 46 additions and 46 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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()
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package xyz.atnrch.wrench.compose
|
||||
package xyz.atnrch.wrench.data
|
||||
|
||||
import androidx.compose.material.ScaffoldState
|
||||
import kotlinx.coroutines.CoroutineScope
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
||||
|
|
@ -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.*
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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()
|
||||
}
|
|
@ -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
|
|
@ -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
|
||||
|
|
Reference in a new issue