From 5bd15a0c2281442d753c65493390ae381c6a4f1e Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Wed, 19 Jan 2022 00:57:08 +0100
Subject: [PATCH] Adjusted UI font size

---
 src/main/kotlin/app/ui/CommitChanges.kt          |  8 ++++----
 src/main/kotlin/app/ui/UncommitedChanges.kt      | 16 +++++++---------
 .../kotlin/app/ui/components/SideMenuEntry.kt    |  5 ++---
 .../kotlin/app/ui/components/SideMenuSubentry.kt |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/kotlin/app/ui/CommitChanges.kt b/src/main/kotlin/app/ui/CommitChanges.kt
index 67cbd34..8060571 100644
--- a/src/main/kotlin/app/ui/CommitChanges.kt
+++ b/src/main/kotlin/app/ui/CommitChanges.kt
@@ -101,7 +101,7 @@ fun CommitChangesView(
                 textAlign = TextAlign.Center,
                 color = MaterialTheme.colors.headerText,
                 maxLines = 1,
-                fontSize = 14.sp,
+                fontSize = 13.sp,
             )
 
 
@@ -153,7 +153,7 @@ fun Author(commit: RevCommit) {
                     color = MaterialTheme.colors.secondaryTextColor,
                     maxLines = 1,
                     modifier = Modifier.padding(horizontal = 16.dp),
-                    fontSize = 12.sp,
+                    fontSize = 13.sp,
                     tooltipTitle = authorIdent.`when`.toSystemDateTimeString()
                 )
 
@@ -185,7 +185,7 @@ fun CommitLogChanges(diffEntries: List<DiffEntry>, onDiffSelected: (DiffEntry) -
 
             Column(
                 modifier = Modifier
-                    .height(48.dp)
+                    .height(40.dp)
                     .fillMaxWidth()
                     .clickable {
                         selectedIndex.value = index
@@ -211,7 +211,7 @@ fun CommitLogChanges(diffEntries: List<DiffEntry>, onDiffSelected: (DiffEntry) -
                         modifier = Modifier.padding(horizontal = 8.dp),
                         color = textColor,
                         maxLines = 1,
-                        fontSize = 14.sp,
+                        fontSize = 13.sp,
                         overflow = TextOverflow.Ellipsis,
                     )
                 }
diff --git a/src/main/kotlin/app/ui/UncommitedChanges.kt b/src/main/kotlin/app/ui/UncommitedChanges.kt
index edd335e..be37f8e 100644
--- a/src/main/kotlin/app/ui/UncommitedChanges.kt
+++ b/src/main/kotlin/app/ui/UncommitedChanges.kt
@@ -252,7 +252,7 @@ private fun EntriesList(
                 fontWeight = FontWeight.Bold,
                 textAlign = TextAlign.Center,
                 color = MaterialTheme.colors.headerText,
-                fontSize = 14.sp,
+                fontSize = 13.sp,
                 maxLines = 1,
             )
 
@@ -337,7 +337,7 @@ private fun FileEntry(
         ) {
             Row(
                 modifier = Modifier
-                    .height(48.dp)
+                    .height(40.dp)
                     .fillMaxWidth(),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
@@ -356,7 +356,7 @@ private fun FileEntry(
                     modifier = Modifier.weight(1f, fill = true),
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    fontSize = 14.sp,
+                    fontSize = 13.sp,
                     color = MaterialTheme.colors.primaryTextColor,
                 )
             }
@@ -368,15 +368,13 @@ private fun FileEntry(
             enter = fadeIn(),
             exit = fadeOut(),
         ) {
-            Button(
+            SecondaryButton(
                 onClick = onButtonClick,
+                text = actionTitle,
+                backgroundButton = actionColor,
                 modifier = Modifier
                     .padding(horizontal = 16.dp),
-                elevation = ButtonDefaults.elevation(0.dp, 0.dp, 0.dp),
-                colors = ButtonDefaults.buttonColors(backgroundColor = actionColor)
-            ) {
-                Text(actionTitle, fontSize = 12.sp)
-            }
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/ui/components/SideMenuEntry.kt b/src/main/kotlin/app/ui/components/SideMenuEntry.kt
index a569866..c9cbf19 100644
--- a/src/main/kotlin/app/ui/components/SideMenuEntry.kt
+++ b/src/main/kotlin/app/ui/components/SideMenuEntry.kt
@@ -21,9 +21,8 @@ fun SideMenuEntry(
 ) {
     Row(
         modifier = Modifier
-            .height(40.dp)
-            .fillMaxWidth()
-            .clickable(onClick = {}),
+            .height(32.dp)
+            .fillMaxWidth(),
         verticalAlignment = Alignment.CenterVertically,
     ) {
 
diff --git a/src/main/kotlin/app/ui/components/SideMenuSubentry.kt b/src/main/kotlin/app/ui/components/SideMenuSubentry.kt
index d4dc8f6..a40e237 100644
--- a/src/main/kotlin/app/ui/components/SideMenuSubentry.kt
+++ b/src/main/kotlin/app/ui/components/SideMenuSubentry.kt
@@ -51,7 +51,7 @@ fun SideMenuSubentry(
             text = text,
             modifier = Modifier.weight(1f, fill = true),
             maxLines = 1,
-            fontSize = 14.sp,
+            fontSize = 13.sp,
             fontWeight = if (bold) FontWeight.SemiBold else FontWeight.Normal,
             color = MaterialTheme.colors.primaryTextColor,
             overflow = TextOverflow.Ellipsis,