From 26e2c0400af45e9f46ba1aac420ea50a24f89661 Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Wed, 21 Feb 2024 09:57:31 +0800
Subject: [PATCH] Change fast scroll support
---
app/build.gradle.kts | 2 ++
.../super12138/todo/views/todo/ToDoFragment.kt | 6 ++++++
app/src/main/res/drawable/line.xml | 18 ------------------
app/src/main/res/drawable/line_drawable.xml | 6 ------
app/src/main/res/drawable/thumb.xml | 16 ----------------
app/src/main/res/drawable/thumb_drawable.xml | 6 ------
app/src/main/res/layout/fragment_todo.xml | 7 +------
7 files changed, 9 insertions(+), 52 deletions(-)
delete mode 100644 app/src/main/res/drawable/line.xml
delete mode 100644 app/src/main/res/drawable/line_drawable.xml
delete mode 100644 app/src/main/res/drawable/thumb.xml
delete mode 100644 app/src/main/res/drawable/thumb_drawable.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c37bfd2..c781010 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -71,6 +71,8 @@ dependencies {
ksp("androidx.room:room-compiler:2.6.1")
// Gson
implementation("com.google.code.gson:gson:2.10.1")
+ // Fast Scroll
+ implementation("me.zhanghai.android.fastscroll:library:1.3.0")
// Test
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
diff --git a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt
index b714676..fb21ec2 100644
--- a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt
@@ -21,6 +21,7 @@ import cn.super12138.todo.logic.model.ToDo
import cn.super12138.todo.views.progress.ProgressFragmentViewModel
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.launch
+import me.zhanghai.android.fastscroll.FastScrollerBuilder
import showToast
import java.util.UUID
@@ -63,6 +64,11 @@ class ToDoFragment : Fragment() {
val adapter = ToDoAdapter(todoList, requireActivity())
binding.todoList.adapter = adapter
+ FastScrollerBuilder(binding.todoList).apply {
+ useMd2Style()
+ build()
+ }
+
if (todoList.isEmpty()) {
todoViewModel.emptyTipVis.value = View.VISIBLE
}
diff --git a/app/src/main/res/drawable/line.xml b/app/src/main/res/drawable/line.xml
deleted file mode 100644
index 97786bd..0000000
--- a/app/src/main/res/drawable/line.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/line_drawable.xml b/app/src/main/res/drawable/line_drawable.xml
deleted file mode 100644
index 5bda4d4..0000000
--- a/app/src/main/res/drawable/line_drawable.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/thumb.xml b/app/src/main/res/drawable/thumb.xml
deleted file mode 100644
index c8542a2..0000000
--- a/app/src/main/res/drawable/thumb.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/thumb_drawable.xml b/app/src/main/res/drawable/thumb_drawable.xml
deleted file mode 100644
index ef2d0e4..0000000
--- a/app/src/main/res/drawable/thumb_drawable.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_todo.xml b/app/src/main/res/layout/fragment_todo.xml
index 807cbdf..e1c0038 100644
--- a/app/src/main/res/layout/fragment_todo.xml
+++ b/app/src/main/res/layout/fragment_todo.xml
@@ -9,12 +9,7 @@
android:id="@+id/todo_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:visibility="gone"
- app:fastScrollEnabled="true"
- app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
- app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
- app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
- app:fastScrollVerticalTrackDrawable="@drawable/line_drawable">
+ android:visibility="gone">