Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed inconsistencies with the side panel context menu

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2023-05-01 17:10:24 +02:00
parent 3752140a22
commit e5a2f5b6a7
No known key found for this signature in database
GPG Key ID: 7587FC860F594869
3 changed files with 100 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/kotlin/com/jetpackduba/gitnuro/ui/SidePanel.kt
View File

@ -18,9 +18,9 @@ import com.jetpackduba.gitnuro.extensions.simpleName
import com.jetpackduba.gitnuro.theme.onBackgroundSecondary
import com.jetpackduba.gitnuro.ui.components.*
import com.jetpackduba.gitnuro.ui.context_menu.*
import com.jetpackduba.gitnuro.ui.dialogs.SetDefaultUpstreamBranchDialog
import com.jetpackduba.gitnuro.ui.dialogs.EditRemotesDialog
import com.jetpackduba.gitnuro.ui.dialogs.AddSubmodulesDialog
import com.jetpackduba.gitnuro.ui.dialogs.EditRemotesDialog
import com.jetpackduba.gitnuro.ui.dialogs.SetDefaultUpstreamBranchDialog
import com.jetpackduba.gitnuro.viewmodels.sidepanel.*
import org.eclipse.jgit.lib.Ref
import org.eclipse.jgit.revwalk.RevCommit
@ -199,9 +199,6 @@ fun LazyListScope.remotes(
val remotes = remotesState.remotes
item {
ContextMenu(
items = { remoteBranchesContextMenu(onShowEditRemotesDialog) }
) {
SideMenuHeader(
text = "Remotes",
icon = painterResource(AppIcons.CLOUD),
@ -227,7 +224,6 @@ fun LazyListScope.remotes(
onExpand = { remotesViewModel.onExpand() }
)
}
}
if (isExpanded) {
for (remote in remotes) {
@ -242,9 +238,12 @@ fun LazyListScope.remotes(
items(remote.remoteInfo.branchesList) { remoteBranch ->
RemoteBranches(
remoteBranch = remoteBranch,
currentBranch = remotesState.currentBranch,
onBranchClicked = { remotesViewModel.selectBranch(remoteBranch) },
onDoubleClick = { remotesViewModel.checkoutRemoteBranch(remoteBranch) },
onCheckoutBranch = { remotesViewModel.checkoutRemoteBranch(remoteBranch) },
onDeleteBranch = { remotesViewModel.deleteRemoteBranch(remoteBranch) },
onPushRemoteBranch = { remotesViewModel.pushToRemoteBranch(remoteBranch) },
onPullRemoteBranch = { remotesViewModel.pullFromRemoteBranch(remoteBranch) },
)
}
}
@ -443,14 +442,28 @@ private fun Remote(
@Composable
private fun RemoteBranches(
remoteBranch: Ref,
currentBranch: Ref?,
onBranchClicked: () -> Unit,
onDoubleClick: () -> Unit,
onCheckoutBranch: () -> Unit,
onDeleteBranch: () -> Unit,
onPushRemoteBranch: () -> Unit,
onPullRemoteBranch: () -> Unit,
) {
ContextMenu(
items = {
remoteBranchesContextMenu(
onDeleteBranch = onDeleteBranch
branchContextMenuItems(
branch = remoteBranch,
currentBranch = currentBranch,
isCurrentBranch = false,
isLocal = false,
onCheckoutBranch = onCheckoutBranch,
onMergeBranch = {},
onDeleteBranch = {},
onDeleteRemoteBranch = onDeleteBranch,
onRebaseBranch = {},
onPushToRemoteBranch = onPushRemoteBranch,
onPullFromRemoteBranch = onPullRemoteBranch,
onChangeDefaultUpstreamBranch = {},
)
}
) {
@ -459,7 +472,7 @@ private fun RemoteBranches(
extraPadding = 24.dp,
iconResourcePath = AppIcons.BRANCH,
onClick = onBranchClicked,
onDoubleClick = onDoubleClick,
onDoubleClick = onCheckoutBranch,
)
}
}

19
src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/RemoteBranchesContextMenu.kt
View File

@ -1,19 +0,0 @@
@file:OptIn(ExperimentalFoundationApi::class)
package com.jetpackduba.gitnuro.ui.context_menu
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.ui.res.painterResource
import com.jetpackduba.gitnuro.AppIcons
fun remoteBranchesContextMenu(
onDeleteBranch: () -> Unit
): List<ContextMenuElement> {
return listOf(
ContextMenuElement.ContextTextEntry(
label = "Delete remote branch",
icon = { painterResource(AppIcons.DELETE) },
onClick = onDeleteBranch
),
)
}

41
src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/sidepanel/RemotesViewModel.kt
View File

@ -7,8 +7,11 @@ import com.jetpackduba.gitnuro.git.RefreshType
import com.jetpackduba.gitnuro.git.TabState
import com.jetpackduba.gitnuro.git.branches.CheckoutRefUseCase
import com.jetpackduba.gitnuro.git.branches.DeleteLocallyRemoteBranchesUseCase
import com.jetpackduba.gitnuro.git.branches.GetCurrentBranchUseCase
import com.jetpackduba.gitnuro.git.branches.GetRemoteBranchesUseCase
import com.jetpackduba.gitnuro.git.remote_operations.DeleteRemoteBranchUseCase
import com.jetpackduba.gitnuro.git.remote_operations.PullFromSpecificBranchUseCase
import com.jetpackduba.gitnuro.git.remote_operations.PushToSpecificBranchUseCase
import com.jetpackduba.gitnuro.git.remotes.*
import com.jetpackduba.gitnuro.ui.dialogs.RemoteWrapper
import dagger.assisted.Assisted
@ -27,18 +30,23 @@ class RemotesViewModel @AssistedInject constructor(
private val deleteRemoteBranchUseCase: DeleteRemoteBranchUseCase,
private val getRemoteBranchesUseCase: GetRemoteBranchesUseCase,
private val getRemotesUseCase: GetRemotesUseCase,
private val getCurrentBranchUseCase: GetCurrentBranchUseCase,
private val deleteRemoteUseCase: DeleteRemoteUseCase,
private val addRemoteUseCase: AddRemoteUseCase,
private val updateRemoteUseCase: UpdateRemoteUseCase,
private val deleteLocallyRemoteBranchesUseCase: DeleteLocallyRemoteBranchesUseCase,
private val checkoutRefUseCase: CheckoutRefUseCase,
private val pushToSpecificBranchUseCase: PushToSpecificBranchUseCase,
private val pullFromSpecificBranchUseCase: PullFromSpecificBranchUseCase,
private val tabScope: CoroutineScope,
@Assisted
private val filter: StateFlow<String>
) : SidePanelChildViewModel(false) {
private val remotes = MutableStateFlow<List<RemoteView>>(listOf())
private val currentBranch = MutableStateFlow<Ref?>(null)
val remoteState: StateFlow<RemotesState> = combine(remotes, isExpanded, filter) { remotes, isExpanded, filter ->
val remoteState: StateFlow<RemotesState> =
combine(remotes, isExpanded, filter, currentBranch) { remotes, isExpanded, filter, currentBranch ->
val remotesFiltered = remotes.map { remote ->
val remoteInfo = remote.remoteInfo
@ -53,12 +61,13 @@ class RemotesViewModel @AssistedInject constructor(
RemotesState(
remotesFiltered,
isExpanded
isExpanded,
currentBranch
)
}.stateIn(
scope = tabScope,
started = SharingStarted.Eagerly,
initialValue = RemotesState(emptyList(), isExpanded.value)
initialValue = RemotesState(emptyList(), isExpanded.value, null)
)
init {
@ -73,12 +82,14 @@ class RemotesViewModel @AssistedInject constructor(
val allRemoteBranches = getRemoteBranchesUseCase(git)
val remoteInfoList = getRemotesUseCase(git, allRemoteBranches)
val currentBranch = getCurrentBranchUseCase(git)
val remoteViewList = remoteInfoList.map { remoteInfo ->
RemoteView(remoteInfo, true)
}
this@RemotesViewModel.remotes.value = remoteViewList
this@RemotesViewModel.currentBranch.value = currentBranch
}
fun deleteRemoteBranch(ref: Ref) = tabState.safeProcessing(
@ -177,8 +188,30 @@ class RemotesViewModel @AssistedInject constructor(
) { git ->
checkoutRefUseCase(git, remoteBranch)
}
fun pushToRemoteBranch(branch: Ref) = tabState.safeProcessing(
refreshType = RefreshType.ALL_DATA,
) { git ->
pushToSpecificBranchUseCase(
git = git,
force = false,
pushTags = false,
remoteBranch = branch,
)
}
fun pullFromRemoteBranch(branch: Ref) = tabState.safeProcessing(
refreshType = RefreshType.ALL_DATA,
) { git ->
pullFromSpecificBranchUseCase(
git = git,
rebase = false,
remoteBranch = branch,
)
}
}
data class RemoteView(val remoteInfo: RemoteInfo, val isExpanded: Boolean)
data class RemotesState(val remotes: List<RemoteView>, val isExpanded: Boolean)
data class RemotesState(val remotes: List<RemoteView>, val isExpanded: Boolean, val currentBranch: Ref?)