增加更多夜间模式颜色

scottflybird · Aug 29, 2016 · 3e91a13 · 3e91a13
1 parent f42b043
commit 3e91a13
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 12 deletions.
diff --git a/...ava/com/wenming/weiswift/ui/login/fragment/profile/setting/accoutlist/AccoutActivity.java b/...ava/com/wenming/weiswift/ui/login/fragment/profile/setting/accoutlist/AccoutActivity.java
@@ -124,15 +124,14 @@ public void initListView(ArrayList<User> userArrayList) {
         mAddAccountBut = (LinearLayout) LayoutInflater.from(mContext).inflate(R.layout.accout_layout_item_footerview, null);
         mAdapter = new AccoutAdapter(mContext, userArrayList);
         listview.addFooterView(mAddAccountBut);
-        listview.setDivider(new ColorDrawable(Color.parseColor("#e5e5e5")));
-        listview.setDividerHeight(DensityUtil.dp2px(mContext, 1));
+        //listview.setDivider(new ColorDrawable(Color.parseColor("#e5e5e5")));
+        //listview.setDividerHeight(DensityUtil.dp2px(mContext, 1));
         listview.setAdapter(mAdapter);
     }
 
     @Override
     public void finishItself() {
         finish();
-        ;
     }
 
     @Override

diff --git a/weiSwift/src/main/res/layout/accout_layout.xml b/weiSwift/src/main/res/layout/accout_layout.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/windowBackground"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
@@ -13,6 +14,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="17dp"
+        android:divider="@color/account_item_drive"
+        android:dividerHeight="1dp"
         android:visibility="gone"
         tools:listitem="@layout/accout_layout_item" />
 

diff --git a/weiSwift/src/main/res/layout/accout_layout_item.xml b/weiSwift/src/main/res/layout/accout_layout_item.xml
@@ -2,9 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="71dp"
-    android:layout_marginBottom="1dp"
     android:background="@drawable/message_item_auto"
-
     android:orientation="horizontal">
 
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -38,7 +36,7 @@
         android:layout_centerInParent="true"
         android:layout_gravity="center"
         android:singleLine="true"
-        android:textColor="#343434"
+        android:textColor="@color/account_item_name"
         android:textSize="17sp" />
 
 </LinearLayout>

diff --git a/weiSwift/src/main/res/layout/accout_layout_item_footerview.xml b/weiSwift/src/main/res/layout/accout_layout_item_footerview.xml
@@ -28,7 +28,7 @@
         android:layout_gravity="center"
         android:singleLine="true"
         android:text="添加帐号"
-        android:textColor="#343434"
+        android:textColor="@color/account_item_name"
         android:textSize="17sp" />
 
 </LinearLayout>

diff --git a/weiSwift/src/main/res/layout/profilefragment_follower_item.xml b/weiSwift/src/main/res/layout/profilefragment_follower_item.xml
@@ -42,8 +42,9 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:text="闭关写代码"
+            android:singleLine="true"
             android:textColor="@color/follow_item_name"
-            android:textSize="16sp" />
+            android:textSize="15sp" />
 
         <TextView
             android:id="@+id/follower_firstcontent"
@@ -67,7 +68,7 @@
                 android:layout_height="wrap_content"
                 android:text="来自"
                 android:textColor="@color/follow_item_constant_comefrom"
-                android:textSize="14sp" />
+                android:textSize="12sp" />
 
             <TextView
                 android:id="@+id/profile_comefrom"
@@ -76,7 +77,7 @@
                 android:layout_marginLeft="2dp"
                 android:text="微博推荐"
                 android:textColor="@color/follow_item_comefrom"
-                android:textSize="14sp" />
+                android:textSize="12sp" />
         </LinearLayout>
 
     </LinearLayout>
@@ -108,7 +109,7 @@
             android:layout_centerInParent="true"
             android:gravity="center"
             android:text="加关注"
-            android:textColor="@color/follow_item_button_text"
+            android:textColor="@color/follow_item_button_follow_none"
             android:textSize="10sp" />
 
     </RelativeLayout>

diff --git a/weiSwift/src/main/res/layout/profilefragment_friend_item.xml b/weiSwift/src/main/res/layout/profilefragment_friend_item.xml
@@ -46,7 +46,7 @@
             android:singleLine="true"
             android:text="闭关写代码"
             android:textColor="@color/friend_item_name"
-            android:textSize="16sp" />
+            android:textSize="15sp" />
 
         <TextView
             android:id="@+id/friend_content"

diff --git a/weiSwift/src/main/res/values-night/color.xml b/weiSwift/src/main/res/values-night/color.xml
@@ -117,7 +117,21 @@
     <color name="night_friend_item_button_follow_alreay">#8b8b8b</color><!--已关注 -->
     <color name="night_friend_item_button_follow_none">#f79f43</color><!--加关注 -->
 
+    <!--我的粉丝 -->
+    <color name="follow_item_name">#8a8a8a</color>
+    <color name="follow_item_description">#444849</color>
+    <color name="follow_item_button_text">#e98219</color>
 
+    <color name="follow_item_constant_comefrom">#919191</color>
+    <color name="follow_item_comefrom">#4d80b2</color>
+
+    <color name="night_follow_item_button_follow_each_other">#5788BF</color> <!--互相关注 -->
+    <color name="night_follow_item_button_follow_alreay">#8b8b8b</color><!--已关注 -->
+    <color name="night_follow_item_button_follow_none">#f79f43</color><!--加关注 -->
+
+    <!-- account -->
+    <color name="account_item_drive">#1a1a1a</color>
+    <color name="account_item_name">#868686</color>
 
     <color name="white">#FFFFFF</color><!--白色 -->
     <color name="orange">#FFA500</color><!--橙色 -->

diff --git a/weiSwift/src/main/res/values/color.xml b/weiSwift/src/main/res/values/color.xml
@@ -127,6 +127,14 @@
     <color name="follow_item_constant_comefrom">#919191</color>
     <color name="follow_item_comefrom">#4d80b2</color>
 
+    <color name="follow_item_button_follow_each_other">#5788BF</color> <!--互相关注 -->
+    <color name="follow_item_button_follow_alreay">#898989</color><!--已关注 -->
+    <color name="follow_item_button_follow_none">#e98219</color><!--加关注 -->
+
+
+    <!-- account -->
+    <color name="account_item_drive">#e5e5e5</color>
+    <color name="account_item_name">#e5e5e5</color>
 
 
     <color name="white">#FFFFFF</color><!--白色 -->