From 07502a1ce278536b0d6059d5077486714ce5ec3c Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Sun, 21 Aug 2022 03:04:50 +0200
Subject: [PATCH] Removed background from diff number

---
 src/main/kotlin/app/ui/diff/Diff.kt | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/app/ui/diff/Diff.kt b/src/main/kotlin/app/ui/diff/Diff.kt
index 0a44b36..d3433b6 100644
--- a/src/main/kotlin/app/ui/diff/Diff.kt
+++ b/src/main/kotlin/app/ui/diff/Diff.kt
@@ -345,6 +345,7 @@ fun SplitDiffLine(highestLineNumberLength: Int, first: Line?, second: Line?) {
     Row(
         modifier = Modifier
             .background(MaterialTheme.colors.secondarySurface)
+            .height(IntrinsicSize.Min)
     ) {
         Box(
             modifier = Modifier
@@ -354,6 +355,13 @@ fun SplitDiffLine(highestLineNumberLength: Int, first: Line?, second: Line?) {
                 SplitDiffLine(highestLineNumberLength, first, first.oldLineNumber + 1)
         }
 
+        Box(
+            modifier = Modifier
+                .fillMaxHeight()
+                .width(4.dp)
+                .background(MaterialTheme.colors.secondarySurface)
+        )
+
         Box(modifier = Modifier.weight(1f)) {
             if (second != null)
                 SplitDiffLine(highestLineNumberLength, second, second.newLineNumber + 1)
@@ -601,7 +609,7 @@ fun DiffLine(
     Row(
         modifier = Modifier
             .background(backgroundColor)
-            .height(IntrinsicSize.Min)
+            .height(IntrinsicSize.Min),
     ) {
         val oldLineText = if (line.lineType == LineType.REMOVED || line.lineType == LineType.CONTEXT) {
             line.displayOldLineNumber.toStringWithSpaces(highestLineNumberLength)
@@ -616,10 +624,12 @@ fun DiffLine(
         DisableSelection {
             LineNumber(
                 text = oldLineText,
+                remarked = line.lineType != LineType.CONTEXT,
             )
 
             LineNumber(
-                text = newLineText
+                text = newLineText,
+                remarked = line.lineType != LineType.CONTEXT,
             )
         }
 
@@ -641,11 +651,12 @@ fun SplitDiffLine(
     Row(
         modifier = Modifier
             .background(backgroundColor)
-            .height(IntrinsicSize.Min)
+            .fillMaxHeight()
     ) {
         DisableSelection {
             LineNumber(
                 text = lineNumber.toStringWithSpaces(highestLineNumberLength),
+                remarked = line.lineType != LineType.CONTEXT,
             )
         }
 
@@ -686,15 +697,14 @@ fun DiffLineText(text: String) {
 }
 
 @Composable
-fun LineNumber(text: String) {
+fun LineNumber(text: String, remarked: Boolean) {
     Text(
         text = text,
         modifier = Modifier
-            .background(MaterialTheme.colors.secondarySurface)
-            .fillMaxHeight()
-            .padding(horizontal = 4.dp),
+            .padding(start = 8.dp, end = 4.dp),
         fontFamily = FontFamily.Monospace,
         style = MaterialTheme.typography.body2,
+        color = if (remarked) MaterialTheme.colors.primaryTextColor else MaterialTheme.colors.secondaryTextColor,
     )
 }