App built

.idea/jarRepositories.xml

@@ -56,5 +56,10 @@
       <option name="name" value="MavenLocal" />
       <option name="url" value="file:/$USER_HOME$/.m2/repository/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:/$USER_HOME$/.m2/repository" />
+    </remote-repository>
   </component>
 </project>

app/build.gradle

@@ -14,13 +14,13 @@ if (file("google-services.json").exists() && file("src/debug/google-services.jso
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 57
-        versionName "5.0-beta4"
+        versionName "5.0-beta7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -63,7 +63,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC-HOTFIX1"
+    //implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'androidx.preference:preference:1.1.1'
@@ -78,6 +78,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-perf:19.0.8'
     implementation 'com.github.arimorty:floatingsearchview:2.1.1'
     implementation 'com.github.clans:fab:1.6.4'
+    //implementation 'com.quiph.ui:recyclerviewfastscroller:0.2.1'
     //noinspection GradleDependency
     implementation 'com.squareup.okhttp3:okhttp:3.12.12'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
@@ -96,10 +97,10 @@ dependencies {
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
     //implementation 'com.andrognito.pinlockview:pinlockview:2.1.0'
     implementation "ru.noties.markwon:core:3.1.0"
-    implementation ("xyz.quaver:libpupil:1.3") {
+    implementation ("xyz.quaver:libpupil:1.5") {
         exclude group: 'org.jetbrains.kotlinx', module: 'kotlinx-serialization-core-jvm'
     }
-    implementation "xyz.quaver:documentfilex:0.2.14-alpha2"
+    implementation "xyz.quaver:documentfilex:0.2.15"
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test:rules:1.3.0'

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "properties": [],
       "versionCode": 57,
-      "versionName": "5.0-beta4",
+      "versionName": "5.0-beta7",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

app/src/main/java/xyz/quaver/pupil/Pupil.kt

@@ -97,7 +97,7 @@ class Pupil : Application() {
 
         try {
             Preferences.get<String>("download_folder").also {
-                if (Build.VERSION.SDK_INT > 19)
+                if (it.startsWith("content") && Build.VERSION.SDK_INT > 19)
                     contentResolver.takePersistableUriPermission(
                         Uri.parse(it),
                         Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION

app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt

@@ -19,9 +19,6 @@
 package xyz.quaver.pupil.adapters
 
 import android.content.Context
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.Drawable
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
@@ -29,7 +26,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
@@ -43,7 +39,6 @@ import com.bumptech.glide.request.target.Target
 import com.daimajia.swipe.SwipeLayout
 import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
-import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt

@@ -40,9 +40,7 @@ import xyz.quaver.Code
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.hitomi.getReferer
 import xyz.quaver.hitomi.imageUrlFromImage
-import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.hiyobi.user_agent
 import xyz.quaver.io.util.readBytes
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.services.DownloadService
@@ -116,10 +114,7 @@ class ReaderAdapter(private val activity: ReaderActivity,
                         )
                     , LazyHeaders.Builder().addHeader("Referer", getReferer(galleryID)).build())
                 Code.HIYOBI ->
-                    GlideUrl(createImgList(galleryID, reader!!, lowQuality)[position].path, LazyHeaders.Builder()
-                        .addHeader("User-Agent", user_agent)
-                        .addHeader("Cookie", cookie)
-                        .build())
+                    GlideUrl(createImgList(galleryID, reader!!, lowQuality)[position].path)
                 else -> null
             }
             holder.view.image.post {

app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt

@@ -307,13 +307,18 @@ class DownloadService : Service() {
             return@launch
         }
 
-        if (progress.indexOfKey(galleryID) < 0)
-            progress.put(galleryID, MutableList(reader.galleryInfo.files.size) { 0F })
+        progress.put(galleryID, MutableList(reader.galleryInfo.files.size) { 0F })
 
         cache.metadata.imageList?.forEachIndexed { index, image ->
             progress[galleryID]?.set(index, if (image != null) Float.POSITIVE_INFINITY else 0F)
         }
 
+        if (isCompleted(galleryID)) {
+            notificationManager.cancel(galleryID)
+            startId?.let { stopSelf(it) }
+            return@launch
+        }
+
         notification[galleryID]?.setContentTitle(reader.galleryInfo.title?.ellipsize(30))
         notify(galleryID)
 

app/src/main/java/xyz/quaver/pupil/types/Tags.kt

@@ -19,7 +19,6 @@
 package xyz.quaver.pupil.types
 
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 
 @Serializable
 data class Tag(val area: String?, val tag: String, val isNegative: Boolean = false) {

app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt

@@ -981,7 +981,7 @@ class MainActivity : AppCompatActivity() {
 
         if (query.isNotEmpty() && mode != Mode.SEARCH) {
             Snackbar.make(this@MainActivity.main_recyclerview, R.string.search_all, Snackbar.LENGTH_SHORT).apply {
-                setAction(android.R.string.yes) {
+                setAction(android.R.string.ok) {
                     cancelFetch()
                     clearGalleries()
                     currentPage = 0

app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt

@@ -196,8 +196,8 @@ class ReaderActivity : AppCompatActivity() {
         return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when(item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when(item.itemId) {
             R.id.reader_menu_page_indicator -> {
                 val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, reader_layout, false)
                 with(view.dialog_number_picker) {

app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt

@@ -22,23 +22,19 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.settings_activity.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import net.rdrei.android.dirchooser.DirectoryChooserActivity
-import xyz.quaver.io.FileX
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.ui.fragment.LockSettingsFragment
 import xyz.quaver.pupil.ui.fragment.SettingsFragment
-import xyz.quaver.pupil.util.*
-import java.io.File
+import xyz.quaver.pupil.util.Preferences
+import xyz.quaver.pupil.util.normalizeID
 import java.nio.charset.Charset
 
 class SettingsActivity : AppCompatActivity() {
@@ -68,8 +64,8 @@ class SettingsActivity : AppCompatActivity() {
         super.onResume()
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
             android.R.id.home -> onBackPressed()
         }
 

app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt

@@ -74,11 +74,11 @@ class LockSettingsFragment : PreferenceFragmentCompat() {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_lock_remove_message)
 
-                        setPositiveButton(android.R.string.yes) { _, _ ->
+                        setPositiveButton(android.R.string.ok) { _, _ ->
                             lockManager.remove(Lock.Type.PATTERN)
                             onResume()
                         }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 } else {
                     val intent = Intent(requireContext(), LockActivity::class.java).apply {
@@ -107,11 +107,11 @@ class LockSettingsFragment : PreferenceFragmentCompat() {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_lock_remove_message)
 
-                        setPositiveButton(android.R.string.yes) { _, _ ->
+                        setPositiveButton(android.R.string.ok) { _, _ ->
                             lockManager.remove(Lock.Type.PIN)
                             onResume()
                         }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 } else {
                     val intent = Intent(requireContext(), LockActivity::class.java).apply {

app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt

@@ -57,7 +57,7 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                     AlertDialog.Builder(context).apply {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_clear_cache_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
+                        setPositiveButton(android.R.string.ok) { _, _ ->
                             if (dir.exists())
                                 dir.deleteRecursively()
 
@@ -74,7 +74,7 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                                 }
                             }
                         }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 }
                 "delete_downloads" -> {
@@ -83,7 +83,7 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                     AlertDialog.Builder(context).apply {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_clear_downloads_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
+                        setPositiveButton(android.R.string.ok) { _, _ ->
                             CoroutineScope(Dispatchers.IO).launch {
                                 job?.cancel()
                                 launch(Dispatchers.Main) {
@@ -109,18 +109,18 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                                 }
                             }
                         }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 }
                 "clear_history" -> {
                     AlertDialog.Builder(context).apply {
                         setTitle(R.string.warning)
                         setMessage(R.string.settings_clear_history_alert_message)
-                        setPositiveButton(android.R.string.yes) { _, _ ->
+                        setPositiveButton(android.R.string.ok) { _, _ ->
                             histories.clear()
                             summary = context.getString(R.string.settings_clear_history_summary, histories.size)
                         }
-                        setNegativeButton(android.R.string.no) { _, _ -> }
+                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 }
                 else -> return false

app/src/main/java/xyz/quaver/pupil/util/GalleryList.kt

@@ -36,15 +36,17 @@ class GalleryList(private val file: File, private val list: MutableSet<Int> = mu
     fun load() {
         synchronized(this) {
             list.clear()
-            list.addAll(
+            kotlin.runCatching {
                 Json.decodeFromString<List<Int>>(file.bufferedReader().use { it.readText() })
-            )
+            }.onSuccess {
+                list.addAll(it)
+            }
         }
     }
 
     fun save() {
         synchronized(this) {
-            file.writeText(Json.encodeToString(list))
+            file.writeText(Json.encodeToString(list.toList()))
         }
     }
 

app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt

@@ -41,6 +41,7 @@ import java.io.FileOutputStream
 import java.io.InputStream
 import java.net.URL
 
+@Suppress("DEPRECATION")
 @Deprecated("Use downloader.Cache instead")
 class Cache(context: Context) : ContextWrapper(context) {
 

app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt

@@ -37,9 +37,7 @@ import xyz.quaver.Code
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.hitomi.getReferer
 import xyz.quaver.hitomi.imageUrlFromImage
-import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.hiyobi.user_agent
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.interceptors
@@ -48,6 +46,7 @@ import java.io.File
 import java.io.IOException
 import java.util.concurrent.LinkedBlockingQueue
 
+@Suppress("DEPRECATION")
 @Deprecated("Use DownloadService instead")
 @OptIn(ExperimentalCoroutinesApi::class)
 class DownloadWorker private constructor(context: Context) : ContextWrapper(context) {
@@ -219,8 +218,6 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
                 }
                 Code.HIYOBI -> {
                     url(createImgList(galleryID, reader, lowQuality)[index].path)
-                    addHeader("User-Agent", user_agent)
-                    addHeader("Cookie", cookie)
                 }
                 else -> {
                     //shouldn't be called anyway

app/src/main/java/xyz/quaver/pupil/util/download/Metadata.kt

@@ -22,6 +22,7 @@ import kotlinx.serialization.Serializable
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
 
+@Suppress("DEPRECATION")
 @Deprecated("Use downloader.Cache.Metadata instead")
 @Serializable
 data class Metadata(

app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt

@@ -34,10 +34,7 @@ import xyz.quaver.Code
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.io.FileX
-import xyz.quaver.io.util.getChild
-import xyz.quaver.io.util.readBytes
-import xyz.quaver.io.util.readText
-import xyz.quaver.io.util.writeBytes
+import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.util.Preferences
 

app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt

@@ -124,7 +124,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
 
         downloadFolderMap[galleryID]?.let {
             kotlin.runCatching {
-                downloadFolder.getChild(it).delete()
+                downloadFolder.getChild(it).deleteRecursively()
                 downloadFolderMap.remove(galleryID)
 
                 downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }

app/src/main/java/xyz/quaver/pupil/util/file.kt

@@ -27,6 +27,7 @@ import java.io.FileOutputStream
 import java.lang.reflect.Array
 import java.net.URL
 
+@Suppress("DEPRECATION")
 @Deprecated("Use downloader.Cache instead")
 fun getCachedGallery(context: Context, galleryID: Int) =
     File(getDownloadDirectory(context), galleryID.toString()).let {
@@ -36,6 +37,7 @@ fun getCachedGallery(context: Context, galleryID: Int) =
             File(context.cacheDir, "imageCache/$galleryID")
     }
 
+@Suppress("DEPRECATION")
 @Deprecated("Use downloader.Cache instead")
 fun getDownloadDirectory(context: Context) =
     Preferences.get<String>("dl_location").let {
@@ -45,6 +47,7 @@ fun getDownloadDirectory(context: Context) =
             context.getExternalFilesDir(null)!!
     }
 
+@Suppress("DEPRECATION")
 @Deprecated("Use FileX instead")
 fun File.isParentOf(another: File) =
     another.absolutePath.startsWith(this.absolutePath)

app/src/main/java/xyz/quaver/pupil/util/misc.kt

@@ -22,11 +22,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import xyz.quaver.Code
@@ -34,11 +29,7 @@ import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.hitomi.getReferer
 import xyz.quaver.hitomi.imageUrlFromImage
-import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.createImgList
-import xyz.quaver.hiyobi.user_agent
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.downloader.Metadata
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -134,8 +125,6 @@ val Reader.requestBuilders: List<Request.Builder>
                 createImgList(galleryID, this, lowQuality).map {
                     Request.Builder()
                         .url(it.path)
-                        .header("User-Agent", user_agent)
-                        .header("Cookie", cookie)
                 }
             }
         }

app/src/main/java/xyz/quaver/pupil/util/update.kt

@@ -158,7 +158,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
             setTitle(R.string.update_title)
             val msg = extractReleaseNote(update, Locale.getDefault())
             setMessage(Markwon.create(context).toMarkdown(msg))
-            setPositiveButton(android.R.string.yes) { _, _ ->
+            setPositiveButton(android.R.string.ok) { _, _ ->
 
                 val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
 
@@ -181,7 +181,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
                     Preferences["update_download_id"] = it
                 }
             }
-            setNegativeButton(if (force) android.R.string.no else R.string.ignore_update) { _, _ ->
+            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore_update) { _, _ ->
                 if (!force)
                     preferences.edit()
                         .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
@@ -325,6 +325,8 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
             .mActions.clear()
         notificationManager.notify(R.id.notification_id_import, notification.build())
 
-        unregisterReceiver(receiver)
+        kotlin.runCatching {
+            unregisterReceiver(receiver)
+        }
     }
 }

app/src/main/res/layout-v23/activity_main_content.xml

@@ -63,18 +63,22 @@
             android:text="@string/main_no_result"
             android:visibility="invisible"/>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/main_recyclerview"
+        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="64dp"
-            android:clipToPadding="false"
-            app:fastScrollEnabled="true"
-            app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-            app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-            app:fastScrollHorizontalTrackDrawable="@drawable/track_drawable"
-            app:fastScrollVerticalTrackDrawable="@drawable/track_drawable"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+            app:handleHeight="100dp"
+            app:addLastItemPadding="true"
+            app:popupDrawable="@color/transparent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/main_recyclerview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingTop="64dp"
+                android:clipToPadding="false"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
 
         <com.github.clans.fab.FloatingActionMenu
             android:id="@+id/main_fab"

app/src/main/res/layout/activity_main_content.xml

@@ -63,18 +63,22 @@
             android:text="@string/main_no_result"
             android:visibility="invisible"/>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/main_recyclerview"
+        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="64dp"
-            android:clipToPadding="false"
-            app:fastScrollEnabled="true"
-            app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-            app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-            app:fastScrollHorizontalTrackDrawable="@drawable/track_drawable"
-            app:fastScrollVerticalTrackDrawable="@drawable/track_drawable"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+            app:handleHeight="100dp"
+            app:addLastItemPadding="true"
+            app:popupDrawable="@color/transparent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/main_recyclerview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingTop="64dp"
+                android:clipToPadding="false"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
 
         <com.github.clans.fab.FloatingActionMenu
                 android:id="@+id/main_fab"

app/src/main/res/layout/activity_reader.xml

@@ -26,16 +26,20 @@
     android:background="@color/dark_gray"
     tools:context=".ui.ReaderActivity">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/reader_recyclerview"
+    <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:fastScrollEnabled="true"
-        app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-        app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-        app:fastScrollHorizontalTrackDrawable="@drawable/track_drawable"
-        app:fastScrollVerticalTrackDrawable="@drawable/track_drawable"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+        app:handleHeight="100dp"
+        app:addLastItemPadding="true"
+        app:popupDrawable="@color/transparent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/reader_recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+    </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
 
     <LinearLayout
         android:layout_width="match_parent"

build.gradle

@@ -22,7 +22,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        mavenLocal()
         maven { url "https://jitpack.io" }
         maven { url 'https://guardian.github.com/maven/repo-releases' }
     }