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

Added current branch icon to detached HEAD

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-12-07 00:02:49 +01:00
parent 6d190614e5
commit 5493451719
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/app/extensions/RefExtensions.kt
View File

@ -27,6 +27,9 @@ val Ref.isRemote: Boolean
fun Ref.isSameBranch(otherRef: Ref?): Boolean { fun Ref.isSameBranch(otherRef: Ref?): Boolean {
if(this.name == "HEAD" && otherRef == null)
return true
if(otherRef == null) if(otherRef == null)
return false return false

12
src/main/kotlin/app/ui/log/Log.kt
View File

@ -159,7 +159,7 @@ fun LogDialogs(
showLogDialog: LogDialog, showLogDialog: LogDialog,
currentBranch: Ref?, currentBranch: Ref?,
) { ) {
when(showLogDialog) { when (showLogDialog) {
is LogDialog.NewBranch -> { is LogDialog.NewBranch -> {
NewBranchDialog( NewBranchDialog(
onReject = onResetShowLogDialog, onReject = onResetShowLogDialog,
@ -179,7 +179,7 @@ fun LogDialogs(
) )
} }
is LogDialog.MergeBranch -> { is LogDialog.MergeBranch -> {
if(currentBranch != null) if (currentBranch != null)
MergeDialog( MergeDialog(
currentBranchName = currentBranch.simpleName, currentBranchName = currentBranch.simpleName,
mergeBranchName = showLogDialog.ref.simpleName, mergeBranchName = showLogDialog.ref.simpleName,
@ -438,10 +438,10 @@ fun CommitMessage(
isCurrentBranch = ref.isSameBranch(currentBranch), isCurrentBranch = ref.isSameBranch(currentBranch),
onCheckoutBranch = { onCheckoutRef(ref) }, onCheckoutBranch = { onCheckoutRef(ref) },
onMergeBranch = { onMergeBranch(ref) }, onMergeBranch = { onMergeBranch(ref) },
onDeleteBranch = { onDeleteBranch(ref) } onDeleteBranch = { onDeleteBranch(ref) },
) )
} }
} }
Text( Text(
text = commit.shortMessage, text = commit.shortMessage,
@ -646,7 +646,7 @@ fun BranchChip(
} }
var endingContent: @Composable () -> Unit = {} var endingContent: @Composable () -> Unit = {}
if(isCurrentBranch) { if (isCurrentBranch) {
endingContent = { endingContent = {
Icon( Icon(
painter = painterResource("location.svg"), painter = painterResource("location.svg"),
@ -682,7 +682,7 @@ fun TagChip(
onClick = onCheckoutTag onClick = onCheckoutTag
) )
).apply { ).apply {
if(ref.isLocal) { if (ref.isLocal) {
add( add(
ContextMenuItem( ContextMenuItem(
label = "Delete tag", label = "Delete tag",