Fix weird clock widget color glitch

Fix #78
This commit is contained in:
MM20 2022-05-17 17:58:16 +02:00
parent cb5be66e01
commit 1c1938f376
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389

View File

@ -6,9 +6,7 @@ import android.content.Intent
import android.provider.CalendarContract import android.provider.CalendarContract
import android.text.format.DateFormat import android.text.format.DateFormat
import android.text.format.DateUtils import android.text.format.DateUtils
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.*
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
@ -42,7 +40,11 @@ class DatePartProvider: PartProvider {
val time by this.time.collectAsState(System.currentTimeMillis()) val time by this.time.collectAsState(System.currentTimeMillis())
val verticalLayout = layout == Settings.ClockWidgetSettings.ClockWidgetLayout.Vertical val verticalLayout = layout == Settings.ClockWidgetSettings.ClockWidgetLayout.Vertical
val context = LocalContext.current val context = LocalContext.current
TextButton(onClick = { TextButton(
colors = ButtonDefaults.textButtonColors(
contentColor = LocalContentColor.current
),
onClick = {
val startMillis = System.currentTimeMillis() val startMillis = System.currentTimeMillis()
val builder = CalendarContract.CONTENT_URI.buildUpon() val builder = CalendarContract.CONTENT_URI.buildUpon()
builder.appendPath("time") builder.appendPath("time")
@ -60,8 +62,7 @@ class DatePartProvider: PartProvider {
time, time,
DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_YEAR DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_YEAR
), ),
style = MaterialTheme.typography.titleMedium, style = MaterialTheme.typography.titleMedium
color = Color.White
) )
} else { } else {
val line1Format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "EEEE") val line1Format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "EEEE")
@ -72,8 +73,7 @@ class DatePartProvider: PartProvider {
lineHeight = 1.2.em, lineHeight = 1.2.em,
style = MaterialTheme.typography.titleLarge.copy( style = MaterialTheme.typography.titleLarge.copy(
fontWeight = FontWeight.Medium fontWeight = FontWeight.Medium
), )
color = Color.White
) )
} }
} }