From 189c92affadf40f3bedd7f52eec1b1813fce98a3 Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Wed, 6 Jul 2022 17:48:38 -0400
Subject: [PATCH] More minSdk 21 cleanup

---
 .../main/java/org/schabi/newpipe/error/ErrorUtil.kt   |  8 +-------
 app/src/main/java/org/schabi/newpipe/ktx/View.kt      | 11 +++--------
 .../settings/PlayerNotificationSettingsFragment.kt    | 10 ----------
 .../custom/NotificationActionsPreference.java         |  2 +-
 4 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/error/ErrorUtil.kt b/app/src/main/java/org/schabi/newpipe/error/ErrorUtil.kt
index e4dd2e16d..86e2e1028 100644
--- a/app/src/main/java/org/schabi/newpipe/error/ErrorUtil.kt
+++ b/app/src/main/java/org/schabi/newpipe/error/ErrorUtil.kt
@@ -114,13 +114,7 @@ class ErrorUtil {
                     context,
                     context.getString(R.string.error_report_channel_id)
                 )
-                    .setSmallIcon(
-                        // the vector drawable icon causes crashes on KitKat devices
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-                            R.drawable.ic_bug_report
-                        else
-                            android.R.drawable.stat_notify_error
-                    )
+                    .setSmallIcon(R.drawable.ic_bug_report)
                     .setContentTitle(context.getString(R.string.error_report_notification_title))
                     .setContentText(context.getString(errorInfo.messageStringId))
                     .setAutoCancel(true)
diff --git a/app/src/main/java/org/schabi/newpipe/ktx/View.kt b/app/src/main/java/org/schabi/newpipe/ktx/View.kt
index ace1dbf7e..ea680dd60 100644
--- a/app/src/main/java/org/schabi/newpipe/ktx/View.kt
+++ b/app/src/main/java/org/schabi/newpipe/ktx/View.kt
@@ -12,7 +12,6 @@ import android.view.View
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
 import androidx.core.animation.addListener
-import androidx.core.view.ViewCompat
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
@@ -21,10 +20,6 @@ import org.schabi.newpipe.MainActivity
 
 private const val TAG = "ViewUtils"
 
-inline var View.backgroundTintListCompat: ColorStateList?
-    get() = ViewCompat.getBackgroundTintList(this)
-    set(value) = ViewCompat.setBackgroundTintList(this, value)
-
 /**
  * Animate the view.
  *
@@ -106,11 +101,11 @@ fun View.animateBackgroundColor(duration: Long, @ColorInt colorStart: Int, @Colo
     viewPropertyAnimator.interpolator = FastOutSlowInInterpolator()
     viewPropertyAnimator.duration = duration
     viewPropertyAnimator.addUpdateListener { animation: ValueAnimator ->
-        backgroundTintListCompat = ColorStateList(empty, intArrayOf(animation.animatedValue as Int))
+        backgroundTintList = ColorStateList(empty, intArrayOf(animation.animatedValue as Int))
     }
     viewPropertyAnimator.addListener(
-        onCancel = { backgroundTintListCompat = ColorStateList(empty, intArrayOf(colorEnd)) },
-        onEnd = { backgroundTintListCompat = ColorStateList(empty, intArrayOf(colorEnd)) }
+        onCancel = { backgroundTintList = ColorStateList(empty, intArrayOf(colorEnd)) },
+        onEnd = { backgroundTintList = ColorStateList(empty, intArrayOf(colorEnd)) }
     )
     viewPropertyAnimator.start()
 }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/PlayerNotificationSettingsFragment.kt b/app/src/main/java/org/schabi/newpipe/settings/PlayerNotificationSettingsFragment.kt
index 3549bff42..7d95433a4 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/PlayerNotificationSettingsFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/PlayerNotificationSettingsFragment.kt
@@ -1,19 +1,9 @@
 package org.schabi.newpipe.settings
 
-import android.os.Build
 import android.os.Bundle
-import androidx.preference.Preference
-import org.schabi.newpipe.R
 
 class PlayerNotificationSettingsFragment : BasePreferenceFragment() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResourceRegistry()
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            val colorizePref: Preference? = findPreference(getString(R.string.notification_colorize_key))
-            colorizePref?.let {
-                preferenceScreen.removePreference(it)
-            }
-        }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java b/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
index 798d299c0..849574171 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
@@ -218,7 +218,7 @@ public class NotificationActionsPreference extends Preference {
                         final int color = ThemeHelper.resolveColorFromAttr(getContext(),
                                 android.R.attr.textColorPrimary);
                         drawable = DrawableCompat.wrap(drawable).mutate();
-                        DrawableCompat.setTint(drawable, color);
+                        drawable.setTint(color);
                         radioButton.setCompoundDrawablesRelativeWithIntrinsicBounds(null,
                                 null, drawable, null);
                     }