From 7c2029d602ad35d1848c1893e349ef10357e90ab Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Thu, 28 Oct 2021 04:28:50 +0200
Subject: [PATCH] Improved merge dialog UI

---
 src/main/kotlin/app/ui/dialogs/MergeDialog.kt | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/app/ui/dialogs/MergeDialog.kt b/src/main/kotlin/app/ui/dialogs/MergeDialog.kt
index 93ed4d2..7845195 100644
--- a/src/main/kotlin/app/ui/dialogs/MergeDialog.kt
+++ b/src/main/kotlin/app/ui/dialogs/MergeDialog.kt
@@ -1,17 +1,22 @@
 package app.ui.dialogs
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.mouseClickable
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusOrder
+import androidx.compose.ui.input.pointer.isPrimaryPressed
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun MergeDialog(
     currentBranchName: String,
@@ -28,19 +33,37 @@ fun MergeDialog(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
     ) {
-        Row {
-            Text(
-                text = currentBranchName,
-            )
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
 
-            Text("  ----------->  ")
 
             Text(
                 text = mergeBranchName,
+                fontWeight = FontWeight.Medium
+            )
+
+
+            Text(
+                text = "will be merged into",
+                modifier = Modifier.padding(horizontal = 8.dp)
+            )
+
+            Text(
+                text = currentBranchName,
+                fontWeight = FontWeight.Medium
             )
         }
 
-        Row {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .mouseClickable {
+                    if(this.buttons.isPrimaryPressed) {
+                        fastForwardCheck = !fastForwardCheck
+                    }
+                }
+        ) {
             Checkbox(
                 checked = fastForwardCheck,
                 onCheckedChange = { checked ->
@@ -50,7 +73,8 @@ fun MergeDialog(
 
             Text(
                 "Fast forward",
-                modifier = Modifier.padding(start = 8.dp)
+                modifier = Modifier
+                    .padding(start = 8.dp)
             )
 
         }