From f7b443e0fa11759666060c3d17cb85ecbb546450 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 4 Feb 2016 23:14:03 +0800
Subject: [PATCH] Add sad panda head

---
 .../ehviewer/ui/scene/GalleryDetailScene.java |  6 +-
 .../java/com/hippo/widget/ContentLayout.java  |  2 +-
 app/src/main/res/drawable/ic_emoticon_sad.xml | 33 -----------
 app/src/main/res/drawable/sadpanda_head.xml   | 56 +++++++++++++++++++
 app/src/main/res/values/pathdata.xml          |  1 -
 5 files changed, 61 insertions(+), 37 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_emoticon_sad.xml
 create mode 100644 app/src/main/res/drawable/sadpanda_head.xml

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index 006fc4804..53203fdcf 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -297,8 +297,10 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
         View mainView = main.findViewById(R.id.scroll_view);
         View progressView = main.findViewById(R.id.progress_view);
         mFailedView = (ViewGroup) main.findViewById(R.id.tip);
+        SimpleImageView mFailedImage = (SimpleImageView) mFailedView.getChildAt(0);
         mFailedText = (TextView) mFailedView.getChildAt(1);
         mFailedView.setOnClickListener(this);
+        mFailedImage.setDrawable(VectorDrawable.create(getContext(), R.drawable.sadpanda_head));
         mViewTransition = new ViewTransition(mainView, progressView, mFailedView);
 
         mHeader = mainView.findViewById(R.id.header);
@@ -362,6 +364,8 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
         mPreviews = belowHeader.findViewById(R.id.previews);
         mGridLayout = (SimpleGridLayout) mPreviews.findViewById(R.id.grid_layout);
         mPreviewText = (TextView) mPreviews.findViewById(R.id.preview_text);
+        RippleSalon.addRipple(mPreviews, false);
+        mPreviews.setOnClickListener(this);
 
         mProgress = mainView.findViewById(R.id.progress);
 
@@ -706,8 +710,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
             mPreviewText.setText(R.string.no_more_previews);
         } else {
             mPreviewText.setText(R.string.more_previews);
-            RippleSalon.addRipple(mPreviews, false);
-            mPreviews.setOnClickListener(this);
         }
 
         LayoutInflater inflater = getActivity().getLayoutInflater();
diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java
index 5e829fa21..470edf4e4 100644
--- a/app/src/main/java/com/hippo/widget/ContentLayout.java
+++ b/app/src/main/java/com/hippo/widget/ContentLayout.java
@@ -99,7 +99,7 @@ public class ContentLayout extends FrameLayout {
         drawable.setColor(ResourcesUtils.getAttrColor(context, R.attr.colorAccent));
         mFastScroller.setHandlerDrawable(drawable);
 
-        imageView.setDrawable(VectorDrawable.create(context, R.drawable.ic_emoticon_sad));
+        imageView.setDrawable(VectorDrawable.create(context, R.drawable.sadpanda_head));
 
         mRefreshLayout.setHeaderColorSchemeResources(
                 R.color.loading_indicator_red,
diff --git a/app/src/main/res/drawable/ic_emoticon_sad.xml b/app/src/main/res/drawable/ic_emoticon_sad.xml
deleted file mode 100644
index 0c96f675b..000000000
--- a/app/src/main/res/drawable/ic_emoticon_sad.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:width="168dp"
-    android:height="168dp"
-    app:width="168dp"
-    app:height="168dp"
-    app:viewportWidth="24"
-    app:viewportHeight="24"
-    app:allowCaching="false">
-
-    <path
-        app:pathData="@string/pd_emoticon_sad"
-        app:fillColor="@color/primary_drawable_light"/>
-
-</vector>
diff --git a/app/src/main/res/drawable/sadpanda_head.xml b/app/src/main/res/drawable/sadpanda_head.xml
new file mode 100644
index 000000000..e29625961
--- /dev/null
+++ b/app/src/main/res/drawable/sadpanda_head.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:width="168dp"
+    app:height="168dp"
+    app:viewportWidth="24"
+    app:viewportHeight="24"
+    app:allowCaching="false">
+
+    <path
+        app:name="right_ear"
+        app:pathData="M7.4,4.3C6.9,3.5,6,3,5,3C3.3,3,2,4.3,2,6c0,1.2,0.7,2.2,1.6,2.7L7.4,4.3Z"
+        app:fillColor="@android:color/black"/>
+
+    <path
+        app:name="left_ear"
+        app:pathData="M20.4,8.7C21.3,8.2,22,7.2,22,6c0-1.7-1.3-3-3-3c-1,0-1.9,0.5-2.4,1.3L20.4,8.7Z"
+        app:fillColor="@android:color/black"/>
+
+    <!--path
+        app:name="face"
+        app:pathData="M16.6,4.3C15.2,3.5,13.7,3,12,3S8.8,3.5,7.4,4.3L3.6,8.7C3.2,9.7,3,10.8,3,12c0,5,4,9,9,9s9-4,9-9c0-1.2-0.2-2.3-0.6-3.3L16.6,4.3Z"
+        app:fillColor="@android:color/white"/-->
+
+    <path
+        app:name="right_eye"
+        app:pathData="M10.1,13L8,15.1c-0.6,0.6-1.5,0.6-2.1,0l0,0c-0.6-0.6-0.6-1.5,0-2.1L8,10.9c0.6-0.6,1.5-0.6,2.1,0l0,0C10.7,11.5,10.7,12.4,10.1,13Z"
+        app:fillColor="@android:color/black"/>
+
+    <path
+        app:name="left_eye"
+        app:pathData="M16,15.1L13.9,13c-0.6-0.6-0.6-1.5,0-2.1l0,0c0.6-0.6,1.5-0.6,2.1,0l2.1,2.1c0.6,0.6,0.6,1.5,0,2.1l0,0C17.5,15.7,16.6,15.7,16,15.1Z"
+        app:fillColor="@android:color/black"/>
+
+    <path
+        app:name="nose"
+        app:pathData="M10.5,18a1.5,1 0 1,0 3,0a1.5,1 0 1,0 -3,0Z"
+        app:fillColor="@android:color/black"/>
+
+</vector>
diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml
index d15c5a38d..441f87d4c 100644
--- a/app/src/main/res/values/pathdata.xml
+++ b/app/src/main/res/values/pathdata.xml
@@ -18,7 +18,6 @@
 <resources>
 
     <string name="pd_alert" translatable="false">M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z</string>
-    <string name="pd_emoticon_sad" translatable="false">M20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M15.5,8C16.3,8 17,8.7 17,9.5C17,10.3 16.3,11 15.5,11C14.7,11 14,10.3 14,9.5C14,8.7 14.7,8 15.5,8M10,9.5C10,10.3 9.3,11 8.5,11C7.7,11 7,10.3 7,9.5C7,8.7 7.7,8 8.5,8C9.3,8 10,8.7 10,9.5M12,14C13.75,14 15.29,14.72 16.19,15.81L14.77,17.23C14.32,16.5 13.25,16 12,16C10.75,16 9.68,16.5 9.23,17.23L7.81,15.81C8.71,14.72 10.25,14 12,14Z</string>
     <string name="pd_magnify" translatable="false">M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z</string>
     <string name="pd_help_circle" translatable="false">M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z</string>
     <string name="pd_dots_vertical" translatable="false">M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z</string>