From 41ec4d6e377607ade2eca8caf35389a5ca713642 Mon Sep 17 00:00:00 2001 From: aro Date: Thu, 24 Nov 2022 14:58:33 +0100 Subject: [PATCH] refactor: folders structure --- .../wrench/components/WatcherDisplay.kt | 4 +- .../{BottomAppBar.kt => bottom/BottomBar.kt} | 0 .../WatcherStatusButton.kt} | 3 - .../{debug => center}/DummyTextEntry.kt | 0 .../components/{ => center}/FilePicker.kt | 0 .../FloatingAddButton.kt} | 3 - .../{ => center}/WatcherTextEntry.kt | 2 +- .../components/center/dialog/DialogButton.kt | 9 ++ .../components/center/dialog/EntryDialog.kt | 89 +++++++++++++++++++ .../{ => center}/input/InputEntries.kt | 2 +- .../{ => center}/input/InputTopText.kt | 2 +- .../{ => center}/output/OutputEntries.kt | 2 +- .../wrench/components/dialog/DialogButton.kt | 2 - .../wrench/components/dialog/EntryDialog.kt | 44 --------- .../wrench/components/tooltip/Tooltip.kt | 2 - .../wrench/components/{ => top}/TopBar.kt | 0 src/main/kotlin/xyz/atnrch/wrench/ui/Fonts.kt | 20 ++--- 17 files changed, 110 insertions(+), 74 deletions(-) rename src/main/kotlin/xyz/atnrch/wrench/components/{BottomAppBar.kt => bottom/BottomBar.kt} (100%) rename src/main/kotlin/xyz/atnrch/wrench/components/{WrenchBottomRow.kt => bottom/WatcherStatusButton.kt} (97%) rename src/main/kotlin/xyz/atnrch/wrench/components/{debug => center}/DummyTextEntry.kt (100%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => center}/FilePicker.kt (100%) rename src/main/kotlin/xyz/atnrch/wrench/components/{AddButton.kt => center/FloatingAddButton.kt} (94%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => center}/WatcherTextEntry.kt (94%) create mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/DialogButton.kt create mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/EntryDialog.kt rename src/main/kotlin/xyz/atnrch/wrench/components/{ => center}/input/InputEntries.kt (95%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => center}/input/InputTopText.kt (95%) rename src/main/kotlin/xyz/atnrch/wrench/components/{ => center}/output/OutputEntries.kt (94%) delete mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/dialog/DialogButton.kt delete mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/dialog/EntryDialog.kt delete mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/tooltip/Tooltip.kt rename src/main/kotlin/xyz/atnrch/wrench/components/{ => top}/TopBar.kt (100%) diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt index 92ebe3d..53d1e4e 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt @@ -2,8 +2,8 @@ package xyz.atnrch.wrench.components import androidx.compose.foundation.layout.Row import androidx.compose.runtime.Composable -import xyz.atnrch.wrench.components.input.InputEntries -import xyz.atnrch.wrench.components.output.OutputEntries +import xyz.atnrch.wrench.components.center.input.InputEntries +import xyz.atnrch.wrench.components.center.output.OutputEntries import xyz.atnrch.wrench.watcher.WatcherManager @Composable diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/BottomAppBar.kt b/src/main/kotlin/xyz/atnrch/wrench/components/bottom/BottomBar.kt similarity index 100% rename from src/main/kotlin/xyz/atnrch/wrench/components/BottomAppBar.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/bottom/BottomBar.kt diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchBottomRow.kt b/src/main/kotlin/xyz/atnrch/wrench/components/bottom/WatcherStatusButton.kt similarity index 97% rename from src/main/kotlin/xyz/atnrch/wrench/components/WrenchBottomRow.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/bottom/WatcherStatusButton.kt index f13733f..aaca62a 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchBottomRow.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/bottom/WatcherStatusButton.kt @@ -27,9 +27,6 @@ fun BottomRow( ) { val buttonColors = remember { arrayOf(UIColors.WATCHER_START_BG) } - //............. - // START BUTTON - //............. Spacer(Modifier.width(5.dp)) Button( { diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/debug/DummyTextEntry.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/DummyTextEntry.kt similarity index 100% rename from src/main/kotlin/xyz/atnrch/wrench/components/debug/DummyTextEntry.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/center/DummyTextEntry.kt diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/FilePicker.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/FilePicker.kt similarity index 100% rename from src/main/kotlin/xyz/atnrch/wrench/components/FilePicker.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/center/FilePicker.kt diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/AddButton.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/FloatingAddButton.kt similarity index 94% rename from src/main/kotlin/xyz/atnrch/wrench/components/AddButton.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/center/FloatingAddButton.kt index a2f2497..9868a20 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/AddButton.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/center/FloatingAddButton.kt @@ -17,9 +17,6 @@ import xyz.atnrch.wrench.watcher.WatcherManager fun AddButton( watcherManager: WatcherManager ) { - //............. - // ADD BUTTON (FLOATING) - //............. FloatingActionButton( { createFileChooser({ diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherTextEntry.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/WatcherTextEntry.kt similarity index 94% rename from src/main/kotlin/xyz/atnrch/wrench/components/WatcherTextEntry.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/center/WatcherTextEntry.kt index 588ec0c..9192f55 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherTextEntry.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/center/WatcherTextEntry.kt @@ -11,7 +11,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.components.dialog.EntryDialog +import xyz.atnrch.wrench.components.center.dialog.EntryDialog import xyz.atnrch.wrench.ui.Fonts import xyz.atnrch.wrench.watcher.WatcherEntry diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/DialogButton.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/DialogButton.kt new file mode 100644 index 0000000..a976d17 --- /dev/null +++ b/src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/DialogButton.kt @@ -0,0 +1,9 @@ +package xyz.atnrch.wrench.components.center.dialog + +import androidx.compose.runtime.Composable + +@Composable +fun DialogButton( + icon: () -> Unit, +) { +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/EntryDialog.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/EntryDialog.kt new file mode 100644 index 0000000..d7e4247 --- /dev/null +++ b/src/main/kotlin/xyz/atnrch/wrench/components/center/dialog/EntryDialog.kt @@ -0,0 +1,89 @@ +package xyz.atnrch.wrench.components.center.dialog + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.Icon +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.sharp.FolderOpen +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog + +@Composable +fun EntryDialog( + onStateChange: (state: Boolean) -> Unit +) { + Dialog( + onCloseRequest = { onStateChange(false) }, + resizable = true + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .fillMaxHeight(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Row( + horizontalArrangement = Arrangement.SpaceEvenly, + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier.size(50.dp) + .clip(CircleShape) + .background(Color.White) + .shadow(30.dp, CircleShape, false) + .height(10.dp), + contentAlignment = Alignment.Center + ) { + Icon( + imageVector = Icons.Sharp.FolderOpen, + tint = Color.Black, + contentDescription = "Open Folder", + modifier = Modifier.size(45.dp) + ) + } + Spacer(Modifier.width(75.dp)) + Icon( + Icons.Filled.Settings, + tint = Color.Black, + contentDescription = "Entry Settings...", + modifier = Modifier.size(45.dp) + ) + Spacer(Modifier.width(75.dp)) + Icon( + Icons.Filled.Settings, + tint = Color.Black, + contentDescription = "Entry Settings...", + modifier = Modifier.size(45.dp) + ) + } + } + + Column( + modifier = Modifier + .fillMaxWidth() + .fillMaxHeight(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Bottom + ) { + Row { + Icon( + Icons.Filled.Close, + tint = Color.Black, + contentDescription = "Entry Settings...", + modifier = Modifier.size(45.dp) + ) + } + Spacer(Modifier.height(15.dp)) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/input/InputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputEntries.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/input/InputEntries.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputEntries.kt index f75be3e..0a00632 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/input/InputEntries.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputEntries.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.input +package xyz.atnrch.wrench.components.center.input import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.border diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/input/InputTopText.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputTopText.kt similarity index 95% rename from src/main/kotlin/xyz/atnrch/wrench/components/input/InputTopText.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputTopText.kt index 71f3bab..5592271 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/input/InputTopText.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputTopText.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.input +package xyz.atnrch.wrench.components.center.input import androidx.compose.foundation.layout.* import androidx.compose.material.ButtonDefaults diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/output/OutputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputEntries.kt similarity index 94% rename from src/main/kotlin/xyz/atnrch/wrench/components/output/OutputEntries.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputEntries.kt index 9a41dbc..f3be271 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/output/OutputEntries.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputEntries.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.output +package xyz.atnrch.wrench.components.center.output import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.border diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/dialog/DialogButton.kt b/src/main/kotlin/xyz/atnrch/wrench/components/dialog/DialogButton.kt deleted file mode 100644 index 27584f1..0000000 --- a/src/main/kotlin/xyz/atnrch/wrench/components/dialog/DialogButton.kt +++ /dev/null @@ -1,2 +0,0 @@ -package xyz.atnrch.wrench.components.dialog - diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/dialog/EntryDialog.kt b/src/main/kotlin/xyz/atnrch/wrench/components/dialog/EntryDialog.kt deleted file mode 100644 index 72fd78e..0000000 --- a/src/main/kotlin/xyz/atnrch/wrench/components/dialog/EntryDialog.kt +++ /dev/null @@ -1,44 +0,0 @@ -package xyz.atnrch.wrench.components.dialog - -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Card -import androidx.compose.material.Text -import androidx.compose.material.TextButton -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp -import androidx.compose.ui.window.Dialog - -@Composable -fun EntryDialog( - onStateChange: (state: Boolean) -> Unit -) { - Dialog( - onCloseRequest = { onStateChange(false) }, - resizable = false, - ) { - Card( - elevation = 8.dp, - shape = RoundedCornerShape(12.dp) - ) { - // Buttons - Row( - horizontalArrangement = Arrangement.End, - modifier = Modifier - .fillMaxWidth() - .fillMaxHeight(), - verticalAlignment = Alignment.Bottom - ) { - TextButton(onClick = { onStateChange(false) }) { - Text(text = "Cancel") - } - Spacer(modifier = Modifier.width(4.dp)) - TextButton(onClick = {}) { - Text(text = "OK") - } - } - } - } -} \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/tooltip/Tooltip.kt b/src/main/kotlin/xyz/atnrch/wrench/components/tooltip/Tooltip.kt deleted file mode 100644 index 2d4136c..0000000 --- a/src/main/kotlin/xyz/atnrch/wrench/components/tooltip/Tooltip.kt +++ /dev/null @@ -1,2 +0,0 @@ -package xyz.atnrch.wrench.components.tooltip - diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/TopBar.kt b/src/main/kotlin/xyz/atnrch/wrench/components/top/TopBar.kt similarity index 100% rename from src/main/kotlin/xyz/atnrch/wrench/components/TopBar.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/top/TopBar.kt diff --git a/src/main/kotlin/xyz/atnrch/wrench/ui/Fonts.kt b/src/main/kotlin/xyz/atnrch/wrench/ui/Fonts.kt index f9e2336..54c05ba 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/ui/Fonts.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/ui/Fonts.kt @@ -15,27 +15,19 @@ class Fonts { ) ) - val JOST_BOLD: FontFamily = FontFamily( + val ROBOTO_MEDIUM: FontFamily = FontFamily( Font( - resource = "font/Jost-Bold.ttf", + resource = "font/Roboto-Medium.ttf", style = FontStyle.Normal, - weight = FontWeight.Bold - ) - ) - - val JOST_MEDIUM_ITALIC: FontFamily = FontFamily( - Font( - resource = "font/Jost-MediumItalic.ttf", - style = FontStyle.Italic, weight = FontWeight.Medium ) ) - val JOST_LIGHT_ITALIC: FontFamily = FontFamily( + val ROBOTO_REGULAR: FontFamily = FontFamily( Font( - resource = "font/Jost-LightItalic.ttf", - style = FontStyle.Italic, - weight = FontWeight.Light + resource = "font/Roboto-Regular.ttf", + style = FontStyle.Normal, + weight = FontWeight.Medium ) ) }