ineanto/wrench
Archived
1
0
Fork 0
Code Issues Pull requests Activity

feat: still figuring out UI stuff

Browse source
This commit is contained in:
aro 2022-11-20 21:58:36 +01:00
parent 1da833a2a4
commit d89a9bfaf5
4 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/kotlin/xyz/atnrch/wrench/components/AddButton.kt
View file

@ -9,8 +9,8 @@ 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.colors.WrenchColors
import xyz.atnrch.wrench.logger.Logger import xyz.atnrch.wrench.logger.Logger
import xyz.atnrch.wrench.ui.UIColors
import xyz.atnrch.wrench.watcher.WatcherManager import xyz.atnrch.wrench.watcher.WatcherManager
@Composable @Composable
@ -29,11 +29,11 @@ fun AddButton(
Logger.info("No file selected.") Logger.info("No file selected.")
}) })
}, },
backgroundColor = WrenchColors.LIGHT, backgroundColor = UIColors.LIGHT,
) { ) {
Icon( Icon(
Icons.Filled.Add, Icons.Filled.Add,
tint = Color.White, tint = Color.Green,
contentDescription = "Add file...", contentDescription = "Add file...",
modifier = Modifier.size(28.dp) modifier = Modifier.size(28.dp)
) )

7
src/main/kotlin/xyz/atnrch/wrench/components/WrenchBottomRow.kt
View file

@ -15,7 +15,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.shadow 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 xyz.atnrch.wrench.colors.WrenchColors import xyz.atnrch.wrench.ui.UIColors
import xyz.atnrch.wrench.watcher.Watcher import xyz.atnrch.wrench.watcher.Watcher
@Composable @Composable
@ -38,18 +38,19 @@ fun BottomRow(
onStateChange(true) onStateChange(true)
} }
}, },
colors = ButtonDefaults.buttonColors(WrenchColors.LIGHT, Color.White), colors = ButtonDefaults.buttonColors(UIColors.LIGHT, Color.White),
contentPadding = ButtonDefaults.ContentPadding, contentPadding = ButtonDefaults.ContentPadding,
shape = RoundedCornerShape(100), shape = RoundedCornerShape(100),
modifier = Modifier.shadow(15.dp, RoundedCornerShape(100), false) modifier = Modifier.shadow(15.dp, RoundedCornerShape(100), false)
) { ) {
if (state) Icon( if (state) Icon(
Icons.Filled.Close, Icons.Filled.Close,
tint = UIColors.STRESS,
contentDescription = "Stop", contentDescription = "Stop",
modifier = Modifier.size(28.dp) modifier = Modifier.size(28.dp)
) else Icon( ) else Icon(
Icons.Filled.PlayArrow, Icons.Filled.PlayArrow,
tint = Color.White, tint = Color.Green,
contentDescription = "Start", contentDescription = "Start",
modifier = Modifier.size(28.dp) modifier = Modifier.size(28.dp)
) )

42
src/main/kotlin/xyz/atnrch/wrench/components/WrenchFileManagerInput.kt
View file

@ -11,6 +11,7 @@ import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.unit.ExperimentalUnitApi import androidx.compose.ui.unit.ExperimentalUnitApi
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import xyz.atnrch.wrench.components.debug.DummyTextEntry import xyz.atnrch.wrench.components.debug.DummyTextEntry
import xyz.atnrch.wrench.ui.UIColors
import xyz.atnrch.wrench.watcher.WatcherManager import xyz.atnrch.wrench.watcher.WatcherManager
@OptIn(ExperimentalUnitApi::class) @OptIn(ExperimentalUnitApi::class)
@ -19,26 +20,34 @@ fun WatcherDisplay(
watcherManager: WatcherManager watcherManager: WatcherManager
) { ) {
var selectedFile = remember { mutableStateOf("") } var selectedFile = remember { mutableStateOf("") }
Column {
Box( Box(
contentAlignment = Alignment.CenterStart, contentAlignment = Alignment.Center,
modifier = Modifier.fillMaxSize(50F).border(BorderStroke(8.dp, Color.Black), RectangleShape), modifier = Modifier
.fillMaxWidth(0.5f)
.fillMaxHeight(1f)
.border(BorderStroke(4.dp, Color.Black), RectangleShape),
) {
Column(
modifier = Modifier.padding(24.dp)
) { ) {
Column( //.............
modifier = Modifier.padding(24.dp) // INPUT SIDE
) { //.............
//............. watcherManager.getEntries().forEach {
// INPUT SIDE WatcherTextEntry(it)
//.............
watcherManager.getEntries().forEach {
WatcherTextEntry(it)
}
DummyTextEntry()
} }
DummyTextEntry()
} }
}
Box {
Box( Box(
contentAlignment = Alignment.CenterEnd, contentAlignment = Alignment.Center,
modifier = Modifier.fillMaxSize(50F), modifier = Modifier
.fillMaxWidth(0.5f)
.fillMaxHeight(1f)
.border(BorderStroke(4.dp, UIColors.STRESS), RectangleShape),
) { ) {
Column( Column(
modifier = Modifier.padding(24.dp) modifier = Modifier.padding(24.dp)
@ -46,6 +55,7 @@ fun WatcherDisplay(
//............. //.............
// OUTPUT SIDE // OUTPUT SIDE
//............. //.............
DummyTextEntry()
} }
} }
} }

3
src/main/kotlin/xyz/atnrch/wrench/components/dialog/EntryDialog.kt
View file

@ -12,7 +12,6 @@ import androidx.compose.ui.window.Dialog
@Composable @Composable
fun EntryDialog( fun EntryDialog(
onCancelClick: () -> Unit,
onStateChange: (state: Boolean) -> Unit onStateChange: (state: Boolean) -> Unit
) { ) {
Dialog( Dialog(
@ -29,7 +28,7 @@ fun EntryDialog(
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()
) { ) {
TextButton(onClick = onCancelClick) { TextButton(onClick = { onStateChange(false) }) {
Text(text = "Cancel") Text(text = "Cancel")
} }
Spacer(modifier = Modifier.width(4.dp)) Spacer(modifier = Modifier.width(4.dp))