diff options
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/adapter')
16 files changed, 45 insertions, 63 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java index 8380d8626..b06c94abd 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java @@ -77,7 +77,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte holder.link.setText(sc.getLink()); holder.link.setOnClickListener(v -> IntentUtils.openInBrowser(context, sc.getLink())); } - holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.av_play)); + holder.secondaryActionIcon.setImageResource(R.drawable.ic_play_48dp); holder.secondaryActionButton.setContentDescription(context.getString(R.string.play_chapter)); holder.secondaryActionButton.setOnClickListener(v -> { if (callback != null) { @@ -92,7 +92,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte progress = Math.max(progress, CircularProgressBar.MINIMUM_PERCENTAGE); progress = Math.min(progress, CircularProgressBar.MAXIMUM_PERCENTAGE); holder.progressBar.setPercentage(progress, position); - holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.av_replay)); + holder.secondaryActionIcon.setImageResource(R.drawable.ic_replay); } else { holder.itemView.setBackgroundColor(ContextCompat.getColor(context, android.R.color.transparent)); holder.progressBar.setPercentage(0, null); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java index 811e1e31b..896daae18 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java @@ -20,7 +20,6 @@ import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.storage.DBTasks; import de.danoeh.antennapod.core.storage.DownloadRequestException; import de.danoeh.antennapod.core.storage.DownloadRequester; -import de.danoeh.antennapod.ui.common.ThemeUtils; import de.danoeh.antennapod.view.viewholder.DownloadItemViewHolder; /** @@ -82,8 +81,7 @@ public class DownloadLogAdapter extends BaseAdapter { holder.secondaryActionButton.setOnClickListener(null); holder.secondaryActionButton.setTag(null); } else { - holder.secondaryActionIcon.setImageResource( - ThemeUtils.getDrawableFromAttr(context, R.attr.navigation_refresh)); + holder.secondaryActionIcon.setImageResource(R.drawable.ic_refresh); holder.secondaryActionButton.setVisibility(View.VISIBLE); if (status.getFeedfileType() == Feed.FEEDFILETYPE_FEED) { diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java index 9363edc9f..f559d4f74 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java @@ -15,7 +15,6 @@ import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.service.download.DownloadRequest; import de.danoeh.antennapod.core.service.download.DownloadStatus; import de.danoeh.antennapod.core.service.download.Downloader; -import de.danoeh.antennapod.ui.common.ThemeUtils; import de.danoeh.antennapod.ui.common.CircularProgressBar; public class DownloadlistAdapter extends BaseAdapter { @@ -64,7 +63,7 @@ public class DownloadlistAdapter extends BaseAdapter { } holder.title.setText(request.getTitle()); - holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.navigation_cancel)); + holder.secondaryActionIcon.setImageResource(R.drawable.ic_cancel); holder.secondaryActionButton.setContentDescription(context.getString(R.string.cancel_download_label)); holder.secondaryActionButton.setTag(downloader); holder.secondaryActionButton.setOnClickListener(butSecondaryListener); 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 8d7add297..816d36353 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java @@ -33,7 +33,6 @@ import de.danoeh.antennapod.fragment.NavDrawerFragment; import de.danoeh.antennapod.fragment.PlaybackHistoryFragment; import de.danoeh.antennapod.fragment.QueueFragment; import de.danoeh.antennapod.fragment.SubscriptionFragment; -import de.danoeh.antennapod.ui.common.ThemeUtils; import org.apache.commons.lang3.ArrayUtils; import java.lang.ref.WeakReference; @@ -109,34 +108,22 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder> } private @DrawableRes int getDrawable(String tag) { - Activity context = activity.get(); - if (context == null) { - return 0; - } - int icon; switch (tag) { case QueueFragment.TAG: - icon = R.attr.stat_playlist; - break; + return R.drawable.ic_playlist; case EpisodesFragment.TAG: - icon = R.attr.feed; - break; + return R.drawable.ic_feed; case DownloadsFragment.TAG: - icon = R.attr.av_download; - break; + return R.drawable.ic_download; case PlaybackHistoryFragment.TAG: - icon = R.attr.ic_history; - break; + return R.drawable.ic_history; case SubscriptionFragment.TAG: - icon = R.attr.ic_folder; - break; + return R.drawable.ic_folder; case AddFeedFragment.TAG: - icon = R.attr.content_new; - break; + return R.drawable.ic_add; default: return 0; } - return ThemeUtils.getDrawableFromAttr(context, icon); } public List<String> getFragmentTags() { @@ -349,7 +336,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder> holder.count.setVisibility(View.GONE); } Glide.with(context).clear(holder.image); - holder.image.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.ic_folder)); + holder.image.setImageResource(R.drawable.ic_folder); holder.failure.setVisibility(View.GONE); } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java index fc97cace5..b18fea481 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java @@ -24,7 +24,6 @@ import de.danoeh.antennapod.core.feed.LocalFeedUpdater; import de.danoeh.antennapod.core.storage.NavDrawerData; import de.danoeh.antennapod.fragment.FeedItemlistFragment; import de.danoeh.antennapod.fragment.SubscriptionFragment; -import de.danoeh.antennapod.ui.common.ThemeUtils; import jp.shts.android.library.TriangleLabelView; /** @@ -115,7 +114,7 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI .load(); } else { new CoverLoader(mainActivityRef.get()) - .withResource(ThemeUtils.getDrawableFromAttr(mainActivityRef.get(), R.attr.ic_folder)) + .withResource(R.drawable.ic_folder) .withPlaceholderView(holder.feedTitle, true) .withCoverView(holder.imageView) .load(); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java index a8001eeb1..f68e9761f 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; @@ -20,9 +20,9 @@ class AddToQueueActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.content_new; + return R.drawable.ic_add; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java index a31d2fdc0..d4a7713d9 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import android.widget.Toast; @@ -25,9 +25,9 @@ public class CancelDownloadActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.navigation_cancel; + return R.drawable.ic_cancel; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java index 45cce23b8..3de3019bb 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java @@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; import android.view.View; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; @@ -22,9 +22,9 @@ public class DeleteActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.ic_delete; + return R.drawable.ic_delete; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java index 0f7c2bdd0..689ecceb0 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java @@ -4,7 +4,7 @@ import android.content.Context; import android.view.View; import android.widget.Toast; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; @@ -33,9 +33,9 @@ public class DownloadActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.av_download; + return R.drawable.ic_download; } @Override 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 35f0a717f..c694c0a0e 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 @@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; import android.widget.ImageView; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; import android.view.View; @@ -11,7 +11,6 @@ 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; @@ -23,7 +22,7 @@ public abstract class ItemActionButton { @StringRes public abstract int getLabel(); - @AttrRes + @DrawableRes public abstract int getDrawable(); public abstract void onClick(Context context); @@ -62,6 +61,6 @@ public abstract class ItemActionButton { button.setVisibility(getVisibility()); button.setContentDescription(context.getString(getLabel())); button.setOnClickListener((view) -> onClick(context)); - icon.setImageResource(ThemeUtils.getDrawableFromAttr(context, getDrawable())); + icon.setImageResource(getDrawable()); } } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java index 14fa94f7a..2eab092af 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import android.view.View; @@ -22,9 +22,9 @@ public class MarkAsPlayedActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.navigation_accept; + return R.drawable.ic_check; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java index 4ac03c50e..ec6284e82 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; @@ -23,9 +23,9 @@ public class PauseActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.av_pause; + return R.drawable.ic_pause; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java index 512f1a512..467af5aa2 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; @@ -24,9 +24,9 @@ public class PlayActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.av_play; + return R.drawable.ic_play_24dp; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java index 78ea3b93f..86ac3db7d 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; @@ -23,9 +23,9 @@ public class PlayLocalActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.av_play; + return R.drawable.ic_play_24dp; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java index 8a892a621..ce7c467e1 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java @@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; @@ -28,9 +28,9 @@ public class StreamActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.action_stream; + return R.drawable.ic_stream; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java index e45280eed..41b8ecb4c 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java @@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; import android.view.View; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; @@ -21,9 +21,9 @@ public class VisitWebsiteActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.location_web_site; + return R.drawable.ic_web; } @Override |