diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Menu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Menu.kt index 42cf00c..797f2f1 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Menu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Menu.kt @@ -51,21 +51,19 @@ fun Menu( Spacer(modifier = Modifier.weight(1f)) - MenuButton( - modifier = Modifier.padding(end = 4.dp), - title = "Fetch", - icon = painterResource("fetch.svg"), - onClick = { menuViewModel.fetchAll() }, - ) - ExtendedMenuButton( modifier = Modifier.padding(end = 4.dp), title = "Pull", icon = painterResource("download.svg"), onClick = { menuViewModel.pull() }, - extendedListItems = pullContextMenuItems { - menuViewModel.pull(true) - } + extendedListItems = pullContextMenuItems( + onPullRebase = { + menuViewModel.pull(true) + }, + onFetchAll = { + menuViewModel.fetchAll() + } + ) ) ExtendedMenuButton( diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/PullContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/PullContextMenu.kt index 434d29e..c912522 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/PullContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/PullContextMenu.kt @@ -4,11 +4,16 @@ import androidx.compose.foundation.ExperimentalFoundationApi fun pullContextMenuItems( onPullRebase: () -> Unit, + onFetchAll: () -> Unit, ): List { return mutableListOf( DropDownContentData( label = "Pull with rebase", onClick = onPullRebase, ), + DropDownContentData( + label = "Fetch all", + onClick = onFetchAll, + ), ) }