diff options
author | ByteHamster <info@bytehamster.com> | 2021-04-15 21:21:31 +0200 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2021-04-18 17:05:04 +0200 |
commit | d51e9c7625e0cf1d72c17e908312b7dd42363622 (patch) | |
tree | 02329281c174705226799b4b82271dba5d5e1640 /app/src/main/java/de/danoeh/antennapod | |
parent | 5c8163184325cabe371200994dbc14a4ab70d54c (diff) | |
download | AntennaPod-d51e9c7625e0cf1d72c17e908312b7dd42363622.zip |
Use VectorDrawable compat library
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod')
3 files changed, 10 insertions, 22 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java index 911e20aa5..8d7add297 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java @@ -3,10 +3,9 @@ package de.danoeh.antennapod.adapter; import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; -import android.content.res.TypedArray; -import android.graphics.drawable.Drawable; import android.view.ContextMenu; import android.view.LayoutInflater; +import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; import android.util.TypedValue; @@ -109,10 +108,10 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder> return titles[index]; } - private Drawable getDrawable(String tag) { + private @DrawableRes int getDrawable(String tag) { Activity context = activity.get(); if (context == null) { - return null; + return 0; } int icon; switch (tag) { @@ -135,12 +134,9 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder> icon = R.attr.content_new; break; default: - return null; + return 0; } - TypedArray ta = context.obtainStyledAttributes(new int[] { icon }); - Drawable result = ta.getDrawable(0); - ta.recycle(); - return result; + return ThemeUtils.getDrawableFromAttr(context, icon); } public List<String> getFragmentTags() { @@ -283,7 +279,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder> } } - holder.image.setImageDrawable(getDrawable(fragmentTags.get(position))); + holder.image.setImageResource(getDrawable(fragmentTags.get(position))); } private void bindSectionDivider(DividerHolder holder) { diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java index 5d95d3775..35f0a717f 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java @@ -1,7 +1,6 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import android.content.res.TypedArray; import android.widget.ImageView; import androidx.annotation.AttrRes; import androidx.annotation.NonNull; @@ -12,6 +11,7 @@ import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.storage.DownloadRequester; +import de.danoeh.antennapod.ui.common.ThemeUtils; public abstract class ItemActionButton { FeedItem item; @@ -62,9 +62,6 @@ public abstract class ItemActionButton { button.setVisibility(getVisibility()); button.setContentDescription(context.getString(getLabel())); button.setOnClickListener((view) -> onClick(context)); - - TypedArray drawables = context.obtainStyledAttributes(new int[]{getDrawable()}); - icon.setImageDrawable(drawables.getDrawable(0)); - drawables.recycle(); + icon.setImageResource(ThemeUtils.getDrawableFromAttr(context, getDrawable())); } } diff --git a/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java b/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java index eaad11d1a..d4bf44aa5 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java +++ b/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java @@ -2,15 +2,12 @@ package de.danoeh.antennapod.view; import android.content.Context;
import android.database.DataSetObserver;
-import android.graphics.drawable.Drawable;
import android.view.Gravity;
import android.widget.AbsListView;
import android.widget.FrameLayout;
import android.widget.ListAdapter;
import androidx.annotation.AttrRes;
-import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
-import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
@@ -18,6 +15,7 @@ import android.widget.RelativeLayout; import android.widget.TextView;
import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.ui.common.ThemeUtils;
public class EmptyViewHandler {
private boolean layoutAdded = false;
@@ -52,10 +50,7 @@ public class EmptyViewHandler { }
public void setIcon(@AttrRes int iconAttr) {
- TypedValue typedValue = new TypedValue();
- context.getTheme().resolveAttribute(iconAttr, typedValue, true);
- Drawable d = ContextCompat.getDrawable(context, typedValue.resourceId);
- ivIcon.setImageDrawable(d);
+ ivIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, iconAttr));
ivIcon.setVisibility(View.VISIBLE);
}
|