From bc16e2d21d708c715de41399b0ff2534175878d3 Mon Sep 17 00:00:00 2001
From: xingxing <xxx823952375@gmail.com>
Date: Wed, 4 Jul 2018 22:23:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=9C=E8=89=B2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |   1 -
 .../org/houxg/leamonax/ui/BaseActivity.java   |  17 +++++++-----
 .../org/houxg/leamonax/ui/MainActivity.java   |   5 ++--
 .../org/houxg/leamonax/ui/Navigation.java     |  11 +++++---
 .../org/houxg/leamonax/ui/NoteFragment.java   |   3 ++-
 .../houxg/leamonax/utils/SkinCompatUtils.java |   9 +++++++
 .../leamonax/utils/StatusBarViewHacker.java   |   4 +--
 .../leamonax/widget/SelectPopupWindow.java    |   6 ++---
 .../drawable-xxhdpi/ic_menu_nav_night.png     | Bin 0 -> 653 bytes
 app/src/main/res-night/menu/main_night.xml    |  10 +++++++
 app/src/main/res-night/menu/note_night.xml    |  16 +++++++++++
 app/src/main/res-night/values/colors.xml      |  25 ++++++++++--------
 app/src/main/res-night/values/drawables.xml   |   2 +-
 .../drawable-xxhdpi/ic_arrow_back_white.png   | Bin 194 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_menu_more.png | Bin 599 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_menu_nav.png  | Bin 0 -> 558 bytes
 .../res/drawable-xxhdpi/ic_menu_white.png     | Bin 95 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_search.png    | Bin 1009 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_view_type.png | Bin 220 -> 0 bytes
 .../main/res/drawable/ic_arrow_back_black.xml |   5 ++++
 .../main/res/drawable/ic_arrow_back_white.xml |   5 ++++
 .../main/res/drawable/ic_more_vert_black.xml  |   5 ++++
 .../main/res/drawable/ic_more_vert_white.xml  |   5 ++++
 app/src/main/res/drawable/ic_search_black.xml |   4 +++
 app/src/main/res/drawable/ic_search_white.xml |   4 +++
 .../main/res/drawable/ic_view_type_black.xml  |   9 +++++++
 .../main/res/drawable/ic_view_type_white.xml  |   9 +++++++
 app/src/main/res/layout/activity_main.xml     |   2 +-
 app/src/main/res/layout/item_account.xml      |   1 +
 app/src/main/res/layout/item_add_account.xml  |   1 +
 app/src/main/res/layout/item_note.xml         |   4 ++-
 .../main/res/layout/simple_list_item_1.xml    |   1 +
 app/src/main/res/menu/main.xml                |   2 +-
 app/src/main/res/menu/note.xml                |   4 +--
 app/src/main/res/values/colors.xml            |   2 ++
 35 files changed, 134 insertions(+), 38 deletions(-)
 create mode 100644 app/src/main/java/org/houxg/leamonax/utils/SkinCompatUtils.java
 create mode 100644 app/src/main/res-night/drawable-xxhdpi/ic_menu_nav_night.png
 create mode 100644 app/src/main/res-night/menu/main_night.xml
 create mode 100644 app/src/main/res-night/menu/note_night.xml
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_more.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_nav.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_white.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_search.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_view_type.png
 create mode 100644 app/src/main/res/drawable/ic_arrow_back_black.xml
 create mode 100644 app/src/main/res/drawable/ic_arrow_back_white.xml
 create mode 100644 app/src/main/res/drawable/ic_more_vert_black.xml
 create mode 100644 app/src/main/res/drawable/ic_more_vert_white.xml
 create mode 100644 app/src/main/res/drawable/ic_search_black.xml
 create mode 100644 app/src/main/res/drawable/ic_search_white.xml
 create mode 100644 app/src/main/res/drawable/ic_view_type_black.xml
 create mode 100644 app/src/main/res/drawable/ic_view_type_white.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f8c7ff7..8880d05 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,6 @@
         <activity
             android:name=".ui.MainActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
             android:label="@string/app_name" />
         <activity android:name=".ui.SignInActivity" android:screenOrientation="portrait" />
         <activity
diff --git a/app/src/main/java/org/houxg/leamonax/ui/BaseActivity.java b/app/src/main/java/org/houxg/leamonax/ui/BaseActivity.java
index 5687b8d..5f16691 100644
--- a/app/src/main/java/org/houxg/leamonax/ui/BaseActivity.java
+++ b/app/src/main/java/org/houxg/leamonax/ui/BaseActivity.java
@@ -8,11 +8,9 @@ import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
 import org.houxg.leamonax.R;
-import org.houxg.leamonax.utils.SharedPreferenceUtils;
+import org.houxg.leamonax.utils.SkinCompatUtils;
 import org.houxg.leamonax.utils.StatusBarUtils;
 
-import static org.houxg.leamonax.ui.Navigation.SP_THEME_NIGHT;
-
 public class BaseActivity extends AppCompatActivity {
 
     private Toolbar mToolbar;
@@ -29,16 +27,22 @@ public class BaseActivity extends AppCompatActivity {
         if (toolbar != null) {
             mToolbar = toolbar;
             setSupportActionBar(toolbar);
-            toolbar.setTitleTextColor(ContextCompat.getColor(this, R.color.white));
+            toolbar.setTitleTextColor(ContextCompat.getColor(this, SkinCompatUtils.isThemeNight() ? R.color.primary_text_light_night : R.color.black));
             toolbar.setTitle(getTitle());
             ActionBar actionBar = getSupportActionBar();
             if (actionBar != null && hasBackArrow) {
                 actionBar.setDisplayHomeAsUpEnabled(true);
-                actionBar.setHomeAsUpIndicator(R.drawable.ic_arrow_back_white);
+                actionBar.setHomeAsUpIndicator(SkinCompatUtils.isThemeNight() ? R.drawable.ic_arrow_back_white : R.drawable.ic_arrow_back_black);
             }
         }
     }
 
+    public void updateTitleTextColorByTheme() {
+        if (mToolbar != null) {
+            mToolbar.setTitleTextColor(ContextCompat.getColor(this, SkinCompatUtils.isThemeNight() ? R.color.primary_text_light_night : R.color.black));
+        }
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
@@ -53,8 +57,7 @@ public class BaseActivity extends AppCompatActivity {
      */
     protected void setStatusBarColor() {
         int id;
-        boolean result = SharedPreferenceUtils.read(SharedPreferenceUtils.LEANOTE, SP_THEME_NIGHT, false);
-        if (result) {
+        if (SkinCompatUtils.isThemeNight()) {
             id = R.color.colorPrimary_night;
         } else {
             id = R.color.colorPrimary;
diff --git a/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java b/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java
index bde16f2..a534cdc 100644
--- a/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java
+++ b/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java
@@ -28,6 +28,7 @@ import org.houxg.leamonax.model.Notebook;
 import org.houxg.leamonax.model.SyncEvent;
 import org.houxg.leamonax.ui.edit.NoteEditActivity;
 import org.houxg.leamonax.utils.NetworkUtils;
+import org.houxg.leamonax.utils.SkinCompatUtils;
 import org.houxg.leamonax.utils.StatusBarUtils;
 import org.houxg.leamonax.utils.StatusBarViewHacker;
 import org.houxg.leamonax.utils.ToastUtils;
@@ -69,7 +70,7 @@ public class MainActivity extends BaseActivity implements Navigation.Callback {
         StatusBarViewHacker.fixStatusBarBackgroundColor(this);
         initToolBar(mToolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_menu_white);
+        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_menu_nav);
         CrashReport.setUserId(Account.getCurrent().getUserId());
 
         mNavigation = new Navigation(this);
@@ -111,7 +112,7 @@ public class MainActivity extends BaseActivity implements Navigation.Callback {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.main, menu);
+        getMenuInflater().inflate(SkinCompatUtils.isThemeNight() ? R.menu.main_night : R.menu.main, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
diff --git a/app/src/main/java/org/houxg/leamonax/ui/Navigation.java b/app/src/main/java/org/houxg/leamonax/ui/Navigation.java
index f609b29..2691218 100644
--- a/app/src/main/java/org/houxg/leamonax/ui/Navigation.java
+++ b/app/src/main/java/org/houxg/leamonax/ui/Navigation.java
@@ -39,6 +39,7 @@ import org.houxg.leamonax.service.NotebookService;
 import org.houxg.leamonax.utils.DisplayUtils;
 import org.houxg.leamonax.utils.OpenUtils;
 import org.houxg.leamonax.utils.SharedPreferenceUtils;
+import org.houxg.leamonax.utils.SkinCompatUtils;
 import org.houxg.leamonax.utils.StatusBarUtils;
 import org.houxg.leamonax.utils.StatusBarViewHacker;
 import org.houxg.leamonax.utils.ToastUtils;
@@ -551,7 +552,7 @@ public class Navigation {
 
     @OnClick(R.id.rl_theme)
     void clickedTheme(final View view) {
-        boolean result = SharedPreferenceUtils.read(SharedPreferenceUtils.LEANOTE, SP_THEME_NIGHT, false);
+        boolean result = SkinCompatUtils.isThemeNight();
         SharedPreferenceUtils.write(SharedPreferenceUtils.LEANOTE, SP_THEME_NIGHT, !result);
 
         SkinCompatManager.SkinLoaderListener skinLoaderListener = new SkinCompatManager.SkinLoaderListener() {
@@ -569,6 +570,10 @@ public class Navigation {
                         StatusBarViewHacker.fixStatusBarBackgroundColor(mActivity);
                     }
                 });
+                if (mActivity instanceof BaseActivity) {
+                    ((BaseActivity)mActivity).updateTitleTextColorByTheme();
+                }
+                mActivity.invalidateOptionsMenu();
             }
 
             @Override
@@ -576,9 +581,9 @@ public class Navigation {
 
             }
         };
-        if (!SharedPreferenceUtils.read(SharedPreferenceUtils.LEANOTE, SP_THEME_NIGHT, false)) {
+        if (!SkinCompatUtils.isThemeNight()) {
             mThemeIv.setImageResource(R.drawable.ic_theme_night);
-            SkinCompatManager.getInstance().loadSkin("", skinLoaderListener, SkinCompatManager.SKIN_LOADER_STRATEGY_NONE);
+            SkinCompatManager.getInstance().loadSkin("", skinLoaderListener, SkinCompatManager.SKIN_LOADER_STRATEGY_NONE);//reset
         } else {
             mThemeIv.setImageResource(R.drawable.ic_theme_daily);
             SkinCompatManager.getInstance().loadSkin("night", skinLoaderListener, SkinCompatManager.SKIN_LOADER_STRATEGY_BUILD_IN);
diff --git a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java
index 49191ac..1594b3c 100644
--- a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java
+++ b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java
@@ -28,6 +28,7 @@ import org.houxg.leamonax.utils.ActionModeHandler;
 import org.houxg.leamonax.utils.CollectionUtils;
 import org.houxg.leamonax.utils.NetworkUtils;
 import org.houxg.leamonax.utils.SharedPreferenceUtils;
+import org.houxg.leamonax.utils.SkinCompatUtils;
 import org.houxg.leamonax.utils.ToastUtils;
 import org.houxg.leamonax.widget.NoteList;
 import org.houxg.leamonax.widget.SelectPopupWindow;
@@ -82,7 +83,7 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.note, menu);
+        inflater.inflate(SkinCompatUtils.isThemeNight() ? R.menu.note_night : R.menu.note, menu);
     }
 
     @Override
diff --git a/app/src/main/java/org/houxg/leamonax/utils/SkinCompatUtils.java b/app/src/main/java/org/houxg/leamonax/utils/SkinCompatUtils.java
new file mode 100644
index 0000000..2bd17d9
--- /dev/null
+++ b/app/src/main/java/org/houxg/leamonax/utils/SkinCompatUtils.java
@@ -0,0 +1,9 @@
+package org.houxg.leamonax.utils;
+
+import static org.houxg.leamonax.ui.Navigation.SP_THEME_NIGHT;
+
+public class SkinCompatUtils {
+    public static boolean isThemeNight() {
+        return SharedPreferenceUtils.read(SharedPreferenceUtils.LEANOTE, SP_THEME_NIGHT, false);
+    }
+}
diff --git a/app/src/main/java/org/houxg/leamonax/utils/StatusBarViewHacker.java b/app/src/main/java/org/houxg/leamonax/utils/StatusBarViewHacker.java
index 1f9e1fa..0e9dc84 100644
--- a/app/src/main/java/org/houxg/leamonax/utils/StatusBarViewHacker.java
+++ b/app/src/main/java/org/houxg/leamonax/utils/StatusBarViewHacker.java
@@ -6,7 +6,6 @@ import android.view.View;
 
 import org.houxg.leamonax.R;
 
-import static org.houxg.leamonax.ui.Navigation.SP_THEME_NIGHT;
 import static org.houxg.leamonax.utils.StatusBarUtils.FAKE_STATUS_BAR_VIEW_ID;
 
 public class StatusBarViewHacker {
@@ -14,8 +13,7 @@ public class StatusBarViewHacker {
         View fakeStatusBarView = activity.findViewById(FAKE_STATUS_BAR_VIEW_ID);
         if (fakeStatusBarView != null) {
             int id;
-            boolean result = SharedPreferenceUtils.read(SharedPreferenceUtils.LEANOTE, SP_THEME_NIGHT, false);
-            if (result) {
+            if (SkinCompatUtils.isThemeNight()) {
                 id = R.color.colorPrimary_night;
             } else {
                 id = R.color.colorPrimary;
diff --git a/app/src/main/java/org/houxg/leamonax/widget/SelectPopupWindow.java b/app/src/main/java/org/houxg/leamonax/widget/SelectPopupWindow.java
index 0e9af30..4c5ee54 100644
--- a/app/src/main/java/org/houxg/leamonax/widget/SelectPopupWindow.java
+++ b/app/src/main/java/org/houxg/leamonax/widget/SelectPopupWindow.java
@@ -16,13 +16,12 @@ import android.widget.TextView;
 import org.houxg.leamonax.R;
 import org.houxg.leamonax.utils.DisplayUtils;
 import org.houxg.leamonax.utils.SharedPreferenceUtils;
+import org.houxg.leamonax.utils.SkinCompatUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.houxg.leamonax.ui.Navigation.SP_THEME_NIGHT;
-
 public class SelectPopupWindow extends ListPopupWindow{
     public static final String SP_SORT_TYPE = "sp_sort_type";
     private Context mContext;
@@ -54,8 +53,7 @@ public class SelectPopupWindow extends ListPopupWindow{
         setAnchorView(anchorView);
         setOverlapAnchor(true);
         setModal(true);
-        boolean result = SharedPreferenceUtils.read(SharedPreferenceUtils.LEANOTE, SP_THEME_NIGHT, false);
-        if (result) {
+        if (SkinCompatUtils.isThemeNight()) {
             setBackgroundDrawable(ContextCompat.getDrawable(mContext, R.drawable.white_night));
         } else {
             setBackgroundDrawable(ContextCompat.getDrawable(mContext, R.drawable.white));
diff --git a/app/src/main/res-night/drawable-xxhdpi/ic_menu_nav_night.png b/app/src/main/res-night/drawable-xxhdpi/ic_menu_nav_night.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fafd238ec63a62ae3384090a2ee5a7f0c1fea44
GIT binary patch
literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq001}u001}$1ONa40*~{R00071Nkl<ZSi|jC
zzl#$=7=7Q&CYO!DoFZ1rRbmkkJ6ml;|A1VhmEc_=92|(3i_KhNAc7*;Scs+I#me4B
zL8~h)f?6ur915O4;<C3p&temDXTsf0-1P_SD|VONnSJ}d{pNe~0XcHy_}h@-mC^3g
zyX?dh@lq!JV%M2oGD$dBICw@K5;~Dlzm`|-Ar;W<-+ZLcd9LaZ#Io4BYm~7LgmvAC
zm*@R^frWKt^a|0J;xV&M*=uYDqN)TUYS-{YL?tK#D+2CWAw_t7hR^+@F~l*X3c>x>
zWyhouQsiCZbnhY#I0jYW&8G)R7W}bgv28883^uAe5oyOdtILsN;*_SWNLDmsYOPV(
zDjU3iizZV+1vbn;Wszn*DWO{kn~Ru3F(Y{zYqD_TgHgtMfKkRa&lhe37TNqnqCE38
z#;hU41G)m>6tMXNUPg%-eJ|nUQnkH7@qijTP|qx;{5Y$O@qB!H(cYlQ&?TCexPW~^
zrW{ov0P<yc_14F2gaEKq^)smapVf5Fgd?t5*V(SZfiy|YhIiS=<V8KlzvqXBJ7=b(
zza+*xtn`lrt{w3X$Fcrx;+Ucs`fp7%uEmi7UGpZcP^VK%h48p$XWQ>b8#zh*uu(6q
zMk$s9vMjxatqY?X`+g|L0UNL&934VQ?hc+L=i#{IS<)0G?m&?^DB?ulD}E)cu>*M$
zE|<zF`k^kM_c)2(n53Zy8)wzLRAAG|RuWIA?wDw_k&|IqfV!@w^c(xScIq3AN_PiU
n*W=$Oled<;Zq;(+_)qZ@jv43?{c}OV00000NkvXXu0mjfl_EG}

literal 0
HcmV?d00001

diff --git a/app/src/main/res-night/menu/main_night.xml b/app/src/main/res-night/menu/main_night.xml
new file mode 100644
index 0000000..15e7c32
--- /dev/null
+++ b/app/src/main/res-night/menu/main_night.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search_white"
+        android:title="@string/search"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res-night/menu/note_night.xml b/app/src/main/res-night/menu/note_night.xml
new file mode 100644
index 0000000..4640cf7
--- /dev/null
+++ b/app/src/main/res-night/menu/note_night.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_view_type"
+        android:icon="@drawable/ic_view_type_white"
+        android:title="@string/view_type"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/action_view_more"
+        android:icon="@drawable/ic_more_vert_white"
+        app:showAsAction="always"
+        android:title="" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res-night/values/colors.xml b/app/src/main/res-night/values/colors.xml
index 1508d6f..463bb65 100644
--- a/app/src/main/res-night/values/colors.xml
+++ b/app/src/main/res-night/values/colors.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary_night">#3b3b3b</color>
-    <!--<color name="colorPrimaryDark">#616161</color>-->
-    <color name="colorAccent_night">#3b3b3b</color>
-    <color name="window_background_night">#373737</color>
+    <color name="colorPrimary_night">#151618</color>
+    <color name="colorPrimaryDark_night">#151618</color>
+    <color name="colorAccent_night">#151618</color>
+    <color name="window_background_night">#111214</color>
 
-    <color name="toolbar_night">#3b3b3b</color>
-    <color name="menu_text_night">#373737</color>
+    <color name="toolbar_night">#151618</color>
+    <color name="menu_text_night">#111214</color>
     <!--<color name="drawer_divider_night">#E0E0E0</color>-->
     <!--<color name="drawer_divider_light_night">#BDBDBD</color>-->
 
     <color name="drawer_divider_night">#2b2b2b</color>
+    <color name="drawer_divider2_night">#00000000</color>
     <color name="drawer_divider_light_night">#E0E0E0</color>
 
-    <!--<color name="primary_text_light">#de000000</color>-->
-    <!--<color name="secondary_text_light">#8a000000</color>-->
-    <!--<color name="hint_text_light">#61000000</color>-->
+    <color name="primary_text_light_night">#7f8182</color>
+    <color name="secondary_text_light_night">#a07f8182</color>
+    <color name="hint_text_light_night">#807f8182</color>
     <!--<color name="divider_light">#1f000000</color>-->
-    <color name="navigation_night">#3b3b3b</color>
+    <color name="navigation_night">#111214</color>
     <!--<color name="transparent">#00000000</color>-->
-    <color name="white_night">#373737</color>
+    <color name="white_night">#111214</color>
     <color name="white_alpha_night">#c7000000</color>
 
     <!--<color name="black">#000</color>-->
     <!--<color name="lightGray">#EEEEEE</color>-->
+    <color name="cardview_light_background_night">#FF424242</color>
+
 </resources>
diff --git a/app/src/main/res-night/values/drawables.xml b/app/src/main/res-night/values/drawables.xml
index 6b2c7e8..4d6ba57 100644
--- a/app/src/main/res-night/values/drawables.xml
+++ b/app/src/main/res-night/values/drawables.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <drawable name="white_night">#373737</drawable>
+    <drawable name="white_night">#111214</drawable>
     <drawable name="colorPrimary_night">#3b3b3b</drawable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
deleted file mode 100644
index e27034d67874687a900f0f960c662e94cd633e2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgIz3$+Ln;{G-r^K&b`Wq0WJxHR
z+hbl+*u(m6U6udA_c1Lg>hl;G7;?6Tmes9(^C#@)&$XLAN2fmDK5_2;oXs^qKRrD?
zT|a&wl=0u{XMX3o{EI(zZSFU;t5*oK`xGb|A7l~sF+e3G`eLnqRNcP#_|M_{efOCe
b7~U|>UYh-J>#;zfqZmA0{an^LB{Ts5m>*B+

diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_more.png b/app/src/main/res/drawable-xxhdpi/ic_menu_more.png
deleted file mode 100644
index 9f6fcec5a6824ce26416eecd4e6af0b0098ee8c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 599
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+e>ZmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG
z?d}4kf#9d}?s_1_S>O>_45U54*zIJt9ng3QPZ!6KjC*fy82TM{5NLfEsh4nBxld5F
zMcQF{LC~ZFtV$Dhur6W~u?qSlqN6!UA}sRS>5lK7dOGV(K6CZ2H53*UocNzzf_eLa
z=skH2n{U-VZQI3k?M)Q(<y(JcrCv!?EWOQrVcM$t5QE!GXPVx($v^w%Q1XV!Eyl~`
znr&6*RO&?R?`bK2v-62{nAM#v$y)oEC*S(}v`w0kJ3(~4rNNrJ(>tDU){1l<P7=v~
z@5J$aYx8rqtj8{Q%-CoB;riP2miudJ*zWz#&b&WwE(rNM>3`Sb7USn~%}Wm?Z+NOd
z_h<E^FRzPYckiE*z-w?@eASm7?_V?9ZaAOVG*j1^gTMBQsNnG}kG?r+=d~Z)@~F&J
zJ8%7#M`A!P_3~dlAU(x5_|r;YV5ye4MwFx^mZVxG7o`Fz1|tJQ3ta<KT_eK~LsKh5
z11m!lZ36=<1A~9-W4KW?<mRVjrd8tB(EsVlcAy3gkPXFU=~hXJ#i_cbMVSm~nK`Le
q`uh4Mxdr;UiRqci*}7?=VV=p!j;6A=^_qZs7(8A5T-G@yGywpCs@wYj

diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_nav.png b/app/src/main/res/drawable-xxhdpi/ic_menu_nav.png
new file mode 100644
index 0000000000000000000000000000000000000000..15edb2514974515ba9607b7665a9e6792e1daf86
GIT binary patch
literal 558
zcmV+}0@3}6P)<h;3K|Lk000e1NJLTq001`t001ip1^@s6+|LlE0005?Nkl<ZXx{Cb
zv5wO~5QhI5uOo%aDR)IW#1l{;Bnpz#DMcQD#^p&!yoh-ON}j<IPY{V9&=pXkR9uDV
z0uqRV%{e<iMO;J&cPBTI?b}asW7*pIH8Wn%%*tdueh1(b&4sEeG<*5s{5-Gj2>{;q
zqKe2E&4!hlN3+>%xFhaX97zYj_G&E&5vlPwAwcTA*E;LCY7yP1xEjK?;iU?OK<6B5
zi36}8`E)k~niiHJguVcu7K_EtI(E80-aqU0dV?k>otcTM{<xZlcNzhpd7d}g$mMb=
zMNwGvSR@jOL?U<T4<*Yo>6);jC_=YAcQPKI5jX`Y5Mj&1kOWczKHnP*UOR}qN}W6I
zgsVu1D$25i_x`OTd0dv|rX!I^Z2Llqgm9#FOa2ykPpVc19e}TCnm*`QSgv9A-4S@c
zDa*&ewgsjw)@IwVbRu%m9}d5Cdn?GYELp8qol3mXXvEHM;*m%s5{Z>KS}-fPN;Nwm
z_B=FgmglC^>Ct+<K4^=<s>*b;QFnOwdp@84y1C6TnY<_YWT)6`xH}{WZ~)+qOVbzC
zwDrHI8ytX>wiT?ZieUB-mzVbeTrZ9!T9%k*W=_Zul0*R@udaW@iAW%swCY140waxP
w0oMov044Bow@`0GGeJb4A{Tw{zujc_UklyDks0J4bpQYW07*qoM6N<$f*RKO+W-In

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_white.png b/app/src/main/res/drawable-xxhdpi/ic_menu_white.png
deleted file mode 100644
index 9cb03482360f7357894c5ad1340238ca06fac6e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc@my3jv*C{
q$r6(m{IloyqulIjBT;%afQ4bba7p3K1NRd_Iz3(eT-G@yGywqarWs)X

diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.png b/app/src/main/res/drawable-xxhdpi/ic_search.png
deleted file mode 100644
index d73b83f7f67ea03ff3edbd43772f2278ede73186..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1009
zcmV<N0}lL&P)<h;3K|Lk000e1NJLTq001=r001=z1^@s6;pU@o00001b5ch_0Itp)
z=>Px&t4TybRA>e5nayexK@^2E`7sJ^WOkBd#D#*{itdKl1O&ln@FlVh<Pq`;3Ry^2
z24UQUAh>a<;7Ze?5Om=WsHjmhen;Cd(_K|lT~poZ89i{A>H4|%p6;sZTh)!J0Q7pj
zIl6V=b$A}0P1)r4E!<DJ$L~G3+h{bt^IJb4rVTgY2UrAZuYT>?s3MqUxD8`Kc9xG#
z9L{Iq2K)(QLiS{Lwo-98Y{DH_CS+gpuzcX?B79z^nm*g|b0MaxM%EY(bmtyHt!gfO
zqOuF`!lzIxo>o5f*J^kP-hkKOY3PDh$t$do>K_*f(i|E#<lfO{6`u0(u6AjA^>aaf
z<IgdSYVx{phsrZPVzO=2530Wl8`*v%UE@j1wr!O=q;3u7hHDY0>Yv(?Jrm?V-g1vI
z*L!HKNbtkj;!8KkhV5bfz3Q>vwt1jjLuRBWlnp}mQoH;ZF?!~KS*0*0XmSV5p{$VX
zwd_LM;<1@+U+5acbI_K{trjv?urYqMikhH!lr)Ed&MPLXlzoIJ!>s!C!oHS!`7vR|
z&q}`4G)3Azn9${A_|;Sqs|@>Ju%#Ec3AVUQZ3oIE%9c4OQ>X$qKeo7r#w1ZnX-rV+
zQw3~(Y;g^Z$t6m;TothS2^OXI#Wx~9VTgX7F@Invk6MI(`Bn^B9N>RGTj+DGCuPfw
ztJ&xL$?8q9zBd*6lu1<d$M55~uZ?Y(z3FRH=&wtZ_Cr;`=I3>&bBWRh%>-@ms({VU
zlVImeR98mfwGj+;j_*=3iYW}&G57mSTtO?}(GA8x-Lmwpqu@gSAgXTrsmq~S2Kpha
zE<0aaf;$ke*9D^La7OWiIIemH?Ar)~$9<Z#?i;IjJ46*Z_w(97V$=8B?;&kxyn}T#
z%pIs;SUF$SC$tLjHoQp^d#H=(Kv<P$>A1_`1tqOAgf%g|lXDlhKtt}9#biQxDZ<M7
zKBZM|9nQdMXhT9pd|?^_7>@ZRv5UQdWt(dk5-Q6PmWos65%SGfx!e{sW(t%i(1nD`
zCEq!gTm5`G;=uKFUOQH8@WjXPK77EcX4<k-^?M}fN$kRN(1wJH4t8GJ8q}_w8`Xjd
zbYYK5?<ZCZkp$d=33Op%h3Px-VlAG8Zx95$1ocE*_%F=&hL+xr$28GTOhe6uXH+hf
zewSl9AmBy#Zwu35=2(DC;uV2*pzZK=EOZ!yOoyW8P!{7iulg0DW&!pK8*f2>#q|lB
f3_%%TxuyIU!&#bQEKEh400000NkvXXu0mjf)6MMy

diff --git a/app/src/main/res/drawable-xxhdpi/ic_view_type.png b/app/src/main/res/drawable-xxhdpi/ic_view_type.png
deleted file mode 100644
index a7a8d2ed65c662a0df5c960fcdf10aa3cbeca548..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^#z3sa!3HGdDv~RK6k~CayA#8@b22Z1oN1mejv*PW
zZ>Kx*H5hQP9R2@4^7X><X-l{b4<F?&dE1kjW3yUsVbayS@bvF@Rz9!Ide~Qb(}(@5
zk6N116sszO%Z|2_J7@AN?UOrG5}+>3<jm3XOZvR%ft0?*H(8?k4)*k%F=>z#&ah-N
zHZr=*kmj?Xv+;lnQw*b8)X#gJizSWOm}=74PAug(Gi8Hhn?Z6zOxKU8GsQQsNLcN+
Sd*cOkA%mx@pUXO@geCwK2vEHM

diff --git a/app/src/main/res/drawable/ic_arrow_back_black.xml b/app/src/main/res/drawable/ic_arrow_back_black.xml
new file mode 100644
index 0000000..27ff68b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="1024.0" android:viewportHeight="1024.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#AF000000" android:pathData="M853.3,554.7 L341.3,554.7 576,789.3 512,853.3 170.7,512 512,170.7 576,234.7 341.3,469.3 853.3,469.3 853.3,554.7Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_back_white.xml b/app/src/main/res/drawable/ic_arrow_back_white.xml
new file mode 100644
index 0000000..6c0d8d8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_white.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="1024.0" android:viewportHeight="1024.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#8fffffff" android:pathData="M853.3,554.7 L341.3,554.7 576,789.3 512,853.3 170.7,512 512,170.7 576,234.7 341.3,469.3 853.3,469.3 853.3,554.7Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_more_vert_black.xml b/app/src/main/res/drawable/ic_more_vert_black.xml
new file mode 100644
index 0000000..052b785
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_vert_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#AF000000" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_more_vert_white.xml b/app/src/main/res/drawable/ic_more_vert_white.xml
new file mode 100644
index 0000000..de6e5b6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_vert_white.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#8fffffff" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_black.xml b/app/src/main/res/drawable/ic_search_black.xml
new file mode 100644
index 0000000..203776c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_black.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#AF000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search_white.xml b/app/src/main/res/drawable/ic_search_white.xml
new file mode 100644
index 0000000..c33b464
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_white.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#8FFFFFFF" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_view_type_black.xml b/app/src/main/res/drawable/ic_view_type_black.xml
new file mode 100644
index 0000000..20e1d1b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_view_type_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#AF000000"
+        android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_view_type_white.xml b/app/src/main/res/drawable/ic_view_type_white.xml
new file mode 100644
index 0000000..881d511
--- /dev/null
+++ b/app/src/main/res/drawable/ic_view_type_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#8FFFFFFF"
+        android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1ae1787..8a68c7f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -37,7 +37,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentEnd="true"
                 android:layout_margin="16dp"
-                app:srcCompat="@drawable/ic_edit_white" />
+                android:src="@drawable/ic_edit_white" />
 
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 0070e1d..8d4a83d 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -24,6 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="14sp"
+            android:textColor="@color/secondary_text_light"
             tools:text="test@leanote.com"/>
 
         <TextView
diff --git a/app/src/main/res/layout/item_add_account.xml b/app/src/main/res/layout/item_add_account.xml
index e917500..4583186 100644
--- a/app/src/main/res/layout/item_add_account.xml
+++ b/app/src/main/res/layout/item_add_account.xml
@@ -17,6 +17,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:text="@string/add_account"
+        android:textColor="@color/primary_text_light"
         android:textSize="14sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
index 5fcb292..d0353a7 100644
--- a/app/src/main/res/layout/item_note.xml
+++ b/app/src/main/res/layout/item_note.xml
@@ -2,6 +2,8 @@
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:cardBackgroundColor="@color/cardview_light_background"
     android:layout_height="wrap_content">
 
     <LinearLayout
@@ -65,7 +67,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:background="@color/drawer_divider" />
+            android:background="@color/drawer_divider2" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/simple_list_item_1.xml b/app/src/main/res/layout/simple_list_item_1.xml
index 22606a2..24d6637 100644
--- a/app/src/main/res/layout/simple_list_item_1.xml
+++ b/app/src/main/res/layout/simple_list_item_1.xml
@@ -19,6 +19,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:minHeight="36dp"
+        android:textColor="@color/secondary_text_light"
         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:textAppearance="?android:attr/textAppearanceListItemSmall" />
 
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 783a29f..275a8cd 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/ic_search_black"
         android:title="@string/search"
         app:showAsAction="always"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/note.xml b/app/src/main/res/menu/note.xml
index 3d0a1c9..d8da8d8 100644
--- a/app/src/main/res/menu/note.xml
+++ b/app/src/main/res/menu/note.xml
@@ -4,13 +4,13 @@
 
     <item
         android:id="@+id/action_view_type"
-        android:icon="@drawable/ic_view_type"
+        android:icon="@drawable/ic_view_type_black"
         android:title="@string/view_type"
         app:showAsAction="always"/>
 
     <item
         android:id="@+id/action_view_more"
-        android:icon="@drawable/ic_menu_more"
+        android:icon="@drawable/ic_more_vert_black"
         app:showAsAction="always"
         android:title="" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5d9f74e..5e3ae0f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,6 +8,7 @@
     <color name="toolbar">#1d89b7</color>
     <color name="menu_text">#FAFAFA</color>
     <color name="drawer_divider">#BDBDBD</color>
+    <color name="drawer_divider2">#BDBDBD</color>
     <color name="drawer_divider_light">#E0E0E0</color>
 
     <color name="primary_text_light">#de000000</color>
@@ -20,4 +21,5 @@
     <color name="white_alpha">#00000000</color>
     <color name="black">#000</color>
     <color name="lightGray">#EEEEEE</color>
+    <color name="cardview_light_background">#FFFFFFFF</color>
 </resources>