From 84f35487c1bf5ef1d8e9b981e58a03497d8c91a1 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sat, 26 Feb 2022 23:37:01 +0100
Subject: [PATCH] Analog clock: fix hour hand

---
 .../widgets/clock/clocks/AnalogClock.kt       |  4 +-
 .../launcher/widgets/clock/parts/DatePart.kt  | 62 -------------------
 2 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePart.kt

diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/AnalogClock.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/AnalogClock.kt
index 8266df20..33557dd5 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/AnalogClock.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/AnalogClock.kt
@@ -38,7 +38,7 @@ fun AnalogClock(
             center = this.size.center,
             style = Fill
         )
-        rotate(hour.toFloat() / 12f * 360f + minute.toFloat() / 60f * 5f, this.size.center) {
+        rotate(hour.toFloat() / 12f * 360f + (minute.toFloat() / 60f) * 30f, this.size.center) {
             drawLine(
                 color,
                 this.size.center, this.size.center.copy(y = this.size.height * 0.25f),
@@ -46,7 +46,7 @@ fun AnalogClock(
                 cap = StrokeCap.Round
             )
         }
-        rotate(minute.toFloat() / 60 * 360, this.size.center) {
+        rotate(minute.toFloat() / 60f * 360f, this.size.center) {
             drawLine(
                 color,
                 this.size.center, this.size.center.copy(y = this.size.height * 0.1f),
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
deleted file mode 100644
index 46d84896..00000000
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePart.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package de.mm20.launcher2.ui.launcher.widgets.clock.parts
-
-import android.content.ContentUris
-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.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
-import java.util.*
-
-@Composable
-fun DatePart(
-    time: Long,
-    layout: ClockWidgetLayout
-) {
-    val verticalLayout = layout == ClockWidgetLayout.Vertical
-    val context = LocalContext.current
-    TextButton(onClick = {
-        val startMillis = System.currentTimeMillis()
-        val builder = CalendarContract.CONTENT_URI.buildUpon()
-        builder.appendPath("time")
-        ContentUris.appendId(builder, startMillis)
-        val intent = Intent(Intent.ACTION_VIEW)
-            .setData(builder.build())
-            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-
-        context.startActivity(intent)
-    }) {
-        if (verticalLayout) {
-            Text(
-                text = DateUtils.formatDateTime(
-                    context,
-                    time,
-                    DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_YEAR
-                ),
-                style = MaterialTheme.typography.titleMedium,
-                color = Color.White
-            )
-        } else {
-            val line1Format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "EEEE")
-            val line2Format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "MMMM dd yyyy")
-            val format = SimpleDateFormat("$line1Format\n$line2Format")
-            Text(
-                text = format.format(time),
-                lineHeight = 1.2.em,
-                style = MaterialTheme.typography.titleLarge.copy(
-                    fontWeight = FontWeight.Medium
-                ),
-                color = Color.White
-            )
-        }
-    }
-}
\ No newline at end of file