From 6398244895394fe63fcb16edcff8cf39514967f5 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Sat, 6 Aug 2022 02:26:30 +0200 Subject: [PATCH] Reduced titles sizes and limited secondary button lines to 1 --- src/main/kotlin/app/ui/Diff.kt | 3 ++- src/main/kotlin/app/ui/components/SecondaryButton.kt | 2 ++ src/main/kotlin/app/ui/log/Log.kt | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/app/ui/Diff.kt b/src/main/kotlin/app/ui/Diff.kt index a41c030..5220b88 100644 --- a/src/main/kotlin/app/ui/Diff.kt +++ b/src/main/kotlin/app/ui/Diff.kt @@ -349,7 +349,8 @@ fun DiffHeader( Text( text = filePath, - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.body2, + maxLines = 1, modifier = Modifier.padding(horizontal = 16.dp), ) diff --git a/src/main/kotlin/app/ui/components/SecondaryButton.kt b/src/main/kotlin/app/ui/components/SecondaryButton.kt index d0e7cc6..f5e229c 100644 --- a/src/main/kotlin/app/ui/components/SecondaryButton.kt +++ b/src/main/kotlin/app/ui/components/SecondaryButton.kt @@ -20,6 +20,7 @@ fun SecondaryButton( text: String, textColor: Color = Color.White, backgroundButton: Color, + maxLines: Int = 1, onClick: () -> Unit, ) { Box( @@ -33,6 +34,7 @@ fun SecondaryButton( text = text, style = MaterialTheme.typography.body2, color = textColor, + maxLines = maxLines, modifier = Modifier.padding(vertical = 4.dp, horizontal = 16.dp) ) } diff --git a/src/main/kotlin/app/ui/log/Log.kt b/src/main/kotlin/app/ui/log/Log.kt index f7a6b99..e7de037 100644 --- a/src/main/kotlin/app/ui/log/Log.kt +++ b/src/main/kotlin/app/ui/log/Log.kt @@ -578,7 +578,7 @@ fun GraphHeader( modifier = Modifier.width(graphWidth).padding(start = 16.dp), text = "Graph", color = MaterialTheme.colors.headerText, - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.body2, maxLines = 1, ) @@ -598,7 +598,7 @@ fun GraphHeader( .weight(1f), text = "Message", color = MaterialTheme.colors.headerText, - style = MaterialTheme.typography.body1, + style = MaterialTheme.typography.body2, maxLines = 1, ) @@ -609,7 +609,7 @@ fun GraphHeader( ) { Icon( Icons.Default.Search, - modifier = Modifier.size(24.dp), + modifier = Modifier.size(18.dp), contentDescription = null, tint = MaterialTheme.colors.primaryTextColor, )