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

Fixed context menu not showing up in branches/tags

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-10-27 03:52:21 +02:00
parent d4d057c291
commit a7d89aabaf
1 changed files with 73 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,83 +466,91 @@ fun UncommitedChangesGraphLine(
} }
} }
@OptIn(ExperimentalFoundationApi::class)
@Composable
fun RefChip(
modifier: Modifier = Modifier,
ref: Ref,
icon: String,
onCheckoutRef: () -> Unit,
) {
Row(
modifier = modifier
.padding(horizontal = 4.dp)
.clip(RoundedCornerShape(16.dp))
.background(MaterialTheme.colors.primary)
.combinedClickable(
onDoubleClick = onCheckoutRef,
onClick = {}
),
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
modifier = Modifier
.padding(start = 6.dp, end = 4.dp, top = 6.dp, bottom = 6.dp)
.size(14.dp),
painter = painterResource(icon),
contentDescription = null,
tint = MaterialTheme.colors.onPrimary,
)
Text(
text = ref.simpleName,
color = MaterialTheme.colors.onPrimary,
fontSize = 12.sp,
modifier = Modifier
.padding(end = 6.dp)
)
}
}
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)
@Composable @Composable
fun BranchChip(modifier: Modifier = Modifier, ref: Ref, onCheckoutBranch: () -> Unit) { fun BranchChip(modifier: Modifier = Modifier, ref: Ref, onCheckoutBranch: () -> Unit) {
ContextMenuArea( val contextMenuItemsList = {
items = { listOf(
listOf( ContextMenuItem(
ContextMenuItem( label = "Checkout branch",
label = "Checkout branch", onClick = onCheckoutBranch
onClick = onCheckoutBranch
)
) )
}
) {
RefChip(
modifier,
ref,
"branch.svg",
onCheckoutRef = onCheckoutBranch
) )
} }
RefChip(
modifier,
ref,
"branch.svg",
onCheckoutRef = onCheckoutBranch,
contextMenuItemsList = contextMenuItemsList
)
} }
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)
@Composable @Composable
fun TagChip(modifier: Modifier = Modifier, ref: Ref, onCheckoutTag: () -> Unit) { fun TagChip(modifier: Modifier = Modifier, ref: Ref, onCheckoutTag: () -> Unit) {
ContextMenuArea( val contextMenuItemsList = {
items = { listOf(
listOf( ContextMenuItem(
ContextMenuItem( label = "Checkout tag",
label = "Checkout tag", onClick = onCheckoutTag
onClick = onCheckoutTag
)
) )
}
) {
RefChip(
modifier,
ref,
"tag.svg",
onCheckoutRef = onCheckoutTag
) )
} }
RefChip(
modifier,
ref,
"tag.svg",
onCheckoutRef = onCheckoutTag,
contextMenuItemsList = contextMenuItemsList,
)
}
@OptIn(ExperimentalFoundationApi::class)
@Composable
fun RefChip(
modifier: Modifier = Modifier,
ref: Ref,
icon: String,
onCheckoutRef: () -> Unit,
contextMenuItemsList: () -> List<ContextMenuItem>,
) {
Box(
modifier = Modifier
.combinedClickable(
onDoubleClick = onCheckoutRef,
onClick = {}
)
) {
ContextMenuArea(
items = contextMenuItemsList
) {
Row(
modifier = modifier
.padding(horizontal = 4.dp)
.clip(RoundedCornerShape(16.dp))
.background(MaterialTheme.colors.primary),
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
modifier = Modifier
.padding(start = 6.dp, end = 4.dp, top = 6.dp, bottom = 6.dp)
.size(14.dp),
painter = painterResource(icon),
contentDescription = null,
tint = MaterialTheme.colors.onPrimary,
)
Text(
text = ref.simpleName,
color = MaterialTheme.colors.onPrimary,
fontSize = 12.sp,
modifier = Modifier
.padding(end = 6.dp)
)
}
}
}
} }