From 31111332e9ac473c37775b32ac4f9e20ca301e05 Mon Sep 17 00:00:00 2001 From: Tobias Preuss Date: Fri, 5 Feb 2016 17:17:28 +0100 Subject: Remove deprecation warnings by using ContextCompat.getColor(). --- .../danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java | 7 ++++--- .../de/danoeh/antennapod/adapter/ChaptersListAdapter.java | 7 ++++--- .../java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java | 5 +++-- .../de/danoeh/antennapod/adapter/DownloadlistAdapter.java | 3 ++- .../de/danoeh/antennapod/adapter/FeedItemlistAdapter.java | 11 ++++++----- .../de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java | 7 ++++--- 6 files changed, 23 insertions(+), 17 deletions(-) (limited to 'app/src/main/java/de/danoeh/antennapod/adapter') diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java index d749b0313..c4bcc85f5 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java @@ -2,6 +2,7 @@ package de.danoeh.antennapod.adapter; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; import android.util.Log; @@ -70,11 +71,11 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter { if (current == sc) { int playingBackGroundColor; if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) { - playingBackGroundColor = getContext().getResources().getColor(R.color.highlight_dark); + playingBackGroundColor = ContextCompat.getColor(getContext(), R.color.highlight_dark); } else { - playingBackGroundColor = getContext().getResources().getColor(R.color.highlight_light); + playingBackGroundColor = ContextCompat.getColor(getContext(), R.color.highlight_light); } holder.view.setBackgroundColor(playingBackGroundColor); } else { - holder.view.setBackgroundColor(getContext().getResources().getColor(android.R.color.transparent)); + holder.view.setBackgroundColor(ContextCompat.getColor(getContext(), android.R.color.transparent)); holder.title.setTextColor(defaultTextColor); holder.start.setTextColor(defaultTextColor); } 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 893c92907..9ff80424c 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java @@ -1,6 +1,7 @@ package de.danoeh.antennapod.adapter; import android.content.Context; +import android.support.v4.content.ContextCompat; import android.text.format.DateUtils; import android.util.Log; import android.view.LayoutInflater; @@ -74,14 +75,14 @@ public class DownloadLogAdapter extends BaseAdapter { status.getCompletionDate().getTime(), System.currentTimeMillis(), 0, 0)); if (status.isSuccessful()) { - holder.icon.setTextColor(convertView.getResources().getColor( + holder.icon.setTextColor(ContextCompat.getColor(convertView.getContext(), R.color.download_success_green)); holder.icon.setText("{fa-check-circle}"); Iconify.addIcons(holder.icon); holder.retry.setVisibility(View.GONE); holder.reason.setVisibility(View.GONE); } else { - holder.icon.setTextColor(convertView.getResources().getColor( + holder.icon.setTextColor(ContextCompat.getColor(convertView.getContext(), R.color.download_failed_red)); holder.icon.setText("{fa-times-circle}"); Iconify.addIcons(holder.icon); 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 206d07f0f..4a0ff1f12 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java @@ -1,6 +1,7 @@ package de.danoeh.antennapod.adapter; import android.content.Context; +import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -74,7 +75,7 @@ public class DownloadlistAdapter extends BaseAdapter { } if (position == selectedItemIndex) { - convertView.setBackgroundColor(convertView.getResources().getColor( + convertView.setBackgroundColor(ContextCompat.getColor(convertView.getContext(), ThemeUtils.getSelectionBackgroundColor())); } else { convertView.setBackgroundResource(0); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java index e483738b4..7ca8d6a31 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java @@ -2,6 +2,7 @@ package de.danoeh.antennapod.adapter; import android.content.Context; import android.content.res.TypedArray; +import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -59,11 +60,11 @@ public class FeedItemlistAdapter extends BaseAdapter { this.makePlayedItemsTransparent = makePlayedItemsTransparent; if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) { - playingBackGroundColor = context.getResources().getColor(R.color.highlight_dark); + playingBackGroundColor = ContextCompat.getColor(context, R.color.highlight_dark); } else { - playingBackGroundColor = context.getResources().getColor(R.color.highlight_light); + playingBackGroundColor = ContextCompat.getColor(context, R.color.highlight_light); } - normalBackGroundColor = context.getResources().getColor(android.R.color.transparent); + normalBackGroundColor = ContextCompat.getColor(context, android.R.color.transparent); } @Override @@ -118,8 +119,8 @@ public class FeedItemlistAdapter extends BaseAdapter { if (!(getItemViewType(position) == Adapter.IGNORE_ITEM_VIEW_TYPE)) { convertView.setVisibility(View.VISIBLE); if (position == selectedItemIndex) { - convertView.setBackgroundColor(convertView.getResources() - .getColor(ThemeUtils.getSelectionBackgroundColor())); + convertView.setBackgroundColor(ContextCompat.getColor(convertView.getContext(), + ThemeUtils.getSelectionBackgroundColor())); } else { convertView.setBackgroundResource(0); } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java index d0266be6d..05562d2da 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java @@ -3,6 +3,7 @@ package de.danoeh.antennapod.adapter; import android.graphics.drawable.Drawable; import android.net.Uri; import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.support.v4.view.MotionEventCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; @@ -78,11 +79,11 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter