资源文件更新

xiaojieonly · Sep 13, 2022 · b96dcd5 · b96dcd5
1 parent 058a97e
commit b96dcd5
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 42 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
 -->
-
+<!--    android:requestLegacyExternalStorage="true"-->
 <manifest xmlns:tools="http://schemas.android.com/tools"
     package="com.hippo.ehviewer"
     xmlns:android="http://schemas.android.com/apk/res/android">
@@ -42,6 +42,7 @@
         android:fullBackupContent="@xml/backup_scheme"
         android:hardwareAccelerated="true"
         android:largeHeap="true"
+        android:requestLegacyExternalStorage="true"
         android:networkSecurityConfig="@xml/network_security_config"
         tools:targetApi="n">
 

diff --git a/app/src/main/res/layout/dialog_donate.xml b/app/src/main/res/layout/dialog_donate.xml
@@ -16,7 +16,6 @@
 
 <!--linkpackage com.hippo.ehviewer.ui.fragment.AboutFragment-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -27,7 +26,7 @@
         android:layout_height="match_parent"
         android:text="@string/settings_about_donate_message" />
 
-    <Space
+    <androidx.legacy.widget.Space
         android:layout_width="wrap_content"
         android:layout_height="@dimen/keyline_margin" />
 
@@ -40,8 +39,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="@dimen/gallery_page_min_height"
-            android:layout_toLeftOf="@+id/image_center"
-            android:layout_weight="1"
+            android:layout_toStartOf="@+id/image_center"
             android:id="@+id/image_aliPay"
             android:background="@drawable/zhifubao" />
 
@@ -58,8 +56,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="@dimen/gallery_page_min_height"
-            android:layout_toRightOf="@+id/image_center"
-            android:layout_weight="1"
+            android:layout_toEndOf="@+id/image_center"
             android:id="@+id/image_weChat"
             android:background="@drawable/weixin" />
     </RelativeLayout>
@@ -121,7 +118,7 @@
 
 
 
-    <Space
+    <androidx.legacy.widget.Space
         android:layout_width="wrap_content"
         android:layout_height="@dimen/keyline_margin" />
 

diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
@@ -32,7 +32,7 @@
             android:background="?attr/galleryDetailHeaderBackgroundColor"
             android:elevation="4dp" />
 
-        <Space
+        <androidx.legacy.widget.Space
             android:layout_width="match_parent"
             android:layout_height="24dp" />
 
@@ -55,10 +55,10 @@
                 android:id="@+id/thumb"
                 android:layout_width="@dimen/gallery_detail_thumb_width"
                 android:layout_height="@dimen/gallery_detail_thumb_height"
-                android:layout_marginLeft="@dimen/keyline_margin"
+                android:layout_marginStart="@dimen/keyline_margin"
                 android:layout_marginTop="@dimen/keyline_margin"
                 android:layout_marginBottom="@dimen/keyline_margin"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_alignWithParentIfMissing="true"
                 android:scaleType="fitCenter" />
 
@@ -69,7 +69,7 @@
                 android:layout_alignTop="@id/thumb"
                 android:layout_marginLeft="@dimen/keyline_margin"
                 android:layout_marginRight="@dimen/keyline_margin"
-                android:layout_toRightOf="@id/thumb"
+                android:layout_toEndOf="@id/thumb"
                 android:ellipsize="end"
                 android:maxLines="5"
                 android:textColor="@android:color/white"
@@ -80,9 +80,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/title"
-                android:layout_alignLeft="@id/title"
+                android:layout_alignStart="@id/title"
                 android:layout_marginTop="8dp"
-                android:layout_marginRight="@dimen/keyline_margin"
+                android:layout_marginEnd="@dimen/keyline_margin"
                 android:background="?selectableItemBackgroundBorderless"
                 android:ellipsize="end"
                 android:singleLine="true"
@@ -94,9 +94,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/uploader"
-                android:layout_alignLeft="@id/title"
+                android:layout_alignStart="@id/title"
                 android:layout_marginTop="12dp"
-                android:layout_marginRight="@dimen/keyline_margin"
+                android:layout_marginEnd="@dimen/keyline_margin"
                 android:ellipsize="end"
                 android:paddingLeft="8dp"
                 android:paddingTop="2dp"
@@ -111,7 +111,7 @@
                 android:layout_width="48dp"
                 android:layout_height="56dp"
                 android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:background="?selectableItemBackgroundBorderless"
                 android:clickable="true"
                 android:focusable="true"

diff --git a/app/src/main/res/layout/scene_download.xml b/app/src/main/res/layout/scene_download.xml
@@ -19,12 +19,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-<!--    <androidx.appcompat.widget.SearchView-->
-<!--        android:id="@+id/download_search"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="@dimen/download_search_bar_height" />-->
+<!--    <com.hippo.ehviewer.widget.SearchBar-->
+<!--        android:id="@+id/download_search_bar"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginLeft="@dimen/gallery_search_bar_margin_h"-->
+<!--        android:layout_marginRight="@dimen/gallery_search_bar_margin_h"-->
+<!--        android:layout_marginTop="@dimen/gallery_search_bar_margin_v"-->
+<!--        style="@style/CardView.Normal"/>-->
     <FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -43,8 +46,8 @@
                 android:layout_width="30dp"
                 android:layout_height="match_parent"
                 android:layout_gravity="right"
-                android:paddingLeft="20dp"
-                android:paddingRight="4dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="4dp"
                 android:paddingTop="8dp"
                 android:paddingBottom="8dp"/>
 

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -583,6 +583,7 @@
     <string name="settings_about_source">源码</string>
     <string name="settings_about_changelog">更新日志</string>
     <string name="settings_about_help">帮助</string>
+    <string name="settings_about_issue_help">问题帮助</string>
     <string name="settings_about_license">开源许可</string>
     <string name="settings_about_license_summary">EhViewer 的诞生离不开许多开源项目</string>
     <string name="settings_about_donate">捐赠</string>
@@ -767,6 +768,7 @@
     <string name="download_torrent_name">种子: %s</string>
     <string name="download_torrent_state">状态: </string>
     <string name="download_torrent_path">路径: %s</string>
+    <string name="download_search">在下载列表内搜索</string>
     <string name="sure">好的</string>
     <string name="try_again">再试一次</string>
     <string name="open_directory">打开目录</string>

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -19,7 +19,7 @@
         res/values/themes.xml-->
     <declare-styleable name="Theme">
         <!--   背景颜色     -->
-        <attr name="android:windowBackground" format="color"/>
+        <attr name="android:windowBackground" format="color" />
         <attr name="android:navigationBarColor" format="color" />
         <attr name="buttonStyle" format="reference" />
 
@@ -105,8 +105,8 @@
     </declare-styleable>
 
     <declare-styleable name="FixedThumbNew">
-<!--        <attr name="minAspect" format="float" />-->
-<!--        <attr name="maxAspect" format="float" />-->
+        <!--        <attr name="minAspect" format="float" />-->
+        <!--        <attr name="maxAspect" format="float" />-->
     </declare-styleable>
 
     <declare-styleable name="CheckTextView">
@@ -204,6 +204,9 @@
 
     <declare-styleable name="UrlPreference">
         <attr name="url" format="string" />
+        <attr name="android:maxLines" format="integer" />
+        <attr name="singleLine" format="boolean" />
+        <attr name="android:ellipsize" format="string" />
     </declare-styleable>
 
     <declare-styleable name="SeekBarPreference">

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -658,6 +658,7 @@
     <string name="settings_about_source">Source</string>
     <string name="settings_about_changelog">Changelog</string>
     <string name="settings_about_help">Help</string>
+    <string name="settings_about_issue_help">Issue Help</string>
     <string name="settings_about_license">License</string>
     <string name="settings_about_license_summary">EhViewer is made possible thanks to many open source projects</string>
     <string name="settings_about_donate">Donate</string>
@@ -847,6 +848,7 @@
     <string name="download_torrent_name">torrent: %s</string>
     <string name="download_torrent_state">state: </string>
     <string name="download_torrent_path">path: %s</string>
+    <string name="download_search">在下载列表内搜索</string>
     <string name="sure">OK</string>
     <string name="try_again">Try Again</string>
     <string name="open_directory">Open Directory</string>

diff --git a/app/src/main/res/xml/about_settings.xml b/app/src/main/res/xml/about_settings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,40 +14,45 @@
   ~ limitations under the License.
   -->
 
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference
         android:key="declaration"
-        android:title="@string/settings_about_declaration"
-        android:summary="@string/settings_about_declaration_summary"/>
+        android:summary="@string/settings_about_declaration_summary"
+        android:title="@string/settings_about_declaration" />
 
     <Preference
         android:key="author"
-        android:title="@string/settings_about_author"/>
+        android:title="@string/settings_about_author" />
 
 
     <com.hippo.preference.UrlPreference
         android:key="latest_release"
         android:title="@string/settings_about_latest_release"
-        app:url="https://github.com/xiaojieonly/Ehviewer_CN_SXJ/releases"/>
+        app:url="https://github.com/xiaojieonly/Ehviewer_CN_SXJ/releases" />
+
+    <com.hippo.preference.UrlPreference
+        android:ellipsize="end"
+        android:key="issue_help"
+        android:singleLine="true"
+        android:title="@string/settings_about_issue_help"
+        app:url="https://github.com/xiaojieonly/Ehviewer_CN_SXJ/blob/BiLi_PC_Gamer/feedauthor/EhviewerIssue.md" />
 
     <com.hippo.preference.ActivityPreference
         android:key="license"
-        android:title="@string/settings_about_license"
         android:summary="@string/settings_about_license_summary"
-        app:activity="com.hippo.ehviewer.ui.LicenseActivity"/>
+        android:title="@string/settings_about_license"
+        app:activity="com.hippo.ehviewer.ui.LicenseActivity" />
 
-    <com.hippo.ehviewer.preference.VersionPreference
-        android:key="version"/>
+    <com.hippo.ehviewer.preference.VersionPreference android:key="version" />
 
     <Preference
         android:key="check_for_updates"
-        android:title="@string/settings_about_check_for_updates"/>
+        android:title="@string/settings_about_check_for_updates" />
 
     <Preference
         android:key="donate"
-        android:title="@string/settings_about_donate"/>
+        android:title="@string/settings_about_donate" />
 
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>