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

Fixed diff header overlapping the buttons

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2023-10-29 16:44:23 +01:00
parent f53c306099
commit 77df8671e6
No known key found for this signature in database
GPG Key ID: 7587FC860F594869
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
View File

@ -861,44 +861,46 @@ private fun DiffHeader(
val fileName = diffEntry.fileName val fileName = diffEntry.fileName
val dirPath: String = diffEntry.parentDirectoryPath val dirPath: String = diffEntry.parentDirectoryPath
SelectionContainer { Box(
Row { modifier = Modifier
if (dirPath.isNotEmpty()) { .weight(1f, true)
Text( ) {
text = dirPath.removeSuffix("/"), SelectionContainer {
style = MaterialTheme.typography.body2, Row() {
color = MaterialTheme.colors.onBackgroundSecondary, if (dirPath.isNotEmpty()) {
maxLines = 1, Text(
softWrap = false, text = dirPath.removeSuffix("/"),
overflow = TextOverflow.Ellipsis, style = MaterialTheme.typography.body2,
fontWeight = FontWeight.Medium, color = MaterialTheme.colors.onBackgroundSecondary,
modifier = Modifier maxLines = 1,
.weight(1f, false), softWrap = false,
) overflow = TextOverflow.Ellipsis,
fontWeight = FontWeight.Medium,
modifier = Modifier
.weight(1f, false),
)
Text(
text = "/",
maxLines = 1,
softWrap = false,
style = MaterialTheme.typography.body2,
overflow = TextOverflow.Visible,
color = MaterialTheme.colors.onBackgroundSecondary,
)
}
Text( Text(
text = "/", text = fileName,
maxLines = 1,
softWrap = false,
style = MaterialTheme.typography.body2, style = MaterialTheme.typography.body2,
overflow = TextOverflow.Visible, color = MaterialTheme.colors.onBackground,
color = MaterialTheme.colors.onBackgroundSecondary, fontWeight = FontWeight.Medium,
maxLines = 1,
modifier = Modifier.padding(end = 16.dp),
) )
} }
Text(
text = fileName,
style = MaterialTheme.typography.body2,
color = MaterialTheme.colors.onBackground,
fontWeight = FontWeight.Medium,
maxLines = 1,
modifier = Modifier.padding(end = 16.dp),
)
} }
} }
Spacer(Modifier.weight(1f, true))
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(16.dp) horizontalArrangement = Arrangement.spacedBy(16.dp)