Merge remote-tracking branch 'origin/master' into master

Fixed pagecount not showing up
Update README.md
2020-10-13 17:13:10 +09:00 · 2020-10-13 17:12:53 +09:00 · 2020-10-13 13:59:02 +09:00
4 changed files with 5 additions and 5 deletions
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 *Pupil, Hitomi.la viewer for Android*  

 ![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
-[![](https://img.shields.io/github/downloads/tom5079/Pupil/latest/Pupil-v5.1.4.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.4/Pupil-v5.1.4.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.4/Pupil-v5.1.4.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.4/Pupil-v5.1.4.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  

 # Features
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,7 @@ android {
        minSdkVersion 16
        targetSdkVersion 30
        versionCode 63
-        versionName "5.1.4"
+        versionName "5.1.4-hotfix1"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
      "filters": [],
      "properties": [],
      "versionCode": 63,
-      "versionName": "5.1.4",
+      "versionName": "5.1.4-hotfix1",
      "enabled": true,
      "outputFile": "app-release.apk"
    }
--- a/app/src/main/res/layout/item_galleryblock.xml
+++ b/app/src/main/res/layout/item_galleryblock.xml
@@ -212,8 +212,8 @@
 				android:layout_marginBottom="8dp"
 				app:layout_constraintTop_toBottomOf="@id/divider"
 				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintLeft_toRightOf="parent"
-				app:layout_constraintRight_toLeftOf="parent" />
+				app:layout_constraintLeft_toLeftOf="parent"
+				app:layout_constraintRight_toRightOf="parent" />

 			<ImageView
 				android:id="@+id/galleryblock_favorite"
Author	SHA1	Message	Date
tom5079	b165a2308f	Merge remote-tracking branch 'origin/master' into master	2020-10-13 17:13:10 +09:00
tom5079	8757b08cd2	Fixed pagecount not showing up	2020-10-13 17:12:53 +09:00
tom5079	3800543fba	Update README.md	2020-10-13 13:59:02 +09:00