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

refactor: rename bottom bar

Browse source
This commit is contained in:
aro 2022-12-31 10:57:06 +01:00
parent 8534c3ebc5
commit 6e35d671c6
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt
View file

@ -5,7 +5,7 @@ import androidx.compose.material.ScaffoldState
import androidx.compose.material.rememberScaffoldState import androidx.compose.material.rememberScaffoldState
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.window.WindowState 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.bottom.FloatingButton
import xyz.atnrch.wrench.components.filemanager.top.TopBar import xyz.atnrch.wrench.components.filemanager.top.TopBar
import xyz.atnrch.wrench.compose.SnackBarDataHolder import xyz.atnrch.wrench.compose.SnackBarDataHolder
@ -34,7 +34,7 @@ fun WrenchScaffold(state: WindowState) {
floatingActionButton = { FloatingButton(watcherManager) }, floatingActionButton = { FloatingButton(watcherManager) },
isFloatingActionButtonDocked = true, isFloatingActionButtonDocked = true,
backgroundColor = UIColors.PRIMARY, backgroundColor = UIColors.PRIMARY,
bottomBar = { BottomAppBar(state, watcherManager, watcher, currentClick, outputs) { currentClick = it } } bottomBar = { AppBottomBar(state, watcherManager, watcher, currentClick, outputs) { currentClick = it } }
) { ) {
WatcherDisplay( WatcherDisplay(
state, state,

5
src/main/kotlin/xyz/atnrch/wrench/components/filemanager/bottom/BottomBar.kt
View file

@ -1,6 +1,7 @@
package xyz.atnrch.wrench.components.filemanager.bottom package xyz.atnrch.wrench.components.filemanager.bottom
import androidx.compose.foundation.shape.CornerSize import androidx.compose.foundation.shape.CornerSize
import androidx.compose.material.BottomAppBar
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.window.WindowState import androidx.compose.ui.window.WindowState
@ -10,7 +11,7 @@ import xyz.atnrch.wrench.watcher.WatcherManager
import java.nio.file.Path import java.nio.file.Path
@Composable @Composable
fun BottomAppBar( fun AppBottomBar(
state: WindowState, state: WindowState,
watcherManager: WatcherManager, watcherManager: WatcherManager,
watcher: Watcher, watcher: Watcher,
@ -18,7 +19,7 @@ fun BottomAppBar(
outputs: MutableList<Path>, outputs: MutableList<Path>,
onCurrentClick: (Int) -> Unit onCurrentClick: (Int) -> Unit
) { ) {
androidx.compose.material.BottomAppBar( BottomAppBar(
cutoutShape = MaterialTheme.shapes.small.copy( cutoutShape = MaterialTheme.shapes.small.copy(
CornerSize(percent = 50) CornerSize(percent = 50)
), ),