diff options
Diffstat (limited to 'core/src/main')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java | 6 | ||||
-rw-r--r-- | core/src/main/res/drawable/borderless_button_dark.xml | 19 | ||||
-rw-r--r-- | core/src/main/res/values-v16/colors.xml (renamed from core/src/main/res/values-v19/colors.xml) | 0 |
3 files changed, 16 insertions, 9 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java b/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java index a8206d3bd..8d77f0f24 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java @@ -1,5 +1,7 @@ package de.danoeh.antennapod.core.util; +import org.apache.commons.lang3.StringUtils; + import java.util.List; import de.danoeh.antennapod.core.feed.FeedItem; @@ -45,9 +47,9 @@ public class FeedItemUtil { public static String getLinkWithFallback(FeedItem item) { if (item == null) { return null; - } else if (item.getLink() != null) { + } else if (StringUtils.isNotBlank(item.getLink())) { return item.getLink(); - } else if (item.getFeed() != null) { + } else if (StringUtils.isNotBlank(item.getFeed().getLink())) { return item.getFeed().getLink(); } return null; diff --git a/core/src/main/res/drawable/borderless_button_dark.xml b/core/src/main/res/drawable/borderless_button_dark.xml index 6d263938d..3a44d81a2 100644 --- a/core/src/main/res/drawable/borderless_button_dark.xml +++ b/core/src/main/res/drawable/borderless_button_dark.xml @@ -1,13 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true"><shape android:shape="rectangle"> + <item android:state_pressed="true"> + <shape android:shape="rectangle"> <solid android:color="@color/selection_background_color_dark" /> - </shape></item> - <item android:state_focused="true"><shape android:shape="rectangle"> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle"> <solid android:color="@color/selection_background_color_dark" /> - </shape></item> - <item><shape android:shape="rectangle"> + </shape> + </item> + <item> + <shape android:shape="rectangle"> <solid android:color="@android:color/transparent" /> - </shape></item> - + </shape> + </item> </selector>
\ No newline at end of file diff --git a/core/src/main/res/values-v19/colors.xml b/core/src/main/res/values-v16/colors.xml index 4154280e8..4154280e8 100644 --- a/core/src/main/res/values-v19/colors.xml +++ b/core/src/main/res/values-v16/colors.xml |