Skip to content

Commit 1daece3

Browse files
authored
Merge pull request #8382 from Isira-Seneviratne/Remove_compat_methods
Remove unnecessary compat method calls.
2 parents adddd48 + a1f64e4 commit 1daece3

4 files changed

Lines changed: 8 additions & 11 deletions

File tree

app/src/main/java/org/schabi/newpipe/RouterActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import androidx.appcompat.content.res.AppCompatResources;
3030
import androidx.core.app.NotificationCompat;
3131
import androidx.core.app.ServiceCompat;
32-
import androidx.core.widget.TextViewCompat;
3332
import androidx.fragment.app.FragmentManager;
3433
import androidx.preference.PreferenceManager;
3534

@@ -388,7 +387,7 @@ private void showDialog(final List<AdapterChoiceItem> choices) {
388387
for (final AdapterChoiceItem item : choices) {
389388
final RadioButton radioButton = ListRadioIconItemBinding.inflate(inflater).getRoot();
390389
radioButton.setText(item.description);
391-
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(radioButton,
390+
radioButton.setCompoundDrawablesRelativeWithIntrinsicBounds(
392391
AppCompatResources.getDrawable(themeWrapperContext, item.icon),
393392
null, null, null);
394393
radioButton.setChecked(false);

app/src/main/java/org/schabi/newpipe/player/Player.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
import android.util.DisplayMetrics;
8989
import android.util.Log;
9090
import android.util.TypedValue;
91+
import android.view.GestureDetector;
9192
import android.view.Gravity;
9293
import android.view.KeyEvent;
9394
import android.view.LayoutInflater;
@@ -118,7 +119,6 @@
118119
import androidx.collection.ArraySet;
119120
import androidx.core.content.ContextCompat;
120121
import androidx.core.graphics.Insets;
121-
import androidx.core.view.GestureDetectorCompat;
122122
import androidx.core.view.ViewCompat;
123123
import androidx.core.view.WindowInsetsCompat;
124124
import androidx.fragment.app.FragmentManager;
@@ -387,7 +387,7 @@ public final class Player implements
387387
private static final float MAX_GESTURE_LENGTH = 0.75f;
388388

389389
private int maxGestureLength; // scaled
390-
private GestureDetectorCompat gestureDetector;
390+
private GestureDetector gestureDetector;
391391
private PlayerGestureListener playerGestureListener;
392392

393393
/*//////////////////////////////////////////////////////////////////////////
@@ -555,7 +555,7 @@ private void initListeners() {
555555
binding.playbackLiveSync.setOnClickListener(this);
556556

557557
playerGestureListener = new PlayerGestureListener(this, service);
558-
gestureDetector = new GestureDetectorCompat(context, playerGestureListener);
558+
gestureDetector = new GestureDetector(context, playerGestureListener);
559559
binding.getRoot().setOnTouchListener(playerGestureListener);
560560

561561
binding.queueButton.setOnClickListener(v -> onQueueClicked());
@@ -4428,7 +4428,7 @@ public AudioReactor getAudioReactor() {
44284428
return audioReactor;
44294429
}
44304430

4431-
public GestureDetectorCompat getGestureDetector() {
4431+
public GestureDetector getGestureDetector() {
44324432
return gestureDetector;
44334433
}
44344434

app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import androidx.appcompat.app.AlertDialog;
2222
import androidx.appcompat.content.res.AppCompatResources;
2323
import androidx.core.graphics.drawable.DrawableCompat;
24-
import androidx.core.widget.TextViewCompat;
2524
import androidx.preference.Preference;
2625
import androidx.preference.PreferenceViewHolder;
2726

@@ -220,8 +219,8 @@ void openActionChooserDialog() {
220219
android.R.attr.textColorPrimary);
221220
drawable = DrawableCompat.wrap(drawable).mutate();
222221
DrawableCompat.setTint(drawable, color);
223-
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(radioButton,
224-
null, null, drawable, null);
222+
radioButton.setCompoundDrawablesRelativeWithIntrinsicBounds(null,
223+
null, drawable, null);
225224
}
226225
}
227226

app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import androidx.core.app.NotificationCompat;
3030
import androidx.core.content.ContextCompat;
3131
import androidx.core.content.FileProvider;
32-
import androidx.core.view.ViewCompat;
3332
import androidx.recyclerview.widget.DiffUtil;
3433
import androidx.recyclerview.widget.RecyclerView;
3534
import androidx.recyclerview.widget.RecyclerView.Adapter;
@@ -871,7 +870,7 @@ class ViewHolderItem extends RecyclerView.ViewHolder {
871870
super(view);
872871

873872
progress = new ProgressDrawable();
874-
ViewCompat.setBackground(itemView.findViewById(R.id.item_bkg), progress);
873+
itemView.findViewById(R.id.item_bkg).setBackground(progress);
875874

876875
status = itemView.findViewById(R.id.item_status);
877876
name = itemView.findViewById(R.id.item_name);

0 commit comments

Comments
 (0)