From 1c1938f376d22a9a1b74d6c205e8e6aeadd26a26 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Tue, 17 May 2022 17:58:16 +0200 Subject: [PATCH] Fix weird clock widget color glitch Fix #78 --- .../widgets/clock/parts/DatePartProvider.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePartProvider.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePartProvider.kt index fae7a2e3..e8fc5609 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePartProvider.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePartProvider.kt @@ -6,9 +6,7 @@ import android.content.Intent import android.provider.CalendarContract import android.text.format.DateFormat import android.text.format.DateUtils -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.material3.TextButton +import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue @@ -42,7 +40,11 @@ class DatePartProvider: PartProvider { val time by this.time.collectAsState(System.currentTimeMillis()) val verticalLayout = layout == Settings.ClockWidgetSettings.ClockWidgetLayout.Vertical val context = LocalContext.current - TextButton(onClick = { + TextButton( + colors = ButtonDefaults.textButtonColors( + contentColor = LocalContentColor.current + ), + onClick = { val startMillis = System.currentTimeMillis() val builder = CalendarContract.CONTENT_URI.buildUpon() builder.appendPath("time") @@ -60,8 +62,7 @@ class DatePartProvider: PartProvider { time, DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_YEAR ), - style = MaterialTheme.typography.titleMedium, - color = Color.White + style = MaterialTheme.typography.titleMedium ) } else { val line1Format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "EEEE") @@ -72,8 +73,7 @@ class DatePartProvider: PartProvider { lineHeight = 1.2.em, style = MaterialTheme.typography.titleLarge.copy( fontWeight = FontWeight.Medium - ), - color = Color.White + ) ) } }