Bug fix

app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 58
-        versionName "5.0-hotfix3"
+        versionCode 59
+        versionName "5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

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

@@ -82,14 +82,9 @@ class ReaderAdapter(private val activity: ReaderActivity,
             cache = Cache.getInstance(holder.view.context, galleryID)
 
         if (isFullScreen) {
-            holder.view.layoutParams.height = RecyclerView.LayoutParams.MATCH_PARENT
             holder.view.container.layoutParams.height = ConstraintLayout.LayoutParams.MATCH_PARENT
         } else {
-            holder.view.layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT
-            holder.view.container.layoutParams.height = 0
-
-            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
-                .dimensionRatio = "W,${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+            holder.view.container.layoutParams.height = ConstraintLayout.LayoutParams.WRAP_CONTENT
         }
 
         holder.view.image.setOnPhotoTapListener { _, _, _ ->
@@ -123,10 +118,15 @@ class ReaderAdapter(private val activity: ReaderActivity,
                     .load(url!!)
                     .diskCacheStrategy(DiskCacheStrategy.NONE)
                     .skipMemoryCache(false)
-                    .fitCenter()
+                    .error(R.drawable.image_broken_variant)
                     .apply {
                         if (BuildConfig.CENSOR)
                             override(5, 8)
+                        else
+                            override(
+                                holder.view.context.resources.displayMetrics.widthPixels,
+                                holder.view.context.resources.getDimensionPixelSize(R.dimen.reader_max_height)
+                            )
                     }
                     .error(R.drawable.image_broken_variant)
                     .into(holder.view.image)
@@ -143,10 +143,14 @@ class ReaderAdapter(private val activity: ReaderActivity,
                         .load(image.readBytes())
                         .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .skipMemoryCache(true)
-                        .fitCenter()
                         .apply {
                             if (BuildConfig.CENSOR)
                                 override(5, 8)
+                            else
+                                override(
+                                    holder.view.context.resources.displayMetrics.widthPixels,
+                                    holder.view.context.resources.getDimensionPixelSize(R.dimen.reader_max_height)
+                                )
                         }
                         .error(R.drawable.image_broken_variant)
                         .listener(object: RequestListener<Drawable> {
@@ -163,8 +167,13 @@ class ReaderAdapter(private val activity: ReaderActivity,
                                 return true
                             }
 
-                            override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean) =
-                                false
+                            override fun onResourceReady(
+                                resource: Drawable?,
+                                model: Any?,
+                                target: Target<Drawable>?,
+                                dataSource: DataSource?,
+                                isFirstResource: Boolean
+                            ) = false
                         }).let { launch(Dispatchers.Main) { it.into(holder.view.image) } }
                 }
             } else {

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

@@ -17,21 +17,15 @@
   ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/container"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
     app:layout_constraintHeight_max="2000dp"
     app:layout_constraintTop_toTopOf="parent"
     app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+    android:paddingBottom="8dp"
     android:background="@drawable/reader_item_boundary">
 
     <LinearLayout
@@ -65,13 +59,10 @@
     <com.github.chrisbanes.photoview.PhotoView
         android:id="@+id/image"
         android:adjustViewBounds="true"
-            android:scaleType="fitCenter"
+        android:scaleType="fitXY"
         android:layout_width="match_parent"
-            android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            android:paddingBottom="8dp"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/dimen.xml

@@ -5,4 +5,6 @@
 	<dimen name="activity_vertical_margin">16dp</dimen>
 
 	<dimen name="galleryblock_thumbnail_thin">100dp</dimen>
+
+	<dimen name="reader_max_height">2000dp</dimen>
 </resources>