diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/AppBottomBar.kt b/src/main/kotlin/xyz/atnrch/wrench/components/AppBottomBar.kt index 17a3ac9..7b0d7aa 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/AppBottomBar.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/AppBottomBar.kt @@ -5,7 +5,7 @@ import androidx.compose.material.BottomAppBar import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.window.WindowState -import xyz.atnrch.wrench.components.filemanager.bottom.FileWatcherBottomRow +import xyz.atnrch.wrench.components.filemanager.bottom.bar.NormalFileBottomRow import xyz.atnrch.wrench.ui.UIColors import xyz.atnrch.wrench.watcher.Watcher import xyz.atnrch.wrench.watcher.WatcherManager @@ -25,5 +25,5 @@ fun AppBottomBar( CornerSize(percent = 50) ), backgroundColor = UIColors.DARK - ) { FileWatcherBottomRow(state, watcherManager, watcher, currentClick, outputs, onCurrentClick) } + ) { NormalFileBottomRow(state, watcherManager, watcher, currentClick, outputs, onCurrentClick) } } \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/bar/NormalFileBottomRow.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/bar/NormalFileBottomRow.kt new file mode 100644 index 0000000..ab34d71 --- /dev/null +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/bar/NormalFileBottomRow.kt @@ -0,0 +1,33 @@ +package xyz.atnrch.wrench.components.filemanager.bottom.bar + +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.width +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.WindowState +import xyz.atnrch.wrench.components.filemanager.bottom.AddOutputButton +import xyz.atnrch.wrench.components.filemanager.bottom.MoveFilesButton +import xyz.atnrch.wrench.components.filemanager.bottom.RemoveOutputButton +import xyz.atnrch.wrench.watcher.Watcher +import xyz.atnrch.wrench.watcher.WatcherManager +import java.nio.file.Path + +@Composable +fun NormalFileBottomRow( + state: WindowState, + watcherManager: WatcherManager, + watcher: Watcher, + currentClick: Int, + outputs: MutableList, + onCurrentClick: (Int) -> Unit, +) { + Spacer(Modifier.width(10.dp)) + MoveFilesButton(state, watcher) + if (currentClick != -1) { + Spacer(Modifier.width(10.dp)) + AddOutputButton(watcherManager, outputs, currentClick) + Spacer(Modifier.width(10.dp)) + RemoveOutputButton(watcherManager, outputs, currentClick, onCurrentClick) + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FileWatcherBottomRow.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/bar/SmallFileBottomRow.kt similarity index 75% rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FileWatcherBottomRow.kt rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/bar/SmallFileBottomRow.kt index 5770f23..c955fb1 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/FileWatcherBottomRow.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/bar/SmallFileBottomRow.kt @@ -1,4 +1,4 @@ -package xyz.atnrch.wrench.components.filemanager.bottom +package xyz.atnrch.wrench.components.filemanager.bottom.bar import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.width @@ -6,12 +6,15 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.window.WindowState +import xyz.atnrch.wrench.components.filemanager.bottom.AddOutputButton +import xyz.atnrch.wrench.components.filemanager.bottom.MoveFilesButton +import xyz.atnrch.wrench.components.filemanager.bottom.RemoveOutputButton import xyz.atnrch.wrench.watcher.Watcher import xyz.atnrch.wrench.watcher.WatcherManager import java.nio.file.Path @Composable -fun FileWatcherBottomRow( +fun SmallBottomRow( state: WindowState, watcherManager: WatcherManager, watcher: Watcher,