From dbb7126dfb08990d069d2f1b2235a785a3329c84 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 25 Aug 2023 19:50:53 +0200
Subject: [PATCH] style: simplify ThemeHelper#getThemeColor

---
 .../java/com/github/libretube/helpers/ThemeHelper.kt   | 10 ++++------
 .../libretube/ui/extensions/SetWatchProgressLength.kt  | 10 +++-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/helpers/ThemeHelper.kt b/app/src/main/java/com/github/libretube/helpers/ThemeHelper.kt
index 768dc6130..01e88cd47 100644
--- a/app/src/main/java/com/github/libretube/helpers/ThemeHelper.kt
+++ b/app/src/main/java/com/github/libretube/helpers/ThemeHelper.kt
@@ -5,6 +5,7 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.graphics.Color
 import android.text.Spanned
 import android.util.TypedValue
 import androidx.appcompat.app.AppCompatActivity
@@ -15,6 +16,7 @@ import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.ui.adapters.IconsSheetAdapter
 import com.google.android.material.color.DynamicColors
+import com.google.android.material.color.MaterialColors
 
 object ThemeHelper {
 
@@ -114,13 +116,9 @@ object ThemeHelper {
     }
 
     /**
-     * Get a color by a resource code
+     * Get a color by a color resource attr
      */
-    fun getThemeColor(context: Context, colorCode: Int): Int {
-        val value = TypedValue()
-        context.theme.resolveAttribute(colorCode, value, true)
-        return value.data
-    }
+    fun getThemeColor(context: Context, colorCode: Int) = MaterialColors.getColor(context, colorCode, Color.TRANSPARENT)
 
     /**
      * Get the styled app name
diff --git a/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt b/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt
index 5db1a5fba..b396279ff 100644
--- a/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt
+++ b/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt
@@ -9,7 +9,6 @@ import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import com.github.libretube.db.DatabaseHolder.Database
 import com.github.libretube.helpers.ThemeHelper
-import com.google.android.material.color.MaterialColors
 import kotlinx.coroutines.runBlocking
 
 /**
@@ -21,15 +20,12 @@ fun View.setWatchProgressLength(videoId: String, duration: Long) {
     updateLayoutParams<ConstraintLayout.LayoutParams> {
         matchConstraintPercentWidth = 0f
     }
-    var backgroundColor = MaterialColors.getColor(
-        this,
+    var backgroundColor = ThemeHelper.getThemeColor(
+        context,
         com.google.android.material.R.attr.colorPrimaryDark
     )
     // increase the brightness for better contrast in light mode
-    if (!ThemeHelper.isDarkMode(
-            context
-        )
-    ) {
+    if (!ThemeHelper.isDarkMode(context)) {
         backgroundColor = ColorUtils.blendARGB(backgroundColor, Color.WHITE, 0.4f)
     }
     setBackgroundColor(backgroundColor)