From c4ce2723597ce1b7c45ddf180862dc234b640ba9 Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Thu, 27 Oct 2022 20:20:39 +0200
Subject: [PATCH] / before file is always shown even if the path is being cut

---
 .../com/jetpackduba/gitnuro/ui/CommitChanges.kt       | 11 ++++++++++-
 .../com/jetpackduba/gitnuro/ui/UncommitedChanges.kt   | 11 ++++++++++-
 .../kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt    | 11 ++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt
index e8ea491..3480899 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt
@@ -280,7 +280,7 @@ fun CommitLogChanges(
 
                         if (diffEntry.parentDirectoryPath.isNotEmpty()) {
                             Text(
-                                text = diffEntry.parentDirectoryPath,
+                                text = diffEntry.parentDirectoryPath.removeSuffix("/"),
                                 modifier = Modifier.weight(1f, fill = false),
                                 maxLines = 1,
                                 softWrap = false,
@@ -288,6 +288,15 @@ fun CommitLogChanges(
                                 style = MaterialTheme.typography.body2,
                                 color = MaterialTheme.colors.onBackgroundSecondary,
                             )
+
+                            Text(
+                                text = "/",
+                                maxLines = 1,
+                                softWrap = false,
+                                style = MaterialTheme.typography.body2,
+                                overflow = TextOverflow.Visible,
+                                color = MaterialTheme.colors.onBackgroundSecondary,
+                            )
                         }
                         Text(
                             text = diffEntry.fileName,
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt
index e5ba647..84be131 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt
@@ -605,7 +605,7 @@ private fun FileEntry(
 
                 if (statusEntry.parentDirectoryPath.isNotEmpty()) {
                     Text(
-                        text = statusEntry.parentDirectoryPath,
+                        text = statusEntry.parentDirectoryPath.removeSuffix("/"),
                         modifier = Modifier.weight(1f, fill = false),
                         maxLines = 1,
                         softWrap = false,
@@ -613,6 +613,15 @@ private fun FileEntry(
                         overflow = TextOverflow.Ellipsis,
                         color = MaterialTheme.colors.onBackgroundSecondary,
                     )
+
+                    Text(
+                        text = "/",
+                        maxLines = 1,
+                        softWrap = false,
+                        style = MaterialTheme.typography.body2,
+                        overflow = TextOverflow.Visible,
+                        color = MaterialTheme.colors.onBackgroundSecondary,
+                    )
                 }
                 Text(
                     text = statusEntry.fileName,
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
index 876fd5d..fbed50b 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
@@ -631,7 +631,7 @@ private fun DiffHeader(
         Row(Modifier.weight(1f, true)) {
             if (dirPath.isNotEmpty()) {
                 Text(
-                    text = dirPath,
+                    text = dirPath.removeSuffix("/"),
                     style = MaterialTheme.typography.body2,
                     color = MaterialTheme.colors.onBackgroundSecondary,
                     maxLines = 1,
@@ -642,6 +642,15 @@ private fun DiffHeader(
                         .weight(1f, false)
                         .padding(start = 16.dp),
                 )
+
+                Text(
+                    text = "/",
+                    maxLines = 1,
+                    softWrap = false,
+                    style = MaterialTheme.typography.body2,
+                    overflow = TextOverflow.Visible,
+                    color = MaterialTheme.colors.onBackgroundSecondary,
+                )
             }
             Text(
                 text = fileName,