5 files changed, 17 insertions, 14 deletions
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index 3b9c0ffb4..9d14d209a 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -2,7 +2,8 @@
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_height="match_parent" android:layout_width="match_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
@@ -11,6 +12,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="?attr/actionBarTheme"
             app:title="@string/add_feed_label"
+            app:navigationIcon="?homeAsUpIndicator"
             android:id="@+id/toolbar"/>
 
     <androidx.cardview.widget.CardView
@@ -19,8 +21,7 @@
             app:cardCornerRadius="4dp"
             app:cardElevation="4dp"
             android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginTop="16dp">
+            android:layout_marginRight="16dp">
 
         <LinearLayout
                 android:layout_width="match_parent"
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 f2aa395de..b80bab8df 100644
--- a/app/src/main/res/layout/feed_item_list_fragment.xml
+++ b/app/src/main/res/layout/feed_item_list_fragment.xml
@@ -39,17 +39,17 @@
                     android:theme="?attr/actionBarTheme"
                     android:layout_alignParentTop="true"
                     android:id="@+id/toolbar"
+                    app:navigationIcon="?homeAsUpIndicator"
                     app:layout_collapseMode="pin"/>
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <de.danoeh.antennapod.view.NestedScrollingListView
-            android:clipToPadding="false"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:id="@android:id/list" />
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     <ProgressBar
             android:id="@+id/progLoading"
diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml
index 1bc18dc0a..66febc1d0 100644
--- a/app/src/main/res/layout/feeditemlist_item.xml
+++ b/app/src/main/res/layout/feeditemlist_item.xml
@@ -25,6 +25,7 @@
                 android:src="?attr/dragview_background"
                 android:paddingEnd="8dp"
                 android:paddingRight="8dp"
+                android:visibility="gone"
                 tools:src="@drawable/ic_drag_vertical_grey600_48dp"
                 tools:background="@android:color/holo_green_dark"/>
 
diff --git a/app/src/main/res/layout/search_fragment.xml b/app/src/main/res/layout/search_fragment.xml
index e9e59b592..371f94e34 100644
--- a/app/src/main/res/layout/search_fragment.xml
+++ b/app/src/main/res/layout/search_fragment.xml
@@ -22,9 +22,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"/>
 
-    <ListView
+    <androidx.recyclerview.widget.RecyclerView
             android:layout_below="@id/toolbar"
-            android:id="@+id/listview"
+            android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/simple_list_fragment.xml b/app/src/main/res/layout/simple_list_fragment.xml
index 91392d0a4..5bd2925ad 100644
--- a/app/src/main/res/layout/simple_list_fragment.xml
+++ b/app/src/main/res/layout/simple_list_fragment.xml
@@ -11,11 +11,12 @@
             android:layout_alignParentTop="true"
             android:id="@+id/toolbar"/>
 
-    <ListView android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:layout_below="@id/toolbar"
-              android:id="@android:id/list"
-              android:clipToPadding="false"/>
+    <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/toolbar"
+            android:id="@+id/recyclerView"
+            android:clipToPadding="false"/>
 
     <ProgressBar
             android:id="@+id/progLoading"