Skip to content

Commit bf29e20

Browse files
xiaojieonlyxiaojieonly
committed
资源文件更新
1 parent 62c7607 commit bf29e20

File tree

9 files changed

+229
-19
lines changed

9 files changed

+229
-19
lines changed

‎app/src/main/res/drawable/ic_baseline_visibility_24.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="?attr/colorControlNormal">
7+
<path
8+
android:fillColor="?attr/drawableColorPrimary"
9+
android:pathData="@string/ic_visibility"/>
10+
</vector>

‎app/src/main/res/drawable/ic_baseline_visibility_off_24.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="?attr/colorControlNormal">
7+
<path
8+
android:fillColor="?attr/drawableColorPrimary"
9+
android:pathData="@string/ic_visibility_off"/>
10+
</vector>

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright 2018 Hippo Seven
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<FrameLayout
19+
xmlns:android="http://schemas.android.com/apk/res/android"
20+
android:layout_width="match_parent"
21+
android:layout_height="wrap_content"
22+
android:clipChildren="false">
23+
24+
<com.hippo.widget.ShadowLinearLayout
25+
android:id="@+id/swipe_handler"
26+
android:layout_width="match_parent"
27+
android:layout_height="wrap_content"
28+
android:orientation="vertical"
29+
android:background="?attr/contentColorPrimary">
30+
31+
<LinearLayout
32+
android:layout_width="match_parent"
33+
android:layout_height="wrap_content"
34+
android:orientation="horizontal">
35+
36+
<ImageView
37+
xmlns:app="http://schemas.android.com/apk/res-auto"
38+
android:id="@+id/delete"
39+
android:layout_width="48dp"
40+
android:layout_height="48dp"
41+
android:padding="12dp"
42+
app:srcCompat="@drawable/v_delete_x24"/>
43+
44+
<TextView
45+
android:id="@+id/label"
46+
android:layout_width="0dp"
47+
android:layout_height="48dp"
48+
android:layout_weight="1"
49+
android:paddingLeft="16dp"
50+
android:paddingRight="16dp"
51+
android:gravity="center"
52+
android:singleLine="true"
53+
android:ellipsize="end"
54+
android:textSize="@dimen/text_little_small"
55+
android:textColor="?android:attr/textColorPrimary"/>
56+
57+
<ImageView
58+
xmlns:app="http://schemas.android.com/apk/res-auto"
59+
android:id="@+id/drag_handler"
60+
android:layout_width="48dp"
61+
android:layout_height="48dp"
62+
android:padding="12dp" />
63+
64+
</LinearLayout>
65+
66+
<View
67+
android:layout_width="wrap_content"
68+
android:layout_height="1dp"
69+
android:background="?attr/dividerColor"/>
70+
71+
</com.hippo.widget.ShadowLinearLayout>
72+
</FrameLayout>

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,24 @@
2020
android:layout_width="match_parent"
2121
android:layout_height="match_parent">
2222

23-
<com.hippo.easyrecyclerview.EasyRecyclerView
24-
android:id="@+id/recycler_view"
23+
<FrameLayout
2524
android:layout_width="match_parent"
26-
android:layout_height="match_parent"
27-
android:padding="@dimen/keyline_margin"
28-
android:clipChildren="false"
29-
android:clipToPadding="false"/>
25+
android:layout_height="match_parent">
26+
<com.hippo.easyrecyclerview.EasyRecyclerView
27+
android:id="@+id/recycler_view"
28+
android:layout_width="match_parent"
29+
android:layout_height="match_parent"
30+
android:padding="@dimen/keyline_margin"
31+
android:clipChildren="false"
32+
android:clipToPadding="false"/>
33+
<com.hippo.widget.ProgressView
34+
android:id="@+id/scene_label_progress"
35+
android:visibility="gone"
36+
style="@style/ProgressView"
37+
android:layout_width="wrap_content"
38+
android:layout_height="wrap_content"
39+
android:layout_gravity="center"/>
40+
</FrameLayout>
3041

3142
<TextView
3243
android:id="@+id/tip"

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright 2018 Hippo Seven
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<FrameLayout
19+
xmlns:android="http://schemas.android.com/apk/res/android"
20+
android:layout_width="match_parent"
21+
android:layout_height="wrap_content"
22+
android:clipChildren="false">
23+
24+
<com.hippo.widget.ShadowLinearLayout
25+
android:id="@+id/swipe_handler"
26+
android:layout_width="match_parent"
27+
android:layout_height="wrap_content"
28+
android:orientation="vertical"
29+
android:background="?attr/contentColorPrimary">
30+
31+
<LinearLayout
32+
android:layout_width="match_parent"
33+
android:layout_height="wrap_content"
34+
android:orientation="horizontal">
35+
36+
<ImageView
37+
xmlns:app="http://schemas.android.com/apk/res-auto"
38+
android:id="@+id/subscription_state"
39+
android:layout_width="48dp"
40+
android:layout_height="48dp"
41+
android:padding="12dp" />
42+
43+
<TextView
44+
android:id="@+id/label"
45+
android:layout_width="0dp"
46+
android:layout_height="48dp"
47+
android:layout_weight="1"
48+
android:paddingLeft="16dp"
49+
android:paddingRight="16dp"
50+
android:gravity="center_vertical"
51+
android:singleLine="true"
52+
android:ellipsize="end"
53+
android:textSize="@dimen/text_little_small"
54+
android:textColor="?android:attr/textColorPrimary"/>
55+
56+
<!-- <ImageView-->
57+
<!-- xmlns:app="http://schemas.android.com/apk/res-auto"-->
58+
<!-- android:id="@+id/drag_handler"-->
59+
<!-- android:layout_width="48dp"-->
60+
<!-- android:layout_height="48dp"-->
61+
<!-- android:padding="12dp"-->
62+
<!-- app:srcCompat="@drawable/v_reorder_x24"/>-->
63+
64+
</LinearLayout>
65+
66+
<View
67+
android:layout_width="wrap_content"
68+
android:layout_height="1dp"
69+
android:background="?attr/dividerColor"/>
70+
71+
</com.hippo.widget.ShadowLinearLayout>
72+
</FrameLayout>

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

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,47 @@
1818

1919
<FrameLayout
2020
android:layout_width="match_parent"
21-
android:layout_height="0dp"
22-
android:layout_weight="1">
23-
24-
<View
21+
android:layout_height="match_parent">
22+
<FrameLayout
2523
android:layout_width="match_parent"
26-
android:layout_height="8dp"
27-
android:background="@drawable/shadow_bottom"/>
24+
android:layout_height="match_parent"
25+
android:id="@+id/tag_list_parent"
26+
android:layout_weight="1">
2827

29-
<TextView
30-
android:id="@+id/tip"
28+
<View
29+
android:layout_width="match_parent"
30+
android:layout_height="8dp"
31+
android:background="@drawable/shadow_bottom"/>
32+
33+
<TextView
34+
android:id="@+id/tip"
35+
android:layout_width="wrap_content"
36+
android:layout_height="wrap_content"
37+
android:layout_gravity="center"
38+
android:visibility="gone"/>
39+
40+
<ListView
41+
android:id="@+id/list_view"
42+
android:layout_width="match_parent"
43+
android:layout_height="match_parent"/>
44+
45+
</FrameLayout>
46+
47+
<com.hippo.widget.ProgressView
48+
android:id="@+id/tag_list_view_progress"
49+
style="@style/ProgressView"
3150
android:layout_width="wrap_content"
3251
android:layout_height="wrap_content"
33-
android:layout_gravity="center"
34-
android:visibility="gone"/>
52+
android:layout_gravity="center"/>
3553

36-
<ListView
37-
android:id="@+id/list_view"
54+
<TextView
55+
android:id="@+id/not_login_text"
3856
android:layout_width="match_parent"
39-
android:layout_height="match_parent"/>
57+
android:layout_height="match_parent"
58+
android:gravity="center"
59+
android:textSize="@dimen/text_super_large"
60+
android:visibility="gone"
61+
android:text="@string/settings_eh_identity_cookies_tourist"/>
4062

4163
</FrameLayout>
4264
</LinearLayout>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,11 @@
754754
<string name="request_camera_permission">EhViewer 将申请设备相机访问权限以便拍摄照片。您愿意授权吗？</string>
755755
<string name="request_storage_permission">EhViewer 将申请设备相册访问权限以便获取图片。您愿意授权吗？</string>
756756

757+
<!-- 订阅服务 -->
758+
<string name="subscription_watched">订阅</string>
759+
<string name="subscription_hidden">排除</string>
760+
<string name="delete_subscription_title">删除标签</string>
761+
757762
<!-- 下载通知 -->
758763
<string name="download_torrent_name">种子: %s</string>
759764
<string name="download_torrent_state">状态: </string>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,12 @@
101101
<string name="filter_8" translatable="false">M3,5L1,5v16c0,1.1 0.9,2 2,2h16v-2L3,21L3,5zM21,1L7,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM21,17L7,17L7,3h14v14zM13,15h2c1.1,0 2,-0.89 2,-2v-1.5c0,-0.83 -0.67,-1.5 -1.5,-1.5 0.83,0 1.5,-0.67 1.5,-1.5L17,7c0,-1.11 -0.9,-2 -2,-2h-2c-1.1,0 -2,0.89 -2,2v1.5c0,0.83 0.67,1.5 1.5,1.5 -0.83,0 -1.5,0.67 -1.5,1.5L11,13c0,1.11 0.9,2 2,2zM13,7h2v2h-2L13,7zM13,11h2v2h-2v-2z</string>
102102
<string name="filter_9" translatable="false">M3,5L1,5v16c0,1.1 0.9,2 2,2h16v-2L3,21L3,5zM21,1L7,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM21,17L7,17L7,3h14v14zM15,5h-2c-1.1,0 -2,0.89 -2,2v2c0,1.11 0.9,2 2,2h2v2h-4v2h4c1.1,0 2,-0.89 2,-2L17,7c0,-1.11 -0.9,-2 -2,-2zM15,9h-2L13,7h2v2z</string>
103103
<string name="filter_much_more" translatable="false">M3,5L1,5v16c0,1.1 0.9,2 2,2h16v-2L3,21L3,5zM14,12L14,8c0,-1.11 -0.9,-2 -2,-2h-1c-1.1,0 -2,0.89 -2,2v1c0,1.11 0.9,2 2,2h1v1L9,12v2h3c1.1,0 2,-0.89 2,-2zM11,9L11,8h1v1h-1zM21,1L7,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM21,9h-2L19,7h-2v2h-2v2h2v2h2v-2h2v6L7,17L7,3h14v6z</string>
104+
104105
<string name="start_play" translatable="false">M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z</string>
105106
<string name="ic_bookmarks" translatable="false">M19,18l2,1V3c0,-1.1 -0.9,-2 -2,-2H8.99C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13zM15,5H5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V7c0,-1.1 -0.9,-2 -2,-2z</string>
106107
<string name="ic_subscription" translatable="false">M20,8L4,8L4,6h16v2zM18,2L6,2v2h12L18,2zM22,12v8c0,1.1 -0.9,2 -2,2L4,22c-1.1,0 -2,-0.9 -2,-2v-8c0,-1.1 0.9,-2 2,-2h16c1.1,0 2,0.9 2,2zM16,16l-6,-3.27v6.53L16,16z</string>
108+
<string name="ic_visibility" translatable="false">M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z</string>
109+
<string name="ic_visibility_off" translatable="false">M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z</string>
107110

108111

109112

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,11 @@
853853
<string name="downloading">Downloading…… Please Try Later</string>
854854
<string name="torrent_exist">File already exists</string>
855855

856+
<!-- 订阅服务 -->
857+
<string name="subscription_watched">Watched</string>
858+
<string name="subscription_hidden">Hidden</string>
859+
<string name="delete_subscription_title">Remove Tag</string>
860+
856861
<string name="yes">Yes</string>
857862
<string name="cancel">Cancel</string>
858863

0 commit comments

Comments
 (0)