Merge pull request #36 from tom5079/Pupil-35

fixes #35

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

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":{}}]
+[{"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":{}}]

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)
                 }
 

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)
     }
 

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)
     }
 

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

@@ -26,18 +26,11 @@
     android:background="@color/dark_gray"
     tools:context=".ui.ReaderActivity">
 
-    <LinearLayout
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/reader_recyclerview"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical">
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
-
-        <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"/>
-
-    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -22,6 +22,4 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="100dp"
-    android:paddingBottom="8dp"
+    android:paddingBottom="8dp"/>
-    android:scaleType="fitCenter"
-    android:adjustViewBounds="true"/>