From 96599b045cc70289ab6879cc20fcd17b84a0adb0 Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Mon, 13 Mar 2023 11:35:43 +0100
Subject: [PATCH] Fixed dialog icon size and subtitle format

---
 .../gitnuro/ui/dialogs/NewBranchDialog.kt          |  8 +++++---
 .../jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt |  8 +++++---
 .../gitnuro/ui/dialogs/PasswordDialog.kt           |  8 +++++---
 .../jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt  |  8 +++++---
 .../gitnuro/ui/dialogs/StashWithMessageDialog.kt   |  8 +++++---
 .../gitnuro/ui/dialogs/UserPasswordDialog.kt       |  8 +++++---
 src/main/resources/branch.svg                      | 14 ++++++--------
 7 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt
index 5fd56e7..63336a0 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.jetpackduba.gitnuro.AppIcons
@@ -40,8 +41,8 @@ fun NewBranchDialog(
                 painterResource(AppIcons.BRANCH),
                 contentDescription = null,
                 modifier = Modifier
-                    .size(64.dp)
-                    .padding(vertical = 16.dp),
+                    .padding(bottom = 16.dp)
+                    .size(64.dp),
                 tint = MaterialTheme.colors.onBackground,
             )
 
@@ -51,13 +52,14 @@ fun NewBranchDialog(
                     .padding(bottom = 8.dp),
                 color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body1,
+                fontWeight = FontWeight.SemiBold,
             )
 
             Text(
                 text = "Create a new branch and check it out",
                 modifier = Modifier
                     .padding(bottom = 16.dp),
-                color = MaterialTheme.colors.onBackgroundSecondary,
+                color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body2,
                 textAlign = TextAlign.Center,
             )
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt
index 67746fe..e0c053b 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.jetpackduba.gitnuro.AppIcons
@@ -40,8 +41,8 @@ fun NewTagDialog(
                 painterResource(AppIcons.TAG),
                 contentDescription = null,
                 modifier = Modifier
-                    .size(64.dp)
-                    .padding(vertical = 16.dp),
+                    .padding(bottom = 16.dp)
+                    .size(64.dp),
                 tint = MaterialTheme.colors.onBackground,
             )
 
@@ -51,13 +52,14 @@ fun NewTagDialog(
                     .padding(bottom = 8.dp),
                 color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body1,
+                fontWeight = FontWeight.SemiBold,
             )
 
             Text(
                 text = "Create a new tag on the specified commit",
                 modifier = Modifier
                     .padding(bottom = 16.dp),
-                color = MaterialTheme.colors.onBackgroundSecondary,
+                color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body2,
                 textAlign = TextAlign.Center,
             )
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt
index 3fe6f10..82c239f 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
@@ -60,8 +61,8 @@ fun PasswordDialog(
                 painterResource(icon),
                 contentDescription = null,
                 modifier = Modifier
-                    .size(64.dp)
-                    .padding(vertical = 16.dp),
+                    .padding(bottom = 16.dp)
+                    .size(64.dp),
                 tint = MaterialTheme.colors.onBackground,
             )
 
@@ -71,13 +72,14 @@ fun PasswordDialog(
                     .padding(bottom = 8.dp),
                 color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body1,
+                fontWeight = FontWeight.SemiBold,
             )
 
             Text(
                 text = subtitle,
                 modifier = Modifier
                     .padding(bottom = 16.dp),
-                color = MaterialTheme.colors.onBackgroundSecondary,
+                color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body2,
                 textAlign = TextAlign.Center,
             )
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt
index f1196fb..f4615aa 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.jetpackduba.gitnuro.AppIcons
@@ -36,8 +37,8 @@ fun ResetBranchDialog(
                 painterResource(AppIcons.UNDO),
                 contentDescription = null,
                 modifier = Modifier
-                    .size(64.dp)
-                    .padding(vertical = 16.dp),
+                    .padding(bottom = 16.dp)
+                    .size(64.dp),
                 tint = MaterialTheme.colors.onBackground,
             )
 
@@ -47,13 +48,14 @@ fun ResetBranchDialog(
                     .padding(bottom = 8.dp),
                 color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body1,
+                fontWeight = FontWeight.SemiBold,
             )
 
             Text(
                 text = "Reset the changes of your current branch to a \nprevious or different commit",
                 modifier = Modifier
                     .padding(bottom = 16.dp),
-                color = MaterialTheme.colors.onBackgroundSecondary,
+                color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body2,
                 textAlign = TextAlign.Center,
             )
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt
index f450ca9..cfb9876 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.jetpackduba.gitnuro.AppIcons
@@ -40,8 +41,8 @@ fun StashWithMessageDialog(
                 painterResource(AppIcons.STASH),
                 contentDescription = null,
                 modifier = Modifier
-                    .size(64.dp)
-                    .padding(vertical = 16.dp),
+                    .padding(bottom = 16.dp)
+                    .size(64.dp),
                 tint = MaterialTheme.colors.onBackground,
             )
 
@@ -51,13 +52,14 @@ fun StashWithMessageDialog(
                     .padding(bottom = 8.dp),
                 color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body1,
+                fontWeight = FontWeight.SemiBold,
             )
 
             Text(
                 text = "Create a new stash with a custom message",
                 modifier = Modifier
                     .padding(bottom = 16.dp),
-                color = MaterialTheme.colors.onBackgroundSecondary,
+                color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body2,
                 textAlign = TextAlign.Center,
             )
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt
index d98597b..bc28211 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -47,8 +48,8 @@ fun UserPasswordDialog(
                 painterResource(AppIcons.LOCK),
                 contentDescription = null,
                 modifier = Modifier
-                    .size(64.dp)
-                    .padding(vertical = 16.dp),
+                    .padding(bottom = 16.dp)
+                    .size(64.dp),
                 tint = MaterialTheme.colors.onBackground,
             )
 
@@ -58,13 +59,14 @@ fun UserPasswordDialog(
                     .padding(bottom = 8.dp),
                 color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body1,
+                fontWeight = FontWeight.SemiBold,
             )
 
             Text(
                 text = "Your remote requires authentication with a\nusername and a password",
                 modifier = Modifier
                     .padding(bottom = 16.dp),
-                color = MaterialTheme.colors.onBackgroundSecondary,
+                color = MaterialTheme.colors.onBackground,
                 style = MaterialTheme.typography.body2,
                 textAlign = TextAlign.Center,
             )
diff --git a/src/main/resources/branch.svg b/src/main/resources/branch.svg
index b0ff232..89363d0 100644
--- a/src/main/resources/branch.svg
+++ b/src/main/resources/branch.svg
@@ -1,9 +1,7 @@
-<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <line x1="17" y1="18" x2="17" y2="43" stroke="black" stroke-width="4"/>
-    <circle cx="17" cy="11" r="6" stroke="black" stroke-width="4"/>
-    <path d="M49 22C49 25.3137 46.3137 28 43 28C39.6863 28 37 25.3137 37 22C37 18.6863 39.6863 16 43 16C46.3137 16 49 18.6863 49 22Z"
-          stroke="black" stroke-width="4"/>
-    <circle cx="17" cy="49" r="6" stroke="black" stroke-width="4"/>
-    <path d="M16.8484 41.636L18.9135 39.8638C21.4322 37.7022 24.6179 36.4731 27.9357 36.3828L34.5028 36.204C38.676 36.0904 42 32.6747 42 28.5V28.5"
-          stroke="black" stroke-width="4"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<line x1="8" y1="9" x2="8" y2="16" stroke="black" stroke-width="2"/>
+<circle cx="8" cy="6" r="3" stroke="black" stroke-width="1.5"/>
+<circle cx="17" cy="9" r="3" stroke="black" stroke-width="1.5"/>
+<circle cx="8" cy="19" r="3" stroke="black" stroke-width="1.5"/>
+<path d="M9.60651 17.0001L11.1551 15.7964C11.7332 15.3471 12.4033 15.031 13.1176 14.8708L15.0484 14.4378C16.1892 14.1819 17 13.1691 17 12" stroke="black" stroke-width="2"/>
 </svg>