Merge branch 'develop' into fix_episodes_list_item_loading_b

18 files changed, 330 insertions, 262 deletions

diff --git a/app/src/main/res/layout/activity_widget_config.xml b/app/src/main/res/layout/activity_widget_config.xml
index ca8aba52d..6e31aec0d 100644
--- a/app/src/main/res/layout/activity_widget_config.xml
+++ b/app/src/main/res/layout/activity_widget_config.xml
@@ -22,7 +22,7 @@
             android:id="@+id/widget_config_preview"
             layout="@layout/player_widget"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="96dp"
             android:layout_gravity="center"
             android:layout_margin="16dp" />
     </FrameLayout>
@@ -68,13 +68,38 @@
             android:max="100"
             android:progress="100" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/ckRewind"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Rewind" />
+
+            <CheckBox
+                android:id="@+id/ckFastForward"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Forward" />
+
+            <CheckBox
+                android:id="@+id/ckSkip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Skip" />
+        </LinearLayout>
         <Button
             android:id="@+id/butConfirm"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="@string/widget_create_button" />
-
     </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index ee57fdbed..d6ebd58d7 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -35,11 +35,11 @@
                     android:layout_marginRight="8dp"
                     android:contentDescription="@string/search_podcast_hint"
                     app:srcCompat="?attr/action_search"
-                    android:id="@+id/search_icon"
+                    android:id="@+id/searchButton"
                     android:scaleType="center"/>
 
             <EditText
-                    android:id="@+id/combinedFeedSearchBox"
+                    android:id="@+id/combinedFeedSearchEditText"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -87,7 +87,7 @@
                     android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
-                    android:id="@+id/btn_add_via_url"
+                    android:id="@+id/addViaUrlButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:drawableStartCompat="?attr/feed"
@@ -96,7 +96,7 @@
                     android:text="@string/add_podcast_by_url"/>
 
             <TextView
-                    android:id="@+id/btn_add_local_folder"
+                    android:id="@+id/addLocalFolderButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:drawableStartCompat="?attr/ic_folder"
@@ -105,7 +105,7 @@
                     android:text="@string/add_local_folder"/>
 
             <TextView
-                    android:id="@+id/btn_search_itunes"
+                    android:id="@+id/searchItunesButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:drawableStartCompat="?attr/action_search"
@@ -114,7 +114,7 @@
                     android:text="@string/search_itunes_label"/>
 
             <TextView
-                    android:id="@+id/btn_search_fyyd"
+                    android:id="@+id/searchFyydButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:drawableStartCompat="?attr/action_search"
@@ -123,7 +123,7 @@
                     android:text="@string/search_fyyd_label"/>
 
             <TextView
-                    android:id="@+id/btn_search_gpodder"
+                    android:id="@+id/searchGPodderButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:drawableStartCompat="?attr/action_search"
@@ -132,7 +132,7 @@
                     android:text="@string/browse_gpoddernet_label"/>
 
             <TextView
-                    android:id="@+id/btn_search_podcastindex"
+                    android:id="@+id/searchPodcastIndexButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:drawableStartCompat="?attr/action_search"
@@ -141,7 +141,7 @@
                     android:text="@string/search_podcastindex_label"/>
 
             <TextView
-                    android:id="@+id/btn_opml_import"
+                    android:id="@+id/opmlImportButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:drawableStartCompat="?attr/av_download"
diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml
index 225fdd98c..3b065cefc 100644
--- a/app/src/main/res/layout/audioplayer_fragment.xml
+++ b/app/src/main/res/layout/audioplayer_fragment.xml
@@ -15,15 +15,15 @@
             app:navigationIcon="?homeAsUpIndicator"
             android:id="@+id/toolbar"/>
 
-    <de.danoeh.antennapod.view.PagerIndicatorView
-            android:id="@+id/page_indicator"
-            android:layout_height="16dp"
-            android:layout_width="40dp"
-            android:layout_marginTop="-12dp"
-            android:padding="4dp"
+    <com.google.android.material.tabs.TabLayout
+            android:id="@+id/sliding_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_below="@id/toolbar"
-            android:contentDescription="@string/switch_pages"
-            android:layout_centerHorizontal="true"/>
+            android:background="?android:attr/windowBackground"
+            app:tabBackground="?attr/selectableItemBackground"
+            app:tabMode="fixed"
+            app:tabGravity="fill"/>
 
     <FrameLayout
             android:id="@+id/playerFragment"
@@ -39,7 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_above="@id/playtime_layout"
-            android:layout_below="@id/toolbar"
+            android:layout_below="@id/sliding_tabs"
             android:foreground="?android:windowContentOverlay"
             android:layout_marginBottom="12dp"/>
 
diff --git a/app/src/main/res/layout/bug_report.xml b/app/src/main/res/layout/bug_report.xml
index 1cc9bc9d8..e97e85265 100644
--- a/app/src/main/res/layout/bug_report.xml
+++ b/app/src/main/res/layout/bug_report.xml
@@ -16,12 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-    <Button
-            android:id="@+id/btn_export_logcat"
-            android:text="@string/export_logs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
     <TextView
             android:layout_marginTop="8dp"
             android:id="@+id/crash_report_logs"
diff --git a/app/src/main/res/layout/edit_text_dialog.xml b/app/src/main/res/layout/edit_text_dialog.xml
index 6bf0bc6cb..b442b92ce 100644
--- a/app/src/main/res/layout/edit_text_dialog.xml
+++ b/app/src/main/res/layout/edit_text_dialog.xml
@@ -10,6 +10,6 @@
             android:layout_height="wrap_content"
             android:inputType="text"
             android:ems="10"
-            android:id="@+id/text" />
+            android:id="@+id/urlEditText" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml
index 72effc585..049182803 100644
--- a/app/src/main/res/layout/feeditem_fragment.xml
+++ b/app/src/main/res/layout/feeditem_fragment.xml
@@ -166,6 +166,15 @@
             </LinearLayout>
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/noMediaLabel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:textAlignment="center"
+            android:background="?android:attr/dividerVertical"
+            android:text="@string/no_media_label"/>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
diff --git a/app/src/main/res/layout/filter_dialog.xml b/app/src/main/res/layout/filter_dialog.xml
index 39e9258d9..d700f0365 100644
--- a/app/src/main/res/layout/filter_dialog.xml
+++ b/app/src/main/res/layout/filter_dialog.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingLeft="24dp"
-    android:paddingTop="24dp"
-    android:paddingRight="24dp"
-    android:paddingBottom="8dp">
-
-</LinearLayout>
\ No newline at end of file
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+            android:id="@+id/filter_rows"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="24dp"
+            android:paddingTop="24dp"
+            android:paddingRight="24dp"
+            android:paddingBottom="8dp">
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/filter_dialog_row.xml b/app/src/main/res/layout/filter_dialog_row.xml
index 0863997b3..5011812d9 100644
--- a/app/src/main/res/layout/filter_dialog_row.xml
+++ b/app/src/main/res/layout/filter_dialog_row.xml
@@ -28,7 +28,7 @@
                 android:layout_marginRight="2dp"
                 android:layout_weight="1"
                 android:background="?attr/filter_dialog_button_background"
-                android:button="@android:color/transparent"
+                style="@style/NoButtonRadio"
                 android:foreground="?android:attr/selectableItemBackground"
                 android:checked="false"
                 android:gravity="center"
@@ -40,7 +40,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="?attr/filter_dialog_button_background"
-                android:button="@android:color/transparent"
+                style="@style/NoButtonRadio"
                 android:foreground="?android:attr/selectableItemBackground"
                 android:checked="false"
                 android:gravity="center"
@@ -53,7 +53,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:background="@drawable/ic_filter_close"
-        android:button="@android:color/transparent"
+        style="@style/NoButtonRadio"
         android:foreground="?android:attr/selectableItemBackground"
         android:layout_gravity="center_vertical"
         android:checked="true" />
diff --git a/app/src/main/res/layout/gpodnet_podcast_list.xml b/app/src/main/res/layout/gpodnet_podcast_list.xml
index ae0a400f1..a6918f8d4 100644
--- a/app/src/main/res/layout/gpodnet_podcast_list.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_list.xml
@@ -2,18 +2,9 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.appcompat.widget.Toolbar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
-        app:navigationIcon="?homeAsUpIndicator"
-        android:id="@+id/toolbar"/>
-
     <GridView
         android:id="@+id/gridView"
         android:layout_width="match_parent"
@@ -27,7 +18,7 @@
         android:paddingTop="@dimen/list_vertical_padding"
         android:stretchMode="columnWidth"
         android:verticalSpacing="8dp"
-        android:layout_below="@id/toolbar"
+        android:layout_alignParentTop="true"
         tools:listitem="@layout/gpodnet_podcast_listitem" />
 
     <ProgressBar
diff --git a/app/src/main/res/layout/gpodnetauth_activity.xml b/app/src/main/res/layout/gpodnetauth_activity.xml
deleted file mode 100644
index c096c20cf..000000000
--- a/app/src/main/res/layout/gpodnetauth_activity.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-<ViewFlipper
-    android:id="@+id/viewflipper"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"/>
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml
index 895b0999c..291b98da3 100644
--- a/app/src/main/res/layout/gpodnetauth_credentials.xml
+++ b/app/src/main/res/layout/gpodnetauth_credentials.xml
@@ -1,96 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="16dp">
-
-    <ImageView
-        android:id="@id/icon"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/gpodder_icon" />
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@id/txtvDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/gpodnetauth_login_descr"
-        android:layout_below="@id/icon"
-        android:textSize="@dimen/text_size_medium"
-        android:textColor="?android:attr/textColorPrimary"/>
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginBottom="8dp">
 
-    <EditText
-        android:id="@+id/etxtUsername"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/username_label"
-        android:layout_below="@id/txtvDescription"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:cursorVisible="true"
-        android:maxLines="1"
-        android:inputType="text"
-        android:imeOptions="actionNext|flagNoFullscreen"
-        android:nextFocusForward="@id/etxtPassword"/>
+        <ImageView
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:src="@drawable/gpodder_icon"/>
 
-    <EditText
-        android:id="@+id/etxtPassword"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/password_label"
-        android:layout_below="@id/etxtUsername"
-        android:inputType="textPassword"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:cursorVisible="true"
-        android:imeOptions="actionGo|flagNoFullscreen"
-        android:imeActionLabel="@string/gpodnetauth_login_butLabel"/>
+        <TextView
+                android:id="@+id/createAccountButton"
+                android:layout_width="0dp"
+                android:textAlignment="textEnd"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:textColor="?colorAccent"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical|end"
+                android:text="@string/create_account"/>
+    </LinearLayout>
 
-    <Button
-        android:id="@+id/butLogin"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/etxtPassword"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:text="@string/gpodnetauth_login_butLabel"/>
+    <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/txtvError"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/etxtPassword"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_toLeftOf="@id/butLogin"
-        android:layout_toStartOf="@id/butLogin"
-        android:textColor="@color/download_failed_red"
-        android:textSize="@dimen/text_size_small"
-        android:maxLines="2"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:layout_margin="16dp"
-        tools:text="Error message"
-        tools:background="@android:color/holo_green_dark" />
+        <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/etxtUsername"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/username_label"
+                android:lines="1"
+                android:imeOptions="actionNext|flagNoFullscreen"/>
 
-    <ProgressBar
-        android:id="@+id/progBarLogin"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_alignTop="@+id/butLogin"
-        android:layout_toLeftOf="@+id/butLogin"
-        android:layout_toStartOf="@+id/butLogin"/>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/text_size_medium"
-        android:textColor="?android:attr/textColorPrimary"
-        android:layout_marginTop="16dp"
-        android:text="@string/gpodnetauth_login_register"
-        android:autoLink="web"
-        android:layout_below="@id/butLogin"/>
-</RelativeLayout>
\ No newline at end of file
+    <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/etxtPassword"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/password_label"
+                android:inputType="textPassword"
+                android:lines="1"
+                android:imeOptions="actionNext|flagNoFullscreen"
+                android:imeActionLabel="@string/gpodnetauth_login_butLabel"/>
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="end|center_vertical">
+
+        <TextView
+                android:id="@+id/credentialsError"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:textColor="@color/download_failed_red"
+                android:textSize="@dimen/text_size_small"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:gravity="center"
+                tools:text="Error message"
+                tools:background="@android:color/holo_green_dark"/>
+
+        <ProgressBar
+                android:id="@+id/progBarLogin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:layout_gravity="right"/>
+
+        <Button
+                android:id="@+id/butLogin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/gpodnetauth_login_butLabel"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gpodnetauth_device.xml b/app/src/main/res/layout/gpodnetauth_device.xml
index 7837121e1..656ba0889 100644
--- a/app/src/main/res/layout/gpodnetauth_device.xml
+++ b/app/src/main/res/layout/gpodnetauth_device.xml
@@ -1,114 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="16dp">
-
-    <TextView
-        android:id="@+id/txtvTitle"
-        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/gpodnetauth_device_title"
-        android:layout_alignParentTop="true"
-        android:layout_marginBottom="16dp"
-        style="@style/AntennaPod.TextView.Heading"/>
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/txtvDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/gpodnetauth_device_descr"
-        android:layout_below="@id/txtvTitle"
-        android:textSize="@dimen/text_size_medium"
-        android:textColor="?android:attr/textColorPrimary"/>
-
-    <EditText
-        android:id="@+id/etxtCaption"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/gpodnetauth_device_caption"
-        android:layout_below="@id/txtvDescription"
-        android:imeOptions="flagNoFullscreen"/>
+    <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/txtvDeviceID"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/gpodnetauth_device_deviceID"
-        android:textSize="@dimen/text_size_medium"
-        android:layout_below="@id/etxtCaption"/>
+        <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/deviceName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/gpodnetauth_device_name"
+                android:lines="1"
+                android:imeOptions="actionNext|flagNoFullscreen"/>
 
-    <EditText
-        android:id="@+id/etxtDeviceID"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txtvDeviceID"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:imeOptions="flagNoFullscreen"/>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <Button
-        android:id="@+id/butCreateNewDevice"
-        android:layout_width="wrap_content"
+            android:id="@+id/createDeviceButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|end"
+            android:text="@string/gpodnetauth_create_device"/>
+
+    <TextView
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@id/etxtDeviceID"
-        android:text="@string/gpodnetauth_device_butCreateNewDevice"/>
+        style="@style/AntennaPod.TextView.Heading"
+        android:layout_marginTop="16dp"
+        android:text="@string/gpodnetauth_existing_devices"/>
 
     <TextView
-        android:id="@+id/txtvError"
-        android:layout_width="0dp"
+        android:id="@+id/deviceSelectError"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_below="@id/etxtDeviceID"
-        android:layout_toLeftOf="@id/butCreateNewDevice"
-        android:layout_toStartOf="@id/butCreateNewDevice"
         android:textColor="@color/download_failed_red"
         android:textSize="@dimen/text_size_small"
+        android:visibility="gone"
         tools:text="Error message"
         tools:background="@android:color/holo_green_dark" />
 
-    <ProgressBar
-        android:id="@+id/progbarCreateDevice"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@id/butCreateNewDevice"
-        android:layout_toLeftOf="@id/butCreateNewDevice"
-        android:layout_toStartOf="@id/butCreateNewDevice"
-        android:textColor="@color/download_failed_red"
-        android:textSize="@dimen/text_size_medium"
-        android:visibility="gone"
-        />
-
-    <TextView
-        android:id="@+id/txtvChooseExistingDevice"
+    <LinearLayout
+        android:id="@+id/devicesContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/gpodnetauth_device_chooseExistingDevice"
-        android:layout_below="@id/butCreateNewDevice"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="@dimen/text_size_medium"
-        android:layout_marginTop="32dp"/>
+        android:orientation="vertical" />
 
-    <Button
-        android:id="@+id/butChooseExistingDevice"
+    <ProgressBar
+        android:id="@+id/progbarCreateDevice"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/gpodnetauth_device_butChoose"
-        android:layout_below="@+id/spinnerChooseDevice"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"/>
-
-    <Spinner
-        android:id="@+id/spinnerChooseDevice"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txtvChooseExistingDevice"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"/>
+        android:textColor="@color/download_failed_red"
+        android:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gpodnetauth_device_row.xml b/app/src/main/res/layout/gpodnetauth_device_row.xml
new file mode 100644
index 000000000..d39c00571
--- /dev/null
+++ b/app/src/main/res/layout/gpodnetauth_device_row.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp">
+
+    <Button
+            android:id="@+id/selectDeviceButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="?attr/materialButtonOutlinedStyle" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gpodnetauth_dialog.xml b/app/src/main/res/layout/gpodnetauth_dialog.xml
new file mode 100644
index 000000000..a70b76a49
--- /dev/null
+++ b/app/src/main/res/layout/gpodnetauth_dialog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:clipToPadding="false">
+    <ViewFlipper
+        android:id="@+id/viewflipper"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inAnimation="@anim/slide_right_in"
+        android:outAnimation="@anim/slide_left_out">
+
+        <include layout="@layout/gpodnetauth_host" />
+        <include layout="@layout/gpodnetauth_credentials" />
+        <include layout="@layout/gpodnetauth_device" />
+        <include layout="@layout/gpodnetauth_finish" />
+
+    </ViewFlipper>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gpodnetauth_finish.xml b/app/src/main/res/layout/gpodnetauth_finish.xml
index fdaa0d5d0..f0bcfd4dc 100644
--- a/app/src/main/res/layout/gpodnetauth_finish.xml
+++ b/app/src/main/res/layout/gpodnetauth_finish.xml
@@ -1,46 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dp">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <ImageView
         android:id="@id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
         android:src="@drawable/gpodder_icon" />
 
     <TextView
-        android:id="@+id/txtvTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/icon"
-        android:text="@string/gpodnetauth_finish_title"
-        style="@style/AntennaPod.TextView.Heading"/>
-
-    <TextView
         android:id="@+id/txtvDescription"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/gpodnetauth_finish_descr"
-        android:layout_below="@id/txtvTitle"
-        android:textSize="@dimen/text_size_medium"
         android:textColor="?android:attr/textColorPrimary" />
 
     <Button
         android:id="@+id/butSyncNow"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/txtvDescription"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:text="@string/gpodnetauth_finish_butsyncnow"/>
 
-    <Button
-        android:id="@+id/butGoMainscreen"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/butSyncNow"
-        android:text="@string/gpodnetauth_finish_butgomainscreen"/>
-
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gpodnetauth_host.xml b/app/src/main/res/layout/gpodnetauth_host.xml
new file mode 100644
index 000000000..52c5fdb5d
--- /dev/null
+++ b/app/src/main/res/layout/gpodnetauth_host.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+    <RadioGroup
+            android:id="@+id/serverRadioGroup"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+        <RadioButton
+                android:id="@+id/officialServerRadio"
+                android:text="@string/gpodnetauth_server_official"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="true"/>
+        <RadioButton
+                android:id="@+id/customServerRadio"
+                android:text="@string/gpodnetauth_server_custom"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+    </RadioGroup>
+
+    <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/serverUrlTextInput"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/serverUrlText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/gpodnetauth_host"
+                android:inputType="textNoSuggestions"
+                android:lines="1"
+                android:imeOptions="actionNext|flagNoFullscreen" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Button
+            android:id="@+id/chooseHostButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|end"
+            android:text="@string/gpodnetauth_select_server"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml
index 0c55311e3..dd720afed 100644
--- a/app/src/main/res/layout/quick_feed_discovery.xml
+++ b/app/src/main/res/layout/quick_feed_discovery.xml
@@ -23,7 +23,7 @@
         <Button
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:minHeight="0dp"
+                android:minHeight="48dp"
                 android:minWidth="0dp"
                 android:text="@string/discover_more"
                 style="@style/Widget.MaterialComponents.Button.TextButton"
@@ -85,6 +85,7 @@
     </RelativeLayout>
 
     <TextView
+            android:id="@+id/discover_powered_by_itunes"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?android:attr/textColorTertiary"
diff --git a/app/src/main/res/layout/time_dialog.xml b/app/src/main/res/layout/time_dialog.xml
index 6523bb1be..6b6ab3195 100644
--- a/app/src/main/res/layout/time_dialog.xml
+++ b/app/src/main/res/layout/time_dialog.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
+              xmlns:tools="http://schemas.android.com/tools"
               android:orientation="vertical"
               android:gravity="center"
               android:padding="16dp">
@@ -52,10 +53,11 @@
         <TextView
                 android:text="00:00:00"
                 android:layout_gravity="center"
+                android:gravity="center"
                 android:textSize="32sp"
                 android:textColor="?android:attr/textColorPrimary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:id="@+id/time"/>
 
         <Button
@@ -64,6 +66,45 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/disableSleeptimerButton"/>
 
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+            <Button
+                    android:id="@+id/extendSleepFiveMinutesButton"
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="4dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_weight="1"
+                    android:padding="5dp"
+                    tools:text="+5 min" />
+
+            <Button
+                    android:id="@+id/extendSleepTenMinutesButton"
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:layout_weight="1"
+                    tools:text="+10 min" />
+
+            <Button
+                    android:id="@+id/extendSleepTwentyMinutesButton"
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_weight="1"
+                    tools:text="+20 min" />
+
+        </LinearLayout>
+
     </LinearLayout>
 
 
@@ -93,4 +134,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>