summaryrefslogtreecommitdiff
path: root/src/de/danoeh/antennapod/adapter
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/danoeh/antennapod/adapter')
-rw-r--r--src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java2
-rw-r--r--src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java2
-rw-r--r--src/de/danoeh/antennapod/adapter/NavListAdapter.java5
-rw-r--r--src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java4
-rw-r--r--src/de/danoeh/antennapod/adapter/QueueListAdapter.java5
-rw-r--r--src/de/danoeh/antennapod/adapter/SearchlistAdapter.java6
-rw-r--r--src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java14
7 files changed, 15 insertions, 23 deletions
diff --git a/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index 641a1368d..ef5af67de 100644
--- a/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -89,7 +89,7 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
PicassoProvider.getMediaMetadataPicassoInstance(context)
.load(item.getImageUri())
- .resize(imageSize, imageSize)
+ .fit()
.into(holder.imageView);
return convertView;
diff --git a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
index 56c3e1ca6..3f666eb8b 100644
--- a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
@@ -176,7 +176,7 @@ public class ExternalEpisodesListAdapter extends BaseExpandableListAdapter {
PicassoProvider.getMediaMetadataPicassoInstance(context)
.load(item.getImageUri())
- .resize(imageSize, imageSize)
+ .fit()
.into(holder.feedImage);
holder.butAction.setFocusable(false);
diff --git a/src/de/danoeh/antennapod/adapter/NavListAdapter.java b/src/de/danoeh/antennapod/adapter/NavListAdapter.java
index ed85c8836..ef8e8ce07 100644
--- a/src/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -32,8 +32,6 @@ public class NavListAdapter extends BaseAdapter {
private ItemAccess itemAccess;
private Context context;
- private final int imageSize;
-
public NavListAdapter(ItemAccess itemAccess, Context context) {
this.itemAccess = itemAccess;
this.context = context;
@@ -43,7 +41,6 @@ public class NavListAdapter extends BaseAdapter {
drawables = new Drawable[]{ta.getDrawable(0), ta.getDrawable(1), ta.getDrawable(2),
ta.getDrawable(3), ta.getDrawable(4)};
ta.recycle();
- this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length_navlist);
}
@Override
@@ -195,7 +192,7 @@ public class NavListAdapter extends BaseAdapter {
PicassoProvider.getDefaultPicassoInstance(context)
.load(feed.getImageUri())
- .resize(imageSize, imageSize)
+ .fit()
.into(holder.image);
return convertView;
diff --git a/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
index 4370de14d..8abe49133 100644
--- a/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
@@ -27,7 +27,6 @@ public class NewEpisodesListAdapter extends BaseAdapter {
private final ItemAccess itemAccess;
private final ActionButtonCallback actionButtonCallback;
private final ActionButtonUtils actionButtonUtils;
- private final int imageSize;
public NewEpisodesListAdapter(Context context, ItemAccess itemAccess, ActionButtonCallback actionButtonCallback) {
super();
@@ -35,7 +34,6 @@ public class NewEpisodesListAdapter extends BaseAdapter {
this.itemAccess = itemAccess;
this.actionButtonUtils = new ActionButtonUtils(context);
this.actionButtonCallback = actionButtonCallback;
- this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length_itemlist);
}
@Override
@@ -133,7 +131,7 @@ public class NewEpisodesListAdapter extends BaseAdapter {
PicassoProvider.getMediaMetadataPicassoInstance(context)
.load(item.getImageUri())
- .resize(imageSize, imageSize)
+ .fit()
.into(holder.imageView);
return convertView;
diff --git a/src/de/danoeh/antennapod/adapter/QueueListAdapter.java b/src/de/danoeh/antennapod/adapter/QueueListAdapter.java
index c670089b9..ebe519592 100644
--- a/src/de/danoeh/antennapod/adapter/QueueListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/QueueListAdapter.java
@@ -22,7 +22,6 @@ public class QueueListAdapter extends BaseAdapter {
private final ActionButtonCallback actionButtonCallback;
private final ActionButtonUtils actionButtonUtils;
- private final int imageSize;
public QueueListAdapter(Context context, ItemAccess itemAccess, ActionButtonCallback actionButtonCallback) {
super();
@@ -30,8 +29,6 @@ public class QueueListAdapter extends BaseAdapter {
this.itemAccess = itemAccess;
this.actionButtonUtils = new ActionButtonUtils(context);
this.actionButtonCallback = actionButtonCallback;
- this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length_queue_item);
-
}
@Override
@@ -97,7 +94,7 @@ public class QueueListAdapter extends BaseAdapter {
PicassoProvider.getMediaMetadataPicassoInstance(context)
.load(item.getImageUri())
- .resize(imageSize, imageSize)
+ .fit()
.into(holder.imageView);
return convertView;
diff --git a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
index 6b1fefaad..2314c2269 100644
--- a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
@@ -23,12 +23,10 @@ public class SearchlistAdapter extends BaseAdapter {
private final Context context;
private final ItemAccess itemAccess;
- private final int imageSize;
public SearchlistAdapter(Context context, ItemAccess itemAccess) {
this.context = context;
this.itemAccess = itemAccess;
- this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length);
}
@Override
@@ -76,7 +74,7 @@ public class SearchlistAdapter extends BaseAdapter {
PicassoProvider.getDefaultPicassoInstance(context)
.load(feed.getImageUri())
- .resize(imageSize, imageSize)
+ .fit()
.into(holder.cover);
} else if (component.getClass() == FeedItem.class) {
@@ -89,7 +87,7 @@ public class SearchlistAdapter extends BaseAdapter {
PicassoProvider.getDefaultPicassoInstance(context)
.load(item.getFeed().getImageUri())
- .resize(imageSize, imageSize)
+ .fit()
.into(holder.cover);
}
diff --git a/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java b/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
index dcad2d524..aeb1fc53a 100644
--- a/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
@@ -8,6 +8,8 @@ import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.TextView;
+import org.apache.commons.lang3.StringUtils;
+
import java.util.List;
import de.danoeh.antennapod.R;
@@ -18,11 +20,9 @@ import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
* Adapter for displaying a list of GPodnetPodcast-Objects.
*/
public class PodcastListAdapter extends ArrayAdapter<GpodnetPodcast> {
- private final int thumbnailLength;
public PodcastListAdapter(Context context, int resource, List<GpodnetPodcast> objects) {
super(context, resource, objects);
- thumbnailLength = (int) context.getResources().getDimension(R.dimen.thumbnail_length);
}
@Override
@@ -50,10 +50,12 @@ public class PodcastListAdapter extends ArrayAdapter<GpodnetPodcast> {
holder.title.setText(podcast.getTitle());
holder.description.setText(podcast.getDescription());
- PicassoProvider.getDefaultPicassoInstance(convertView.getContext())
- .load(podcast.getLogoUrl())
- .resize(thumbnailLength, thumbnailLength)
- .into(holder.image);
+ if (StringUtils.isNoneBlank(podcast.getLogoUrl())) {
+ PicassoProvider.getDefaultPicassoInstance(convertView.getContext())
+ .load(podcast.getLogoUrl())
+ .fit()
+ .into(holder.image);
+ }
return convertView;
}