From b533e02ecfb9e18c4d05b7555eb58b3e0dd873f4 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 20 Feb 2022 13:59:05 +0100 Subject: [PATCH] Make clock widget fonts lighter in compact layout --- .../ui/launcher/widgets/clock/clocks/DigitalClock2.kt | 5 ++++- .../launcher2/ui/launcher/widgets/clock/parts/DatePart.kt | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock2.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock2.kt index 999326e1..6f8c4964 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock2.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock2.kt @@ -5,6 +5,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight import de.mm20.launcher2.preferences.Settings @@ -15,6 +16,8 @@ fun DigitalClock2( ) { Text( text = DateUtils.formatDateTime(LocalContext.current, time, DateUtils.FORMAT_SHOW_TIME), - style = MaterialTheme.typography.displaySmall + style = MaterialTheme.typography.displaySmall.copy( + fontWeight = FontWeight.Normal + ) ) } \ No newline at end of file diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePart.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePart.kt index 4d46e718..46d84896 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePart.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePart.kt @@ -11,6 +11,7 @@ import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.em import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetLayout import java.text.SimpleDateFormat @@ -51,7 +52,9 @@ fun DatePart( Text( text = format.format(time), lineHeight = 1.2.em, - style = MaterialTheme.typography.titleLarge, + style = MaterialTheme.typography.titleLarge.copy( + fontWeight = FontWeight.Medium + ), color = Color.White ) }