From a0b273bb72069de698fc29dd7580f13e433ae150 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Fri, 4 Mar 2016 20:15:11 +0800
Subject: [PATCH] Add set default favorites slot

---
 .../ehviewer/ui/scene/FavoritesScene.java     | 30 +++++++++++++++++++
 .../res/drawable/v_heart_box_dark_x24.xml     | 29 ++++++++++++++++++
 app/src/main/res/menu/drawer_favorites.xml    | 28 +++++++++++++++++
 app/src/main/res/values/pathdata.xml          |  1 +
 app/src/main/res/values/strings.xml           |  2 ++
 5 files changed, 90 insertions(+)
 create mode 100644 app/src/main/res/drawable/v_heart_box_dark_x24.xml
 create mode 100644 app/src/main/res/menu/drawer_favorites.xml

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
index 05eadfc38..c1a814098 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
@@ -30,6 +30,7 @@ import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -38,6 +39,7 @@ import android.transition.TransitionInflater;
 import android.util.SparseBooleanArray;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -82,6 +84,7 @@ import com.hippo.widget.SearchBarMover;
 import com.hippo.yorozuya.AssertUtils;
 import com.hippo.yorozuya.ObjectUtils;
 import com.hippo.yorozuya.SimpleHandler;
+import com.hippo.yorozuya.ViewUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -333,8 +336,35 @@ public class FavoritesScene extends BaseScene implements
     public View onCreateDrawerView(LayoutInflater inflater,
             @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.drawer_list, container, false);
+        Toolbar toolbar = (Toolbar) ViewUtils.$$(view, R.id.toolbar);
         ListView listView = (ListView) view.findViewById(R.id.list_view);
 
+        toolbar.inflateMenu(R.menu.drawer_favorites);
+        toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                int id = item.getItemId();
+                switch (id) {
+                    case R.id.action_default_favorites_slot:
+                        String[] items = new String[12];
+                        items[0] = getString(R.string.let_me_select_favorites_slot);
+                        items[1] = getString(R.string.local_favorites);
+                        String[] favCat = Settings.getFavCat();
+                        System.arraycopy(favCat, 0, items, 2, 10);
+                        new AlertDialog.Builder(getContext())
+                                .setTitle(R.string.default_favorites_slot)
+                                .setItems(items, new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        Settings.putDefaultFavSlot(which - 2);
+                                    }
+                                }).show();
+                        return true;
+                }
+                return false;
+            }
+        });
+
         mDrawerList = new ArrayList<>(12);
         mDrawerList.add(getString(R.string.local_favorites));
         mDrawerList.add(getString(R.string.cloud_favorites));
diff --git a/app/src/main/res/drawable/v_heart_box_dark_x24.xml b/app/src/main/res/drawable/v_heart_box_dark_x24.xml
new file mode 100644
index 000000000..1f67e4b91
--- /dev/null
+++ b/app/src/main/res/drawable/v_heart_box_dark_x24.xml
@@ -0,0 +1,29 @@
+<?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"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/primary_drawable_dark"
+        android:pathData="@string/pd_heart_box"/>
+
+</vector>
diff --git a/app/src/main/res/menu/drawer_favorites.xml b/app/src/main/res/menu/drawer_favorites.xml
new file mode 100644
index 000000000..41273a069
--- /dev/null
+++ b/app/src/main/res/menu/drawer_favorites.xml
@@ -0,0 +1,28 @@
+<?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.
+  -->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_default_favorites_slot"
+        android:icon="@drawable/v_heart_box_dark_x24"
+        android:title="@string/default_favorites_slot"
+        app:showAsAction="always"/>
+
+</menu>
diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml
index eadc64f10..d365968c9 100644
--- a/app/src/main/res/values/pathdata.xml
+++ b/app/src/main/res/values/pathdata.xml
@@ -49,6 +49,7 @@
     <string name="pd_star_half" translatable="false">M12,15.89V6.59L13.71,10.63L18.09,11L14.77,13.88L15.76,18.16M22,9.74L14.81,9.13L12,2.5L9.19,9.13L2,9.74L7.45,14.47L5.82,21.5L12,17.77L18.18,21.5L16.54,14.47L22,9.74Z</string>
     <string name="pd_star_outline" translatable="false">M12,15.39L8.24,17.66L9.23,13.38L5.91,10.5L10.29,10.13L12,6.09L13.71,10.13L18.09,10.5L14.77,13.38L15.76,17.66M22,9.24L14.81,8.63L12,2L9.19,8.63L2,9.24L7.45,13.97L5.82,21L12,17.27L18.18,21L16.54,13.97L22,9.24Z</string>
     <string name="pd_info" translatable="false">M13,9H11V7H13M13,17H11V11H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z</string>
+    <string name="pd_heart_box" translatable="false">M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M12,17L12.72,16.34C15.3,14 17,12.46 17,10.57C17,9.03 15.79,7.82 14.25,7.82C13.38,7.82 12.55,8.23 12,8.87C11.45,8.23 10.62,7.82 9.75,7.82C8.21,7.82 7,9.03 7,10.57C7,12.46 8.7,14 11.28,16.34L12,17Z</string>
 
     <string name="pd_slider_bubble" translatable="false">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</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87b759004..1ffd86209 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -324,6 +324,8 @@
     <string name="delete_favorites_dialog_title">Delete from favorites</string>
     <string name="delete_favorites_dialog_message">Delete %d items from favorites</string>
     <string name="move_favorites_dialog_title">Move favorites</string>
+    <string name="default_favorites_slot">Default favorites slot</string>
+    <string name="let_me_select_favorites_slot">Let me select when necessary</string>
 
     <!-- Progress Scene -->
     <string name="error_something_wrong_happened">Something wrong happened</string>