lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add clock widget preference migration, remove OnePlus variant

Browse Source
This commit is contained in:
MM20
2024-03-29 16:53:45 +01:00
parent 2cd4097b1d
commit 4ce4812317
6 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/WatchFaceSelector.kt
-4
View File
@@ -77,7 +77,6 @@ fun WatchFaceSelector(
mapOf(
ClockStyle.DigitalClock1 to 0,
ClockStyle.DigitalClock1_Outlined to 0,
ClockStyle.DigitalClock1_OnePlus to 0,
ClockStyle.DigitalClock2 to 1,
ClockStyle.AnalogClock to 2,
ClockStyle.OrbitClock to 3,
@@ -258,7 +257,6 @@ fun getClockstyleName(context: Context, style: ClockWidgetStyle): String {
return when (style) {
ClockStyle.DigitalClock1,
ClockStyle.DigitalClock1_Outlined,
ClockStyle.DigitalClock1_OnePlus -> context.getString(R.string.clock_style_digital1)
ClockStyle.DigitalClock2 -> context.getString(R.string.clock_style_digital2)
ClockStyle.OrbitClock -> context.getString(R.string.clock_style_orbit)
ClockStyle.BinaryClock -> context.getString(R.string.clock_style_binary)
@@ -279,7 +277,6 @@ fun getVariantName(context: Context, style: ClockWidgetStyle): String {
ClockStyle.SegmentClock,
ClockStyle.EmptyClock -> context.getString(R.string.clock_variant_standard)
ClockStyle.DigitalClock1_Outlined -> context.getString(R.string.clock_variant_outlined)
ClockStyle.DigitalClock1_OnePlus -> "OnePlus"
else -> ""
}
@@ -289,7 +286,6 @@ fun getVariantName(context: Context, style: ClockWidgetStyle): String {
object ClockStyle {
val DigitalClock1 = ClockWidgetStyle.Digital1()
val DigitalClock1_Outlined = ClockWidgetStyle.Digital1(outlined = true)
val DigitalClock1_OnePlus = ClockWidgetStyle.Digital1(variant = ClockWidgetStyle.Digital1.Variant.OnePlus)
val DigitalClock2 = ClockWidgetStyle.Digital2
val OrbitClock = ClockWidgetStyle.Orbit
val AnalogClock = ClockWidgetStyle.Analog
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt
+5 -26
View File
@@ -84,32 +84,11 @@ fun DigitalClock1(
Column(
verticalArrangement = Arrangement.Center
) {
if (style.variant == ClockWidgetStyle.Digital1.Variant.OnePlus) {
val hour = formattedString.substring(0, 2)
Text(
modifier = modifier,
text = buildAnnotatedString {
hour.forEach {
if (it == '1') {
withStyle(style = SpanStyle(color = Color(0xFFC41442))) {
append(it)
}
} else {
append(it)
}
}
append(formattedString.substring(2))
},
style = textStyle
)
}
else {
Text(
modifier = modifier,
text = formattedString,
style = textStyle,
)
}
Text(
modifier = modifier,
text = formattedString,
style = textStyle,
)
if (verticalLayout && showSeconds) {
Text(