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

Moved gitManager code to Log

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-11-12 23:54:46 +01:00
parent fce9f93df4
commit 58da603bbf
2 changed files with 18 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/kotlin/app/ui/Log.kt
View File

@ -67,13 +67,6 @@ fun Log(
dialogManager: DialogManager, dialogManager: DialogManager,
onRevCommitSelected: (RevCommit) -> Unit, onRevCommitSelected: (RevCommit) -> Unit,
onUncommitedChangesSelected: () -> Unit, onUncommitedChangesSelected: () -> Unit,
onCheckoutCommit: (graphNode: GraphNode) -> Unit,
onRevertCommit: (graphNode: GraphNode) -> Unit,
onResetToCommit: (graphNode: GraphNode, resetType: ResetType) -> Unit,
onCreateBranchOnCommit: (branchName: String, graphNode: GraphNode) -> Unit,
onCreateTagOnCommit: (tagName: String, graphNode: GraphNode) -> Unit,
onCheckoutRef: (ref: Ref) -> Unit,
onMergeBranch: (ref: Ref, fastForwards: Boolean) -> Unit,
selectedIndex: MutableState<Int> = remember { mutableStateOf(-1) } selectedIndex: MutableState<Int> = remember { mutableStateOf(-1) }
) { ) {
val logStatusState = gitManager.logStatus.collectAsState() val logStatusState = gitManager.logStatus.collectAsState()
@ -195,13 +188,13 @@ fun Log(
} }
} }
itemsIndexed(items = commitList) { index, item -> itemsIndexed(items = commitList) { index, graphNode ->
val commitRefs = item.refs val commitRefs = graphNode.refs
Box(modifier = Modifier Box(modifier = Modifier
.clickable { .clickable {
selectedIndex.value = index selectedIndex.value = index
selectedUncommited.value = false selectedUncommited.value = false
onRevCommitSelected(item) onRevCommitSelected(graphNode)
} }
) { ) {
@ -211,8 +204,9 @@ fun Log(
listOf( listOf(
ContextMenuItem( ContextMenuItem(
label = "Checkout commit", label = "Checkout commit",
onClick = { onCheckoutCommit(item) } onClick = {
), gitManager.checkoutCommit(graphNode)
}),
ContextMenuItem( ContextMenuItem(
label = "Create branch", label = "Create branch",
onClick = { onClick = {
@ -222,8 +216,8 @@ fun Log(
dialogManager.dismiss() dialogManager.dismiss()
}, },
onAccept = { branchName -> onAccept = { branchName ->
onCreateBranchOnCommit(branchName, item)
dialogManager.dismiss() dialogManager.dismiss()
gitManager.createBranchOnCommit(branchName, graphNode)
} }
) )
} }
@ -237,8 +231,8 @@ fun Log(
onReject = { onReject = {
dialogManager.dismiss() dialogManager.dismiss()
}, },
onAccept = { branchName -> onAccept = { tagName ->
onCreateTagOnCommit(branchName, item) gitManager.createTagOnCommit(tagName, graphNode)
dialogManager.dismiss() dialogManager.dismiss()
} }
) )
@ -248,7 +242,7 @@ fun Log(
ContextMenuItem( ContextMenuItem(
label = "Revert commit", label = "Revert commit",
onClick = { onClick = {
onRevertCommit(item) gitManager.revertCommit(graphNode)
} }
), ),
@ -261,8 +255,8 @@ fun Log(
dialogManager.dismiss() dialogManager.dismiss()
}, },
onAccept = { resetType -> onAccept = { resetType ->
onResetToCommit(item, resetType)
dialogManager.dismiss() dialogManager.dismiss()
gitManager.resetToCommit(graphNode, resetType)
} }
) )
} }
@ -279,7 +273,7 @@ fun Log(
CommitsGraphLine( CommitsGraphLine(
modifier = Modifier modifier = Modifier
.width(graphWidth), .width(graphWidth),
plotCommit = item plotCommit = graphNode
) )
DividerLog( DividerLog(
@ -294,10 +288,12 @@ fun Log(
CommitMessage( CommitMessage(
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
commit = item, commit = graphNode,
selected = selectedIndex.value == index, selected = selectedIndex.value == index,
refs = commitRefs, refs = commitRefs,
onCheckoutRef = onCheckoutRef, onCheckoutRef = { ref ->
gitManager.checkoutRef(ref)
},
onMergeBranch = { ref -> onMergeBranch = { ref ->
dialogManager.show { dialogManager.show {
MergeDialog( MergeDialog(
@ -308,7 +304,7 @@ fun Log(
}, },
onAccept = { fastForward -> onAccept = { fastForward ->
dialogManager.dismiss() dialogManager.dismiss()
onMergeBranch(ref, fastForward) gitManager.mergeBranch(ref, fastForward)
} }
) )
} }

23
src/main/kotlin/app/ui/RepositoryOpen.kt
View File

@ -107,27 +107,6 @@ fun RepositoryOpenPage(gitManager: GitManager, dialogManager: DialogManager) {
gitManager = gitManager, gitManager = gitManager,
dialogManager = dialogManager, dialogManager = dialogManager,
selectedIndex = selectedIndexCommitLog, selectedIndex = selectedIndexCommitLog,
onCheckoutCommit = { graphNode ->
gitManager.checkoutCommit(graphNode)
},
onRevertCommit = { graphNode ->
gitManager.revertCommit(graphNode)
},
onResetToCommit = { graphNode, resetType ->
gitManager.resetToCommit(graphNode, resetType)
},
onCreateBranchOnCommit = { branch, graphNode ->
gitManager.createBranchOnCommit(branch, graphNode)
},
onCreateTagOnCommit = { tag, graphNode ->
gitManager.createTagOnCommit(tag, graphNode)
},
onCheckoutRef = { ref ->
gitManager.checkoutRef(ref)
},
onMergeBranch = { ref, fastForward ->
gitManager.mergeBranch(ref, fastForward)
},
onRevCommitSelected = { commit -> onRevCommitSelected = { commit ->
selectedRevCommit = commit selectedRevCommit = commit
uncommitedChangesSelected = false uncommitedChangesSelected = false
@ -146,8 +125,8 @@ fun RepositoryOpenPage(gitManager: GitManager, dialogManager: DialogManager) {
} }
} }
} }
} }
Box( Box(
modifier = Modifier modifier = Modifier
.weight(0.25f) .weight(0.25f)