From 91accb6655c8fea9397470da45d6067f92175f1a Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sun, 16 Jul 2023 18:38:54 +0800
Subject: [PATCH] Cleanup all unnecessary easyrv usage, prepare to drop easyrv

---
 .../ehviewer/ui/scene/GalleryListScene.kt     |  3 +-
 .../main/res/layout/dialog_recycler_view.xml  |  2 +-
 app/src/main/res/layout/drawer_list_rv.xml    |  2 +-
 .../res/layout/preference_recyclerview.xml    | 30 -------------------
 4 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 app/src/main/res/layout/preference_recyclerview.xml

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
index 5eb188453..051e16093 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
@@ -83,7 +83,6 @@ import com.hippo.ehviewer.ui.doGalleryInfoAction
 import com.hippo.ehviewer.ui.legacy.AddDeleteDrawable
 import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
 import com.hippo.ehviewer.ui.legacy.BringOutTransition
-import com.hippo.ehviewer.ui.legacy.EasyRecyclerView
 import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
 import com.hippo.ehviewer.ui.legacy.FabLayout
 import com.hippo.ehviewer.ui.legacy.FabLayout.OnClickFabListener
@@ -521,7 +520,7 @@ class GalleryListScene : SearchBarScene() {
 
     private fun showAddQuickSearchDialog(
         adapter: QsDrawerAdapter,
-        recyclerView: EasyRecyclerView,
+        recyclerView: RecyclerView,
         tip: TextView,
     ) {
         val context = context ?: return
diff --git a/app/src/main/res/layout/dialog_recycler_view.xml b/app/src/main/res/layout/dialog_recycler_view.xml
index fd122992d..161f85f52 100644
--- a/app/src/main/res/layout/dialog_recycler_view.xml
+++ b/app/src/main/res/layout/dialog_recycler_view.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<com.hippo.ehviewer.ui.legacy.EasyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Indicating"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/drawer_list_rv.xml b/app/src/main/res/layout/drawer_list_rv.xml
index c3366a08c..54569fd04 100644
--- a/app/src/main/res/layout/drawer_list_rv.xml
+++ b/app/src/main/res/layout/drawer_list_rv.xml
@@ -44,7 +44,7 @@
                 android:layout_gravity="center"
                 android:visibility="gone" />
 
-            <com.hippo.ehviewer.ui.legacy.EasyRecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_view_drawer"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/preference_recyclerview.xml b/app/src/main/res/layout/preference_recyclerview.xml
deleted file mode 100644
index c3de625dd..000000000
--- a/app/src/main/res/layout/preference_recyclerview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2022 Tarsin Norbin
-  ~
-  ~ This file is part of EhViewer
-  ~
-  ~ EhViewer is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published
-  ~ by the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ EhViewer is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with EhViewer.
-  ~ If not, see <https://www.gnu.org/licenses/>.
-  -->
-<com.hippo.ehviewer.ui.legacy.EasyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@android:id/list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:fadeScrollbars="true"
-    android:scrollbarStyle="outsideOverlay"
-    android:scrollbars="vertical"
-    app:fitsSystemWindowsInsets="bottom"
-    tools:ignore="UnusedResources"
-    tools:viewBindingIgnore="true" />