派对 广场 消息 UI修改

app/src/main/java/com/yizhuan/erban/MainActivity.java

@@ -236,7 +236,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         fragmentArray.put(MainTabLayout.MAIN_TAB_POS_MSG, new ContactsListFragment());
         fragmentArray.put(MainTabLayout.MAIN_TAB_POS_SQUARE, new SquareFragment());
         fragmentArray.put(MainTabLayout.MAIN_TAB_POS_ME, new MeFragment());
-        fragmentArray.put(MainTabLayout.MAIN_TAB_POS_GAME, FaradayFragment.newInstance("main", null, false, null));
+        fragmentArray.put(MainTabLayout.MAIN_TAB_POS_GAME, FaradayFragment.newInstance("main", null, true,null));
     }
 
     public static void start(Context context) {
@@ -507,6 +507,9 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         }
         onParseIntent();
         handleNimIntent();
+        if (tempFragment instanceof FaradayFragment && intent != null) {
+            ((FaradayFragment) tempFragment).onNewIntent(intent);
+        }
     }
 
 
@@ -1112,6 +1115,30 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     protected void setStatusBar() {
         super.setStatusBar();
         StatusBarUtil.transparencyBar(this);
-        StatusBarUtil.StatusBarLightMode(this);
+    }
+
+    @Override
+    public void onTrimMemory(int level) {
+        super.onTrimMemory(level);
+        if (tempFragment instanceof FaradayFragment) {
+            ((FaradayFragment) tempFragment).onTrimMemory(level);
         }
     }
+
+    @Override
+    protected void onUserLeaveHint() {
+        super.onUserLeaveHint();
+        if (tempFragment instanceof FaradayFragment) {
+            ((FaradayFragment) tempFragment).onUserLeaveHint();
+        }
+    }
+
+    @Override
+    protected void onPostResume() {
+        super.onPostResume();
+        if (tempFragment instanceof FaradayFragment) {
+            ((FaradayFragment) tempFragment).onPostResume();
+        }
+    }
+
+}

app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java

@@ -40,8 +40,8 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter {
     @Override
     public IPagerTitleView getTitleView(Context context, final int i) {
         ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true);
-        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_999999));
+        scaleTransitionPagerTitleView.setNormalColor(Color.parseColor("#4F516A"));
-        scaleTransitionPagerTitleView.setSelectedColor(mIsShowIndicator ? ContextCompat.getColor(mContext, R.color.appColor) : ContextCompat.getColor(mContext, R.color.color_333333));
+        scaleTransitionPagerTitleView.setSelectedColor(Color.WHITE);
         scaleTransitionPagerTitleView.setMinScale(0.8f);
         scaleTransitionPagerTitleView.setTextSize(16);
         int padding = UIUtil.dip2px(context, 5);

app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java

@@ -1,6 +1,8 @@
 package com.yizhuan.erban.home.adapter;
 
 import android.content.Context;
+import android.graphics.Color;
+
 import androidx.core.content.ContextCompat;
 
 import com.yizhuan.erban.R;
@@ -35,8 +37,8 @@ public class TopMagicIndicatorAdapter extends CommonNavigatorAdapter {
     @Override
     public IPagerTitleView getTitleView(Context context, final int i) {
         ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, false);
-        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_999999));
+        scaleTransitionPagerTitleView.setNormalColor(Color.parseColor("#4F516A"));
-        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_333333));
+        scaleTransitionPagerTitleView.setSelectedColor(Color.WHITE);
         scaleTransitionPagerTitleView.setMinScale(0.75f);
         scaleTransitionPagerTitleView.setTextSize(21);
         scaleTransitionPagerTitleView.setText(mTitleList.get(i));

app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.java

@@ -206,9 +206,6 @@ public class HomeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmen
             case R.id.tv_room_more:
                 HomeMoreRoomActivity.start(mContext);
                 break;
-            case R.id.iv_me:
-                EventBus.getDefault().post(new ShowMeEvent());
-                break;
         }
     }
 
@@ -726,7 +723,6 @@ public class HomeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmen
         if (!TextUtils.isEmptyText(userInfo.getNick())) {
             getRoomShortcut();
             getHomeConcern();
-            ImageLoadUtilsV2.loadAvatar(mBinding.ivMe, userInfo.getAvatar());
         }
 
     }

app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java

@@ -65,10 +65,6 @@ public class CommonRecentViewHolder extends RecentViewHolder {
         mIvNobleHeadWear = holder.getView(R.id.noble_head_wear);
         mIvNobleLevel = holder.getView(R.id.iv_noble_level);
         mIvNobleBadge = holder.getView(R.id.iv_user_badge);
-//        topLine = holder.getView(R.id.top_line);
-//        ivUserOfficialView = holder.getView(R.id.iv_user_official);
-
-//        holder.addOnClickListener(R.id.unread_number_tip);
 
         MessageBubbleView.attach(this.tvUnread, new BubbleMessageTouchListener.BubbleDisappearListener() {
             @Override
@@ -90,25 +86,6 @@ public class CommonRecentViewHolder extends RecentViewHolder {
 
         });
 
-
-
-//        this.tvUnread.setTouchListener(new DropFake.ITouchListener() {
-//            @Override
-//            public void onDown() {
-//                DropManager.getInstance().setCurrentId(recent);
-//                DropManager.getInstance().down(tvUnread, tvUnread.getText());
-//            }
-//
-//            @Override
-//            public void onMove(float curX, float curY) {
-//                DropManager.getInstance().move(curX, curY);
-//            }
-//
-//            @Override
-//            public void onUp() {
-//                DropManager.getInstance().up();
-//            }
-//        });
     }
 
     @Override

app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java

@@ -49,14 +49,12 @@ public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapt
 
     protected int lastUnreadCount = 0;
 
-    protected View topLine;
     protected HeadImageView imgHead;
     protected AppCompatImageView mIvNobleHeadWear;
     protected AppCompatImageView mIvNobleLevel;
     protected AppCompatImageView mIvNobleBadge;
     protected AppCompatImageView ivCharmLevel;
     protected AppCompatImageView ivUserGender;
-    protected AppCompatImageView ivUserOfficialView;
 
     protected TextView tvNickname;
 
@@ -111,9 +109,6 @@ public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapt
     protected void updateNewIndicator(RecentContact recent) {
         int unreadNum = recent.getUnreadCount();
         setUnRead(unreadNum);
-//        tvUnread.setNumText(unreadNum);
-//        tvUnread.setVisibility(unreadNum > 0 ? VISIBLE : GONE);
-//        tvUnread.setText(unreadCountShowRule(unreadNum));
     }
 
     protected void setUnRead(int count) {
@@ -127,8 +122,6 @@ public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapt
     protected void updateMsgLabel(BaseViewHolder holder, RecentContact recent) {
         // 显示消息具体内容
         MoonUtil.identifyRecentVHFaceExpressionAndTags(holder.getContext(), tvMessage, getContent(recent), -1, 0.45f);
-        //tvMessage.setText(getContent());
-
         MsgStatusEnum status = recent.getMsgStatus();
         switch (status) {
             case fail:
@@ -183,11 +176,6 @@ public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapt
         }
     }
 
-    protected String unreadCountShowRule(int unread) {
-        unread = Math.min(unread, 99);
-        return String.valueOf(unread);
-    }
-
     protected RecentContactsCallback getCallback() {
         return ((RecentContactAdapter) getAdapter()).getCallback();
     }
@@ -249,36 +237,8 @@ public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapt
                 return TeamNotificationHelper.getTeamNotificationText(recent.getContactId(),
                         recent.getFromAccount(),
                         (NotificationAttachment) recent.getAttachment());
-            case avchat:
-//                AVChatAttachment avchat = (AVChatAttachment) attachment;
-//                if (avchat.getState() == AVChatRecordState.Missed && !recent.getFromAccount().equals(NimUIKit.getAccount())) {
-//                    // 未接通话请求
-//                    StringBuilder sb = new StringBuilder("[未接");
-//                    if (avchat.getType() == AVChatType.VIDEO) {
-//                        sb.append("视频电话]");
-//                    } else {
-//                        sb.append("音频电话]");
-//                    }
-//                    return sb.toString();
-//                } else if (avchat.getState() == AVChatRecordState.Success) {
-//                    StringBuilder sb = new StringBuilder();
-//                    if (avchat.getType() == AVChatType.VIDEO) {
-//                        sb.append("[视频电话]: ");
-//                    } else {
-//                        sb.append("[音频电话]: ");
-//                    }
-//                    sb.append(TimeUtil.secToTime(avchat.getDuration()));
-//                    return sb.toString();
-//                } else {
-//                    if (avchat.getType() == AVChatType.VIDEO) {
-//                        return ("[视频电话]");
-//                    } else {
-//                        return ("[音频电话]");
-//                    }
-//                }
             case robot:
                 return "[机器人消息]";
-
             case custom:
                 if (attachment instanceof CustomAttachment) {
                     CustomAttachment customAttachment = (CustomAttachment) attachment;

app/src/main/res/drawable/bg_common_touch_while.xml

@@ -2,5 +2,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/item_hover" android:state_pressed="true" />
     <item android:drawable="@color/item_hover" android:state_focused="true" />
-    <item android:drawable="@color/color_white" />
+    <item android:drawable="@color/color_1c1b22" />
 </selector>

app/src/main/res/drawable/bg_shape_home_top.xml

@@ -4,8 +4,8 @@
 
     <gradient
         android:angle="180"
-        android:endColor="#FFB22B"
+        android:endColor="#462893"
-        android:startColor="#FF9813" />
+        android:startColor="#356DC1" />
 
 
 </shape>

app/src/main/res/drawable/shape_add_friends_2a2a39.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FFEFD8" />
+    <solid android:color="#2A2A39" />
     <corners android:radius="@dimen/dp_12"/>
 </shape>

app/src/main/res/drawable/shape_home_bg_15dp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_1c1b22"/>
+    <corners android:topLeftRadius="@dimen/dp_15"
+        android:topRightRadius="@dimen/dp_15"/>
+</shape>

app/src/main/res/layout/fragment_contact_list.xml

@@ -1,8 +1,9 @@
 <?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="match_parent"
-    android:background="@color/white"
+    android:background="@color/color_1c1b22"
     android:orientation="vertical">
 
     <FrameLayout
@@ -15,7 +16,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:text="消息"
-            android:textColor="@color/color_333333"
+            android:textColor="@color/white"
             android:textSize="21sp" />
 
         <ImageView
@@ -41,6 +42,7 @@
             android:drawableTop="@drawable/ic_msg_friend"
             android:gravity="center"
             android:text="好友"
+            android:textColor="@color/white"
             android:textSize="15sp" />
 
         <TextView
@@ -51,6 +53,7 @@
             android:drawableTop="@drawable/ic_msg_attention"
             android:gravity="center"
             android:text="关注"
+            android:textColor="@color/white"
             android:textSize="15sp" />
 
         <TextView
@@ -61,6 +64,7 @@
             android:drawableTop="@drawable/ic_msg_fans"
             android:gravity="center"
             android:text="粉丝"
+            android:textColor="@color/white"
             android:textSize="15sp" />
     </LinearLayout>
 

app/src/main/res/layout/fragment_game_home.xml

@@ -19,7 +19,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_F9F9F9"
+        android:background="@color/color_1c1b22"
         android:orientation="vertical">
 
         <LinearLayout
@@ -32,20 +32,10 @@
             android:paddingBottom="@dimen/dp_10"
             app:layout_constraintTop_toTopOf="parent">
 
-            <com.yizhuan.erban.common.widget.CircleImageView
-                android:id="@+id/iv_me"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_marginStart="15dp"
-                android:onClick="@{click}"
-                android:src="@drawable/default_avatar"
-                app:cborder_color="@color/white"
-                app:cborder_width="1dp" />
-
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="43dp"
+                android:layout_marginStart="90dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="音游"
@@ -150,7 +140,7 @@
                                 <View
                                     android:layout_width="match_parent"
                                     android:layout_height="15dp"
-                                    android:background="@drawable/shape_f9f9f9_top_15dp"
+                                    android:background="@drawable/shape_home_bg_15dp"
                                     app:layout_constraintTop_toTopOf="parent" />
 
                                 <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
@@ -158,7 +148,7 @@
                                     android:layout_width="0dp"
                                     android:layout_height="wrap_content"
                                     android:layout_weight="1"
-                                    android:paddingStart="14dp"
+                                    android:paddingStart="13dp"
                                     android:paddingEnd="@dimen/dp_10"
                                     android:paddingBottom="5dp"
                                     app:layout_constraintBottom_toBottomOf="parent"
@@ -170,14 +160,14 @@
                                     android:id="@+id/tv_room_more"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:drawableRight="@drawable/arrow_right_2"
+                                    android:drawableRight="@drawable/arrow_right_more_room"
                                     android:drawablePadding="@dimen/dp_3"
                                     android:gravity="bottom"
                                     android:onClick="@{click}"
                                     android:paddingTop="5dp"
                                     android:paddingEnd="15dp"
                                     android:text="更多房间"
-                                    android:textColor="@color/color_999999"
+                                    android:textColor="#C6C6E9"
                                     android:textSize="12sp"
                                     app:layout_constraintEnd_toEndOf="parent"
                                     app:layout_constraintStart_toEndOf="@id/magic_indicator"
@@ -195,11 +185,10 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="10dp"
-                                android:background="@color/color_F9F9F9"
                                 android:includeFontPadding="false"
                                 android:paddingStart="16dp"
                                 android:text="交友扩列"
-                                android:textColor="@color/color_333333"
+                                android:textColor="@color/white"
                                 android:textSize="16sp"
                                 android:textStyle="bold"
                                 android:visibility="gone"
@@ -209,7 +198,6 @@
                                 android:id="@+id/rv_add_friends"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:background="@color/color_F9F9F9"
                                 android:paddingTop="@dimen/dp_5"
                                 android:visibility="gone"
                                 tools:visibility="visible" />
@@ -220,7 +208,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="@dimen/dp_15"
                                 android:layout_marginEnd="@dimen/dp_15"
-                                android:layout_marginBottom="5dp">
+                                android:layout_marginBottom="15dp">
 
                                 <com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView
                                     android:id="@+id/roll_view"
@@ -241,8 +229,7 @@
                         android:id="@+id/fl_indicator"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
+                        android:layout_marginTop="5dp"
-                        android:background="@color/color_F9F9F9"
                         android:paddingTop="5dp"
                         android:paddingBottom="5dp">
 
@@ -250,8 +237,8 @@
                             android:id="@+id/magic_indicator_bottom"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:paddingLeft="14dp"
+                            android:paddingLeft="13dp"
-                            android:paddingRight="14dp" />
+                            android:paddingRight="10dp" />
                     </FrameLayout>
 
                 </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/fragment_home_room_tab.xml

@@ -2,7 +2,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_F9F9F9"
     tools:context="com.yizhuan.erban.home.fragment.HomeOtherTabFragment">
 
     <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/fragment_recent_contacts.xml

@@ -11,7 +11,6 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:cacheColorHint="@android:color/white"
         android:clipToPadding="false"
         android:paddingBottom="60dp" />
 

app/src/main/res/layout/fragment_recent_list.xml

@@ -35,7 +35,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/color_black_333333"
+                android:textColor="@color/white"
                 android:textSize="@dimen/dp_15"
                 android:text="@string/find_new"
                 android:gravity="center_vertical"
@@ -68,7 +68,6 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_grab_apprentices"
-        android:background="@color/white"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 

app/src/main/res/layout/item_home_add_friends.xml

@@ -15,7 +15,7 @@
         android:layout_height="0dp"
         android:layout_marginStart="15dp"
         android:layout_marginEnd="15dp"
-        android:background="@drawable/shape_add_friends_f4f1ff"
+        android:background="@drawable/shape_add_friends_2a2a39"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -47,7 +47,7 @@
         android:layout_marginStart="@dimen/dp_6"
         android:ellipsize="end"
         android:lines="1"
-        android:textColor="@color/color_333333"
+        android:textColor="@color/white"
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="@id/iv_room_avatar"
         app:layout_constraintStart_toEndOf="@id/iv_room_avatar"
@@ -62,7 +62,7 @@
         android:layout_marginEnd="15dp"
         android:drawableStart="@drawable/ic_online_user_count"
         android:includeFontPadding="false"
-        android:textColor="@color/color_333333"
+        android:textColor="@color/white"
         android:textSize="@dimen/dp_13"
         app:layout_constraintBottom_toBottomOf="@id/iv_room_avatar"
         app:layout_constraintEnd_toEndOf="@id/view_bg"
@@ -96,7 +96,7 @@
                 android:layout_width="65dp"
                 android:layout_height="65dp"
                 android:src="@drawable/ic_home_play_empty"
-                app:cborder_color="#FFBD2F"
+                app:cborder_color="#248CFE"
                 app:cborder_width="@dimen/dp_2" />
 
             <com.yizhuan.erban.common.widget.CircleImageView
@@ -105,7 +105,7 @@
                 android:layout_height="65dp"
                 android:layout_marginStart="10dp"
                 android:src="@drawable/ic_home_play_empty"
-                app:cborder_color="#FFBD2F"
+                app:cborder_color="#248CFE"
                 app:cborder_width="@dimen/dp_2" />
 
             <com.yizhuan.erban.common.widget.CircleImageView
@@ -114,7 +114,7 @@
                 android:layout_height="65dp"
                 android:layout_marginStart="10dp"
                 android:src="@drawable/ic_home_play_empty"
-                app:cborder_color="#FFBD2F"
+                app:cborder_color="#248CFE"
                 app:cborder_width="@dimen/dp_2" />
 
             <com.yizhuan.erban.common.widget.CircleImageView
@@ -123,7 +123,7 @@
                 android:layout_height="65dp"
                 android:layout_marginStart="10dp"
                 android:src="@drawable/ic_home_play_empty"
-                app:cborder_color="#FFBD2F"
+                app:cborder_color="#248CFE"
                 app:cborder_width="@dimen/dp_2" />
 
             <com.yizhuan.erban.common.widget.CircleImageView
@@ -132,7 +132,7 @@
                 android:layout_height="65dp"
                 android:layout_marginStart="10dp"
                 android:src="@drawable/ic_home_play_empty"
-                app:cborder_color="#FFBD2F"
+                app:cborder_color="#248CFE"
                 app:cborder_width="@dimen/dp_2" />
 
         </LinearLayout>

app/src/main/res/layout/item_home_dynamic.xml

@@ -8,7 +8,7 @@
     android:layout_marginStart="@dimen/dp_15"
     android:layout_marginEnd="@dimen/dp_15"
     android:paddingBottom="13.5dp"
-    android:background="@drawable/bg_corner_shadow_12">
+    android:background="@drawable/shape_add_friends_2a2a39">
 
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/item_home_tab_map.xml

@@ -85,7 +85,7 @@
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="1"
-        android:textColor="@color/color_333333"
+        android:textColor="#C6C6E9"
         android:textSize="12sp"
         tools:text="房间名称房间名称房间名称" />
 

app/src/main/res/layout/layout_ktv_empty.xml

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_F9F9F9"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
@@ -13,7 +12,6 @@
         android:layout_height="wrap_content"
         android:src="@drawable/icon_common_failure" />
 
-
     <TextView
         android:id="@+id/tv_hint"
         android:layout_width="wrap_content"

app/src/main/res/layout/layout_recommend_topic_header.xml

@@ -11,9 +11,9 @@
         android:layout_marginStart="@dimen/dp_20"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="@dimen/dp_15"
-        android:drawableEnd="@drawable/arrow_right_3"
+        android:drawableEnd="@drawable/arrow_right_more_room"
         android:text="@string/recommend_topic"
-        android:textColor="@color/color_333333"
+        android:textColor="#C6C6E9"
         android:textSize="@dimen/sp_13"
         app:layout_constraintTop_toTopOf="parent" />
 

app/src/main/res/layout/nim_recent_contact_list_item_new.xml

@@ -2,9 +2,15 @@
 <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="71dp"
+    android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
+    android:orientation="vertical"
+    tools:background="@color/color_1c1b22">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="71dp"
         android:orientation="horizontal">
 
         <RelativeLayout
@@ -54,7 +60,7 @@
                     android:maxWidth="95dp"
                     android:singleLine="true"
                     android:text=""
-                android:textColor="@color/color_black_333333"
+                    android:textColor="@color/white"
                     android:textSize="15dp"
                     tools:ignore="SpUsage"
                     tools:text="你好啊啊啊啊啊啊啊啊" />
@@ -114,7 +120,7 @@
                     android:gravity="center_vertical"
                     android:lines="1"
                     android:text=""
-                android:textColor="@color/color_999999"
+                    android:textColor="#C6C6E9"
                     android:textSize="12dp"
                     tools:ignore="SpUsage"
                     tools:text="我是内容" />
@@ -140,7 +146,7 @@
                     android:lines="1"
                     android:scrollHorizontally="true"
                     android:text=""
-                android:textColor="@color/color_999999"
+                    android:textColor="#C6C6E9"
                     android:textSize="12dp"
                     tools:ignore="SpUsage"
                     tools:text="我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容" />
@@ -161,10 +167,10 @@
                 android:id="@+id/unread_number_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_18"
+                android:layout_gravity="right"
                 android:singleLine="true"
                 android:visibility="gone"
                 tools:text="123"
-            android:layout_gravity="right"
                 tools:visibility="visible" />
 
             <ImageView
@@ -180,12 +186,21 @@
                 android:id="@+id/tv_date_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:textColor="@color/color_B3B3B3"
-            android:layout_marginTop="2dp"
                 android:layout_gravity="center_vertical|right"
+                android:layout_marginTop="2dp"
+                android:textColor="#4F516A"
                 android:textSize="11dp"
                 tools:text="just now" />
 
         </FrameLayout>
 
     </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:layout_marginStart="85dp"
+        android:layout_marginEnd="15dp"
+        android:background="#353548" />
+
+</LinearLayout>

app/src/main/res/values/base_styles.xml

@@ -5,7 +5,7 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
-    <style name="MyMaterialTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="MyMaterialTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="windowNoTitle">true</item>
         <item name="android:screenOrientation">portrait</item>
         <item name="colorPrimary">@color/colorPrimary</item>

app/src/main/res/values/colors.xml

@@ -550,4 +550,5 @@
     <color name="color_fe5d7f">#fe5d7f</color>
 
     <color name="color_2D93FF">#2D93FF</color>
+    <color name="color_1c1b22">#1C1B22</color>
 </resources>

app/src/module_community/res/drawable/shape_bg_mini_world_name.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_eeeeee" />
+    <solid android:color="#3D3D53" />
     <corners android:radius="@dimen/dp_12" />
 </shape>

app/src/module_community/res/layout/fragment_home_dynamic.xml

@@ -8,8 +8,7 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_F9F9F9"
         android:clipToPadding="false"
-        android:paddingBottom="60dp" />
+        />
 
 </com.yizhuan.erban.common.widget.StatusLayout>

app/src/module_community/res/layout/fragment_home_play.xml

@@ -3,10 +3,8 @@
     android:id="@+id/recycler_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_F9F9F9"
     android:clipToPadding="false"
     android:paddingStart="10dp"
     android:paddingTop="2dp"
-    android:paddingBottom="60dp"
     android:paddingEnd="10dp" />
 

app/src/module_community/res/layout/fragment_square.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/color_1c1b22"
     app:layout_constraintTop_toTopOf="parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/module_community/res/layout/item_square_dynamic.xml

@@ -4,13 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    tools:background="@color/color_1c1b22"
     android:orientation="vertical">
 
     <View
         android:id="@+id/view_top_line"
         android:layout_width="match_parent"
         android:layout_height="5dp"
-        android:background="@color/color_f5f5f5"
+        android:background="#201F27"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -78,7 +79,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:lineSpacingExtra="4dp"
-            android:textColor="@color/color_333333"
+            android:textColor="#C6C6E9"
             android:textSize="15sp" />
 
         <LinearLayout
@@ -154,7 +155,7 @@
                 android:layout_marginStart="2.5dp"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:textColor="@color/color_999999"
+                android:textColor="#C6C6E9"
                 android:textSize="@dimen/sp_12"
                 tools:text="0123" />
         </LinearLayout>
@@ -182,7 +183,7 @@
                 android:layout_height="@dimen/dp_24"
                 android:layout_marginStart="2.5dp"
                 android:gravity="center_vertical"
-                android:textColor="@color/color_999999"
+                android:textColor="#C6C6E9"
                 android:textSize="@dimen/sp_12"
                 tools:text="0" />
         </LinearLayout>
@@ -219,7 +220,7 @@
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
             android:singleLine="true"
-            android:textColor="@color/color_333333"
+            android:textColor="@color/white"
             android:textSize="@dimen/sp_12"
             android:textStyle="bold"
             tools:text="话题名称话题名称话题名称话题名称话题名称话题名称" />

app/src/module_community/res/layout/layout_dy_nick_detail.xml

@@ -13,7 +13,7 @@
         android:ellipsize="end"
         android:maxWidth="120dp"
         android:singleLine="true"
-        android:textColor="@color/color_333333"
+        android:textColor="@color/white"
         android:textSize="@dimen/dp_15"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -137,7 +137,7 @@
         android:layout_marginStart="@dimen/dp_5"
         android:layout_marginEnd="@dimen/dp_20"
         android:gravity="center"
-        android:textColor="@color/color_999999"
+        android:textColor="#4F516A"
         android:textSize="@dimen/dp_12"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/ll_official_mask"

app/src/module_mini_world/res/layout/item_recommend_topic_list.xml

@@ -27,6 +27,7 @@
         android:paddingBottom="@dimen/dp_5"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_12"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/iv_icon"
         app:layout_constraintStart_toStartOf="@id/iv_icon"

nim_uikit/res/drawable/nim_recent_contact_sticky_selecter.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@color/im_list_select_hover" android:state_pressed="true"></item>
+    <item android:drawable="@color/color_1c1b22" android:state_pressed="true" />
-    <item android:drawable="@color/green_4DC0A4" android:state_pressed="false"></item>
+    <item android:drawable="@color/color_2a2a39" android:state_pressed="false" />
-    <item android:drawable="@color/green_4DC0A4"></item>
+    <item android:drawable="@color/color_2a2a39" />
 
 </selector>

nim_uikit/res/values/colors-ptr.xml

@@ -2,5 +2,5 @@
 <resources>
     <color name="left_ball_color">#7f01020a</color>
     <color name="right_ball_color">#7f01020b</color>
-    <color name="item_hover">#dbdbdb</color>
+    <color name="item_hover">#2A2A39</color>
 </resources>

nim_uikit/res/values/colors.xml

@@ -71,5 +71,7 @@
     <color name="color_B3B3B3">#B3B3B3</color>
     <color name="color_7154EE">#7154EE</color>
     <color name="color_BAB0FF">#BAB0FF</color>
+    <color name="color_2a2a39">#2A2A39</color>
+    <color name="color_1c1b22">#1C1B22</color>
 
 </resources>