diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index d50c98701..250215c34 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -43,7 +43,7 @@ import com.hippo.ehviewer.client.EhUtils;
import com.hippo.ehviewer.ui.scene.AnalyticsScene;
import com.hippo.ehviewer.ui.scene.BaseScene;
import com.hippo.ehviewer.ui.scene.CookieSignInScene;
-import com.hippo.ehviewer.ui.scene.DownloadLabelScene;
+import com.hippo.ehviewer.ui.scene.DownloadLabelsScene;
import com.hippo.ehviewer.ui.scene.DownloadsScene;
import com.hippo.ehviewer.ui.scene.FavoritesScene;
import com.hippo.ehviewer.ui.scene.GalleryCommentsScene;
@@ -107,7 +107,7 @@ public final class MainActivity extends StageActivity
registerLaunchMode(GalleryCommentsScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
registerLaunchMode(GalleryPreviewsScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
registerLaunchMode(DownloadsScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
- registerLaunchMode(DownloadLabelScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
+ registerLaunchMode(DownloadLabelsScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(FavoritesScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
registerLaunchMode(HistoryScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TOP);
registerLaunchMode(ProgressScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelsScene.java
similarity index 95%
rename from app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java
rename to app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelsScene.java
index e71ba8f03..810c92edd 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelsScene.java
@@ -17,6 +17,7 @@
package com.hippo.ehviewer.ui.scene;
import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
import android.graphics.drawable.NinePatchDrawable;
import android.os.Bundle;
import android.support.annotation.Nullable;
@@ -49,12 +50,13 @@ import com.hippo.easyrecyclerview.EasyRecyclerView;
import com.hippo.ehviewer.EhApplication;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.dao.DownloadLabel;
+import com.hippo.util.DrawableManager;
import com.hippo.view.ViewTransition;
import com.hippo.yorozuya.ViewUtils;
import java.util.List;
-public class DownloadLabelScene extends ToolbarScene {
+public class DownloadLabelsScene extends ToolbarScene {
/*---------------
Whole life cycle
@@ -89,14 +91,16 @@ public class DownloadLabelScene extends ToolbarScene {
@Override
public View onCreateView2(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.scene_download_label, container, false);
+ View view = inflater.inflate(R.layout.scene_label_list, container, false);
mRecyclerView = (EasyRecyclerView) ViewUtils.$$(view, R.id.recycler_view);
- View tip = ViewUtils.$$(view, R.id.tip);
- TextView tipText = (TextView) ViewUtils.$$(tip, R.id.tip_text);
+ TextView tip = (TextView) ViewUtils.$$(view, R.id.tip);
mViewTransition = new ViewTransition(mRecyclerView, tip);
- tipText.setText(R.string.no_download_label);
+ Drawable drawable = DrawableManager.getDrawable(getContext(), R.drawable.big_label);
+ drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+ tip.setCompoundDrawables(null, drawable, null, null);
+ tip.setText(R.string.no_download_label);
// touch guard manager (this class is required to suppress scrolling while swipe-dismiss animation is running)
RecyclerViewTouchActionGuardManager guardManager = new RecyclerViewTouchActionGuardManager();
@@ -131,7 +135,7 @@ public class DownloadLabelScene extends ToolbarScene {
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- setTitle(R.string.label);
+ setTitle(R.string.download_labels);
setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
}
@@ -159,7 +163,7 @@ public class DownloadLabelScene extends ToolbarScene {
int id = item.getItemId();
switch (id) {
case R.id.action_add: {
- EditTextDialogBuilder builder = new EditTextDialogBuilder(getContext(), null, getString(R.string.label));
+ EditTextDialogBuilder builder = new EditTextDialogBuilder(getContext(), null, getString(R.string.download_labels));
builder.setTitle(R.string.new_label_title);
builder.setPositiveButton(android.R.string.ok, null);
AlertDialog dialog = builder.show();
@@ -290,7 +294,7 @@ public class DownloadLabelScene extends ToolbarScene {
if (label == v) {
DownloadLabel raw = mList.get(index);
EditTextDialogBuilder builder = new EditTextDialogBuilder(
- getContext(), raw.getLabel(), getString(R.string.label));
+ getContext(), raw.getLabel(), getString(R.string.download_labels));
builder.setTitle(R.string.rename_label_title);
builder.setPositiveButton(android.R.string.ok, null);
AlertDialog dialog = builder.show();
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
index 67646e9bf..9d8d672ce 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
@@ -314,7 +314,7 @@ public class DownloadsScene extends ToolbarScene
View view = inflater.inflate(R.layout.drawer_list, container, false);
Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
- toolbar.setTitle(R.string.drawer_download_label_title);
+ toolbar.setTitle(R.string.download_labels);
toolbar.inflateMenu(R.menu.drawer_download);
toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
@Override
@@ -322,7 +322,7 @@ public class DownloadsScene extends ToolbarScene
int id = item.getItemId();
switch (id) {
case R.id.action_settings:
- startScene(new Announcer(DownloadLabelScene.class));
+ startScene(new Announcer(DownloadLabelsScene.class));
return true;
case R.id.action_default_download_label:
DownloadManager dm = EhApplication.getDownloadManager(getContext());
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
index 994bd6750..43b6ff930 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java
@@ -20,6 +20,7 @@ import android.annotation.TargetApi;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
@@ -51,6 +52,7 @@ import com.hippo.scene.SceneFragment;
import com.hippo.scene.StageActivity;
import com.hippo.scene.TransitionHelper;
import com.hippo.util.ApiHelper;
+import com.hippo.util.DrawableManager;
import com.hippo.view.ViewTransition;
import com.hippo.widget.LoadImageView;
import com.hippo.yorozuya.ResourcesUtils;
@@ -87,9 +89,13 @@ public class HistoryScene extends ToolbarScene
View content = ViewUtils.$$(view, R.id.content);
mRecyclerView = (EasyRecyclerView) ViewUtils.$$(content, R.id.recycler_view);
FastScroller fastScroller = (FastScroller) ViewUtils.$$(content, R.id.fast_scroller);
- View tip = ViewUtils.$$(view, R.id.tip);
+ TextView tip = (TextView) ViewUtils.$$(view, R.id.tip);
mViewTransition = new ViewTransition(content, tip);
+ Drawable drawable = DrawableManager.getDrawable(getContext(), R.drawable.big_history);
+ drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+ tip.setCompoundDrawables(null, drawable, null, null);
+
Resources resources = getResources();
mList = EhDB.getHistoryLazyList();
@@ -107,9 +113,9 @@ public class HistoryScene extends ToolbarScene
mRecyclerView.setPadding(paddingV, paddingH, paddingV, paddingH);
fastScroller.attachToRecyclerView(mRecyclerView);
- HandlerDrawable drawable = new HandlerDrawable();
- drawable.setColor(ResourcesUtils.getAttrColor(getContext(), R.attr.colorAccent));
- fastScroller.setHandlerDrawable(drawable);
+ HandlerDrawable handlerDrawable = new HandlerDrawable();
+ handlerDrawable.setColor(ResourcesUtils.getAttrColor(getContext(), R.attr.colorAccent));
+ fastScroller.setHandlerDrawable(handlerDrawable);
if (null != mList && mList.size() > 0) {
mViewTransition.showView(0);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java
index 7f0116841..708bdf95c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/QuickSearchScene.java
@@ -17,6 +17,7 @@
package com.hippo.ehviewer.ui.scene;
import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
import android.graphics.drawable.NinePatchDrawable;
import android.os.Bundle;
import android.support.annotation.Nullable;
@@ -45,6 +46,7 @@ import com.hippo.easyrecyclerview.EasyRecyclerView;
import com.hippo.ehviewer.EhDB;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.dao.QuickSearch;
+import com.hippo.util.DrawableManager;
import com.hippo.view.ViewTransition;
import com.hippo.yorozuya.ViewUtils;
@@ -85,14 +87,16 @@ public final class QuickSearchScene extends ToolbarScene {
@Override
public View onCreateView2(LayoutInflater inflater,
@Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.scene_download_label, container, false);
+ View view = inflater.inflate(R.layout.scene_label_list, container, false);
mRecyclerView = (EasyRecyclerView) ViewUtils.$$(view, R.id.recycler_view);
- View tip = ViewUtils.$$(view, R.id.tip);
- TextView tipText = (TextView) ViewUtils.$$(tip, R.id.tip_text);
+ TextView tip = (TextView) ViewUtils.$$(view, R.id.tip);
mViewTransition = new ViewTransition(mRecyclerView, tip);
- tipText.setText(R.string.no_quick_search);
+ Drawable drawable = DrawableManager.getDrawable(getContext(), R.drawable.big_search);
+ drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+ tip.setCompoundDrawables(null, drawable, null, null);
+ tip.setText(R.string.no_quick_search);
// touch guard manager (this class is required to suppress scrolling while swipe-dismiss animation is running)
RecyclerViewTouchActionGuardManager guardManager = new RecyclerViewTouchActionGuardManager();
diff --git a/app/src/main/res/drawable/big_history.xml b/app/src/main/res/drawable/big_history.xml
new file mode 100644
index 000000000..8a960d8a8
--- /dev/null
+++ b/app/src/main/res/drawable/big_history.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/big_history_internal.xml b/app/src/main/res/drawable/big_history_internal.xml
new file mode 100644
index 000000000..7f3b7b7ac
--- /dev/null
+++ b/app/src/main/res/drawable/big_history_internal.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/big_label.xml b/app/src/main/res/drawable/big_label.xml
new file mode 100644
index 000000000..c5a35a169
--- /dev/null
+++ b/app/src/main/res/drawable/big_label.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/big_label_internal.xml b/app/src/main/res/drawable/big_label_internal.xml
new file mode 100644
index 000000000..5b3a77f6b
--- /dev/null
+++ b/app/src/main/res/drawable/big_label_internal.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/big_search.xml b/app/src/main/res/drawable/big_search.xml
new file mode 100644
index 000000000..0e50b705f
--- /dev/null
+++ b/app/src/main/res/drawable/big_search.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/big_search_internal.xml b/app/src/main/res/drawable/big_search_internal.xml
new file mode 100644
index 000000000..20e758ad4
--- /dev/null
+++ b/app/src/main/res/drawable/big_search_internal.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/scene_history.xml b/app/src/main/res/layout/scene_history.xml
index 0d874ee3c..2c744732a 100644
--- a/app/src/main/res/layout/scene_history.xml
+++ b/app/src/main/res/layout/scene_history.xml
@@ -42,29 +42,14 @@
-
+ android:gravity="center_horizontal"
+ android:drawablePadding="16dp"
+ android:text="@string/no_history"
+ style="@style/TextAppearance.AppCompat.Medium"/>
-
-
-
-
-
diff --git a/app/src/main/res/layout/scene_download_label.xml b/app/src/main/res/layout/scene_label_list.xml
similarity index 61%
rename from app/src/main/res/layout/scene_download_label.xml
rename to app/src/main/res/layout/scene_label_list.xml
index 2b840fd98..11f2c4607 100644
--- a/app/src/main/res/layout/scene_download_label.xml
+++ b/app/src/main/res/layout/scene_label_list.xml
@@ -28,29 +28,13 @@
android:clipChildren="false"
android:clipToPadding="false"/>
-
+ android:gravity="center_horizontal"
+ android:drawablePadding="16dp"
+ style="@style/TextAppearance.AppCompat.Medium"/>
-
-
-
-
-
diff --git a/app/src/main/res/menu/scene_download.xml b/app/src/main/res/menu/scene_download.xml
index edda43a33..1bd11830f 100644
--- a/app/src/main/res/menu/scene_download.xml
+++ b/app/src/main/res/menu/scene_download.xml
@@ -34,7 +34,7 @@
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index bd82a5264..a96e10d86 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -115,7 +115,7 @@
删除
删除快速搜索
删除“%s”?
- 未添加快速搜索
+ 这里是快速搜索
2 星
@@ -235,7 +235,7 @@
标签
默认
移动
- 标签
+ 下载标签
全部开始
全部停止
EhViewer 下载服务
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 7db0a1afa..bbe015cc6 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -235,7 +235,7 @@
標籤
默認
移動
- 標籤
+ 標籤
全部開始
全部停止
EhViewer 下載服務
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e07dac711..5a4220477 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -235,7 +235,7 @@
標籤
預設
移動
- 標籤
+ 標籤
全部開始
全部停止
EhViewer 下載服務
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 106f738c2..3f3ea3f67 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -104,4 +104,6 @@
#ff212121
#ff353535
+ #1f000000
+
diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml
index f0eb34560..693dd8dca 100644
--- a/app/src/main/res/values/pathdata.xml
+++ b/app/src/main/res/values/pathdata.xml
@@ -54,6 +54,10 @@
M16,11.78L20.24,4.45L21.97,5.45L16.74,14.5L10.23,10.75L5.46,19H22V21H2V3H4V17.54L9.5,8L16,11.78Z
M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z
+ M12.88,2H4V11L14.97,22.14L24,13.1L12.88,2ZM7.26,5.26C7.96,4.58,9.06,4.58,9.74,5.26C10.42,5.96,10.42,7.06,9.74,7.74S7.94,8.42,7.26,7.74S6.58,5.94,7.26,5.26ZM14.98,19.3L8.76,12.95L14.88,6.83L21.18,13.11L14.98,19.31ZM11.6,21.56L10.23,23L0,12.74V5H2V11.9L11.6,21.56Z
+ M20.46,14.65C21.86,16.15,20.31,18.6,18.32,17.87C19.78,17.57,20.79,16.37,20.46,14.65ZM4.32,17.87C6.32,18.6,7.86,16.17,6.46,14.65C6.79,16.38,5.78,17.55,4.32,17.87ZM16.87,4.3C16.6,3.56,15.87,3,15,3C13.7,3,12.7,4.24,13.1,5.58C14.2,5.18,15.44,4.48,16.87,4.31ZM24,16C24,18.76,21.76,21,19,21C14.96,21,14.84,16.88,12,16.88S9.04,21,5,21C2.24,21,0,18.76,0,16C0,13.87,1.53,11.43,3.94,7.18C5.84,3.81,8.69,5.92,10.76,6.58C11.54,6.85,12.41,6.88,13.24,6.58C15.3,5.92,18.14,3.81,20.06,7.18C22.46,11.43,24,13.88,24,16ZM8,16C8,14.35,6.65,13,5,13S2,14.35,2,16S3.35,19,5,19S8,17.65,8,16ZM13,14C13,13.45,12.55,13,12,13S11,13.45,11,14S11.45,15,12,15S13,14.55,13,14ZM22,16C22,14.35,20.65,13,19,13S16,14.35,16,16S17.35,19,19,19S22,17.65,22,16ZM9,3C8.14,3,7.4,3.55,7.13,4.3C8.56,4.48,9.79,5.2,10.9,5.58C11.3,4.24,10.3,3,9,3Z
+ M5.5,2H22V0H5C3.3,0,2,1.3,2,3V21C2,22.7,3.3,24,5,24H22V4H5.5C4.1,4,4.1,2,5.5,2ZM20,6V22H6V6H20M12.5,11.8V14.4L14.9,15.8L15.3,15.2L13.3,14V11.9M13.3,9.3C11.5,9.3,10,10.3,9.2,11.7L8,10.5V13.8H11.3L9.9,12.4C10.5,11.1,11.8,10.3,13.3,10.3C15.4,10.3,17.1,12,17.1,14.1S15.4,17.9,13.3,17.9C11.7,17.9,10.3,16.9,9.8,15.4H8.7C9.3,17.4,11.1,18.9,13.3,18.9C15.9,18.9,18.1,16.8,18.1,14.1C18,11.4,15.9,9.3,13.3,9.3Z
+
M13,0C20.2,0,26,5.9,26,13.2,26,16.9,24,20.8,18.7,26.1L13,32,7.2,26.2C2,20.8,0,16.9,0,13.3,0,5.9,5.8,0,13,0Z
M21.1,7.8C22.2,7.4,23,6.3,23,5C23,3.3,21.7,2,20,2C18.9,2,17.9,2.6,17.4,3.6L21.1,7.8Z
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95de99b6f..0a9adef8e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -154,7 +154,7 @@
Delete
Delete Quick Search
Delete \"%s\"?
- No quick search saved yet
+ Quick search will be shown here
2 stars
@@ -275,7 +275,7 @@
Label
Default
Move
- Label
+ Download labels
Start all
Stop all
EhViewer Download Service