From ace8974d3be41c918dc59d41c1c9300a82547a3a Mon Sep 17 00:00:00 2001 From: aro Date: Sun, 27 Nov 2022 18:44:29 +0100 Subject: [PATCH] refactor: button name and remove watcher action for now --- .../kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt | 8 ++++++-- src/main/kotlin/xyz/atnrch/wrench/watcher/Watcher.kt | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt b/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt index c066333..ec7b148 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt @@ -1,6 +1,8 @@ package xyz.atnrch.wrench.components import androidx.compose.material.Scaffold +import androidx.compose.material.ScaffoldState +import androidx.compose.material.rememberScaffoldState import androidx.compose.runtime.* import xyz.atnrch.wrench.components.center.AddButton import xyz.atnrch.wrench.components.top.TopBar @@ -10,16 +12,18 @@ import xyz.atnrch.wrench.watcher.WatcherManager @Composable fun WrenchScaffold() { + val scaffoldState: ScaffoldState = rememberScaffoldState() val entries: MutableMap = remember { mutableStateMapOf() } val watcherManager = remember { WatcherManager(entries) } val watcher = remember { Watcher(watcherManager) } - var buttonState by remember { mutableStateOf(false) } + var watcherState by remember { mutableStateOf(false) } Scaffold( + scaffoldState = scaffoldState, topBar = { TopBar() }, floatingActionButton = { AddButton(watcherManager) }, isFloatingActionButtonDocked = true, - bottomBar = { BottomAppBar(watcher, buttonState) { buttonState = it } } + bottomBar = { BottomAppBar(watcher, watcherState) { watcherState = it } } ) { WatcherDisplay(watcherManager) } } \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/watcher/Watcher.kt b/src/main/kotlin/xyz/atnrch/wrench/watcher/Watcher.kt index 345ed2c..455e4e2 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/watcher/Watcher.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/watcher/Watcher.kt @@ -3,7 +3,6 @@ package xyz.atnrch.wrench.watcher import kotlinx.coroutines.* import kotlinx.coroutines.swing.Swing import xyz.atnrch.wrench.logger.Logger -import java.nio.file.Files import java.util.concurrent.TimeUnit class Watcher(private val watcherManager: WatcherManager) { @@ -14,7 +13,7 @@ class Watcher(private val watcherManager: WatcherManager) { private var coroutineScope = CoroutineScope(Dispatchers.Swing) fun start() { - if(WATCHING) return + if (WATCHING) return coroutineScope.launch { WATCHING = true @@ -23,7 +22,7 @@ class Watcher(private val watcherManager: WatcherManager) { delay(TimeUnit.SECONDS.toMillis(5)) for (entry: WatcherEntry in watcherManager.getEntries().values) { entry.map.forEach { - Files.copy(entry.file.toPath(), it.toAbsolutePath()) + //Files.copy(entry.file.toPath(), it.toAbsolutePath()) } } }