From bbc5228bc294dbb58660dc164bd9fa5873f7254d Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Tue, 6 Apr 2021 21:54:08 +0800
Subject: [PATCH] Update dependencies

---
 app/build.gradle                                      | 11 +++++------
 .../hippo/ehviewer/ui/scene/GalleryCommentsScene.java |  1 +
 app/src/main/res/layout/scene_gallery_comments.xml    |  1 -
 build.gradle                                          | 10 +++++-----
 gradle.properties                                     |  1 -
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 30d6adc7c..1891b4e76 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -79,19 +79,18 @@ tasks.withType(JavaCompile) {
     task -> task.dependsOn ":daogenerator:executeDaoGenerator"
 }
 
-def optimizeReleaseResources = task('optimizeReleaseResources').doLast {
+def optimizeReleaseRes = task('optimizeReleaseRes').doLast {
     def aapt2 = Paths.get(project.android.sdkDirectory.path, 'build-tools', project.android.buildToolsVersion, 'aapt2')
     def zip = Paths.get(
             project.buildDir.path,
             "intermediates",
-            "shrunk_processed_res",
+            "optimized_processed_res",
             "release",
-            "resources-release-stripped.ap_"
+            "resources-release-optimize.ap_"
     )
     def optimized = new File("${zip}.opt")
     def cmd = exec {
         commandLine aapt2, 'optimize', '--collapse-resource-names',
-                '--shorten-resource-paths',
                 '-o', optimized, zip
         ignoreExitValue false
     }
@@ -102,8 +101,8 @@ def optimizeReleaseResources = task('optimizeReleaseResources').doLast {
 }
 
 tasks.whenTaskAdded { task ->
-    if (task.name == 'shrinkReleaseRes') {
-        task.finalizedBy optimizeReleaseResources
+    if (task.name == 'optimizeReleaseResources') {
+        task.finalizedBy optimizeReleaseRes
     }
 }
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
index b97a8e0e0..1bbcd922b 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
@@ -303,6 +303,7 @@ public final class GalleryCommentsScene extends ToolbarScene
         if (itemAnimator instanceof DefaultItemAnimator) {
             ((DefaultItemAnimator) itemAnimator).setSupportsChangeAnimations(false);
         }
+        RecyclerViewKt.addVerticalPadding(mRecyclerView, 0, 80);
 
         mSendImage.setOnClickListener(this);
         mFab.setOnClickListener(this);
diff --git a/app/src/main/res/layout/scene_gallery_comments.xml b/app/src/main/res/layout/scene_gallery_comments.xml
index 3a88658c2..22b0ce101 100644
--- a/app/src/main/res/layout/scene_gallery_comments.xml
+++ b/app/src/main/res/layout/scene_gallery_comments.xml
@@ -30,7 +30,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
-            android:paddingBottom="@dimen/gallery_padding_bottom_fab"
             app:fitSystemWindowsInsets="bottom" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/build.gradle b/build.gradle
index a7718c8a6..75cfd8507 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,13 +3,12 @@
 buildscript {
     repositories {
         google()
-        jcenter()
-        maven { url "https://jitpack.io" }
+        mavenCentral()
         maven { url "https://storage.googleapis.com/r8-releases/raw" }
     }
     dependencies {
-        classpath 'com.android.tools:r8:3.0.28-dev'
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha12'
+        classpath 'com.android.tools:r8:3.0.32-dev'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha13'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,7 +18,8 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        maven { url "https://jcenter.bintray.com" }
         maven { url "https://jitpack.io" }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index d296fbeee..027ef9db8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,4 +19,3 @@
 
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableResourceOptimizations=false