res 资源更新

app/src/main/res/drawable/jump_selector_shape.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:radius="12dp" />
+</shape>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.hippo.ehviewer.widget.JumpDateSelector
+        android:id="@+id/gallery_list_jump_date"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+</LinearLayout>

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

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/title_text_top_padding"
+    android:orientation="vertical">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        style="@style/TopListTitle"
+        android:padding="@dimen/title_text_top_padding"
+        android:text="@string/gallery_list_time_jump_dialog_title"
+        />
+    <com.hippo.ehviewer.widget.MyRadioGroup
+        android:id="@+id/jump_date_picker_group"
+        android:padding="@dimen/title_text_top_padding"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/jump_1d"
+            android:text="@string/gallery_list_date_jump_1d"
+            />
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/jump_3d"
+            android:text="@string/gallery_list_date_jump_3d"
+            />
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/jump_1w"
+            android:text="@string/gallery_list_date_jump_1w"
+            />
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/jump_2w"
+            android:text="@string/gallery_list_date_jump_2w"
+            />
+
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/jump_1m"
+            android:text="@string/gallery_list_date_jump_1m"
+            />
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/jump_6m"
+            android:text="@string/gallery_list_date_jump_6m"
+            />
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/jump_1y"
+            android:text="@string/gallery_list_date_jump_1y"
+            />
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/jump_2y"
+            android:text="@string/gallery_list_date_jump_2y"
+            />
+
+    </com.hippo.ehviewer.widget.MyRadioGroup>
+
+    <DatePicker
+        android:id="@+id/date_picker_view"
+        android:datePickerMode="spinner"
+        android:calendarViewShown="false"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/picker_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/gallery_list_select_jump_date"
+            />
+        <Space
+            android:layout_width="@dimen/button_space_between"
+            android:layout_height="wrap_content"/>
+        <Button
+            android:id="@+id/goto_jump"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/gallery_list_jump_now"
+            />
+
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -22,6 +22,7 @@
         android:layout_marginBottom="@dimen/advance_search_table_item_margin">
 
         <CheckBox
+            android:id="@+id/search_gallery"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -31,6 +32,7 @@
             android:text="@string/search_sname"/>
 
         <CheckBox
+            android:id="@+id/search_gallery_tags"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -47,6 +49,7 @@
         android:layout_marginBottom="@dimen/advance_search_table_item_margin">
 
         <CheckBox
+            android:id="@+id/search_gallery_description"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -55,6 +58,7 @@
             android:text="@string/search_sdesc"/>
 
         <CheckBox
+            android:id="@+id/search_torrent_filenames"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -70,6 +74,7 @@
         android:layout_marginBottom="@dimen/advance_search_table_item_margin">
 
         <CheckBox
+            android:id="@+id/only_show_galleries_with_torrents"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -78,6 +83,7 @@
             android:text="@string/search_sto"/>
 
         <CheckBox
+            android:id="@+id/search_low_power_tags"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -93,6 +99,7 @@
         android:layout_marginBottom="@dimen/advance_search_table_item_margin">
 
         <CheckBox
+            android:id="@+id/search_downvoted_tags"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -101,6 +108,7 @@
             android:text="@string/search_sdt2"/>
 
         <CheckBox
+            android:id="@+id/search_expunged_galleries"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -116,6 +124,7 @@
         android:layout_marginBottom="@dimen/advance_search_table_item_margin">
 
         <CheckBox
+            android:id="@+id/minimum_rating"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -124,6 +133,7 @@
             android:text="@string/search_sr"/>
 
         <Spinner
+            android:id="@+id/search_min_rating"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -139,6 +149,7 @@
         android:layout_marginBottom="@dimen/advance_search_table_item_margin">
 
         <CheckBox
+            android:id="@+id/pages_setting"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/advance_search_table_item_margin"
@@ -205,6 +216,7 @@
         android:layout_marginTop="@dimen/advance_search_table_item_margin">
 
         <CheckBox
+            android:id="@+id/disable_default_filter_language"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -213,6 +225,7 @@
             android:text="@string/search_sfl"/>
 
         <CheckBox
+            android:id="@+id/disable_default_filter_uploader"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -222,6 +235,7 @@
             android:text="@string/search_sfu"/>
 
         <CheckBox
+            android:id="@+id/disable_default_filter_tags"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"

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

@@ -210,7 +210,7 @@
     <string name="search_sto">Only Show Galleries With Torrents</string>
     <string name="search_sdt1">Search Low-Power Tags</string>
     <string name="search_sdt2">Search Downvoted Tags</string>
-    <string name="search_sh">Show Expunged Galleries</string>
+    <string name="search_sh">Search Expunged Galleries</string>
     <string name="search_sr">Minimum Rating:</string>
     <string name="search_sp">Pages:</string>
     <string name="search_sp_to">to</string>

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

@@ -83,8 +83,6 @@
     <string name="error_invalid_archive">잘못된 압축 파일</string>
     <string name="error_reading_failed">읽기 실패</string>
     <string name="error_out_of_range">범위 초과</string>
-    <string name="error_write_failed">쓰기 실패</string>
-    <string name="error_parse_error">구문 분석 오류</string>
     <string name="error_write_failed">쓰기 오류</string>
     <string name="error_parse_error">분석 오류</string>
     <string name="error_509">509</string>
@@ -139,8 +137,8 @@
     <string name="gallery_list_no_preview_tag">미리보기 탭 없음</string>
     <string name="search">검색</string>
 
-    <string name="gallery_list_action_url_missed">해당 링크를 찾을 수 없음</string>
-    <string name="gallery_list_can_not_jump">현재 점프할 수 없음</string>
+    <string name="gallery_list_action_url_missed">다음 페이지를 찾을 수 없습니다</string>
+    <string name="gallery_list_no_more_data">현재 점프할 수 없음</string>
 
     <string name="keyword_search">키워드 검색</string>
     <string name="image_search">이미지 검색</string>
@@ -166,11 +164,6 @@
     <string name="search_sh">Expunged 갤러리 표시</string>
     <string name="search_sr">최소 평점:</string>
     <string name="search_sp">페이지 수:</string>
-    <string name="select_image">이미지 선택</string>
-    <string name="search_uss">유사한 이미지 검색</string>
-    <string name="search_osc">커버만 검색</string>
-    <string name="search_se">Expunged 이미지 표시</string>
-    <string name="select_image_first">먼저 이미지를 선택해 주세요.</string>
 
     <string name="select_image">이미지 선택</string>
     <string name="search_uss">유사한 검색 사용</string>
@@ -245,8 +238,8 @@
     <string name="remove_from_favorite_success">즐겨찾기에서 제거했습니다.</string>
     <string name="add_to_favorite_failure">즐겨찾기에 추가하지 못했습니다.</string>
     <string name="remove_from_favorite_failure">즐겨찾기에서 제거하지 못했습니다.</string>
-    <string name="filter_the_uploader">업로더 '%s'을(를) 차단하시겠습니까?</string>
-    <string name="filter_the_tag">태그 '%s'을(를) 차단하시겠습니까?</string>
+    <string name="filter_the_uploader">업로더 \"%s\"을(를) 차단하시겠습니까?</string>
+    <string name="filter_the_tag">태그 \"%s\"을(를) 차단하시겠습니까?</string>
     <string name="filter_added">차단 항목 추가됨</string>
 
     <!-- Rating -->
@@ -380,7 +373,7 @@
     <string name="filter_uploader">업로더</string>
     <string name="filter_tag">태그</string>
     <string name="filter_tag_namespace">태그 네임스페이스</string>
-    <string name="delete_filter">차단 항목 '%s' 을(를) 삭제하시겠습니까?</string>
+    <string name="delete_filter">차단 항목 \'%s\' 을(를) 삭제하시겠습니까?</string>
     <string name="tip">팁</string>
     <string name="add_filter">차단 항목 추가</string>
     <string name="show_definition">정의 표시</string>
@@ -399,7 +392,7 @@
     <string name="apply_tip">설정을 저장하려면 체크 표시를 누르세요.</string>
 
     <!-- My Tags Activity -->
-    <string name="my_tags">나의 태그</string
+    <string name="my_tags">나의 태그</string>
 
     <!-- Hosts Activity -->
     <string name="hosts">사용자 지정 hosts.txt</string>
@@ -734,8 +727,6 @@
 
     <string name="download_service">다운로드 서비스</string>
     <string name="favorite_name">즐겨찾기</string>
-    <string name="settings_about_donate_guide">지원 매 뉴 얼</string>
-
 
     <!--  排行榜  -->
     <string name="gallery_toplists">갤러리 순위표</string>
@@ -780,7 +771,7 @@
     <string name="sure">예</string>
     <string name="try_again">잠시후 다시 시도하십시오.</string>
     <string name="open_directory">디렉터리 열기</string>
-    <string name="downloading">다운로드 중... 나중에 다시 시도하십시오.</string>
+    <string name="downloading">다운로드 중… 나중에 다시 시도하십시오.</string>
     <string name="torrent_exist">파일이 이미 존재합니다.</string>
 
     <string name="yes">예</string>

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

@@ -139,8 +139,20 @@
     <string name="gallery_list_no_preview_tag">暂无预览标签</string>
     <string name="search">搜索</string>
 
-    <string name="gallery_list_action_url_missed">没找到对应链接</string>
-    <string name="gallery_list_can_not_jump">当前无法跳转</string>
+    <string name="gallery_list_action_url_missed">没找到下一页</string>
+    <string name="gallery_list_no_more_data">当前列表没有更多数据</string>
+    <string name="gallery_list_date_jump_1d">昨天</string>
+    <string name="gallery_list_date_jump_3d">三天前</string>
+    <string name="gallery_list_date_jump_1w">一周前</string>
+    <string name="gallery_list_date_jump_2w">两周前</string>
+    <string name="gallery_list_date_jump_1m">一个月前</string>
+    <string name="gallery_list_date_jump_6m">半年前</string>
+    <string name="gallery_list_date_jump_1y">一年前</string>
+    <string name="gallery_list_date_jump_2y">两年前</string>
+    <string name="gallery_list_select_jump_date">选择日期</string>
+    <string name="gallery_list_select_jump_node">选择节点</string>
+    <string name="gallery_list_jump_now">立即跳转</string>
+    <string name="gallery_list_time_jump_dialog_title">跳转选择器</string>
 
     <string name="keyword_search">关键字搜索</string>
     <string name="image_search">图片搜索</string>
@@ -163,7 +175,7 @@
     <string name="search_sto">仅显示有种子的画廊</string>
     <string name="search_sdt1">搜索低愿力标签</string>
     <string name="search_sdt2">搜索差评标签</string>
-    <string name="search_sh">显示被删除的画廊</string>
+    <string name="search_sh">只显示被删除的画廊</string>
     <string name="search_sr">最低评分：</string>
     <string name="search_sp">页数：</string>
     <string name="search_sp_to">到</string>

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

@@ -165,5 +165,6 @@
     <dimen name="popup_text_margin">12dp</dimen>
 
     <dimen name="download_search_bar_height">40dp</dimen>
+    <dimen name="button_space_between">20dp</dimen>
 
 </resources>

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

@@ -206,8 +206,20 @@
     <string name="gallery_list_empty_hit_subscription">Subscribe to tags in Settings->EH->My tags</string>
     <string name="gallery_list_no_preview_tag">No preview tag</string>
 
-    <string name="gallery_list_action_url_missed">No corresponding link found</string>
-    <string name="gallery_list_can_not_jump">Currently unable to jump</string>
+    <string name="gallery_list_action_url_missed">Next page not found</string>
+    <string name="gallery_list_no_more_data">There is no more data for the current listing</string>
+    <string name="gallery_list_date_jump_1d">Yesterday</string>
+    <string name="gallery_list_date_jump_3d">Three days ago</string>
+    <string name="gallery_list_date_jump_1w">One week ago</string>
+    <string name="gallery_list_date_jump_2w">Two weeks ago</string>
+    <string name="gallery_list_date_jump_1m">One month ago</string>
+    <string name="gallery_list_date_jump_6m">Six months ago</string>
+    <string name="gallery_list_date_jump_1y">One year ago</string>
+    <string name="gallery_list_date_jump_2y">Two years ago</string>
+    <string name="gallery_list_select_jump_date">Use date selector</string>
+    <string name="gallery_list_select_jump_node">Use node selector</string>
+    <string name="gallery_list_jump_now">Jump Now</string>
+    <string name="gallery_list_time_jump_dialog_title">Jump Selector</string>
 
     <string name="search">Search</string>
 
@@ -232,7 +244,7 @@
     <string name="search_sto">Only Show Galleries With Torrents</string>
     <string name="search_sdt1">Search Low-Power Tags</string>
     <string name="search_sdt2">Search Downvoted Tags</string>
-    <string name="search_sh">Show Expunged Galleries</string>
+    <string name="search_sh">Search Expunged Galleries</string>
     <string name="search_sr">Minimum Rating:</string>
     <string name="search_sp">Pages:</string>
     <string name="search_sp_to">to</string>