Merge pull request #19 from keiji/hotfix_1_1_1

Hotfix 1.1.1
keiji · Dec 31, 2020 · 217a662 · 217a662
2 parents c1f09d2 + 8171c9c
commit 217a662
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,8 @@ buildscript {
 
     ext.kotlin_version = "1.4.21"
 
-    ext.version_name = '1.1.0'
-    ext.version_code = 1100
+    ext.version_name = '1.1.1'
+    ext.version_code = 1110
 
     repositories {
         google()

diff --git a/mangaview/src/main/java/dev/keiji/mangaview/widget/DoublePageLayout.kt b/mangaview/src/main/java/dev/keiji/mangaview/widget/DoublePageLayout.kt
@@ -193,10 +193,10 @@ class DoublePageLayout(
             .apply { round() }
 
         page.globalRect.also {
-            it.left = globalPosition.left + paddingLeft
-            it.top = globalPosition.top + paddingTop
-            it.right = globalPosition.right - pageWidth - paddingRight
-            it.bottom = globalPosition.bottom - paddingBottom
+            it.left = globalPosition.left + padding.left
+            it.top = globalPosition.top + padding.top
+            it.right = globalPosition.right - pageWidth - padding.right
+            it.bottom = globalPosition.bottom - padding.bottom
         }
 
         leftPage = page

diff --git a/mangaview/src/main/java/dev/keiji/mangaview/widget/ViewContext.kt b/mangaview/src/main/java/dev/keiji/mangaview/widget/ViewContext.kt
@@ -3,7 +3,7 @@ package dev.keiji.mangaview.widget
 import android.os.Parcelable
 import androidx.annotation.VisibleForTesting
 import dev.keiji.mangaview.Rectangle
-import kotlinx.android.parcel.IgnoredOnParcel
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import kotlin.math.max
 import kotlin.math.min