From 23a9fb3849d13b029bf1851171618a26cf4e51c0 Mon Sep 17 00:00:00 2001
From: maning <ning.ma@12301.cn>
Date: Mon, 5 Sep 2016 21:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9C=E9=97=B4=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E8=AE=BE=E7=BD=AEselecter=E9=94=99=E8=AF=AF=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=83=A8=E5=88=86=E6=89=8B=E6=9C=BA=E5=B4=A9=E6=BA=83?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/item_selecter.xml            |  4 ++--
 app/src/main/res/drawable/item_selecter_night.xml      |  7 +++++++
 app/src/main/res/drawable/item_setting_selecter.xml    |  4 ++--
 .../main/res/drawable/item_setting_selecter_night.xml  |  7 +++++++
 app/src/main/res/layout/activity_setting.xml           |  7 ++++---
 app/src/main/res/layout/item_time.xml                  |  2 +-
 app/src/main/res/values/attrs.xml                      |  1 -
 app/src/main/res/values/styles.xml                     | 10 ++++------
 8 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/drawable/item_selecter_night.xml
 create mode 100644 app/src/main/res/drawable/item_setting_selecter_night.xml

diff --git a/app/src/main/res/drawable/item_selecter.xml b/app/src/main/res/drawable/item_selecter.xml
index 0873982..929c97b 100644
--- a/app/src/main/res/drawable/item_selecter.xml
+++ b/app/src/main/res/drawable/item_selecter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:drawable="?item_bg_pressed"/>
-    <item android:drawable="?item_bg"/>
+    <item android:state_pressed="true" android:drawable="@color/item_selecter_pressed_color"/>
+    <item android:drawable="@color/item_bg"/>
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/item_selecter_night.xml b/app/src/main/res/drawable/item_selecter_night.xml
new file mode 100644
index 0000000..f917e92
--- /dev/null
+++ b/app/src/main/res/drawable/item_selecter_night.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" android:drawable="@color/item_selecter_pressed_color_night"/>
+    <item android:drawable="@color/item_bg_night"/>
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/item_setting_selecter.xml b/app/src/main/res/drawable/item_setting_selecter.xml
index 1064df6..6bd43f2 100644
--- a/app/src/main/res/drawable/item_setting_selecter.xml
+++ b/app/src/main/res/drawable/item_setting_selecter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:drawable="?item_bg_pressed"/>
-    <item android:drawable="?item_setting_bg"/>
+    <item android:state_pressed="true" android:drawable="@color/item_selecter_pressed_color"/>
+    <item android:drawable="@color/item_setting_bg"/>
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/item_setting_selecter_night.xml b/app/src/main/res/drawable/item_setting_selecter_night.xml
new file mode 100644
index 0000000..7bceaaa
--- /dev/null
+++ b/app/src/main/res/drawable/item_setting_selecter_night.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" android:drawable="@color/item_selecter_pressed_color_night"/>
+    <item android:drawable="@color/item_setting_bg_night"/>
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 2232300..e3eec01 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -98,7 +98,7 @@
             android:id="@+id/item_clean_cache"
             android:layout_width="match_parent"
             android:layout_height="44dp"
-            android:background="@drawable/item_setting_selecter"
+            android:background="?item_setting_bg"
             app:setting_red_dot="false"
             app:setting_right_text="0M"
             app:setting_title="图片缓存" />
@@ -114,7 +114,8 @@
             android:id="@+id/item_feedback"
             android:layout_width="match_parent"
             android:layout_height="44dp"
-            android:background="@drawable/item_setting_selecter"
+            android:visibility="visible"
+            android:background="?item_setting_bg"
             app:setting_red_dot="true"
             app:setting_title="意见反馈" />
 
@@ -130,7 +131,7 @@
             android:id="@+id/item_app_update"
             android:layout_width="match_parent"
             android:layout_height="44dp"
-            android:background="@drawable/item_setting_selecter"
+            android:background="?item_setting_bg"
             app:setting_red_dot="true"
             app:setting_title="版本更新" />
 
diff --git a/app/src/main/res/layout/item_time.xml b/app/src/main/res/layout/item_time.xml
index 438d4df..db7ab2c 100644
--- a/app/src/main/res/layout/item_time.xml
+++ b/app/src/main/res/layout/item_time.xml
@@ -2,7 +2,7 @@
     android:id="@+id/tv_time"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/item_selecter"
+    android:background="?item_bg"
     android:paddingBottom="12dp"
     android:paddingLeft="20dp"
     android:paddingTop="12dp"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 68c21d2..cf75198 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -27,7 +27,6 @@
     <attr name="toolbar_line_color" format="reference|color" />
     <attr name="item_bg" format="reference|color" />
     <attr name="item_setting_bg" format="reference|color" />
-    <attr name="item_bg_pressed" format="reference|color" />
     <attr name="lineColor" format="reference" />
     <attr name="setting_text_color" format="reference|color" />
     <attr name="setting_small_text_color" format="reference|color" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1f75cbb..6f39860 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -42,9 +42,8 @@
         <item name="android:windowBackground">@color/main_color</item>
         <item name="app_background">@color/backgroundColor</item>
         <item name="lineColor">@color/lineColor</item>
-        <item name="item_bg">@color/item_bg</item>
-        <item name="item_setting_bg">@color/item_setting_bg</item>
-        <item name="item_bg_pressed">@color/item_selecter_pressed_color</item>
+        <item name="item_bg">@drawable/item_selecter</item>
+        <item name="item_setting_bg">@drawable/item_setting_selecter</item>
         <item name="setting_text_color">@color/gank_text2_color</item>
         <item name="setting_small_text_color">@color/gank_text3_color</item>
         <item name="app_toolbar_bg">@color/main_color</item>
@@ -86,9 +85,8 @@
         <item name="android:windowBackground">@color/main_color_night</item>
         <item name="app_background">@color/backgroundColor_night</item>
         <item name="lineColor">@color/lineColor_night</item>
-        <item name="item_bg">@color/item_bg_night</item>
-        <item name="item_setting_bg">@color/item_setting_bg_night</item>
-        <item name="item_bg_pressed">@color/item_selecter_pressed_color_night</item>
+        <item name="item_bg">@drawable/item_selecter_night</item>
+        <item name="item_setting_bg">@drawable/item_setting_selecter_night</item>
         <item name="setting_text_color">@color/gank_text2_color_night</item>
         <item name="setting_small_text_color">@color/gank_text3_color_night</item>
         <item name="app_toolbar_bg">@color/main_color_night</item>