Merge branch 'scrollbar'

quran · Mar 5, 2021 · adfe6ad · adfe6ad
2 parents 689ad20 + c80b797
commit adfe6ad
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/app/src/main/res/drawable/fast_scroll_thumb.xml b/app/src/main/res/drawable/fast_scroll_thumb.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- taken and tweaked from
+https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:recyclerview/recyclerview/src/androidTest/res/drawable/fast_scroll_track_drawable.xml;l=1?q=fast_scroll
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true">
+    <shape android:shape="rectangle">
+      <solid android:color="@color/accent_color" />
+      <size android:width="8dp" android:height="48dp" />
+    </shape>
+  </item>
+
+  <item>
+    <shape android:shape="rectangle">
+      <solid android:color="@color/accent_color_dark" />
+      <size android:width="8dp" android:height="48dp" />
+    </shape>
+  </item>
+</selector>
diff --git a/app/src/main/res/drawable/fast_scroll_track.xml b/app/src/main/res/drawable/fast_scroll_track.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- taken and tweaked from
+https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:recyclerview/recyclerview/src/androidTest/res/drawable/fast_scroll_track_drawable.xml
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <solid android:color="@color/header_background" />
+  <size android:width="8dp" />
+</shape>
diff --git a/app/src/main/res/layout/quran_list.xml b/app/src/main/res/layout/quran_list.xml
@@ -1,15 +1,20 @@
 <?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" >
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/recycler_view"
-	    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler_view"
+    android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:divider="@null"
 		android:dividerHeight="0dp"
-		android:fastScrollEnabled="true"/>
+    app:fastScrollEnabled="true"
+    app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb"
+    app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track"
+    app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb"
+    app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track"/>
 	<TextView android:id="@+id/empty_list"
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"

diff --git a/app/src/main/res/xml/about.xml b/app/src/main/res/xml/about.xml
@@ -214,6 +214,7 @@
           android:action="android.intent.action.VIEW"
           android:data="@string/about_numberPicker_url"/>
     </Preference>
+
   </PreferenceCategory>
 
   <PreferenceCategory