diff --git a/app/build.gradle b/app/build.gradle index 02530dd6..87b76990 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { minSdkVersion 16 targetSdkVersion 29 versionCode 31 - versionName "4.2-beta1" + versionName "4.2-beta2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/app/release/output.json b/app/release/output.json index 6014db92..f833a508 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"4.2-beta1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"4.2-beta2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt index a177925c..1a65a3e4 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt @@ -95,7 +95,6 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri if (BuildConfig.CENSOR) override(5, 8) } - .fitCenter() .into(galleryblock_thumbnail) } diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt index 8e076d07..36d29dc3 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt @@ -49,17 +49,21 @@ class ReaderAdapter(private val glide: RequestManager, override fun onBindViewHolder(holder: ViewHolder, position: Int) { holder.view as ImageView + if (isFullScreen) + holder.view.layoutParams.height = RecyclerView.LayoutParams.MATCH_PARENT + else + holder.view.layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT + glide .load(File(getCachedGallery(holder.view.context, galleryID), images[position])) - .dontTransform() .diskCacheStrategy(DiskCacheStrategy.NONE) .skipMemoryCache(true) .error(R.drawable.image_broken_variant) + .dontTransform() .apply { if (BuildConfig.CENSOR) override(5, 8) } - .fitCenter() .into(holder.view) } diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt index 759f7523..db85c79d 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt @@ -39,7 +39,6 @@ class ThumbnailAdapter(private val glide: RequestManager, private val thumbnails if (BuildConfig.CENSOR) override(5, 8) } - .fitCenter() .into(holder.view) } diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml index 3c79bab3..24cfc787 100644 --- a/app/src/main/res/layout/activity_reader.xml +++ b/app/src/main/res/layout/activity_reader.xml @@ -26,18 +26,11 @@ android:background="@color/dark_gray" tools:context=".ui.ReaderActivity"> - - - - - + android:layout_height="match_parent" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/> \ No newline at end of file + android:paddingBottom="8dp"/> \ No newline at end of file