From 1dc146322c5666f2a4af9f9d14b5f2aa56626b32 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Thu, 17 Mar 2022 18:34:44 +0100
Subject: [PATCH] Merged ``DrawableResolver`` into ``ThemeHelper``

---
 .../schabi/newpipe/local/feed/FeedFragment.kt |  2 +-
 .../helper/PlaybackParameterDialog.java       |  2 +-
 .../schabi/newpipe/util/DrawableResolver.kt   | 26 -------------------
 .../org/schabi/newpipe/util/ThemeHelper.java  | 18 +++++++++++++
 4 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/util/DrawableResolver.kt

diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
index 55810284f..b291aa035 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -75,10 +75,10 @@ import org.schabi.newpipe.local.feed.item.StreamItem
 import org.schabi.newpipe.local.feed.service.FeedLoadService
 import org.schabi.newpipe.local.subscription.SubscriptionManager
 import org.schabi.newpipe.util.DeviceUtils
-import org.schabi.newpipe.util.DrawableResolver.resolveDrawable
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.ThemeHelper.getGridSpanCountStreams
+import org.schabi.newpipe.util.ThemeHelper.resolveDrawable
 import org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout
 import java.time.OffsetDateTime
 import java.util.function.Consumer
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
index 26caa1b20..62446b50e 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
@@ -2,8 +2,8 @@ package org.schabi.newpipe.player.helper;
 
 import static org.schabi.newpipe.ktx.ViewUtils.animateRotation;
 import static org.schabi.newpipe.player.Player.DEBUG;
-import static org.schabi.newpipe.util.DrawableResolver.resolveDrawable;
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+import static org.schabi.newpipe.util.ThemeHelper.resolveDrawable;
 
 import android.app.Dialog;
 import android.content.Context;
diff --git a/app/src/main/java/org/schabi/newpipe/util/DrawableResolver.kt b/app/src/main/java/org/schabi/newpipe/util/DrawableResolver.kt
deleted file mode 100644
index 8a728bfbf..000000000
--- a/app/src/main/java/org/schabi/newpipe/util/DrawableResolver.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.schabi.newpipe.util
-
-import android.content.Context
-import android.graphics.drawable.Drawable
-import android.util.TypedValue
-import androidx.annotation.AttrRes
-import androidx.core.content.ContextCompat
-
-/**
- * Utility class for resolving [Drawables](Drawable)
- */
-object DrawableResolver {
-    @JvmStatic
-    fun resolveDrawable(context: Context, @AttrRes attrResId: Int): Drawable? {
-        return ContextCompat.getDrawable(
-            context,
-            TypedValue().apply {
-                context.theme.resolveAttribute(
-                    attrResId,
-                    this,
-                    true
-                )
-            }.resourceId
-        )
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
index 7c47d387f..7d06e57b6 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
@@ -23,9 +23,11 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.util.TypedValue;
 
 import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.ActionBar;
@@ -227,6 +229,22 @@ public final class ThemeHelper {
         return value.data;
     }
 
+    /**
+     * Resolves a {@link Drawable} by it's id.
+     *
+     * @param context   Context
+     * @param attrResId Resource id
+     * @return the {@link Drawable}
+     */
+    public static Drawable resolveDrawable(
+            @NonNull final Context context,
+            @AttrRes final int attrResId
+    ) {
+        final TypedValue typedValue = new TypedValue();
+        context.getTheme().resolveAttribute(attrResId, typedValue, true);
+        return ContextCompat.getDrawable(context, typedValue.resourceId);
+    }
+
     private static String getSelectedThemeKey(final Context context) {
         final String themeKey = context.getString(R.string.theme_key);
         final String defaultTheme = context.getResources().getString(R.string.default_theme_value);