Skip to content

Commit c5e509f

Browse files
Use AppCompatResources.
1 parent 212a413 commit c5e509f

3 files changed

Lines changed: 9 additions & 15 deletions

File tree

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
55

66
import android.content.Context;
7-
import android.content.res.ColorStateList;
87
import android.os.Bundle;
98
import android.text.TextUtils;
109
import android.util.Log;
@@ -18,7 +17,6 @@
1817
import androidx.annotation.NonNull;
1918
import androidx.annotation.Nullable;
2019
import androidx.appcompat.content.res.AppCompatResources;
21-
import androidx.core.content.ContextCompat;
2220

2321
import com.google.android.material.shape.CornerFamily;
2422
import com.google.android.material.shape.ShapeAppearanceModel;
@@ -41,6 +39,7 @@
4139
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
4240
import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
4341
import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
42+
import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
4443
import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
4544
import org.schabi.newpipe.player.MainPlayer.PlayerType;
4645
import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -49,7 +48,6 @@
4948
import org.schabi.newpipe.util.Localization;
5049
import org.schabi.newpipe.util.NavigationHelper;
5150
import org.schabi.newpipe.util.PicassoHelper;
52-
import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
5351
import org.schabi.newpipe.util.external_communication.ShareUtils;
5452

5553
import java.util.ArrayList;
@@ -293,10 +291,8 @@ public void handleResult(@NonNull final PlaylistInfo result) {
293291
.setAllCorners(CornerFamily.ROUNDED, 0f)
294292
.build(); // this turns the image back into a square
295293
headerBinding.uploaderAvatarView.setShapeAppearanceModel(model);
296-
headerBinding.uploaderAvatarView.setStrokeColor(
297-
ColorStateList.valueOf(ContextCompat.getColor(
298-
requireContext(), R.color.transparent_background_color))
299-
);
294+
headerBinding.uploaderAvatarView.setStrokeColor(AppCompatResources
295+
.getColorStateList(requireContext(), R.color.transparent_background_color));
300296
headerBinding.uploaderAvatarView.setImageDrawable(
301297
AppCompatResources.getDrawable(requireContext(),
302298
R.drawable.ic_radio)

app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package org.schabi.newpipe.local.subscription.dialog
22

33
import android.app.Dialog
4-
import android.content.res.ColorStateList
54
import android.os.Bundle
65
import android.os.Parcelable
76
import android.view.LayoutInflater
87
import android.view.View
98
import android.view.ViewGroup
109
import android.view.inputmethod.InputMethodManager
1110
import android.widget.Toast
12-
import androidx.core.content.ContextCompat
11+
import androidx.appcompat.content.res.AppCompatResources
1312
import androidx.core.content.getSystemService
1413
import androidx.core.os.bundleOf
1514
import androidx.core.view.isGone
@@ -127,7 +126,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
127126

128127
if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
129128
// KitKat doesn't apply container's theme to <include> content
130-
val contrastColor = ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.contrastColor))
129+
val contrastColor = AppCompatResources.getColorStateList(requireContext(), R.color.contrastColor)
131130
searchLayoutBinding.toolbarSearchEditText.setTextColor(contrastColor)
132131
searchLayoutBinding.toolbarSearchEditText.setHintTextColor(contrastColor.withAlpha(128))
133132
ImageViewCompat.setImageTintList(searchLayoutBinding.toolbarSearchClearIcon, contrastColor)

app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import androidx.appcompat.app.ActionBar;
3434
import androidx.appcompat.app.AppCompatActivity;
3535
import androidx.appcompat.app.AppCompatDelegate;
36+
import androidx.appcompat.content.res.AppCompatResources;
3637
import androidx.core.content.ContextCompat;
3738
import androidx.preference.PreferenceManager;
3839

@@ -236,13 +237,11 @@ public static int resolveColorFromAttr(final Context context, @AttrRes final int
236237
* @param attrResId Resource id
237238
* @return the {@link Drawable}
238239
*/
239-
public static Drawable resolveDrawable(
240-
@NonNull final Context context,
241-
@AttrRes final int attrResId
242-
) {
240+
public static Drawable resolveDrawable(@NonNull final Context context,
241+
@AttrRes final int attrResId) {
243242
final TypedValue typedValue = new TypedValue();
244243
context.getTheme().resolveAttribute(attrResId, typedValue, true);
245-
return ContextCompat.getDrawable(context, typedValue.resourceId);
244+
return AppCompatResources.getDrawable(context, typedValue.resourceId);
246245
}
247246

248247
private static String getSelectedThemeKey(final Context context) {

0 commit comments

Comments
 (0)