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 @@ - - + + \ 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 @@ + + + + + + + \ 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 @@ - - + + \ 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 @@ + + + + + + + \ 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 @@ - 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 @@ @color/main_color @color/backgroundColor @color/lineColor - @color/item_bg - @color/item_setting_bg - @color/item_selecter_pressed_color + @drawable/item_selecter + @drawable/item_setting_selecter @color/gank_text2_color @color/gank_text3_color @color/main_color @@ -86,9 +85,8 @@ @color/main_color_night @color/backgroundColor_night @color/lineColor_night - @color/item_bg_night - @color/item_setting_bg_night - @color/item_selecter_pressed_color_night + @drawable/item_selecter_night + @drawable/item_setting_selecter_night @color/gank_text2_color_night @color/gank_text3_color_night @color/main_color_night