test

AChep · Nov 27, 2021 · dc24098 · dc24098
1 parent e00592a
commit dc24098
Showing 1 changed file with 31 additions and 48 deletions.
diff --git a/common/src/main/java/com/artemchep/essence/ui/drawables/AnalogClockDrawable.kt b/common/src/main/java/com/artemchep/essence/ui/drawables/AnalogClockDrawable.kt
@@ -41,9 +41,8 @@ class AnalogClockDrawable(
 
     var complicationDataSparse: SparseArray<Complication2>? = null
 
-    var time: String = "10:20"
-    var timeH: String = "10:20"
-    var timeM: String = "10:20"
+    var hours: String = "00"
+    var minutes: String = "00"
 
     var timeEnabled: Boolean = true
 
@@ -140,16 +139,24 @@ class AnalogClockDrawable(
         )
 
         // Draw tick marks
-        tickPaint.alpha = blend(ambience, 255f, 80f).toInt()
-        for (i in 0 until 12) {
+        for (i in 0 until 60) {
             withRotation(
-                degrees = 360f / 12f * i,
+                degrees = 360f / 60f * i,
                 pivotX = centerX,
                 pivotY = centerY,
             ) {
-                val length = blend(ambience, radius / 24f, 0f)
-                if (length > 0f) {
-                    drawLine(centerX, 0f, centerX, length, tickPaint)
+                if (i.rem(5) == 0) {
+                    tickPaint.alpha = 255
+                    val length = blend(ambience, radius / 28f, 0f)
+                    if (length > 0f) {
+                        drawLine(centerX, 0f, centerX, length, tickPaint)
+                    }
+                } else {
+                    tickPaint.alpha = 122
+                    val length = blend(ambience, radius / 42f, 0f)
+                    if (length > 0f) {
+                        drawLine(centerX, 0f, centerX, length, tickPaint)
+                    }
                 }
             }
         }
@@ -167,28 +174,16 @@ class AnalogClockDrawable(
         textPaint.textSize = (radius - hourHandLength) / 2.3f
         textPaint.alpha = (30 * ambience).toInt()
         clockPaint.color = contentColor
-        clockPaint.textAlign = Paint.Align.RIGHT
+        clockPaint.textAlign = Paint.Align.CENTER
         clockPaint.letterSpacing = -0.10f
-        clockPaint.textSize = (radius - hourHandLength) / 2.2f
-        clockPaint.alpha = (30 * ambience).toInt()
+        clockPaint.textSize = (radius - hourHandLengthMax) / 2f
 
-        if (timeEnabled) withRotation(minuteHandRotation + 235f, centerX, centerY) {
-            val path = Path().apply {
-                addCircle(
-                    centerX,
-                    centerY,
-                    minuteHandLength - clockPaint.textSize / 2f,
-                    Path.Direction.CW
-                )
-            }
-            clockPaint.alpha = (55 * ambience).toInt()
-            drawTextOnPath(time, path, 0f, 0f, clockPaint)
+        if (timeEnabled) {
+            clockPaint.alpha = 225
+            drawText(hours, centerX * 1.6f, centerY, clockPaint)
+            clockPaint.alpha = 120
+            drawText(minutes, centerX * 1.6f, centerY + clockPaint.textSize, clockPaint)
         }
-        clockPaint.textAlign = Paint.Align.CENTER
-        clockPaint.alpha = 220
-        drawText(timeH, centerX * 1.6f, centerY, clockPaint)
-        clockPaint.alpha = 150
-        drawText(timeM, centerX * 1.6f, centerY + clockPaint.textSize, clockPaint)
 
         handPaint.color = accentColor
         handPaint.strokeWidth = radius / blend(ambience, 8f, 5f)
@@ -207,6 +202,12 @@ class AnalogClockDrawable(
         if (ambience < 1f)
             drawClockHand(minuteHandRotation, centerX, centerY, hourHandLength / 1.5f, handSubPaint)
 
+        if (timeEnabled) {
+            clockPaint.alpha = 50
+            drawText(hours, centerX * 1.6f, centerY, clockPaint)
+            drawText(minutes, centerX * 1.6f, centerY + clockPaint.textSize, clockPaint)
+        }
+
         textPaint.textAlign = Paint.Align.CENTER
         textPaint.textSize = (radius - minuteHandLengthMin) / 3.1f
 
@@ -394,11 +395,7 @@ fun AnalogClockDrawable.installTimeIn(
             }
 
             // Update digital clock
-            this.time = formatTime(
-                context = context,
-                calendar = calendar,
-            )
-            this.timeH = formatTwoDigitNumber(
+            this.hours = formatTwoDigitNumber(
                 if (is24HourFormat(context)) {
                     calendar.get(Calendar.HOUR_OF_DAY)
                 } else {
@@ -407,7 +404,7 @@ fun AnalogClockDrawable.installTimeIn(
                         ?: 12
                 }
             )
-            this.timeM = formatTwoDigitNumber(calendar.get(Calendar.MINUTE))
+            this.minutes = formatTwoDigitNumber(calendar.get(Calendar.MINUTE))
 
             // Update analog clock
             animator?.cancel()
@@ -482,20 +479,6 @@ private fun AnalogClockDrawable.showAnalogTime(
     }
 }
 
-private fun formatTime(context: Context, calendar: Calendar) = run {
-    val h = formatTwoDigitNumber(
-        if (is24HourFormat(context)) {
-            calendar.get(Calendar.HOUR_OF_DAY)
-        } else {
-            calendar.get(Calendar.HOUR)
-                .takeIf { it != 0 }
-                ?: 12
-        }
-    )
-    val m = formatTwoDigitNumber(calendar.get(Calendar.MINUTE))
-    "$h:$m"
-}
-
 /**
  * Formats number as two-digit number: adds leading zero if
  * needed.