Merge branch 'develop' into add-local-feeds

16 files changed, 149 insertions, 85 deletions

diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index 92569552a..be262094c 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -90,14 +90,9 @@
                     android:id="@+id/btn_add_via_url"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawablePadding="8dp"
                     app:drawableStartCompat="?attr/feed"
                     app:drawableLeftCompat="?attr/feed"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:clickable="true"
+                    style="@style/AddPodcastTextView"
                     android:text="@string/add_podcast_by_url"/>
 
             <TextView
@@ -118,57 +113,46 @@
                     android:id="@+id/btn_search_itunes"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawablePadding="8dp"
                     app:drawableStartCompat="?attr/action_search"
                     app:drawableLeftCompat="?attr/action_search"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:clickable="true"
+                    style="@style/AddPodcastTextView"
                     android:text="@string/search_itunes_label"/>
 
             <TextView
                     android:id="@+id/btn_search_fyyd"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawablePadding="8dp"
                     app:drawableStartCompat="?attr/action_search"
                     app:drawableLeftCompat="?attr/action_search"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:clickable="true"
+                    style="@style/AddPodcastTextView"
                     android:text="@string/search_fyyd_label"/>
 
             <TextView
                     android:id="@+id/btn_search_gpodder"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawablePadding="8dp"
                     app:drawableStartCompat="?attr/action_search"
                     app:drawableLeftCompat="?attr/action_search"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:clickable="true"
+                    style="@style/AddPodcastTextView"
                     android:text="@string/browse_gpoddernet_label"/>
 
             <TextView
+                    android:id="@+id/btn_search_podcastindex"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:drawableStartCompat="?attr/action_search"
+                    app:drawableLeftCompat="?attr/action_search"
+                    style="@style/AddPodcastTextView"
+                    android:text="@string/search_podcastindex_label"/>
+
+            <TextView
                     android:id="@+id/btn_opml_import"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawablePadding="8dp"
                     app:drawableStartCompat="?attr/av_download"
                     app:drawableLeftCompat="?attr/av_download"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:clickable="true"
-                    android:text="@string/opml_import_label"/>
+                    style="@style/AddPodcastTextView"
+                    android:text="@string/opml_add_podcast_label"/>
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml
index 353e4f1d0..3b560967c 100644
--- a/app/src/main/res/layout/all_episodes_fragment.xml
+++ b/app/src/main/res/layout/all_episodes_fragment.xml
@@ -16,19 +16,26 @@
         android:visibility="gone"
         tools:text="(i) Information" />
 
-    <de.danoeh.antennapod.view.EpisodeItemListRecyclerView
-        android:id="@android:id/list"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/txtvInformation"
-        android:layout_marginTop="0dp"
-        android:layout_marginBottom="0dp"
-        android:paddingTop="@dimen/list_vertical_padding"
-        android:paddingBottom="@dimen/list_vertical_padding"
-        android:paddingHorizontal="@dimen/additional_horizontal_spacing"
-        android:layout_above="@id/loadingMore"
-        tools:itemCount="13"
-        tools:listitem="@layout/feeditemlist_item" />
+        android:layout_above="@id/loadingMore">
+
+            <de.danoeh.antennapod.view.EpisodeItemListRecyclerView
+                android:id="@android:id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="0dp"
+                android:layout_marginBottom="0dp"
+                android:paddingTop="@dimen/list_vertical_padding"
+                android:paddingBottom="@dimen/list_vertical_padding"
+                android:paddingHorizontal="@dimen/additional_horizontal_spacing"
+                tools:itemCount="13"
+                tools:listitem="@layout/feeditemlist_item" />
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <ProgressBar
         android:id="@+id/progLoading"
diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml
index 1c2866a1b..225fdd98c 100644
--- a/app/src/main/res/layout/audioplayer_fragment.xml
+++ b/app/src/main/res/layout/audioplayer_fragment.xml
@@ -67,7 +67,8 @@
                 android:max="500"
                 tools:progress="100"
                 android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp" />
+                android:layout_marginRight="8dp"
+                android:clickable="true"/>
 
         <RelativeLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml
index a66a5f5d7..5460d0609 100644
--- a/app/src/main/res/layout/cover_fragment.xml
+++ b/app/src/main/res/layout/cover_fragment.xml
@@ -15,8 +15,9 @@
         android:layout_width="0dp"
         android:layout_height="200dp"
         android:layout_gravity="center"
-        android:layout_marginLeft="64dp"
-        android:layout_marginRight="64dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="8dp"
         android:layout_weight="0"
         android:foreground="?attr/selectableItemBackgroundBorderless"
         android:importantForAccessibility="no"
@@ -29,16 +30,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp">
 
         <TextView
             android:id="@+id/txtvPodcastTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:gravity="center"
+            android:ellipsize="none"
+            android:gravity="center_horizontal"
             android:maxLines="2"
+            android:textSize="@dimen/text_size_small"
             android:textColor="?android:attr/textColorSecondary"
             android:textIsSelectable="true"
             tools:text="Podcast" />
@@ -47,8 +49,9 @@
             android:id="@+id/txtvEpisodeTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:gravity="center"
+            android:ellipsize="none"
+            android:gravity="center_horizontal"
+            android:textSize="@dimen/text_size_small"
             android:maxLines="2"
             android:textColor="?android:attr/textColorPrimary"
             android:textIsSelectable="true"
diff --git a/app/src/main/res/layout/feed_item_list_fragment.xml b/app/src/main/res/layout/feed_item_list_fragment.xml
index b995ff28f..6dc484e2f 100644
--- a/app/src/main/res/layout/feed_item_list_fragment.xml
+++ b/app/src/main/res/layout/feed_item_list_fragment.xml
@@ -48,12 +48,19 @@
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <de.danoeh.antennapod.view.EpisodeItemListRecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingHorizontal="@dimen/additional_horizontal_spacing"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <de.danoeh.antennapod.view.EpisodeItemListRecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingHorizontal="@dimen/additional_horizontal_spacing" />
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <ProgressBar
             android:id="@+id/progLoading"
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index a8845ec27..005702c59 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -24,7 +24,7 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginEnd="16dp"
                 android:importantForAccessibility="no"
-                tools:src="@drawable/ic_antenna"
+                tools:src="@tools:sample/avatars"
                 tools:background="@android:color/holo_green_dark"/>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml
index c2bcced6f..7083365e7 100644
--- a/app/src/main/res/layout/feeditemlist_item.xml
+++ b/app/src/main/res/layout/feeditemlist_item.xml
@@ -45,11 +45,12 @@
             android:id="@+id/coverHolder"
             app:cardBackgroundColor="@color/non_square_icon_background"
             app:cardCornerRadius="4dp"
+            app:cardPreventCornerOverlap="false"
             app:cardElevation="0dp">
 
         <RelativeLayout
-                android:layout_width="@dimen/thumbnail_length_queue_item"
-                android:layout_height="@dimen/thumbnail_length_queue_item">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
             <TextView
                     android:id="@+id/txtvPlaceholder"
diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml
index d82051867..6e00bdf0d 100644
--- a/app/src/main/res/layout/fragment_itunes_search.xml
+++ b/app/src/main/res/layout/fragment_itunes_search.xml
@@ -4,18 +4,35 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <androidx.appcompat.widget.Toolbar
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
-        android:layout_alignParentTop="true"
-        app:navigationIcon="?homeAsUpIndicator"
-        app:title="@string/discover"
-        android:id="@+id/toolbar"/>
+        android:orientation="horizontal"
+        android:id="@+id/browsing"
+        android:layout_alignParentTop="true">
+        <androidx.appcompat.widget.Toolbar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="?attr/actionBarTheme"
+            app:navigationIcon="?homeAsUpIndicator"
+            app:title="@string/discover"
+            android:id="@+id/toolbar"/>
+
+        <android.widget.Spinner
+            android:id="@+id/spinner_country"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|end"
+            android:gravity="right|end"
+            android:isScrollContainer="true"
+            android:minHeight="?attr/actionBarSize"
+            android:spinnerMode="dropdown"
+            android:textAlignment="textEnd" />
+    </LinearLayout>
 
     <GridView
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/browsing"
         android:id="@+id/gridView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index a1a5a26f2..d08e0c501 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -28,17 +28,24 @@
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="@dimen/text_size_small" />
 
-    <GridView
-            android:layout_below="@id/feeds_filtered_message"
-            android:id="@+id/subscriptions_grid"
-            android:layout_width="match_parent"
-            android:numColumns="3"
-            android:horizontalSpacing="2dp"
-            android:verticalSpacing="2dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
-            android:paddingBottom="88dp"
-            android:clipToPadding="false"/>
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipeRefresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/feeds_filtered_message">
+
+        <GridView
+                android:id="@+id/subscriptions_grid"
+                android:layout_width="match_parent"
+                android:numColumns="3"
+                android:horizontalSpacing="2dp"
+                android:verticalSpacing="2dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_horizontal"
+                android:paddingBottom="88dp"
+                android:clipToPadding="false"/>
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <ProgressBar
             android:id="@+id/progLoading"
diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
index 9821f6e17..99991e919 100644
--- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
@@ -23,7 +23,7 @@
             android:importantForAccessibility="no"
             android:cropToPadding="true"
             android:scaleType="fitXY"
-            tools:src="@drawable/ic_antenna"
+            tools:src="@tools:sample/avatars"
             tools:background="@android:color/holo_green_dark"/>
 
 
diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml
index dcf2face6..fe53e1944 100644
--- a/app/src/main/res/layout/itunes_podcast_listitem.xml
+++ b/app/src/main/res/layout/itunes_podcast_listitem.xml
@@ -23,7 +23,7 @@
         android:cropToPadding="true"
         android:scaleType="fitXY"
         tools:background="@android:color/holo_green_dark"
-        tools:src="@drawable/ic_antenna" />
+        tools:src="@tools:sample/avatars" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml
index c26d0b8ed..ed850cc86 100644
--- a/app/src/main/res/layout/nav_list.xml
+++ b/app/src/main/res/layout/nav_list.xml
@@ -71,4 +71,11 @@
         android:paddingTop="8dp"
         android:scrollbarStyle="outsideOverlay"
         tools:listitem="@layout/nav_listitem" />
+
+    <ProgressBar
+        style="?android:attr/progressBarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/progressBar"
+        android:layout_centerVertical="true"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/onlinefeedview_activity.xml b/app/src/main/res/layout/onlinefeedview_activity.xml
index 812933fb1..996db7d36 100644
--- a/app/src/main/res/layout/onlinefeedview_activity.xml
+++ b/app/src/main/res/layout/onlinefeedview_activity.xml
@@ -57,7 +57,7 @@
                             android:layout_marginStart="16dp"
                             android:layout_marginTop="16dp"
                             android:importantForAccessibility="no"
-                            tools:src="@drawable/ic_antenna"/>
+                            tools:src="@tools:sample/avatars"/>
 
                     <TextView
                             android:id="@+id/txtvTitle"
diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml
index b125206c1..0c55311e3 100644
--- a/app/src/main/res/layout/quick_feed_discovery.xml
+++ b/app/src/main/res/layout/quick_feed_discovery.xml
@@ -4,6 +4,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical">
 
     <LinearLayout
@@ -54,12 +55,32 @@
                 android:layout_centerInParent="true"
                 android:layout_marginTop="30dp"/>
 
-        <TextView
+        <LinearLayout
                 android:id="@+id/discover_error"
-                android:textColor="@color/download_failed_red"
                 android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                android:layout_height="wrap_content"/>
+                android:gravity="center"
+                android:orientation="vertical">
+
+            <TextView
+                    android:id="@+id/discover_error_txtV"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:layout_margin="16dp"
+                    android:textSize="@dimen/text_size_small"
+                    tools:text="Error message"
+                    tools:background="@android:color/holo_red_light" />
+
+            <Button
+                    android:id="@+id/discover_error_retry_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:text="@string/retry_label"
+                    tools:background="@android:color/holo_red_light" />
+        </LinearLayout>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/search_fragment.xml b/app/src/main/res/layout/search_fragment.xml
index 0bc663db1..28d4778f7 100644
--- a/app/src/main/res/layout/search_fragment.xml
+++ b/app/src/main/res/layout/search_fragment.xml
@@ -14,6 +14,15 @@
             app:title="@string/search_label"
             android:id="@+id/toolbar"/>
 
+    <com.google.android.material.chip.Chip
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/toolbar"
+            android:id="@+id/feed_title_chip"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="0dp"
+            app:closeIconVisible="true"/>
+
     <ProgressBar
             android:layout_centerInParent="true"
             android:id="@+id/progressBar"
@@ -23,7 +32,7 @@
             android:layout_gravity="center"/>
 
     <androidx.recyclerview.widget.RecyclerView
-            android:layout_below="@id/toolbar"
+            android:layout_below="@id/feed_title_chip"
             android:id="@+id/recyclerViewFeeds"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml
index c41ace58b..5989595e1 100644
--- a/app/src/main/res/layout/statistics_listitem.xml
+++ b/app/src/main/res/layout/statistics_listitem.xml
@@ -21,7 +21,7 @@
             android:adjustViewBounds="true"
             android:cropToPadding="true"
             android:scaleType="fitCenter"
-            tools:src="@drawable/ic_antenna"
+            tools:src="@tools:sample/avatars"
             tools:background="@android:color/holo_green_dark"/>
 
     <TextView