refactor: relocate to make space for server manager feature

This commit is contained in:
aro 2022-12-26 12:20:02 +01:00
parent c80f52d351
commit ccb083050b
20 changed files with 63 additions and 31 deletions

View file

@ -5,7 +5,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Window import androidx.compose.ui.window.Window
import androidx.compose.ui.window.application import androidx.compose.ui.window.application
import androidx.compose.ui.window.rememberWindowState 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 xyz.atnrch.wrench.logger.Logger
import javax.swing.UIManager import javax.swing.UIManager

View file

@ -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.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding 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.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.WindowState import androidx.compose.ui.window.WindowState
import xyz.atnrch.wrench.components.center.empty.DefaultDisplay import xyz.atnrch.wrench.components.filemanager.center.empty.DefaultDisplay
import xyz.atnrch.wrench.components.center.input.InputEntries import xyz.atnrch.wrench.components.filemanager.center.input.InputEntries
import xyz.atnrch.wrench.components.center.output.OutputEntries import xyz.atnrch.wrench.components.filemanager.center.output.OutputEntries
import xyz.atnrch.wrench.ui.UIColors
import xyz.atnrch.wrench.watcher.WatcherManager import xyz.atnrch.wrench.watcher.WatcherManager
import java.nio.file.Path import java.nio.file.Path
@ -22,6 +26,34 @@ fun WatcherDisplay(
currentClick: Int, currentClick: Int,
outputs: MutableList<Path>, outputs: MutableList<Path>,
onEntryClick: (id: Int) -> Unit 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<Path>,
onEntryClick: (id: Int) -> Unit
) { ) {
if (state.size.width <= 600.dp) { if (state.size.width <= 600.dp) {
Column( Column(

View file

@ -1,13 +1,13 @@
package xyz.atnrch.wrench.components package xyz.atnrch.wrench.components.filemanager
import androidx.compose.material.Scaffold import androidx.compose.material.Scaffold
import androidx.compose.material.ScaffoldState import androidx.compose.material.ScaffoldState
import androidx.compose.material.rememberScaffoldState import androidx.compose.material.rememberScaffoldState
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.window.WindowState import androidx.compose.ui.window.WindowState
import xyz.atnrch.wrench.components.bottom.BottomAppBar import xyz.atnrch.wrench.components.filemanager.bottom.BottomAppBar
import xyz.atnrch.wrench.components.bottom.FloatingButton import xyz.atnrch.wrench.components.filemanager.bottom.FloatingButton
import xyz.atnrch.wrench.components.top.TopBar import xyz.atnrch.wrench.components.filemanager.top.TopBar
import xyz.atnrch.wrench.compose.SnackBarDataHolder import xyz.atnrch.wrench.compose.SnackBarDataHolder
import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.ui.UIColors
import xyz.atnrch.wrench.watcher.Watcher import xyz.atnrch.wrench.watcher.Watcher

View file

@ -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.BorderStroke
import androidx.compose.foundation.layout.PaddingValues 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.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.WindowState 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.logger.Logger
import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.ui.UIColors
import xyz.atnrch.wrench.watcher.WatcherEntry import xyz.atnrch.wrench.watcher.WatcherEntry

View file

@ -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.foundation.shape.CornerSize
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme

View file

@ -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.border
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp 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.logger.Logger
import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.ui.UIColors
import xyz.atnrch.wrench.watcher.WatcherManager import xyz.atnrch.wrench.watcher.WatcherManager

View file

@ -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.BorderStroke
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues

View file

@ -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.BorderStroke
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues

View file

@ -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.Spacer
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width

View file

@ -1,7 +1,7 @@
package xyz.atnrch.wrench.components.center package xyz.atnrch.wrench.components.filemanager.center
import androidx.compose.runtime.Composable 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.registery.RegisterComposable
import xyz.atnrch.wrench.watcher.WatcherEntry import xyz.atnrch.wrench.watcher.WatcherEntry
import xyz.atnrch.wrench.watcher.WatcherManager import xyz.atnrch.wrench.watcher.WatcherManager

View file

@ -1,4 +1,4 @@
package xyz.atnrch.wrench.components.center package xyz.atnrch.wrench.components.filemanager.center
import java.io.File import java.io.File
import javax.swing.JFileChooser import javax.swing.JFileChooser

View file

@ -1,4 +1,4 @@
package xyz.atnrch.wrench.components.center.dialog package xyz.atnrch.wrench.components.filemanager.center.dialog
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable

View file

@ -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.background
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*

View file

@ -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.foundation.layout.*
import androidx.compose.material.Icon import androidx.compose.material.Icon

View file

@ -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.BorderStroke
import androidx.compose.foundation.border import androidx.compose.foundation.border

View file

@ -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.ExperimentalFoundationApi
import androidx.compose.foundation.PointerMatcher 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.ExperimentalUnitApi
import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnit
import androidx.compose.ui.unit.TextUnitType 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.registery.ACTIVE_COMPOSABLE
import xyz.atnrch.wrench.ui.Fonts import xyz.atnrch.wrench.ui.Fonts
import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.ui.UIColors

View file

@ -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.foundation.layout.*
import androidx.compose.material.ButtonDefaults import androidx.compose.material.ButtonDefaults

View file

@ -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.BorderStroke
import androidx.compose.foundation.border import androidx.compose.foundation.border

View file

@ -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.foundation.layout.*
import androidx.compose.material.ButtonDefaults import androidx.compose.material.ButtonDefaults

View file

@ -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.Spacer
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size