From dae9540a99b153f0d34bcfa8952068cdfedf7968 Mon Sep 17 00:00:00 2001 From: tehcneko <7764726+tehcneko@users.noreply.github.com> Date: Sun, 21 Mar 2021 13:24:26 +0800 Subject: [PATCH] Bump version --- app/build.gradle | 5 ++-- app/proguard-rules.pro | 10 +++---- .../com/hippo/ehviewer/ui/EhActivity.java | 4 ++- .../ehviewer/ui/scene/DownloadsScene.java | 1 + .../ehviewer/ui/scene/FavoritesScene.java | 1 + .../ehviewer/ui/scene/GalleryDetailScene.java | 28 ++++++++++++------- .../ehviewer/ui/scene/GalleryListScene.java | 1 + 7 files changed, 31 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6a9acac81..84cef139f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,4 @@ import java.nio.file.Paths -import java.nio.file.Paths apply plugin: 'com.android.application' @@ -28,8 +27,8 @@ android { applicationId "io.github.nekoinverter.ehviewer" minSdkVersion 23 targetSdkVersion 30 - versionCode 143 - versionName "1.7.22" + versionCode 145 + versionName "1.7.23" resConfigs "zh", "zh-rCN", "zh-rHK", "zh-rTW", "es", "ja", "ko", "fr", "de", "th" testOptions.unitTests.includeAndroidResources = true diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 177486466..325fc16f8 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -2,15 +2,15 @@ public static final ** CREATOR; } --assumenosideeffects class kotlin.jvm.internal.Intrinsics { - public static void check*(...); - public static void throw*(...); -} - -repackageclasses -allowaccessmodification -overloadaggressively +-assumenosideeffects class kotlin.jvm.internal.Intrinsics { + public static void check*(...); + public static void throw*(...); +} + -keepattributes SourceFile,LineNumberTable -keep class com.hippo.a7zip.* { *; } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java index 80349b7e7..2eb4d82cc 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java @@ -23,6 +23,7 @@ import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.view.Window; +import android.view.WindowInsets; import android.view.WindowManager; import androidx.annotation.NonNull; @@ -110,7 +111,8 @@ public abstract class EhActivity extends MaterialActivity { window.setStatusBarColor(Color.TRANSPARENT); window.getDecorView().post(() -> { - if (window.getDecorView().getRootWindowInsets().getSystemWindowInsetBottom() >= Resources.getSystem().getDisplayMetrics().density * 40) { + WindowInsets rootWindowInsets = window.getDecorView().getRootWindowInsets(); + if (rootWindowInsets != null && rootWindowInsets.getSystemWindowInsetBottom() >= Resources.getSystem().getDisplayMetrics().density * 40) { window.setNavigationBarColor(ResourcesKt.resolveColor(getTheme(), android.R.attr.navigationBarColor) & 0x00ffffff | -0x20000000); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { window.setNavigationBarContrastEnforced(false); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java index 86ecb203a..993d83ae8 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java @@ -466,6 +466,7 @@ public class DownloadsScene extends ToolbarScene TapTarget.forBounds(bounds, getString(R.string.guide_download_labels_title), getString(R.string.guide_download_labels_text)) + .outerCircleColor(R.color.colorPrimary) .transparentTarget(true), new TapTargetView.Listener() { @Override diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java index 6d206e8a7..05dbb9ecb 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java @@ -376,6 +376,7 @@ public class FavoritesScene extends BaseScene implements TapTarget.forBounds(bounds, getString(R.string.guide_collections_title), getString(R.string.guide_collections_text)) + .outerCircleColor(R.color.colorPrimary) .transparentTarget(true), new TapTargetView.Listener() { @Override diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index 2bae087cf..976e75719 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -447,11 +447,15 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene public void onResume() { super.onResume(); if (mRead != null) { - GalleryProvider2 galleryProvider = new EhGalleryProvider(requireContext(), mGalleryInfo); - galleryProvider.start(); - int startPage = galleryProvider.getStartPage(); - if (startPage != 0) { - mRead.setText(getString(R.string.read_from, startPage + 1)); + try { + GalleryProvider2 galleryProvider = new EhGalleryProvider(requireContext(), mGalleryInfo); + galleryProvider.start(); + int startPage = galleryProvider.getStartPage(); + if (startPage != 0) { + mRead.setText(getString(R.string.read_from, startPage + 1)); + } + } catch (Exception ignore) { + } } } @@ -537,11 +541,15 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mActionGroup = (ViewGroup) ViewUtils.$$(mHeader, R.id.action_card); mDownload = (TextView) ViewUtils.$$(mActionGroup, R.id.download); mRead = (TextView) ViewUtils.$$(mActionGroup, R.id.read); - GalleryProvider2 galleryProvider = new EhGalleryProvider(requireContext(), mGalleryInfo); - galleryProvider.start(); - int startPage = galleryProvider.getStartPage(); - if (startPage != 0) { - mRead.setText(getString(R.string.read_from, startPage + 1)); + try { + GalleryProvider2 galleryProvider = new EhGalleryProvider(requireContext(), mGalleryInfo); + galleryProvider.start(); + int startPage = galleryProvider.getStartPage(); + if (startPage != 0) { + mRead.setText(getString(R.string.read_from, startPage + 1)); + } + } catch (Exception ignore) { + } mUploader.setOnClickListener(this); mCategory.setOnClickListener(this); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index 398b02d7b..881b32c11 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -720,6 +720,7 @@ public final class GalleryListScene extends BaseScene TapTarget.forBounds(bounds, getString(R.string.guide_quick_search_title), getString(R.string.guide_quick_search_text)) + .outerCircleColor(R.color.colorPrimary) .transparentTarget(true), new TapTargetView.Listener() { @Override