Merge branch 'develop' into folders

22 files changed, 396 insertions, 324 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/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml
index 3b065cefc..f77e96338 100644
--- a/app/src/main/res/layout/audioplayer_fragment.xml
+++ b/app/src/main/res/layout/audioplayer_fragment.xml
@@ -51,6 +51,34 @@
             app:tint="?android:attr/windowBackground"
             android:importantForAccessibility="no"/>
 
+    <androidx.cardview.widget.CardView
+            android:id="@+id/cardViewSeek"
+            android:alpha="0"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/pager"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="12dp"
+            app:cardCornerRadius="8dp"
+            app:cardBackgroundColor="?attr/seek_background"
+            app:cardElevation="0dp"
+            tools:alpha="1">
+
+        <TextView
+                android:id="@+id/txtvSeek"
+                android:gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="24dp"
+                android:paddingTop="4dp"
+                android:paddingRight="24dp"
+                android:paddingBottom="4dp"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                tools:text="1:06:29" />
+
+    </androidx.cardview.widget.CardView>
+
     <LinearLayout
             android:id="@+id/playtime_layout"
             android:layout_width="match_parent"
@@ -60,7 +88,7 @@
             android:layoutDirection="ltr"
             android:orientation="vertical">
 
-        <SeekBar
+        <de.danoeh.antennapod.view.ChapterSeekBar
                 android:id="@+id/sbPosition"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -128,7 +156,7 @@
                     android:scaleType="fitCenter"
                     tools:srcCompat="@drawable/ic_av_play_white_24dp"/>
 
-            <de.danoeh.antennapod.view.CircularProgressBar
+            <de.danoeh.antennapod.ui.common.CircularProgressBar
                     android:layout_width="@dimen/audioplayer_playercontrols_length_big"
                     android:layout_height="@dimen/audioplayer_playercontrols_length_big"
                     android:layout_marginLeft="16dp"
@@ -136,7 +164,8 @@
                     android:layout_marginRight="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_centerHorizontal="true"
-                    android:layout_centerVertical="true"/>
+                    android:layout_centerVertical="true"
+                    app:foregroundColor="?attr/action_icon_color"/>
 
             <ProgressBar
                     style="?android:attr/progressBarStyle"
@@ -177,7 +206,7 @@
                     android:textColor="?android:attr/textColorSecondary"
                     android:clickable="false"/>
 
-            <de.danoeh.antennapod.view.PlaybackSpeedIndicatorView
+            <de.danoeh.antennapod.ui.common.PlaybackSpeedIndicatorView
                     android:id="@+id/butPlaybackSpeed"
                     android:layout_width="@dimen/audioplayer_playercontrols_length"
                     android:layout_height="@dimen/audioplayer_playercontrols_length"
@@ -186,7 +215,8 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/playback_speed"
-                    tools:srcCompat="@drawable/ic_playback_speed_white"/>
+                    tools:srcCompat="@drawable/ic_playback_speed_white"
+                    app:foregroundColor="?attr/action_icon_color"/>
 
             <TextView
                     android:id="@+id/txtvPlaybackSpeed"
diff --git a/app/src/main/res/layout/authentication_dialog.xml b/app/src/main/res/layout/authentication_dialog.xml
index 9c6f3e2bb..f311fc1dd 100644
--- a/app/src/main/res/layout/authentication_dialog.xml
+++ b/app/src/main/res/layout/authentication_dialog.xml
@@ -1,30 +1,59 @@
 <?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" >
-
-    <EditText
-        android:id="@+id/etxtUsername"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_margin="16dp"
-        android:hint="@string/username_label"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:cursorVisible="true"/>
-
-    <EditText
-        android:id="@+id/etxtPassword"
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_margin="16dp"
-        android:inputType="textPassword"
-        android:hint="@string/password_label"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:cursorVisible="true"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+    <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp">
+
+        <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/usernameEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/username_label"
+                android:lines="1"/>
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+
+            <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/passwordEditText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/password_label"
+                    android:inputType="textPassword"
+                    android:lines="1"/>
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.joanzapata.iconify.widget.IconTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/showPasswordButton"
+                android:text="{fa-eye}"
+                android:padding="8dp"
+                android:textColor="?android:attr/textColorPrimary"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:alpha="0.6"
+                android:textSize="20sp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"/>
 
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml
index 5460d0609..0ec46cbcd 100644
--- a/app/src/main/res/layout/cover_fragment.xml
+++ b/app/src/main/res/layout/cover_fragment.xml
@@ -10,7 +10,7 @@
     android:padding="8dp"
     android:gravity="center">
 
-    <de.danoeh.antennapod.view.SquareImageView
+    <de.danoeh.antennapod.ui.common.SquareImageView
         android:id="@+id/imgvCover"
         android:layout_width="0dp"
         android:layout_height="200dp"
diff --git a/app/src/main/res/layout/download_authentication_activity.xml b/app/src/main/res/layout/download_authentication_activity.xml
deleted file mode 100644
index e16a8b3a8..000000000
--- a/app/src/main/res/layout/download_authentication_activity.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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:padding="16dp">
-
-    <TextView
-            android:id="@+id/txtvTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/authentication_notification_title"
-            android:textSize="@dimen/text_size_large"
-            android:textColor="?android:attr/textColorPrimary"/>
-
-    <TextView
-            android:id="@+id/txtvDescription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/authentication_notification_msg"
-            android:textColor="?android:attr/textColorSecondary"/>
-
-    <EditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/etxtUsername"
-            android:hint="@string/username_label"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:cursorVisible="true"/>
-
-    <EditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/etxtPassword"
-            android:hint="@string/password_label"
-            android:inputType="textPassword"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:cursorVisible="true"/>
-
-    <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="48dp"
-            android:orientation="horizontal"
-            android:gravity="end">
-
-        <Button
-                android:id="@+id/butCancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/cancel_label"
-                style="@style/Widget.MaterialComponents.Button.TextButton"/>
-
-        <Button
-                android:id="@+id/butConfirm"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/confirm_label"
-                style="@style/Widget.MaterialComponents.Button.TextButton"/>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/downloadlog_item.xml b/app/src/main/res/layout/downloadlog_item.xml
index 5cde763a0..60c916cdc 100644
--- a/app/src/main/res/layout/downloadlog_item.xml
+++ b/app/src/main/res/layout/downloadlog_item.xml
@@ -83,6 +83,14 @@
                 android:textColor="?android:attr/textColorSecondary"
                 tools:text="@string/design_time_downloaded_log_failure_reason"/>
 
+        <TextView
+                android:id="@+id/txtvTapForDetails"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textColor="?android:attr/textColorSecondary"
+                android:text="@string/download_error_tap_for_details"/>
+
     </LinearLayout>
 
     <include layout="@layout/secondary_action"/>
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index 005702c59..2b59845f7 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -94,17 +94,6 @@
 
     </LinearLayout>
 
-    <TextView
-            android:id="@+id/txtvInformation"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="2dp"
-            android:background="?android:attr/windowBackground"
-            android:visibility="gone"
-            android:gravity="center"
-            tools:visibility="visible"
-            tools:text="(i) Information"/>
-
     <com.joanzapata.iconify.widget.IconTextView
             android:id="@+id/txtvFailure"
             android:layout_width="match_parent"
@@ -117,4 +106,15 @@
             android:text="@string/refresh_failed_msg"
             tools:visibility="visible"
             tools:text="(!) Last refresh failed"/>
+
+    <TextView
+            android:id="@+id/txtvInformation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="2dp"
+            android:background="?android:attr/windowBackground"
+            android:visibility="gone"
+            android:gravity="center"
+            tools:visibility="visible"
+            tools:text="(i) Information"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml
index a8ae5743e..e1f382e46 100644
--- a/app/src/main/res/layout/feeditemlist_item.xml
+++ b/app/src/main/res/layout/feeditemlist_item.xml
@@ -145,6 +145,7 @@
                         android:layout_marginRight="4dp"
                         android:layout_marginEnd="4dp"
                         android:text="·"
+                        android:importantForAccessibility="no"
                         tools:background="@android:color/holo_blue_light"/>
 
                 <TextView
@@ -163,6 +164,7 @@
                         android:layout_marginRight="4dp"
                         android:layout_marginEnd="4dp"
                         android:text="·"
+                        android:importantForAccessibility="no"
                         tools:background="@android:color/holo_blue_light"/>
 
                 <TextView
diff --git a/app/src/main/res/layout/filter_dialog_row.xml b/app/src/main/res/layout/filter_dialog_row.xml
index 5011812d9..914525387 100644
--- a/app/src/main/res/layout/filter_dialog_row.xml
+++ b/app/src/main/res/layout/filter_dialog_row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<de.danoeh.antennapod.view.RecursiveRadioGroup
+<de.danoeh.antennapod.ui.common.RecursiveRadioGroup
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -58,4 +58,4 @@
         android:layout_gravity="center_vertical"
         android:checked="true" />
 
-</de.danoeh.antennapod.view.RecursiveRadioGroup>
+</de.danoeh.antennapod.ui.common.RecursiveRadioGroup>
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..9fcf67cff 100644
--- a/app/src/main/res/layout/gpodnetauth_credentials.xml
+++ b/app/src/main/res/layout/gpodnetauth_credentials.xml
@@ -1,96 +1,106 @@
 <?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">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginBottom="8dp">
+
+        <ImageView
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:src="@drawable/gpodder_icon"/>
+
+        <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>
 
     <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"/>
+            android:id="@+id/createAccountWarning"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/gpodnetauth_encryption_warning"
+            android:textColor="#F44336"
+            android:textStyle="bold"
+            android:visibility="invisible" />
 
-    <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"/>
+    <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <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"/>
+        <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"/>
 
-    <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>
 
-    <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.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <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.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"/>
 
-    <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>
+
+    <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>
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 dd720afed..9ef3db180 100644
--- a/app/src/main/res/layout/quick_feed_discovery.xml
+++ b/app/src/main/res/layout/quick_feed_discovery.xml
@@ -34,7 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-        <de.danoeh.antennapod.view.WrappingGridView
+        <de.danoeh.antennapod.ui.common.WrappingGridView
                 android:id="@+id/discover_grid"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
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 e1c91f9d8..cb03b6677 100644
--- a/app/src/main/res/layout/quick_feed_discovery_item.xml
+++ b/app/src/main/res/layout/quick_feed_discovery_item.xml
@@ -7,7 +7,7 @@
         android:padding="4dp"
         android:clipToPadding="false">
 
-    <de.danoeh.antennapod.view.SquareImageView
+    <de.danoeh.antennapod.ui.common.SquareImageView
             android:id="@+id/discovery_cover"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/searchlist_item_feed.xml b/app/src/main/res/layout/searchlist_item_feed.xml
index 607a3197f..c16911f99 100644
--- a/app/src/main/res/layout/searchlist_item_feed.xml
+++ b/app/src/main/res/layout/searchlist_item_feed.xml
@@ -7,7 +7,7 @@
         android:padding="4dp"
         android:clipToPadding="false">
 
-    <de.danoeh.antennapod.view.SquareImageView
+    <de.danoeh.antennapod.ui.common.SquareImageView
             android:id="@+id/discovery_cover"
             android:layout_width="match_parent"
             android:layout_height="96dp"
diff --git a/app/src/main/res/layout/secondary_action.xml b/app/src/main/res/layout/secondary_action.xml
index 73ca174a6..e5bff480e 100644
--- a/app/src/main/res/layout/secondary_action.xml
+++ b/app/src/main/res/layout/secondary_action.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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="48dp"
              android:layout_height="48dp"
              android:layout_marginRight="12dp"
@@ -19,9 +20,10 @@
             tools:ignore="ContentDescription"
             tools:src="@sample/secondaryaction"/>
 
-    <de.danoeh.antennapod.view.CircularProgressBar
+    <de.danoeh.antennapod.ui.common.CircularProgressBar
             android:id="@+id/secondaryActionProgress"
             android:layout_width="40dp"
             android:layout_gravity="center"
-            android:layout_height="40dp"/>
+            android:layout_height="40dp"
+            app:foregroundColor="?attr/action_icon_color"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/subscription_item.xml b/app/src/main/res/layout/subscription_item.xml
index e0c821868..7fa738f12 100644
--- a/app/src/main/res/layout/subscription_item.xml
+++ b/app/src/main/res/layout/subscription_item.xml
@@ -8,7 +8,7 @@
     android:layout_height="match_parent"
     android:foreground="?attr/selectableItemBackground">
 
-    <de.danoeh.antennapod.view.SquareImageView
+    <de.danoeh.antennapod.ui.common.SquareImageView
         android:id="@+id/imgvCover"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/videoplayer_activity.xml b/app/src/main/res/layout/videoplayer_activity.xml
index c978a1e4d..e0632ef41 100644
--- a/app/src/main/res/layout/videoplayer_activity.xml
+++ b/app/src/main/res/layout/videoplayer_activity.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/black"
     android:orientation="vertical"
     android:id="@+id/videoframe">
@@ -75,6 +76,33 @@
         android:layout_gravity="bottom|center"
         android:orientation="vertical">
 
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cardViewSeek"
+            android:alpha="0"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            android:layout_gravity="center"
+            app:cardCornerRadius="8dp"
+            app:cardBackgroundColor="?attr/seek_background"
+            app:cardElevation="0dp"
+            tools:alpha="1">
+
+            <TextView
+                android:id="@+id/txtvSeek"
+                android:gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="24dp"
+                android:paddingTop="4dp"
+                android:paddingRight="24dp"
+                android:paddingBottom="4dp"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                tools:text="1:06:29" />
+
+        </androidx.cardview.widget.CardView>
+
         <RelativeLayout
             android:id="@+id/timecontrol"
             android:layout_width="match_parent"