夜间模式改善

scottflybird · Sep 1, 2016 · 3a75c3a · 3a75c3a
1 parent 59a978b
commit 3a75c3a
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 28 deletions.
diff --git a/...java/com/wenming/weiswift/ui/login/fragment/home/userdetail/adapter/UserPhotoAdapter.java b/...java/com/wenming/weiswift/ui/login/fragment/home/userdetail/adapter/UserPhotoAdapter.java
@@ -1,6 +1,7 @@
 package com.wenming.weiswift.ui.login.fragment.home.userdetail.adapter;
 
 import android.content.Context;
+import android.graphics.Bitmap;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,10 +29,8 @@ public UserPhotoAdapter(ArrayList<String> bmiddle_pic_urls, Context context) {
         this.bmiddle_pic_urls = bmiddle_pic_urls;
         this.mContext = context;
         options = new DisplayImageOptions.Builder()
-                .showImageOnLoading(R.drawable.message_image_default)
-                .showImageForEmptyUri(R.drawable.message_image_default)
-                .showImageOnFail(R.drawable.message_image_default)
                 .imageScaleType(ImageScaleType.NONE_SAFE)
+                .bitmapConfig(Bitmap.Config.ARGB_8888)
                 .cacheInMemory(true)
                 .cacheOnDisk(true)
                 .considerExifParams(true)

diff --git a/weiSwift/src/main/res/drawable-night/user_homepage_item_auto.xml b/weiSwift/src/main/res/drawable-night/user_homepage_item_auto.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/user_homepage_item_bg_hight" android:state_pressed="true" />
+    <item android:drawable="@color/user_homepage_item_bg" />
+
+</selector>
diff --git a/weiSwift/src/main/res/drawable/user_homepage_item_auto.xml b/weiSwift/src/main/res/drawable/user_homepage_item_auto.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/user_homepage_item_bg_hight" android:state_pressed="true" />
+    <item android:drawable="@color/user_homepage_item_bg" />
+
+</selector>
diff --git a/weiSwift/src/main/res/layout/home_user_layout.xml b/weiSwift/src/main/res/layout/home_user_layout.xml
@@ -16,6 +16,7 @@
             android:id="@+id/base_RecyclerView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:background="@color/windowBackground"
             android:scrollbars="vertical" />
 
     </android.support.v4.widget.SwipeRefreshLayout>

diff --git a/weiSwift/src/main/res/layout/toolbar_post_writeweibo.xml b/weiSwift/src/main/res/layout/toolbar_post_writeweibo.xml
@@ -13,7 +13,7 @@
         android:clickable="true"
         android:padding="10dp"
         android:text="取消"
-        android:textColor="@color/toolbar_textview_background_auto"
+        android:textColor="@color/cancel_text"
         android:textSize="16sp" />
 
     <LinearLayout
@@ -30,15 +30,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="发微博"
-            android:textColor="#545454"
+            android:textColor="@color/middle_send_text"
             android:textSize="17sp" />
 
         <TextView
             android:id="@+id/idea_username"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="闭关写代码"
-            android:textColor="#b6b6b6"
+            android:textColor="@color/middle_username_text"
             android:textSize="12sp" />
 
     </LinearLayout>

diff --git a/weiSwift/src/main/res/layout/user_profile_layout.xml b/weiSwift/src/main/res/layout/user_profile_layout.xml
@@ -9,7 +9,6 @@
         android:id="@+id/base_RecyclerView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="#f2f2f2"
         android:scrollbars="vertical" />
 
 </android.support.v4.widget.SwipeRefreshLayout>

diff --git a/weiSwift/src/main/res/layout/user_profile_layout_homepage_footerview.xml b/weiSwift/src/main/res/layout/user_profile_layout_homepage_footerview.xml
@@ -3,7 +3,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="47dp"
-    android:background="@drawable/message_item_auto"
+    android:background="@drawable/user_homepage_item_auto"
     android:clickable="true"
     android:orientation="vertical">
 
@@ -12,13 +12,13 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:text="更多基本资料"
-        android:textColor="#919191" />
+        android:textColor="@color/user_homepage_key" />
 
     <ImageView
         android:layout_width="337dp"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:background="#ececec" />
+        android:background="@color/user_homepage_drive" />
 </RelativeLayout>
 
diff --git a/weiSwift/src/main/res/layout/user_profile_layout_homepage_item.xml b/weiSwift/src/main/res/layout/user_profile_layout_homepage_item.xml
@@ -3,7 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/message_item_auto"
+    android:background="@drawable/user_homepage_item_auto"
     android:clickable="true"
     android:orientation="vertical">
 
@@ -18,7 +18,7 @@
             android:layout_height="match_parent"
             android:gravity="center"
             android:text="所在地"
-            android:textColor="#919191"
+            android:textColor="@color/user_homepage_key"
             android:textSize="@dimen/home_retweet_weiboitem_font" />
 
         <TextView
@@ -32,14 +32,14 @@
             android:gravity="center_vertical"
             android:minHeight="37dp"
             android:text="上海 静安区"
-            android:textColor="@color/black"
+            android:textColor="@color/user_homepage_value"
             android:textSize="@dimen/home_original_weiboitem_font" />
     </LinearLayout>
 
     <ImageView
         android:layout_width="337dp"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_gravity="center"
-        android:background="#ececec" />
+        android:background="@color/user_homepage_drive" />
 </LinearLayout>
 
diff --git a/weiSwift/src/main/res/layout/user_profile_photo_item.xml b/weiSwift/src/main/res/layout/user_profile_photo_item.xml
@@ -3,6 +3,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_margin="2dp"
+    android:background="@color/loadding_img_bg"
     android:orientation="vertical">
 
     <com.cesards.cropimageview.CropImageView

diff --git a/weiSwift/src/main/res/values-night/color.xml b/weiSwift/src/main/res/values-night/color.xml
@@ -35,19 +35,23 @@
     <!--<color name="night_send_button_stoke">#141414</color>-->
 
     <!-- 发送按钮在普通状态下，不可点击 -->
-    <color name="normal_send_button_bg">#FFFFFF</color>
-    <color name="normal_send_button_stoke">#cbcbcb</color>
-    <color name="normal_send_button_text">#b3b3b3</color>
+    <color name="normal_send_button_bg">#272727</color>
+    <color name="normal_send_button_stoke">#141414</color>
+    <color name="normal_send_button_text">#4d4d4d</color>
 
     <!-- 发送按钮在按压状态下 -->
-    <color name="press_send_button_bg">#df7500</color>
-    <color name="press_send_button_stoke">#df7500</color>
-    <color name="press_send_button_text">#ffecd3</color>
+    <color name="press_send_button_bg">#00386b</color>
+    <color name="press_send_button_stoke">#00386b</color>
+    <color name="press_send_button_text">#7f9fb5</color>
 
     <!-- 发送按钮在可以点击的状态下 -->
-    <color name="highlight_send_button_bg">#fe8300</color>
-    <color name="highlight_send_button_stoke">#fe8300</color>
-    <color name="highlight_send_button_text">#fbffff</color>
+    <color name="highlight_send_button_bg">#1f6eac</color>
+    <color name="highlight_send_button_stoke">#1f6eac</color>
+    <color name="highlight_send_button_text">#bcd5e4</color>
+
+    <color name="cancel_text">#898989</color><!--取消按钮文本颜色 -->
+    <color name="middle_send_text">#868686</color><!--topbar中间区域 发微博文本颜色 -->
+    <color name="middle_username_text">#4e4e4e</color><!--topbar中间区域 用户名文本颜色 -->
 
     <color name="create_weibo_input_text">#FFFFFF</color>
     <color name="create_weibo_input_hint">#454648</color>
@@ -158,6 +162,12 @@
     <color name="user_topbar_text_drive">#236ead</color> <!--基本，微博，相册的bar的文字底部的高亮条 -->
     <color name="user_topbar_driver">#171717</color>
 
+    <color name="user_homepage_item_bg">#1d1d1d</color>
+    <color name="user_homepage_item_bg_hight">#1a1a1a</color>
+    <color name="user_homepage_drive">#0e0e0e</color>
+    <color name="user_homepage_key">#4e4e4e</color>
+    <color name="user_homepage_value">#898989</color>
+
     <color name="white">#FFFFFF</color><!--白色 -->
     <color name="orange">#FFA500</color><!--橙色 -->
     <color name="grey">#f2f2f2</color><!--灰色 -->

diff --git a/weiSwift/src/main/res/values/color.xml b/weiSwift/src/main/res/values/color.xml
@@ -32,9 +32,9 @@
     <color name="retweet_weibo_text">#909090</color>
 
     <!-- 发送按钮在普通状态下，不可点击 -->
-    <color name="normal_send_button_bg">#272727</color>
-    <color name="normal_send_button_stoke">#cbcbcb</color>
-    <color name="normal_send_button_text">#4d4d4d</color>
+    <color name="normal_send_button_bg">#FFFFFF</color>
+    <color name="normal_send_button_stoke">#d8d8d8</color>
+    <color name="normal_send_button_text">#b5b5b5</color>
 
     <!-- 发送按钮在按压状态下 -->
     <color name="press_send_button_bg">#df7500</color>
@@ -46,6 +46,10 @@
     <color name="highlight_send_button_stoke">#fe8300</color>
     <color name="highlight_send_button_text">#fbffff</color>
 
+    <color name="cancel_text">#494949</color><!--取消按钮文本颜色 -->
+    <color name="middle_send_text">#505050</color><!--topbar中间区域 发微博文本颜色 -->
+    <color name="middle_username_text">#b4b4b4</color><!--topbar中间区域 用户名文本颜色 -->
+
 
     <color name="create_weibo_input_text">#FFFFFF</color>
     <color name="create_weibo_input_hint">#454648</color>
@@ -162,6 +166,13 @@
     <color name="user_topbar_text_drive">#ff8300</color> <!--基本，微博，相册的bar的高亮文字 -->
     <color name="user_topbar_driver">#e5e5e5</color>
 
+    <color name="user_homepage_item_bg">#FFFFFF</color>
+    <color name="user_homepage_item_bg_hight">#f2f2f2</color>
+    <color name="user_homepage_drive">#ececec</color>
+    <color name="user_homepage_key">#919191</color>
+    <color name="user_homepage_value">#000000</color>
+
+
     <color name="white">#FFFFFF</color><!--白色 -->
     <color name="orange">#FFA500</color><!--橙色 -->
     <color name="grey">#f2f2f2</color><!--灰色 -->