Make release

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -57,7 +57,7 @@ body:
     id: ci
     attributes:
       label: EhViewer CI 版本 / EhViewer CI Version
-      description: 直接将对应 CI 下载页面网址填入即可 / Simply drop CI download page url here
+      description: 直接将对应 GitHub Action CI 下载页面网址填入即可 / Simply drop GitHub Action CI download page url here
       placeholder: https://github.com/Ehviewer-Overhauled/Ehviewer/actions/runs/XXXXXXXXXX
     validations:
       required: true

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -56,7 +56,7 @@ body:
     id: ci
     attributes:
       label: EhViewer CI 版本 / EhViewer CI Version
-      description: 直接将对应 CI 下载页面网址填入即可 / Simply drop CI download page url here
+      description: 直接将对应 GitHub Action CI 下载页面网址填入即可 / Simply drop GitHub Action CI download page url here
       placeholder: https://github.com/Ehviewer-Overhauled/Ehviewer/actions/runs/XXXXXXXXXX
     validations:
       required: true

.github/workflows/releases.yml

@@ -30,17 +30,25 @@ jobs:
         with:
           arguments: assembleRelease
 
+      - name: Rename Apks
+        run: |
+          cp app/build/outputs/apk/release/app-universal-release.apk app/build/outputs/apk/release/EhViewer-universal-A12+.apk
+          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/EhViewer-arm64-v8a-A12+.apk
+          cp app/build/outputs/apk/release/app-x86_64-release.apk app/build/outputs/apk/release/EhViewer-x86_64-A12+.apk
+          cp app/build/outputs/apk/release/app-x86-release.apk app/build/outputs/apk/release/EhViewer-x86-A12+.apk
+          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/EhViewer-armeabi-v7a-A12+.apk
+
       - name: Releases
         uses: softprops/action-gh-release@v1
         with:
           body: Bump Version
           discussion_category_name: Announcements
           files: |
-            app/build/outputs/apk/release/app-universal-release.apk
-            app/build/outputs/apk/release/app-arm64-v8a-release.apk
-            app/build/outputs/apk/release/app-x86_64-release.apk
-            app/build/outputs/apk/release/app-x86-release.apk
-            app/build/outputs/apk/release/app-armeabi-v7a-release.apk
+            app/build/outputs/apk/release/EhViewer-universal-A12+.apk
+            app/build/outputs/apk/release/EhViewer-arm64-v8a-A12+.apk
+            app/build/outputs/apk/release/EhViewer-x86_64-A12+.apk
+            app/build/outputs/apk/release/EhViewer-x86-A12+.apk
+            app/build/outputs/apk/release/EhViewer-armeabi-v7a-A12+.apk
 
       - name: Collect Apks
         run: |

app/build.gradle

@@ -36,8 +36,8 @@ android {
         applicationId "moe.tarsin.ehviewer"
         minSdkVersion 31
         targetSdkVersion 33
-        versionCode 180007
-        versionName "1.8.1.0"
+        versionCode 180008
+        versionName "1.8.1.1"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 

app/src/main/java/com/hippo/ehviewer/Settings.java

@@ -100,6 +100,11 @@ public class Settings {
     private static final int DEFAULT_VERSION_CODE = 0;
     private static final String KEY_DISPLAY_NAME = "display_name";
     private static final String DEFAULT_DISPLAY_NAME = null;
+    public static final String KEY_LIST_THUMB_SIZE = "list_tile_size";
+    private static final int DEFAULT_LIST_THUMB_SIZE = 40;
+    private static int LIST_THUMB_SIZE = 40;
+
+    public static boolean LIST_THUMB_SIZE_INITED = false;
     private static final String KEY_AVATAR = "avatar";
     private static final String DEFAULT_AVATAR = null;
     private static final String KEY_SHOW_WARNING = "show_warning";
@@ -1168,4 +1173,14 @@ public class Settings {
     public static void putPasswdToArchivePasswds(String value) {
         putStringToStringSet(KEY_ARCHIVE_PASSWDS, value);
     }
+
+    public static int getListThumbSize() {
+        if (LIST_THUMB_SIZE_INITED) {
+            return LIST_THUMB_SIZE;
+        }
+        int size = 3 * getInt(KEY_LIST_THUMB_SIZE, DEFAULT_LIST_THUMB_SIZE);
+        LIST_THUMB_SIZE = size;
+        LIST_THUMB_SIZE_INITED = true;
+        return size;
+    }
 }

app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java

@@ -406,17 +406,22 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
             }
             switch (event.getAction()) {
                 case MotionEvent.ACTION_SCROLL:
-                    if (event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0.0f) {
+                    float scroll = event.getAxisValue(MotionEvent.AXIS_VSCROLL) * 300;
+                    if (scroll < 0.0f) {
                         if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
                             mGalleryView.pageLeft();
-                        } else {
+                        } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT){
                             mGalleryView.pageRight();
+                        } else if (mLayoutMode == GalleryView.LAYOUT_TOP_TO_BOTTOM) {
+                            mGalleryView.onScroll(0, -scroll, 0, -scroll, 0, -scroll);
                         }
                     } else {
                         if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
                             mGalleryView.pageRight();
-                        } else {
+                        } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT) {
                             mGalleryView.pageLeft();
+                        } else if (mLayoutMode == GalleryView.LAYOUT_TOP_TO_BOTTOM) {
+                            mGalleryView.onScroll(0, -scroll, 0, -scroll, 0, -scroll);
                         }
                     }
             }

app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java

@@ -288,7 +288,6 @@ public final class MainActivity extends StageActivity
 
         mStageLayout = (EhStageLayout) ViewUtils.$$(this, R.id.fragment_container);
         mDrawerLayout = (DrawerLayout) ViewUtils.$$(this, R.id.draw_view);
-        mDrawerLayout.setStatusBarBackgroundColor(0);
         mNavView = (NavigationView) ViewUtils.$$(this, R.id.nav_view);
         mRightDrawer = (DrawerView) ViewUtils.$$(this, R.id.right_drawer);
 

app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java

@@ -1,68 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.ehviewer.ui;
-
-import android.os.Bundle;
-import android.view.MenuItem;
-
-import androidx.annotation.StringRes;
-import androidx.appcompat.app.ActionBar;
-import androidx.fragment.app.FragmentTransaction;
-
-import com.google.android.material.snackbar.Snackbar;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.ui.fragment.SettingsFragment;
-import com.hippo.ehviewer.ui.scene.BaseScene;
-
-public final class SettingsActivity extends EhActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_preference);
-        setSupportActionBar(findViewById(R.id.toolbar));
-        ActionBar bar = getSupportActionBar();
-        if (bar != null) {
-            bar.setDisplayHomeAsUpEnabled(true);
-        }
-        if (savedInstanceState == null) {
-            getSupportFragmentManager()
-                    .beginTransaction()
-                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_MATCH_ACTIVITY_OPEN)
-                    .replace(R.id.fragment, new SettingsFragment())
-                    .commitAllowingStateLoss();
-        }
-    }
-
-    public void showTip(@StringRes int id, int length) {
-        showTip(getString(id), length);
-    }
-
-    public void showTip(CharSequence message, int length) {
-        Snackbar.make(findViewById(R.id.snackbar), message,
-                length == BaseScene.LENGTH_LONG ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT).show();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            onBackPressed();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}

app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.ui
+
+import android.content.res.Configuration
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.annotation.StringRes
+import androidx.core.view.WindowCompat
+import androidx.fragment.app.FragmentTransaction
+import com.google.android.material.snackbar.Snackbar
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.ui.fragment.SettingsFragment
+import com.hippo.ehviewer.ui.scene.BaseScene
+
+class SettingsActivity : EhActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_preference)
+        setSupportActionBar(findViewById(R.id.toolbar))
+        val bar = supportActionBar
+        bar?.setDisplayHomeAsUpEnabled(true)
+        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) <= 0
+        if (savedInstanceState == null) {
+            supportFragmentManager
+                .beginTransaction()
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_MATCH_ACTIVITY_OPEN)
+                .replace(R.id.fragment, SettingsFragment())
+                .commitAllowingStateLoss()
+        }
+    }
+
+    fun showTip(@StringRes id: Int, length: Int) {
+        showTip(getString(id), length)
+    }
+
+    fun showTip(message: CharSequence?, length: Int) {
+        Snackbar.make(
+            findViewById(R.id.snackbar), message!!,
+            if (length == BaseScene.LENGTH_LONG) Snackbar.LENGTH_LONG else Snackbar.LENGTH_SHORT
+        ).show()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+}

app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.java

@@ -38,6 +38,7 @@ public class EhFragment extends BasePreferenceFragment {
         Preference blackDarkTheme = findPreference(Settings.KEY_BLACK_DARK_THEME);
         Preference gallerySite = findPreference(Settings.KEY_GALLERY_SITE);
         Preference listMode = findPreference(Settings.KEY_LIST_MODE);
+        Preference listThumbSize = findPreference(Settings.KEY_LIST_THUMB_SIZE);
         Preference detailSize = findPreference(Settings.KEY_DETAIL_SIZE);
         Preference thumbSize = findPreference(Settings.KEY_THUMB_SIZE);
         Preference showTagTranslations = findPreference(Settings.KEY_SHOW_TAG_TRANSLATIONS);
@@ -46,6 +47,7 @@ public class EhFragment extends BasePreferenceFragment {
         theme.setOnPreferenceChangeListener(this);
         gallerySite.setOnPreferenceChangeListener(this);
         listMode.setOnPreferenceChangeListener(this);
+        listThumbSize.setOnPreferenceChangeListener(this);
         detailSize.setOnPreferenceChangeListener(this);
         thumbSize.setOnPreferenceChangeListener(this);
         showTagTranslations.setOnPreferenceChangeListener(this);
@@ -70,6 +72,10 @@ public class EhFragment extends BasePreferenceFragment {
         } else if (Settings.KEY_LIST_MODE.equals(key)) {
             requireActivity().setResult(Activity.RESULT_OK);
             return true;
+        } else if (Settings.KEY_LIST_THUMB_SIZE.equals(key)) {
+            Settings.LIST_THUMB_SIZE_INITED = false;
+            requireActivity().setResult(Activity.RESULT_OK);
+            return true;
         } else if (Settings.KEY_DETAIL_SIZE.equals(key)) {
             requireActivity().setResult(Activity.RESULT_OK);
         } else if (Settings.KEY_THUMB_SIZE.equals(key)) {

app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java

@@ -56,7 +56,6 @@ public abstract class BaseScene extends SceneFragment {
     private View drawerView;
     @Nullable
     private SparseArray<Parcelable> drawerViewState;
-    private boolean needWhiteStatusBar = needWhiteStatusBar();
 
     public void addAboveSnackView(View view) {
         FragmentActivity activity = getActivity();
@@ -118,10 +117,6 @@ public abstract class BaseScene extends SceneFragment {
         return true;
     }
 
-    public boolean needWhiteStatusBar() {
-        return true;
-    }
-
     public int getNavCheckedItem() {
         return 0;
     }
@@ -176,14 +171,6 @@ public abstract class BaseScene extends SceneFragment {
         drawerView = null;
     }
 
-    public void setLightStatusBar(boolean set) {
-        var insetsController = getInsetsController();
-        if (insetsController != null) {
-            insetsController.setAppearanceLightStatusBars(set && (requireActivity().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) <= 0);
-        }
-        needWhiteStatusBar = set;
-    }
-
     public void onDestroyDrawerView() {
     }
 
@@ -213,7 +200,11 @@ public abstract class BaseScene extends SceneFragment {
 
         // Hide soft ime
         hideSoftInput();
-        setLightStatusBar(needWhiteStatusBar);
+
+        insetsController = getInsetsController();
+        if (insetsController != null) {
+            insetsController.setAppearanceLightStatusBars((requireActivity().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) <= 0);
+        }
     }
 
     @Nullable

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java

@@ -559,12 +559,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
 
         ViewGroup main = (ViewGroup) ViewUtils.$$(view, R.id.main);
         ScrollView mainView = (ScrollView) ViewUtils.$$(main, R.id.scroll_view);
-        mainView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
-            if (mActionGroup != null && mHeader != null) {
-                //noinspection IntegerDivisionInFloatingPointContext
-                setLightStatusBar(mActionGroup.getY() - mHeader.findViewById(R.id.header_content).getPaddingTop() / 2 < scrollY);
-            }
-        });
         View progressView = ViewUtils.$$(main, R.id.progress_view);
         mTip = (TextView) ViewUtils.$$(main, R.id.tip);
         mViewTransition = new ViewTransition(mainView, progressView, mTip);
@@ -668,11 +662,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         return view;
     }
 
-    @Override
-    public boolean needWhiteStatusBar() {
-        return false;
-    }
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -841,19 +830,16 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
 
         switch (state) {
             case STATE_NORMAL:
-                setLightStatusBar(false);
                 // Show mMainView
                 mViewTransition.showView(0, animation);
                 // Show mBelowHeader
                 mViewTransition2.showView(0, animation);
                 break;
             case STATE_REFRESH:
-                setLightStatusBar(true);
                 // Show mProgressView
                 mViewTransition.showView(1, animation);
                 break;
             case STATE_REFRESH_HEADER:
-                setLightStatusBar(false);
                 // Show mMainView
                 mViewTransition.showView(0, animation);
                 // Show mProgress
@@ -862,7 +848,6 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
             default:
             case STATE_INIT:
             case STATE_FAILED:
-                setLightStatusBar(true);
                 // Show mFailedView
                 mViewTransition.showView(2, animation);
                 break;

app/src/main/java/com/hippo/ehviewer/ui/scene/ToolbarScene.java

@@ -87,12 +87,6 @@ public abstract class ToolbarScene extends BaseScene {
         }
     }
 
-    @Override
-    public boolean needWhiteStatusBar() {
-        return false;
-    }
-
-
     public int getMenuResId() {
         return 0;
     }

app/src/main/java/com/hippo/ehviewer/widget/ResizeableFixedThumb.kt

@@ -0,0 +1,13 @@
+package com.hippo.ehviewer.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import com.hippo.ehviewer.Settings
+
+class ResizeableFixedThumb @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : FixedThumb(context, attrs) {
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        setMeasuredDimension(Settings.getListThumbSize() * 2, Settings.getListThumbSize() * 3)
+    }
+}

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

@@ -29,10 +29,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.hippo.ehviewer.widget.FixedThumb
+        <com.hippo.ehviewer.widget.ResizeableFixedThumb
             android:id="@+id/thumb"
-            android:layout_width="@dimen/gallery_list_thumb_width"
-            android:layout_height="@dimen/gallery_list_thumb_height"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             app:alwaysCutAndScale="true"
             app:retryType="longClick" />
 

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

@@ -35,10 +35,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
 
-            <com.hippo.ehviewer.widget.FixedThumb
+            <com.hippo.ehviewer.widget.ResizeableFixedThumb
                 android:id="@+id/thumb"
-                android:layout_width="@dimen/gallery_list_thumb_width"
-                android:layout_height="@dimen/gallery_list_thumb_height"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
                 app:alwaysCutAndScale="true"
                 app:retryType="click"/>
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -768,4 +768,5 @@
     <string name="archive_need_passwd">归档文件需要密码</string>
     <string name="passwd_wrong">密码错误</string>
     <string name="passwd_cannot_be_empty">密码不能为空</string>
+    <string name="list_tile_thumb_size">详情模式下缩略图大小</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -95,7 +95,7 @@
 
     <string name="kokomade_tip">設定->Eh->圖庫站台->e-hentai</string>
 
-    <string name="app_waring">本應用程式中內容來自網際網路，部分內容可能對您的生理及心理造成難以恢復的傷害。本應用程式的作者不會對由其所造成的任何影響負責。\n\n未成年人應在監護人指導下使用本應用程式。</string>
+    <string name="app_waring">本應用程式中內容來自網際網路，部分內容可能對您的生理及心理造成難以恢復的傷害。本應用程式的作者不會對由其所造成的任何影響負責。\n\n未成年人應在監護人指導下使用本應用程式。\n\n繼續使用即代表您同意上述條款。</string>
     <string name="error_username_cannot_empty">使用者名稱欄位不能為空</string>
     <string name="error_password_cannot_empty">密碼欄位不能為空</string>
     <string name="skip_signing_in">略過登入</string>

app/src/main/res/values/attrs.xml

@@ -134,10 +134,6 @@
         <attr name="url" format="string" />
     </declare-styleable>
 
-    <declare-styleable name="SeekBarPreference">
-        <attr name="max" format="integer" />
-    </declare-styleable>
-
     <declare-styleable name="FastScroller">
         <attr name="handler" format="reference" />
         <attr name="draggable" format="boolean" />

app/src/main/res/values/dimens.xml

@@ -31,8 +31,6 @@
     <dimen name="rating_size">16dp</dimen>
     <dimen name="rating_interval">1dp</dimen>
 
-    <dimen name="gallery_list_thumb_height">120dp</dimen>
-    <dimen name="gallery_list_thumb_width">80dp</dimen>
     <!-- 4dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_list_interval">0dp</dimen>
     <!-- 8dp - 4dp, 4dp for card padding -->

app/src/main/res/values/strings.xml

@@ -832,4 +832,5 @@
     <string name="archive_need_passwd">Archive need password</string>
     <string name="passwd_wrong">Password Wrong</string>
     <string name="passwd_cannot_be_empty">Password can\'t be empty</string>
+    <string name="list_tile_thumb_size">Thumb size in thumb mode</string>
 </resources>

app/src/main/res/xml/eh_settings.xml

@@ -82,6 +82,15 @@
         app:entryValues="@array/list_mode_entry_values"
         app:iconSpaceReserved="false" />
 
+    <SeekBarPreference
+        android:defaultValue="40"
+        android:key="list_tile_size"
+        android:title="@string/list_tile_thumb_size"
+        android:max="60"
+        app:iconSpaceReserved="false"
+        app:min="30"
+        app:showSeekBarValue="true" />
+
     <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="detail_size"

app/src/main/res/xml/read_settings.xml

@@ -122,8 +122,8 @@
         android:dependency="custom_screen_lightness"
         android:key="screen_lightness"
         android:title="@string/settings_read_screen_lightness"
+        android:max="200"
         app:iconSpaceReserved="false"
-        app:max="200"
         app:showSeekBarValue="true" />
 
 </PreferenceScreen>