Merge pull request #3596 from ByteHamster/prominent-add-podcast

Even more prominent subscribe button

7 files changed, 56 insertions, 44 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 10a315a9b..0c6c63e73 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -147,7 +147,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
      */
     private void setLoadingLayout() {
         progressBar.setVisibility(View.VISIBLE);
-        listView.setVisibility(View.GONE);
+        findViewById(R.id.feedDisplay).setVisibility(View.GONE);
     }
 
     @Override
@@ -360,27 +360,26 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
      */
     private void showFeedInformation(final Feed feed, Map<String, String> alternateFeedUrls) {
         progressBar.setVisibility(View.GONE);
-        listView.setVisibility(View.VISIBLE);
+        findViewById(R.id.feedDisplay).setVisibility(View.VISIBLE);
         this.feed = feed;
         this.selectedDownloadUrl = feed.getDownload_url();
         listView.setSelector(android.R.color.transparent);
-        LayoutInflater inflater = LayoutInflater.from(this);
-        View header = inflater.inflate(R.layout.onlinefeedview_header, listView, false);
-        listView.addHeaderView(header);
-
         listView.setAdapter(new FeedItemlistDescriptionAdapter(this, 0, feed.getItems()));
 
-        ImageView cover = header.findViewById(R.id.imgvCover);
-        ImageView headerBackground = header.findViewById(R.id.imgvBackground);
-        header.findViewById(R.id.butShowInfo).setVisibility(View.INVISIBLE);
-        header.findViewById(R.id.butShowSettings).setVisibility(View.INVISIBLE);
+        ImageView cover = findViewById(R.id.imgvCover);
+        ImageView headerBackground = findViewById(R.id.imgvBackground);
+        findViewById(R.id.butShowInfo).setVisibility(View.INVISIBLE);
+        findViewById(R.id.butShowSettings).setVisibility(View.INVISIBLE);
         headerBackground.setColorFilter(new LightingColorFilter(0xff828282, 0x000000));
-        TextView title = header.findViewById(R.id.txtvTitle);
-        TextView author = header.findViewById(R.id.txtvAuthor);
+        TextView title = findViewById(R.id.txtvTitle);
+        TextView author = findViewById(R.id.txtvAuthor);
+        Spinner spAlternateUrls = findViewById(R.id.spinnerAlternateUrls);
+
+        View header = View.inflate(this, R.layout.onlinefeedview_header, null);
+        listView.addHeaderView(header);
         TextView description = header.findViewById(R.id.txtvDescription);
-        Spinner spAlternateUrls = header.findViewById(R.id.spinnerAlternateUrls);
 
-        subscribeButton = header.findViewById(R.id.butSubscribe);
+        subscribeButton = findViewById(R.id.butSubscribe);
 
         if (StringUtils.isNotBlank(feed.getImageUrl())) {
             Glide.with(this)
diff --git a/app/src/main/res/layout/onlinefeedview_activity.xml b/app/src/main/res/layout/onlinefeedview_activity.xml
index b55993fcf..4ed8a0341 100644
--- a/app/src/main/res/layout/onlinefeedview_activity.xml
+++ b/app/src/main/res/layout/onlinefeedview_activity.xml
@@ -9,7 +9,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:cardCornerRadius="4dp"
-            android:layout_margin="16dp"
+            android:layout_margin="32dp"
             android:elevation="16dp">
 
         <FrameLayout
@@ -23,10 +23,40 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/progressBar"
                     android:layout_gravity="center"/>
-            <ListView
-                    android:id="@+id/listview"
+
+            <LinearLayout
+                    android:id="@+id/feedDisplay"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                <include layout="@layout/feeditemlist_header"/>
+
+                <Spinner
+                        android:id="@+id/spinnerAlternateUrls"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginTop="8dp"
+                        android:padding="8dp"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:textSize="@dimen/text_size_micro"/>
+
+                <Button
+                        android:id="@+id/butSubscribe"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="16dp"
+                        android:focusable="false"
+                        android:text="@string/subscribe_label"/>
+
+                <ListView
+                        android:id="@+id/listview"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"/>
+
+            </LinearLayout>
 
         </FrameLayout>
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/onlinefeedview_header.xml b/app/src/main/res/layout/onlinefeedview_header.xml
index 20fbb8026..aa690e142 100644
--- a/app/src/main/res/layout/onlinefeedview_header.xml
+++ b/app/src/main/res/layout/onlinefeedview_header.xml
@@ -6,27 +6,6 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent">
 
-    <include layout="@layout/feeditemlist_header"/>
-
-    <Spinner
-            android:id="@+id/spinnerAlternateUrls"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginTop="8dp"
-            android:padding="8dp"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/text_size_micro"/>
-
-    <Button
-            android:id="@+id/butSubscribe"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:focusable="false"
-            android:text="@string/subscribe_label"/>
-
     <TextView
             android:id="@+id/txtvDescription"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml
index a80b9381a..561eadf45 100644
--- a/app/src/main/res/layout/quick_feed_discovery.xml
+++ b/app/src/main/res/layout/quick_feed_discovery.xml
@@ -52,8 +52,6 @@
                     android:numColumns="4"
                     app:layout_columnWeight="1"
                     app:layout_rowWeight="1"
-                    android:horizontalSpacing="4dp"
-                    android:verticalSpacing="4dp"
                     android:scrollbars="none"
                     android:layout_marginTop="8dp"
                     android:layout_centerInParent="true"
diff --git a/app/src/main/res/layout/quick_feed_discovery_item.xml b/app/src/main/res/layout/quick_feed_discovery_item.xml
index 6b0c98013..3a0fe0b4b 100644
--- a/app/src/main/res/layout/quick_feed_discovery_item.xml
+++ b/app/src/main/res/layout/quick_feed_discovery_item.xml
@@ -2,12 +2,16 @@
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:padding="4dp"
+        android:clipToPadding="false">
 
     <de.danoeh.antennapod.view.SquareImageView
             android:id="@+id/discovery_cover"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:elevation="4dp"
+            android:outlineProvider="bounds"
             android:foreground="?android:attr/selectableItemBackground"/>
 
 </LinearLayout>
diff --git a/core/src/main/res/values-v21/styles.xml b/core/src/main/res/values-v21/styles.xml
index c53000c4f..54951b9ec 100644
--- a/core/src/main/res/values-v21/styles.xml
+++ b/core/src/main/res/values-v21/styles.xml
@@ -20,7 +20,8 @@
         <item name="android:colorPrimaryDark">@color/black</item>
     </style>
 
-    <style name="Widget.AntennaPod.Button" parent="Widget.AppCompat.Button">
+    <style name="Widget.AntennaPod.Button" parent="Widget.AppCompat.Button.Colored">
+        <item name="colorButtonNormal">@color/antennapod_blue</item>
         <item name="textAllCaps">true</item>
     </style>
 
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index e3f351d05..476ad247a 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -304,7 +304,8 @@
         <item name="android:textAllCaps">true</item>
     </style>
 
-    <style name="Widget.AntennaPod.Button" parent="Widget.AppCompat.Button">
+    <style name="Widget.AntennaPod.Button" parent="Widget.AppCompat.Button.Colored">
+        <item name="colorButtonNormal">@color/antennapod_blue</item>
         <item name="textAllCaps">false</item>
     </style>