Skip to content

Commit 7fcc62a

Browse files
xiaojieonlyxiaojieonly
committed
资源文件及配置文件更新
1 parent 8699bbc commit 7fcc62a

File tree

7 files changed

+74
-55
lines changed

7 files changed

+74
-55
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ android {
2525
minSdkVersion 23
2626
//noinspection ExpiredTargetSdkVersion
2727
targetSdkVersion 29
28-
versionCode 109
29-
versionName "1.9.2.3"
28+
versionCode 110
29+
versionName "1.9.3.0"
3030
vectorDrawables.useSupportLibrary = true
3131
resConfigs "zh", "zh-rCN", "zh-rHK", "zh-rTW",
3232
"es", "ja", "ko", "fr", "de", "th"

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
2424
<uses-permission android:name="android.permission.WAKE_LOCK" />
2525
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
26+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
27+
2628
<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
2729
<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
2830
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

‎app/src/main/res/layout/scene_download.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
android:layout_width="match_parent"
3232
android:layout_height="match_parent">
3333

34+
<com.hippo.widget.ProgressView
35+
android:id="@+id/download_progress_view"
36+
style="@style/ProgressView"
37+
android:layout_width="wrap_content"
38+
android:layout_height="wrap_content"
39+
android:visibility="gone"
40+
android:layout_gravity="center"/>
41+
3442
<FrameLayout
3543
android:id="@+id/content"
3644
android:layout_width="match_parent"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,8 @@
351351
<string name="remember_download_label">记住下载标签</string>
352352
<string name="default_download_label">默认下载标签</string>
353353
<string name="added_to_download_list">已添加至下载列表</string>
354+
<string name="download_searching">正在搜索请稍候</string>
355+
<string name="download_searching_failed">搜索失败，请尝试重启软件</string>
354356

355357
<!-- Download label -->
356358
<string name="no_download_label">这里是下载标签</string>
@@ -469,6 +471,7 @@
469471
<string name="settings_eh_excluded_languages">排除语言</string>
470472
<string name="settings_eh_excluded_languages_summary">在主页与搜索中隐藏指定语言的画廊</string>
471473
<string name="settings_eh_show_jpn_title">显示日文标题</string>
474+
<string name="settings_eh_show_gallery_comment">显示画廊评论</string>
472475
<string name="settings_eh_show_jpn_title_summary">需同时在 EHentai 网站设置中启用 Japanese Title</string>
473476
<string name="settings_eh_show_gallery_pages">显示画廊页数</string>
474477
<string name="settings_eh_show_gallery_pages_summary">在画廊列表中显示页数</string>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,8 @@
424424
<string name="remember_download_label">Remember download label</string>
425425
<string name="default_download_label">Default download label</string>
426426
<string name="added_to_download_list">Added to download list</string>
427+
<string name="download_searching">Searching please wait</string>
428+
<string name="download_searching_failed">Searching failed</string>
427429

428430
<!-- Download label -->
429431
<string name="no_download_label">Download labels will be shown here</string>
@@ -541,6 +543,7 @@
541543
<string name="settings_eh_excluded_tag_namespaces">Excluded tag namespaces</string>
542544
<string name="settings_eh_excluded_tag_namespaces_summary">Exclude certain namespaces from a default tag search</string>
543545
<string name="settings_eh_show_jpn_title">Show Japanese title</string>
546+
<string name="settings_eh_show_gallery_comment">Show Gallery Comment</string>
544547
<string name="settings_eh_show_jpn_title_summary">Require enabling Japanese Title in Settings on EHentai website</string>
545548
<string name="settings_eh_show_gallery_pages">Show gallery pages</string>
546549
<string name="settings_eh_show_gallery_pages_summary">Display the number of pages in the gallery list</string>

‎app/src/main/res/xml/advanced_settings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
android:key="built_ex_hosts"
7878
android:title="@string/settings_advanced_built_ex_hosts_title"
7979
android:summary="@string/settings_advanced_built_ex_hosts_summary"
80-
android:defaultValue="false"/>
80+
android:defaultValue="true"/>
8181

8282
<com.hippo.preference.ActivityPreference
8383
xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -93,7 +93,7 @@
9393
android:defaultValue="false"/>
9494

9595
<com.hippo.preference.SwitchPreference
96-
android:defaultValue="false"
96+
android:defaultValue="true"
9797
android:key="domain_fronting"
9898
android:summary="@string/settings_advanced_domain_fronting_summary"
9999
android:title="@string/settings_advanced_domain_fronting_title" />

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

Lines changed: 54 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
~ Copyright 2016 Hippo Seven
43
~
54
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,136 +14,140 @@
1514
~ limitations under the License.
1615
-->
1716

18-
<PreferenceScreen
19-
xmlns:android="http://schemas.android.com/apk/res/android"
17+
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
2018
xmlns:app="http://schemas.android.com/apk/res-auto">
2119

2220
<com.hippo.ehviewer.preference.SignOutPreference
2321
android:key="sign_out"
24-
android:title="@string/settings_eh_sign_out"
25-
android:summary="@string/settings_eh_sign_out_summary"/>
22+
android:summary="@string/settings_eh_sign_out_summary"
23+
android:title="@string/settings_eh_sign_out" />
2624

2725
<com.hippo.ehviewer.preference.IdentityCookiePreference
2826
android:key="identity_cookie"
29-
android:title="@string/settings_eh_identity_cookies"
30-
android:summary="@string/settings_eh_identity_cookies_summary"/>
27+
android:summary="@string/settings_eh_identity_cookies_summary"
28+
android:title="@string/settings_eh_identity_cookies" />
3129

3230
<com.hippo.preference.ListPreference
31+
android:defaultValue="1"
3332
android:key="gallery_site"
34-
android:title="@string/settings_eh_gallery_site"
3533
android:summary="%s"
34+
android:title="@string/settings_eh_gallery_site"
3635
app:entries="@array/gallery_site_entries"
37-
app:entryValues="@array/gallery_site_entry_values"
38-
android:defaultValue="1"/>
36+
app:entryValues="@array/gallery_site_entry_values" />
3937

4038
<com.hippo.ehviewer.preference.SignInRequiredActivityPreference
4139
android:key="u_config"
42-
android:title="@string/settings_u_config"
4340
android:summary="@string/settings_u_config_summary"
44-
app:activity="com.hippo.ehviewer.ui.UConfigActivity"/>
41+
android:title="@string/settings_u_config"
42+
app:activity="com.hippo.ehviewer.ui.UConfigActivity" />
4543

4644
<com.hippo.ehviewer.preference.SignInRequiredActivityPreference
4745
android:key="my_tags"
48-
android:title="@string/settings_my_tags"
4946
android:summary="@string/settings_my_tags_summary"
50-
app:activity="com.hippo.ehviewer.ui.MyTagsActivity"/>
47+
android:title="@string/settings_my_tags"
48+
app:activity="com.hippo.ehviewer.ui.MyTagsActivity" />
5149

5250
<com.hippo.preference.ListPreference
51+
android:defaultValue="0"
5352
android:key="theme"
54-
android:title="@string/settings_eh_theme"
5553
android:summary="%s"
54+
android:title="@string/settings_eh_theme"
5655
app:entries="@array/theme_entries"
57-
app:entryValues="@array/theme_entry_values"
58-
android:defaultValue="0"/>
56+
app:entryValues="@array/theme_entry_values" />
5957

6058
<com.hippo.preference.SwitchPreference
59+
android:defaultValue="false"
6160
android:key="apply_nav_bar_theme_color"
62-
android:title="@string/settings_eh_apply_nav_bar_theme_color"
63-
android:defaultValue="false"/>
61+
android:title="@string/settings_eh_apply_nav_bar_theme_color" />
6462

6563
<com.hippo.preference.ListPreference
64+
android:defaultValue="0"
6665
android:key="launch_page"
67-
android:title="@string/settings_eh_launch_page"
6866
android:summary="%s"
67+
android:title="@string/settings_eh_launch_page"
6968
app:entries="@array/launch_page_entries"
70-
app:entryValues="@array/launch_page_entry_values"
71-
android:defaultValue="0"/>
69+
app:entryValues="@array/launch_page_entry_values" />
7270

7371
<com.hippo.preference.ListPreference
72+
android:defaultValue="0"
7473
android:key="list_mode"
75-
android:title="@string/settings_eh_list_mode"
7674
android:summary="%s"
75+
android:title="@string/settings_eh_list_mode"
7776
app:entries="@array/list_mode_entries"
78-
app:entryValues="@array/list_mode_entry_values"
79-
android:defaultValue="0"/>
77+
app:entryValues="@array/list_mode_entry_values" />
8078

8179
<com.hippo.preference.ListPreference
80+
android:defaultValue="0"
8281
android:key="detail_size"
83-
android:title="@string/settings_eh_detail_size"
8482
android:summary="%s"
83+
android:title="@string/settings_eh_detail_size"
8584
app:entries="@array/detail_size_entries"
86-
app:entryValues="@array/detail_size_entry_values"
87-
android:defaultValue="0"/>
85+
app:entryValues="@array/detail_size_entry_values" />
8886

8987
<com.hippo.preference.ListPreference
88+
android:defaultValue="1"
9089
android:key="thumb_size"
91-
android:title="@string/settings_eh_thumb_size"
9290
android:summary="%s"
91+
android:title="@string/settings_eh_thumb_size"
9392
app:entries="@array/thumb_size_entries"
94-
app:entryValues="@array/thumb_size_entry_values"
95-
android:defaultValue="1"/>
93+
app:entryValues="@array/thumb_size_entry_values" />
9694

9795
<com.hippo.preference.ListPreference
96+
android:defaultValue="0"
9897
android:key="thumb_resolution"
99-
android:title="@string/settings_eh_thumb_resolution"
10098
android:summary="@string/settings_eh_thumb_resolution_summary"
99+
android:title="@string/settings_eh_thumb_resolution"
101100
app:entries="@array/thumb_resolution_entries"
102-
app:entryValues="@array/thumb_resolution_entry_values"
103-
android:defaultValue="0"/>
101+
app:entryValues="@array/thumb_resolution_entry_values" />
104102

105103
<com.hippo.preference.SwitchPreference
106-
android:key="fix_thumb_url"
107-
android:title="@string/settings_eh_fix_thumb_url"
108-
android:defaultValue="false"/>
104+
android:defaultValue="false"
105+
android:key="fix_thumb_url"
106+
android:title="@string/settings_eh_fix_thumb_url" />
109107

110108
<com.hippo.preference.SwitchPreference
109+
android:defaultValue="false"
111110
android:key="show_jpn_title"
112-
android:title="@string/settings_eh_show_jpn_title"
113111
android:summary="@string/settings_eh_show_jpn_title_summary"
114-
android:defaultValue="false"/>
112+
android:title="@string/settings_eh_show_jpn_title" />
115113

116114
<com.hippo.preference.SwitchPreference
115+
android:defaultValue="false"
117116
android:key="show_gallery_pages"
118-
android:title="@string/settings_eh_show_gallery_pages"
119117
android:summary="@string/settings_eh_show_gallery_pages_summary"
120-
android:defaultValue="false"/>
118+
android:title="@string/settings_eh_show_gallery_pages" />
121119

122120
<com.hippo.preference.SwitchPreference
121+
android:defaultValue="true"
123122
android:key="show_tag_translations"
124-
android:title="@string/settings_eh_show_tag_translations"
125123
android:summary="@string/settings_eh_show_tag_translations_summary"
126-
android:defaultValue="true"/>
124+
android:title="@string/settings_eh_show_tag_translations" />
127125

128126
<com.hippo.preference.UrlPreference
129127
android:key="tag_translations_source"
130128
android:title="@string/settings_eh_tag_translations_source"
131-
app:url="@string/settings_eh_tag_translations_source_url"/>
129+
app:url="@string/settings_eh_tag_translations_source_url" />
132130

133131
<com.hippo.preference.ActivityPreference
134132
android:key="filter"
135-
android:title="@string/settings_eh_filter"
136133
android:summary="@string/settings_eh_filter_summary"
137-
app:activity="com.hippo.ehviewer.ui.FilterActivity"/>
134+
android:title="@string/settings_eh_filter"
135+
app:activity="com.hippo.ehviewer.ui.FilterActivity" />
136+
137+
<com.hippo.preference.SwitchPreference
138+
android:defaultValue="true"
139+
android:key="show_gallery_comment"
140+
android:title="@string/settings_eh_show_gallery_comment" />
138141

139142
<com.hippo.preference.ActivityPreference
140143
android:key="blickList"
141-
android:title="@string/settings_eh_blacklist"
142144
android:summary="@string/settings_eh_blacklist_summary"
143-
app:activity="com.hippo.ehviewer.ui.BlackListActivity"/>
145+
android:title="@string/settings_eh_blacklist"
146+
app:activity="com.hippo.ehviewer.ui.BlackListActivity" />
144147

145148
<com.hippo.preference.SwitchPreference
149+
android:defaultValue="false"
146150
android:key="cellular_network_warning"
147-
android:title="@string/settings_eh_cellular_network_warning"
148-
android:defaultValue="false"/>
151+
android:title="@string/settings_eh_cellular_network_warning" />
149152

150153
</PreferenceScreen>

0 commit comments

Comments
 (0)