From 039b6b2f76a5c49cc4b428b5aa0c47cd491bba35 Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Sat, 22 Oct 2022 15:51:06 +0200
Subject: [PATCH] Fixed diff header using wrong spacing when file path is shown

---
 .../com/jetpackduba/gitnuro/ui/diff/Diff.kt   | 85 ++++++++++---------
 1 file changed, 44 insertions(+), 41 deletions(-)

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 dcd84e0..d96b1b2 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
@@ -627,51 +627,54 @@ private fun DiffHeader(
         val fileName = diffEntry.fileName
         val dirPath: String = diffEntry.parentDirectoryPath
 
-        if (dirPath.isNotEmpty()) {
+        Row(Modifier.weight(1f, true)) {
+            if (dirPath.isNotEmpty()) {
+                Text(
+                    text = dirPath,
+                    style = MaterialTheme.typography.body2,
+                    color = MaterialTheme.colors.secondaryTextColor,
+                    maxLines = 1,
+                    softWrap = false,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier
+                        .weight(1f, false)
+                        .padding(start = 16.dp),
+                )
+            }
             Text(
-                text = dirPath,
+                text = fileName,
                 style = MaterialTheme.typography.body2,
-                color = MaterialTheme.colors.secondaryTextColor,
+                color = MaterialTheme.colors.onBackground,
                 maxLines = 1,
-                softWrap = false,
-                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.padding(end = 16.dp),
+            )
+        }
+
+
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            if (diffEntryType.statusType != StatusType.ADDED && diffEntryType.statusType != StatusType.REMOVED) {
+                DiffTypeButtons(diffType = diffType, onChangeDiffType = onChangeDiffType)
+            }
+
+            if (diffEntryType is DiffEntryType.UncommitedDiff) {
+                UncommitedDiffFileHeaderButtons(
+                    diffEntryType,
+                    onUnstageFile = onUnstageFile,
+                    onStageFile = onStageFile
+                )
+            }
+
+            IconButton(
+                onClick = onCloseDiffView,
                 modifier = Modifier
-                    .weight(1f, false)
-                    .padding(start = 16.dp),
-            )
-        }
-        Text(
-            text = fileName,
-            style = MaterialTheme.typography.body2,
-            color = MaterialTheme.colors.onBackground,
-            maxLines = 1,
-            modifier = Modifier.padding(end = 16.dp),
-        )
-
-        Spacer(modifier = Modifier.weight(1f))
-
-        if (diffEntryType.statusType != StatusType.ADDED && diffEntryType.statusType != StatusType.REMOVED) {
-            DiffTypeButtons(diffType = diffType, onChangeDiffType = onChangeDiffType)
-        }
-
-        if (diffEntryType is DiffEntryType.UncommitedDiff) {
-            UncommitedDiffFileHeaderButtons(
-                diffEntryType,
-                onUnstageFile = onUnstageFile,
-                onStageFile = onStageFile
-            )
-        }
-
-        IconButton(
-            onClick = onCloseDiffView,
-            modifier = Modifier
-                .handOnHover()
-        ) {
-            Image(
-                painter = painterResource("close.svg"),
-                contentDescription = "Close diff",
-                colorFilter = ColorFilter.tint(MaterialTheme.colors.onBackground),
-            )
+                    .handOnHover()
+            ) {
+                Image(
+                    painter = painterResource("close.svg"),
+                    contentDescription = "Close diff",
+                    colorFilter = ColorFilter.tint(MaterialTheme.colors.onBackground),
+                )
+            }
         }
     }
 }