diff --git a/app/build.gradle b/app/build.gradle index e423c9fb..09b76794 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ android { applicationId "xyz.quaver.pupil" minSdkVersion 16 targetSdkVersion 30 - versionCode 58 - versionName "5.0-hotfix4" + versionCode 59 + versionName "5.0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/app/libs/recyclerviewfastscroller-release.aar b/app/libs/recyclerviewfastscroller-release.aar index 4484c737..01804c5c 100644 Binary files a/app/libs/recyclerviewfastscroller-release.aar and b/app/libs/recyclerviewfastscroller-release.aar differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 0a10735c..30815387 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "properties": [], - "versionCode": 58, - "versionName": "5.0-hotfix4", + "versionCode": 59, + "versionName": "5.0.1", "enabled": true, "outputFile": "app-release.apk" } diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt index d8ed35e6..92a9bc24 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt @@ -38,6 +38,7 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat import com.bumptech.glide.Glide import com.google.android.material.snackbar.Snackbar import com.google.firebase.crashlytics.FirebaseCrashlytics +import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller import kotlinx.android.synthetic.main.activity_reader.* import kotlinx.android.synthetic.main.activity_reader.view.* import kotlinx.android.synthetic.main.dialog_numberpicker.view.* @@ -422,10 +423,22 @@ class ReaderActivity : BaseActivity() { flags = flags or WindowManager.LayoutParams.FLAG_FULLSCREEN supportActionBar?.hide() this@ReaderActivity.reader_fab.visibility = View.INVISIBLE + this@ReaderActivity.scroller.let { + it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_height) + it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_width) + it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb_horizontal) + it.fastScrollDirection = RecyclerViewFastScroller.FastScrollDirection.HORIZONTAL + } } else { flags = flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv() supportActionBar?.show() this@ReaderActivity.reader_fab.visibility = View.VISIBLE + this@ReaderActivity.scroller.let { + it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_width) + it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_height) + it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb) + it.fastScrollDirection = RecyclerViewFastScroller.FastScrollDirection.VERTICAL + } } window.attributes = this diff --git a/app/src/main/res/drawable/thumb.xml b/app/src/main/res/drawable/thumb.xml index 1cb96f13..4541d8a9 100644 --- a/app/src/main/res/drawable/thumb.xml +++ b/app/src/main/res/drawable/thumb.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/thumb_horizontal.xml b/app/src/main/res/drawable/thumb_horizontal.xml index a469d771..0de6aece 100644 --- a/app/src/main/res/drawable/thumb_horizontal.xml +++ b/app/src/main/res/drawable/thumb_horizontal.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/layout/activity_main_content.xml b/app/src/main/res/layout/activity_main_content.xml index 5ec4b8a0..f9487f70 100644 --- a/app/src/main/res/layout/activity_main_content.xml +++ b/app/src/main/res/layout/activity_main_content.xml @@ -70,6 +70,7 @@ app:handleHasFixedSize="true" app:handleHeight="72dp" app:handleWidth="24dp" + app:trackMarginStart="64dp" app:addLastItemPadding="true" app:popupDrawable="@color/transparent"> diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml index a3774f0c..2b9de763 100644 --- a/app/src/main/res/layout/activity_reader.xml +++ b/app/src/main/res/layout/activity_reader.xml @@ -27,13 +27,13 @@ tools:context=".ui.ReaderActivity"> diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 90c55199..616e6f93 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -7,4 +7,7 @@ 100dp 2000dp + + 24dp + 72dp \ No newline at end of file