From 6e35d671c6e932c367928fb7b989f557d80d4ccd Mon Sep 17 00:00:00 2001 From: aro Date: Sat, 31 Dec 2022 10:57:06 +0100 Subject: [PATCH] refactor: rename bottom bar --- .../kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt | 4 ++-- .../atnrch/wrench/components/filemanager/bottom/BottomBar.kt | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt b/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt index a5802ee..fa3b6c6 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt @@ -5,7 +5,7 @@ import androidx.compose.material.ScaffoldState import androidx.compose.material.rememberScaffoldState import androidx.compose.runtime.* import androidx.compose.ui.window.WindowState -import xyz.atnrch.wrench.components.filemanager.bottom.BottomAppBar +import xyz.atnrch.wrench.components.filemanager.bottom.AppBottomBar import xyz.atnrch.wrench.components.filemanager.bottom.FloatingButton import xyz.atnrch.wrench.components.filemanager.top.TopBar import xyz.atnrch.wrench.compose.SnackBarDataHolder @@ -34,7 +34,7 @@ fun WrenchScaffold(state: WindowState) { floatingActionButton = { FloatingButton(watcherManager) }, isFloatingActionButtonDocked = true, backgroundColor = UIColors.PRIMARY, - bottomBar = { BottomAppBar(state, watcherManager, watcher, currentClick, outputs) { currentClick = it } } + bottomBar = { AppBottomBar(state, watcherManager, watcher, currentClick, outputs) { currentClick = it } } ) { WatcherDisplay( state, diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/BottomBar.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/BottomBar.kt index c2d02b7..bfdbefb 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/BottomBar.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/BottomBar.kt @@ -1,6 +1,7 @@ package xyz.atnrch.wrench.components.filemanager.bottom import androidx.compose.foundation.shape.CornerSize +import androidx.compose.material.BottomAppBar import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.window.WindowState @@ -10,7 +11,7 @@ import xyz.atnrch.wrench.watcher.WatcherManager import java.nio.file.Path @Composable -fun BottomAppBar( +fun AppBottomBar( state: WindowState, watcherManager: WatcherManager, watcher: Watcher, @@ -18,7 +19,7 @@ fun BottomAppBar( outputs: MutableList, onCurrentClick: (Int) -> Unit ) { - androidx.compose.material.BottomAppBar( + BottomAppBar( cutoutShape = MaterialTheme.shapes.small.copy( CornerSize(percent = 50) ),