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

/ before file is always shown even if the path is being cut

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-10-27 20:20:39 +02:00
parent 315387fafc
commit c4ce272359
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt
View File

@ -280,7 +280,7 @@ fun CommitLogChanges(
if (diffEntry.parentDirectoryPath.isNotEmpty()) { if (diffEntry.parentDirectoryPath.isNotEmpty()) {
Text( Text(
text = diffEntry.parentDirectoryPath, text = diffEntry.parentDirectoryPath.removeSuffix("/"),
modifier = Modifier.weight(1f, fill = false), modifier = Modifier.weight(1f, fill = false),
maxLines = 1, maxLines = 1,
softWrap = false, softWrap = false,
@ -288,6 +288,15 @@ fun CommitLogChanges(
style = MaterialTheme.typography.body2, style = MaterialTheme.typography.body2,
color = MaterialTheme.colors.onBackgroundSecondary, color = MaterialTheme.colors.onBackgroundSecondary,
) )
Text(
text = "/",
maxLines = 1,
softWrap = false,
style = MaterialTheme.typography.body2,
overflow = TextOverflow.Visible,
color = MaterialTheme.colors.onBackgroundSecondary,
)
} }
Text( Text(
text = diffEntry.fileName, text = diffEntry.fileName,

11
src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt
View File

@ -605,7 +605,7 @@ private fun FileEntry(
if (statusEntry.parentDirectoryPath.isNotEmpty()) { if (statusEntry.parentDirectoryPath.isNotEmpty()) {
Text( Text(
text = statusEntry.parentDirectoryPath, text = statusEntry.parentDirectoryPath.removeSuffix("/"),
modifier = Modifier.weight(1f, fill = false), modifier = Modifier.weight(1f, fill = false),
maxLines = 1, maxLines = 1,
softWrap = false, softWrap = false,
@ -613,6 +613,15 @@ private fun FileEntry(
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
color = MaterialTheme.colors.onBackgroundSecondary, color = MaterialTheme.colors.onBackgroundSecondary,
) )
Text(
text = "/",
maxLines = 1,
softWrap = false,
style = MaterialTheme.typography.body2,
overflow = TextOverflow.Visible,
color = MaterialTheme.colors.onBackgroundSecondary,
)
} }
Text( Text(
text = statusEntry.fileName, text = statusEntry.fileName,

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

@ -631,7 +631,7 @@ private fun DiffHeader(
Row(Modifier.weight(1f, true)) { Row(Modifier.weight(1f, true)) {
if (dirPath.isNotEmpty()) { if (dirPath.isNotEmpty()) {
Text( Text(
text = dirPath, text = dirPath.removeSuffix("/"),
style = MaterialTheme.typography.body2, style = MaterialTheme.typography.body2,
color = MaterialTheme.colors.onBackgroundSecondary, color = MaterialTheme.colors.onBackgroundSecondary,
maxLines = 1, maxLines = 1,
@ -642,6 +642,15 @@ private fun DiffHeader(
.weight(1f, false) .weight(1f, false)
.padding(start = 16.dp), .padding(start = 16.dp),
) )
Text(
text = "/",
maxLines = 1,
softWrap = false,
style = MaterialTheme.typography.body2,
overflow = TextOverflow.Visible,
color = MaterialTheme.colors.onBackgroundSecondary,
)
} }
Text( Text(
text = fileName, text = fileName,