refactor

Author: Razeeman

wear/src/main/java/com/example/util/simpletimetracker/complication/WearComplicationService.kt

@@ -9,13 +9,8 @@ import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.graphics.Bitmap
-import android.graphics.Canvas
 import android.graphics.drawable.Icon
-import android.os.Build
 import android.util.Log
-import android.util.TypedValue
-import android.view.View
-import android.view.View.MeasureSpec
 import androidx.wear.watchface.complications.data.ComplicationData
 import androidx.wear.watchface.complications.data.ComplicationText
 import androidx.wear.watchface.complications.data.ComplicationType
@@ -30,13 +25,11 @@ import androidx.wear.watchface.complications.datasource.SuspendingComplicationDa
 import com.example.util.simpletimetracker.R
 import com.example.util.simpletimetracker.data.WearDataRepo
 import com.example.util.simpletimetracker.data.WearIconMapper
-import com.example.util.simpletimetracker.data.WearMessenger
 import com.example.util.simpletimetracker.domain.WearActivityIcon
 import com.example.util.simpletimetracker.presentation.MainActivity
 import dagger.hilt.android.AndroidEntryPoint
 import java.time.Instant
 import javax.inject.Inject
-import kotlin.math.roundToInt
 
 @AndroidEntryPoint
 class WearComplicationService : SuspendingComplicationDataSourceService() {
@@ -47,9 +40,9 @@ class WearComplicationService : SuspendingComplicationDataSourceService() {
     @Inject
     lateinit var iconMapper: WearIconMapper
 
-    private val tag: String = WearMessenger::class.java.name
+    private val tag: String = WearComplicationService::class.java.name
     private val appIcon = R.drawable.app_ic_launcher_monochrome
-    private val iconSize by lazy { 20.dpToPx() }
+    private val iconSizeDp = 20
     private val defaultText = "×"
     private val previewText = "Tracking"
 
@@ -144,41 +137,14 @@ class WearComplicationService : SuspendingComplicationDataSourceService() {
     }
 
     private fun getBitmap(icon: WearActivityIcon): Bitmap {
-        return IconView(this)
+        return WearIconView(this)
             .apply {
                 itemIcon = icon
-                measureExactly(iconSize)
+                measureExactly(iconSizeDp.dpToPx(this.context))
             }
             .getBitmapFromView()
     }
 
-    private fun View.measureExactly(width: Int, height: Int = width) {
-        val specWidth = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY)
-        val specHeight = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-        measure(specWidth, specHeight)
-        layout(0, 0, measuredWidth, measuredHeight)
-    }
-
-    private fun View.getBitmapFromView(): Bitmap {
-        fun Int.checkValue(): Int = this.takeUnless { it <= 0 } ?: iconSize
-
-        return Bitmap.createBitmap(
-            measuredWidth.checkValue(),
-            measuredHeight.checkValue(),
-            Bitmap.Config.ARGB_8888,
-        ).also {
-            draw(Canvas(it))
-        }
-    }
-
-    private fun Int.dpToPx(): Int {
-        return TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            this.toFloat(),
-            this@WearComplicationService.resources.displayMetrics,
-        ).roundToInt()
-    }
-
     @SuppressLint("WearRecents")
     private fun getMainStartIntent(): PendingIntent {
         val startIntent = Intent(this, MainActivity::class.java).apply {
@@ -189,15 +155,7 @@ class WearComplicationService : SuspendingComplicationDataSourceService() {
             this,
             0,
             startIntent,
-            getFlags(),
+            getPendingIntentFlags(),
         )
     }
-
-    private fun getFlags(): Int {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
-        } else {
-            PendingIntent.FLAG_UPDATE_CURRENT
-        }
-    }
 }

wear/src/main/java/com/example/util/simpletimetracker/complication/WearComplicationUtils.kt

@@ -0,0 +1,52 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+package com.example.util.simpletimetracker.complication
+
+import android.app.PendingIntent
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.os.Build
+import android.util.TypedValue
+import android.view.View
+import android.view.View.MeasureSpec
+import kotlin.math.roundToInt
+
+fun View.measureExactly(width: Int, height: Int = width) {
+    val specWidth = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY)
+    val specHeight = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+    measure(specWidth, specHeight)
+    layout(0, 0, measuredWidth, measuredHeight)
+}
+
+fun View.getBitmapFromView(): Bitmap {
+    val defaultSize by lazy { 20.dpToPx(context) }
+    fun Int.checkValue(): Int = this.takeUnless { it <= 0 } ?: defaultSize
+
+    return Bitmap.createBitmap(
+        measuredWidth.checkValue(),
+        measuredHeight.checkValue(),
+        Bitmap.Config.ARGB_8888,
+    ).also {
+        draw(Canvas(it))
+    }
+}
+
+fun Int.dpToPx(context: Context): Int {
+    return TypedValue.applyDimension(
+        TypedValue.COMPLEX_UNIT_DIP,
+        this.toFloat(),
+        context.resources.displayMetrics,
+    ).roundToInt()
+}
+
+fun getPendingIntentFlags(): Int {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
+    } else {
+        PendingIntent.FLAG_UPDATE_CURRENT
+    }
+}

wear/src/main/java/com/example/util/simpletimetracker/complication/IconView.kt wear/src/main/java/com/example/util/simpletimetracker/complication/WearIconView.kt

@@ -10,10 +10,10 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.core.view.isVisible
-import com.example.util.simpletimetracker.databinding.IconViewLayoutBinding
+import com.example.util.simpletimetracker.databinding.WearIconViewLayoutBinding
 import com.example.util.simpletimetracker.domain.WearActivityIcon
 
-class IconView @JvmOverloads constructor(
+class WearIconView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
@@ -23,7 +23,7 @@ class IconView @JvmOverloads constructor(
     defStyleAttr,
 ) {
 
-    private val binding: IconViewLayoutBinding = IconViewLayoutBinding
+    private val binding: WearIconViewLayoutBinding = WearIconViewLayoutBinding
         .inflate(LayoutInflater.from(context), this)
 
     var itemIcon: WearActivityIcon = WearActivityIcon.Image(0)

wear/src/main/java/com/example/util/simpletimetracker/presentation/layout/ScrollingColumn.kt

@@ -41,7 +41,7 @@ fun ScrollingColumn(
             .selectableGroup(),
         flingBehavior = ScalingLazyColumnDefaults.snapFlingBehavior(
             state = scrollState,
-            decay = exponentialDecay(frictionMultiplier = 0.75f)
+            decay = exponentialDecay(frictionMultiplier = 0.75f),
         ),
         autoCentering = AutoCenteringParams(
             itemIndex = 0,