From 057843e7f9b54ca1f8a82750de035d4337fbf92e Mon Sep 17 00:00:00 2001
From: houxg <houxg09@foxmail.com>
Date: Wed, 30 Nov 2016 16:11:22 +0800
Subject: [PATCH] =?UTF-8?q?add=20icon=20for=20notebook=20list=E2=80=99s=20?=
 =?UTF-8?q?item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../leamonax/adapter/NotebookAdapter.java     |   7 +++--
 .../res/drawable-xxhdpi/ic_add_note_book.png  | Bin 0 -> 1762 bytes
 .../res/drawable-xxhdpi/ic_expandable.png     | Bin 0 -> 446 bytes
 .../main/res/drawable-xxhdpi/ic_expanding.png | Bin 0 -> 499 bytes
 app/src/main/res/layout/item_add_notebook.xml |  28 ++++++++----------
 app/src/main/res/layout/item_notebook.xml     |  28 ++++++++++--------
 6 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_add_note_book.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_expandable.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_expanding.png

diff --git a/app/src/main/java/org/houxg/leamonax/adapter/NotebookAdapter.java b/app/src/main/java/org/houxg/leamonax/adapter/NotebookAdapter.java
index 56c18ae..2ce5e9c 100644
--- a/app/src/main/java/org/houxg/leamonax/adapter/NotebookAdapter.java
+++ b/app/src/main/java/org/houxg/leamonax/adapter/NotebookAdapter.java
@@ -1,10 +1,12 @@
 package org.houxg.leamonax.adapter;
 
 
+import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.houxg.leamonax.R;
@@ -91,7 +93,7 @@ public class NotebookAdapter extends RecyclerView.Adapter<NotebookAdapter.Notebo
 //        boolean hasChild = hasChild(notebookId);
         holder.placeholder.setVisibility(isSuperOrRoot ? View.GONE : View.VISIBLE);
 //        holder.navigator.setVisibility(hasChild ? View.VISIBLE : View.INVISIBLE);
-        holder.navigator.setText(isSuper ? "-" : "+");
+        holder.navigator.setImageResource(isSuper ? R.drawable.ic_expanding : R.drawable.ic_expandable);
         holder.navigator.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -175,9 +177,10 @@ public class NotebookAdapter extends RecyclerView.Adapter<NotebookAdapter.Notebo
     static class NotebookHolder extends RecyclerView.ViewHolder {
         View itemView;
         @BindView(R.id.navigator)
-        TextView navigator;
+        ImageView navigator;
         @BindView(R.id.tv_title)
         TextView titleTv;
+        @Nullable
         @BindView(R.id.placeholder)
         View placeholder;
 
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_note_book.png b/app/src/main/res/drawable-xxhdpi/ic_add_note_book.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae1bb6f1b867fa087eeff7e72bc2f926ed015248
GIT binary patch
literal 1762
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
Eg2$LxDgXcg

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_expandable.png b/app/src/main/res/drawable-xxhdpi/ic_expandable.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a9b51a983a3ab81f9873212956b46e20a96a5df
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq000#L001Be1^@s6{h%|500001b5ch_0Itp)
z=>Px$cu7P-R7ef2mfKClFc3wt^G`i=fJ6-mj};Pa&<0{*$>WOxkhX)ZhyOU-8_AI$
ziSZ+rtk{ly=I+d7*5b-&!!TScrM{(<uXSBtj8{oRp?4EFj^i2g8zICmz_+>J8EOKx
zkrJ?+rb$BK4;5-4pIE0W&M;`Ln|rp#5{eZ18#X9+Q!aS%Y2WwvP<8@Xy6{w2EKq{>
z0$Zw@rs=>wpclEqQcAUKZQDNJ@riC3<+~VHtU`IX>$*n->I1`M@Fuhb9E9eA|Ai8a
ztaw7Y9Wjh@MHEzn>0@;7j2k@9G68E1>2?C}8Gy-sk9F&l_N=-G+&R+i0Pr!SI9jO-
z56zR5#;9Zsj#kPHfV%h4&(=jfO6l$?mGij<mF55$z)fgLrCNoS0IAfAKC3_0vui1#
zmQn)u_@7#!2ugz-{DL7*y<0G-Ce&u=o<JI#FB4Gs!m(>TRiQpVUnZ)my2FBXA<G34
oy!h0-Pn7^IC?^CX`o&ktKg&lMSq;0divR!s07*qoM6N<$g6%BDkN^Mx

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_expanding.png b/app/src/main/res/drawable-xxhdpi/ic_expanding.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4791ad36d0a233a37451db55cc7c6be3435e6ee
GIT binary patch
literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq001BW000#T1^@s6C(Z2Y00001b5ch_0Itp)
z=>Px$tw}^dR7efIl~GcIFc5}Ic=tSYdH`lT1EAH;cnz=NOl=GFsRwZ620f4Ofd8K%
zOn?{?sAfh<vf2Iq-E4HV(nixXLR<dHbjS!4<$ONhRaNyF1i^cnriI$S<u}js1Oi^e
zFnoyP_?xk1#x1<WdV>R}qA1c^f*Ff385`3L5-rK(exSkE+-OHFgxDrYlB<m+U&8CU
zJ|c#G#aC1!5-?m~(BWip|CnXjBNs~sV;JBJxh5NliZ|T5ypI8hY7a|9w7v(#(KDAA
zGRYQbhASqKO$3_fNqTwwYJF_*h;028up}iKMK;HPRYTwlUdL&$Z(I_NI3F<nmbrw}
zxf8$z8gj7+A2^vkg;UqTtkBV0I+_M;u9++UUIo<VR3*?eJ3LW7t8NgEE8JtFmlO}Q
z4cC>ub21&K(WMgT@Mjf>bKlIBudxEkXsZOW0<+oiEarR6N3m>~E5^u48Ppfq-6PN!
z0HfDI5j-~+PTxrZJY=f`?Ze@cx$<!mz{9R0eBg}hEWkyCFWg&zO~f4dECD7FbK$cE
p=ps1hKQsRA;QU_)8<Rgvpg+FEGBtZbCdvQ+002ovPDHLkV1m=~+H3#-

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/item_add_notebook.xml b/app/src/main/res/layout/item_add_notebook.xml
index 2aa3894..c1a92d2 100644
--- a/app/src/main/res/layout/item_add_notebook.xml
+++ b/app/src/main/res/layout/item_add_notebook.xml
@@ -2,34 +2,30 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:background="?android:attr/selectableItemBackground"
     android:orientation="horizontal">
 
-    <View
-        android:id="@+id/placeholder"
-        android:layout_width="12dp"
-        android:layout_height="wrap_content" />
-
-    <TextView
+    <ImageView
         android:id="@+id/navigator"
         android:layout_width="36dp"
         android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:gravity="center"
-        android:text="+"
-        android:textColor="#333"
-        android:textSize="18sp" />
+        android:layout_gravity="start|center_vertical"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp"
+        android:scaleType="center"
+        android:src="@drawable/ic_add_note_book" />
 
     <TextView
         android:id="@+id/tv_title"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:gravity="center_vertical|start"
+        android:fontFamily="sans-serif-medium"
         android:paddingBottom="8dp"
-        android:paddingEnd="8dp"
+        android:gravity="center_vertical"
         android:paddingTop="8dp"
         android:text="@string/add_notebook"
         android:textColor="@color/primary_text_light"
-        android:textSize="16sp" />
+        android:textSize="14sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_notebook.xml b/app/src/main/res/layout/item_notebook.xml
index 030aaa8..7fe34f6 100644
--- a/app/src/main/res/layout/item_notebook.xml
+++ b/app/src/main/res/layout/item_notebook.xml
@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:clickable="true"
     android:orientation="horizontal">
 
     <View
         android:id="@+id/placeholder"
-        android:layout_width="12dp"
+        android:layout_width="16dp"
         android:layout_height="wrap_content" />
 
-    <TextView
+    <ImageView
         android:id="@+id/navigator"
         android:layout_width="36dp"
         android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:gravity="center"
-        android:text="+"
-        android:textColor="#333"
-        android:textSize="18sp" />
+        android:layout_gravity="start|center_vertical"
+        android:background="?android:attr/selectableItemBackground"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp"
+        android:scaleType="center"
+        android:src="@drawable/ic_expandable" />
 
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
+        android:layout_gravity="start|center_vertical"
         android:background="?android:attr/selectableItemBackground"
-        android:gravity="center_vertical|start"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="start|center_vertical"
         android:paddingBottom="8dp"
-        android:paddingEnd="8dp"
         android:paddingTop="8dp"
-        tools:text="NotebookTitle"
         android:textColor="@color/primary_text_light"
-        android:textSize="16sp" />
+        android:textSize="14sp"
+        tools:text="NotebookTitle" />
 
 </LinearLayout>
\ No newline at end of file