From 187aaafddce000ea5857325f5b4bcbd3e0c73ad9 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Thu, 22 Oct 2020 05:45:27 +0530
Subject: [PATCH] Use
 TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds().

---
 app/src/main/java/org/schabi/newpipe/RouterActivity.java   | 7 ++++---
 .../newpipe/settings/NotificationSettingsFragment.java     | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index 251affaed..388d7683a 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -8,7 +8,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import androidx.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -27,7 +26,9 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.app.NotificationCompat;
+import androidx.core.widget.TextViewCompat;
 import androidx.fragment.app.FragmentManager;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.extractor.Info;
@@ -45,8 +46,8 @@ import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -326,7 +327,7 @@ public class RouterActivity extends AppCompatActivity {
             final RadioButton radioButton
                     = (RadioButton) inflater.inflate(R.layout.list_radio_icon_item, null);
             radioButton.setText(item.description);
-            radioButton.setCompoundDrawablesWithIntrinsicBounds(
+            TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(radioButton,
                     AppCompatResources.getDrawable(getApplicationContext(), item.icon),
                     null, null, null);
             radioButton.setChecked(false);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/NotificationSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/NotificationSettingsFragment.java
index ce1e9e5a5..84bfc29e9 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/NotificationSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/NotificationSettingsFragment.java
@@ -23,6 +23,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.widget.TextViewCompat;
 import androidx.fragment.app.Fragment;
 
 import org.schabi.newpipe.R;
@@ -247,7 +248,7 @@ public class NotificationSettingsFragment extends Fragment {
                         } else {
                             drawable.mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN);
                         }
-                        radioButton.setCompoundDrawablesWithIntrinsicBounds(
+                        TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(radioButton,
                                 null, null, drawable, null);
                     }
                 }