编辑个人资料页和相关二级页面UI修改

app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java

@@ -2,8 +2,12 @@ package com.yizhuan.erban.ui.login;
 
 import android.content.Intent;
 import android.os.Bundle;
+
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.content.ContextCompat;
+
 import com.google.android.material.snackbar.Snackbar;
+
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.TextWatcher;
@@ -12,6 +16,7 @@ import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.netease.nim.uikit.StatusBarUtil;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseActivity;
 import com.yizhuan.erban.base.TitleBar;
@@ -22,7 +27,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo;
  * Created by zhouxiangfeng on 2017/5/13.
  */
 
-public class ModifyInfoActivity extends BaseActivity implements View.OnClickListener{
+public class ModifyInfoActivity extends BaseActivity implements View.OnClickListener {
     public static final int CONTENT_MODIFY = 1;
     public static final int NICK_MODIFY = 2;
     public static final String MODIFY_TYPE = "modify_type";
@@ -80,7 +85,7 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList
         if (userInfo != null) {
             if (modifyType == CONTENT_MODIFY) {
                 etEditText.setText(userInfo.getUserDesc());
-            } else if (modifyType == NICK_MODIFY){
+            } else if (modifyType == NICK_MODIFY) {
                 etEditTextNick.setText(userInfo.getNick());
             }
         }
@@ -93,26 +98,19 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList
             etEditText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(60)});
             etEditText.addTextChangedListener(textWatcher);
             rlNickGroup.setVisibility(View.GONE);
-            initTitleBar("修改个人介绍");
+            initWhiteTitleBar("修改个人介绍");
 
         } else if (modifyType == NICK_MODIFY) {
             rlNickGroup.setVisibility(View.VISIBLE);
             rlContentGroup.setVisibility(View.GONE);
             etEditTextNick.setFilters(new InputFilter[]{new InputFilter.LengthFilter(15)});
             etEditTextNick.addTextChangedListener(textWatcher);
-            initTitleBar("修改昵称");
+            initWhiteTitleBar("修改昵称");
-
+        } else {
-        } else
             initTitleBar("");
-
+        }
-    }
+        mTitleBar.addAction(new TitleBar.TextAction(getString(R.string.label_modify_info_confirm),
-
+                ContextCompat.getColor(this, R.color.text_normal_c6c6e9)) {
-    @Override
-    public void initTitleBar(String title) {
-        super.initTitleBar(title);
-        TitleBar titleBar = findViewById(R.id.title_bar);
-        titleBar.setActionTextColor(R.color.text_color_primary);
-        titleBar.addAction(new TitleBar.TextAction(getString(R.string.label_modify_info_confirm)) {
             @Override
             public void performAction(View view) {
 
@@ -139,8 +137,10 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList
 
             }
         });
+
     }
 
+
     private void onSetListener() {
         findViewById(R.id.iv_nick_delete).setOnClickListener(this);
         findViewById(R.id.iv_content_delete).setOnClickListener(this);
@@ -178,4 +178,14 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList
 
     }
 
+    @Override
+    protected boolean needSteepStateBar() {
+        return true;
+    }
+
+    @Override
+    protected void setStatusBar() {
+        StatusBarUtil.transparencyBar(this);
+    }
+
 }

app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java

@@ -483,13 +483,11 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         }
         if (bannerAdapter == null) {
             TextHintView hintView = new TextHintView(this);
-            hintView.setBackground(getResources().getDrawable(R.drawable.bg_userinfo_photo_hintview));
-            hintView.setTextSize(SizeUtils.dp2px(this, 4));
-            hintView.setTextColor(getResources().getColor(R.color.text_normal_c6c6e9));
             mBinding.rollView.setHintView(hintView);
+            hintView.setTextSize(10);
+            hintView.setTextColor(getResources().getColor(R.color.white));
             bannerAdapter = new UserInfoPhotoAdapter(list, this);
             mBinding.rollView.setAdapter(bannerAdapter);
-            //设置透明度
             mBinding.rollView.setAnimationDurtion(500);
         } else {
             bannerAdapter.setData(list);

app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.java

@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 import com.fourmob.datetimepicker.date.DatePickerDialog;
 import com.jph.takephoto.model.TResult;
+import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.common.util.sys.TimeUtil;
 import com.sleepbot.datetimepicker.time.RadialPickerLayout;
 import com.sleepbot.datetimepicker.time.TimePickerDialog;
@@ -53,7 +54,6 @@ public class UserInfoModifyActivity extends BaseActivity
 
     private static final String TAG = "UserInfoModifyActivity";
 
-    private static final String CAMERA_PREFIX = "picture_";
     private ImageView civAvatar;
     private DatePickerDialog datePickerDialog;
     private TextView tvBirth;
@@ -61,7 +61,6 @@ public class UserInfoModifyActivity extends BaseActivity
     private TextView tvDesc;
     private UserInfo mUserInfo;
     private long userId;
-    //    private TextView tvVoice;
     private TextView tvNoVoice;
     private String audioFileUrl;
     private RecyclerView photosRecyclerView;
@@ -71,21 +70,18 @@ public class UserInfoModifyActivity extends BaseActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_user_info_modify);
-        initTitleBar(getString(R.string.label_title_modify_info));
+        initWhiteTitleBar(getString(R.string.label_title_modify_info));
         findViews();
         init();
         onSetListener();
-
         userId = getIntent().getLongExtra("userId", 0);
         UserModel.get().getUserInfo(userId).subscribe(userInfoUpdateObserver);
-
     }
 
 
     @Override
     public void click(int position, UserPhoto userPhoto, boolean isOwner) {
         if (userPhoto != null) {
-//            UIHelper.showModifyPhotosAct(UserInfoModifyActivity.this, userId);
             UserModifyPhotosActivity.startForResult(UserInfoModifyActivity.this, userId, Method.PHOTO);
         }
     }
@@ -94,12 +90,6 @@ public class UserInfoModifyActivity extends BaseActivity
 
     }
 
-    private void setTextViewLeftDrawable(TextView tvVoice, int drawId) {
-        Drawable drawablePlay = getResources().getDrawable(drawId);
-        drawablePlay.setBounds(0, 0, drawablePlay.getMinimumWidth(), drawablePlay.getMinimumHeight());
-        tvVoice.setCompoundDrawables(drawablePlay, null, null, null);
-    }
-
     private void initData(UserInfo userInfo) {
         if (null != userInfo) {
             audioFileUrl = userInfo.getUserVoice();
@@ -108,12 +98,8 @@ public class UserInfoModifyActivity extends BaseActivity
             tvBirth.setText(birth);
             tvNick.setText(RegexUtil.getPrintableString(userInfo.getNick()));
             setTvDesc(userInfo.getUserDesc());
-
             boolean hasVoice = userInfo.getVoiceDura() > 0;
             tvNoVoice.setVisibility(hasVoice ? View.GONE : View.VISIBLE);
-//            tvVoice.setVisibility(hasVoice ? View.VISIBLE : View.GONE);
-//            tvVoice.setText(hasVoice ? getString(R.string.user_info_voice_dur, userInfo.getVoiceDura()) : "");
-
             UserPhotoAdapter adapter = new UserPhotoAdapter(userInfo.getPrivatePhoto(), 1, userInfo.getUid());
             adapter.setSmall(true);
             adapter.setImageClickListener(this);
@@ -131,7 +117,6 @@ public class UserInfoModifyActivity extends BaseActivity
         tvBirth = findViewById(R.id.tv_birth);
         tvNick = findViewById(R.id.tv_nick);
         tvDesc = findViewById(R.id.tv_desc);
-//        tvVoice = findViewById(R.id.tv_voice);
         tvNoVoice = findViewById(R.id.tv_no_voice);
         photosRecyclerView = findViewById(R.id.rv_photos);
         findViewById(R.id.layout_avatar).setOnClickListener(this);
@@ -256,7 +241,6 @@ public class UserInfoModifyActivity extends BaseActivity
             // 获取数据并刷新显示
             audioFileUrl = data.getStringExtra(RecordingVoiceActivity.AUDIO_FILE);
             int audioDura = data.getIntExtra(RecordingVoiceActivity.AUDIO_DURA, 0);
-//            tvVoice.setText(getString(R.string.user_info_voice_dur, audioDura));
 
             // 更新用户信息
             UserInfo user = new UserInfo();
@@ -322,7 +306,6 @@ public class UserInfoModifyActivity extends BaseActivity
 
                 break;
             case R.id.layout_photos:
-//                UIHelper.showModifyPhotosAct(UserInfoModifyActivity.this, userId);
                 UserModifyPhotosActivity.startForResult(UserInfoModifyActivity.this, userId, Method.PHOTO);
                 break;
             default:
@@ -407,4 +390,14 @@ public class UserInfoModifyActivity extends BaseActivity
             toast(e.getMessage());
         }
     };
+
+    @Override
+    protected boolean needSteepStateBar() {
+        return true;
+    }
+
+    @Override
+    protected void setStatusBar() {
+        StatusBarUtil.transparencyBar(this);
+    }
 }

app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java

@@ -11,6 +11,7 @@ import android.widget.GridView;
 import com.jph.takephoto.app.TakePhotoActivity;
 import com.jph.takephoto.compress.CompressConfig;
 import com.jph.takephoto.model.TResult;
+import com.netease.nim.uikit.StatusBarUtil;
 import com.orhanobut.logger.Logger;
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.yizhuan.erban.R;
@@ -68,22 +69,15 @@ public class UserModifyPhotosActivity extends TakePhotoActivity implements UserM
     }
 
     private void initView() {
-        initTitleBar("我的相册");
+        initWhiteTitleBar("我的相册");
         TitleBar titleBar = findViewById(R.id.title_bar);
-        titleBar.addAction(new TitleBar.TextAction("编辑",getResources().getColor(R.color.color_666666)) {
+        titleBar.addAction(new TitleBar.TextAction("编辑",getResources().getColor(R.color.text_normal_c6c6e9)) {
             @Override
             public void performAction(View view) {
                 notifyEditMode();
             }
         });
-
         photoGridView = findViewById(R.id.gridView);
-//        dialog = new BottomSelectDialog(this);
-////        dialog.create();
-//        dialog.setHideTitle(true);
-//        dialog.setTvOne("拍照上传");
-//        dialog.setTvTwo("本地相册");
-//        dialog.setButtonText("取消");
     }
 
     @Override
@@ -190,19 +184,6 @@ public class UserModifyPhotosActivity extends TakePhotoActivity implements UserM
             intent.putExtra("position", position1);
             intent.putExtra("photoList", userPhotos1);
             startActivity(intent);
-//            PhotoPreviewIntent intent = new PhotoPreviewIntent(this);
-//            intent.setCurrentItem(position-1); // 当前选中照片的下标
-//             ArrayList<String> paths = new ArrayList<>();
-//            paths.add(userInfo.getAvatar());
-//            paths.add(userInfo.getAvatar());
-//            paths.add(userInfo.getAvatar());
-//            paths.add(userInfo.getAvatar());
-//            paths.add(userInfo.getAvatar());
-//            paths.add(userInfo.getAvatar());
-//            intent.setPhotoPaths(paths);
-//            startActivityForResult(intent, 201);
-
-
         }
     }
 
@@ -265,4 +246,14 @@ public class UserModifyPhotosActivity extends TakePhotoActivity implements UserM
         toast(msg);
     }
 
+    @Override
+    protected boolean needSteepStateBar() {
+        return true;
+    }
+
+    @Override
+    protected void setStatusBar() {
+        StatusBarUtil.transparencyBar(this);
+    }
+
 }

app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java

@@ -349,7 +349,7 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene
             removeView(mHintView);
         }
         this.mHintView = (View) hintview;
-        if (hintview != null && hintview instanceof View) {
+        if (hintview != null) {
             initHint(hintview);
         }
     }

app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/TextHintView.java

@@ -24,7 +24,6 @@ public class TextHintView extends AppCompatTextView implements HintView {
 	@Override
 	public void initView(int length, int gravity) {
 		this.length = length;
-		setTextColor(Color.WHITE);
 		switch (gravity) {
 		case 0:
 			setGravity(Gravity.LEFT| Gravity.CENTER_VERTICAL);

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

@@ -3,8 +3,7 @@
     android:id="@+id/layout_coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/bg_normal_1c1b22"
-    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <LinearLayout
@@ -14,6 +13,7 @@
 
         <com.yizhuan.erban.base.TitleBar
             android:id="@+id/title_bar"
+            android:layout_marginTop="@dimen/dp_25"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
@@ -26,7 +26,7 @@
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
             android:padding="11dp"
-            android:background="@drawable/bg_shape_modify_info" >
+            android:background="@drawable/bg_2a2a39_0_15" >
 
             <EditText
                 android:layout_toStartOf="@+id/iv_content_delete"
@@ -35,7 +35,7 @@
                 android:layout_height="137dp"
                 android:gravity="start|top"
                 android:background="@null"
-                android:textColor="#333333"
+                android:textColor="@color/text_normal_c6c6e9"
                 android:textSize="14sp" />
 
             <ImageView
@@ -51,7 +51,7 @@
         <RelativeLayout
             android:id="@+id/rl_nick_group"
             android:layout_width="match_parent"
-            android:background="@drawable/bg_shape_modify_nick"
+            android:background="@drawable/bg_2a2a39_0_15"
             android:orientation="horizontal"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
@@ -72,7 +72,7 @@
                 android:gravity="start|center_vertical"
                 android:maxLines="1"
                 android:singleLine="true"
-                android:textColor="@color/color_333333"
+                android:textColor="@color/text_normal_c6c6e9"
                 android:textSize="14sp" />
 
             <ImageView
@@ -82,7 +82,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginStart="10dp"
                 android:layout_centerVertical="true"
-                android:src="@drawable/ic_nick_delete"/>
+                android:src="@drawable/icon_dy_delete_pic"/>
 
         </RelativeLayout>
 
@@ -91,6 +91,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
+            android:textColor="@color/text_normal_c6c6e9"
             android:layout_marginEnd="15dp"/>
 
     </LinearLayout>

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

@@ -24,31 +24,24 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <FrameLayout
+                <com.yizhuan.erban.ui.widget.EdgeTransparentView
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="250dp"
+                    app:edge_position="bottom">
 
-                    <com.yizhuan.erban.ui.widget.EdgeTransparentView
+                    <com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView
+                        android:id="@+id/roll_view"
                         android:layout_width="match_parent"
                         android:layout_height="250dp"
-                        app:edge_position="bottom">
+                        app:rollviewpager_hint_gravity="right"
-
+                        app:rollviewpager_hint_paddingBottom="60dp"
-                        <com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView
+                        app:rollviewpager_hint_paddingRight="20dp"
-                            android:id="@+id/roll_view"
+                        app:rollviewpager_play_delay="5000" />
-                            android:layout_width="match_parent"
-                            android:layout_height="250dp"
-                            app:rollviewpager_hint_gravity="right"
-                            app:rollviewpager_hint_paddingBottom="60dp"
-                            app:rollviewpager_hint_paddingRight="20dp"
-                            app:rollviewpager_play_delay="5000" />
-                    </com.yizhuan.erban.ui.widget.EdgeTransparentView>
-
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="250dp"
                         android:background="@mipmap/bg_userinfo_photo_cover" />
-
+                </com.yizhuan.erban.ui.widget.EdgeTransparentView>
-                </FrameLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -545,8 +538,8 @@
                     android:id="@+id/iv_user_back"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:scaleType="center"
                     android:layout_centerVertical="true"
+                    android:scaleType="center"
                     android:src="@drawable/arrow_left_white" />
 
                 <TextView

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

@@ -2,69 +2,68 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
+    android:background="@color/bg_normal_1c1b22"
     android:orientation="vertical">
 
     <com.yizhuan.erban.base.TitleBar
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_25" />
 
     <View
         android:layout_width="match_parent"
         android:layout_height="10dp"
-        android:background="@color/color_F5F5F5" />
+        android:background="@color/line_color_353548" />
 
     <LinearLayout
         android:id="@+id/layout_addinfo"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
         android:orientation="vertical">
 
         <RelativeLayout
             android:id="@+id/layout_avatar"
             android:layout_width="match_parent"
             android:layout_height="76dp"
-            android:background="@color/white"
             android:layout_marginStart="15dp">
 
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@null"
                 android:layout_centerVertical="true"
+                android:background="@null"
                 android:text="@string/label_user_info_avatar"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_title_white"
                 android:textSize="@dimen/font_normal" />
 
             <com.yizhuan.erban.common.widget.CircleImageView
-                android:layout_toStartOf="@+id/iv_arrow"
                 android:id="@+id/civ_avatar"
                 android:layout_width="55dp"
                 android:layout_height="55dp"
                 android:layout_centerVertical="true"
+                android:layout_toStartOf="@+id/iv_arrow"
                 android:src="@drawable/default_user_head" />
 
             <ImageView
                 android:id="@+id/iv_arrow"
                 android:layout_width="wrap_content"
-                android:padding="15dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:src="@mipmap/common_ic_more_arrow" />
+                android:layout_gravity="center"
+                android:padding="15dp"
+                android:src="@drawable/arrow_right_white" />
 
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_marginRight="15dp"
-            android:layout_marginLeft="15dp"
             android:layout_height="1px"
-            android:background="@color/color_F5F5F5" />
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:background="@color/line_color_353548" />
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -77,8 +76,8 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:text="@string/label_user_info_nick"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_title_white"
-                android:textSize="14sp"/>
+                android:textSize="14sp" />
 
             <TextView
                 android:id="@+id/tv_nick"
@@ -87,33 +86,33 @@
                 android:background="@null"
                 android:gravity="center_vertical|end"
                 android:hint="输入您的昵称"
-                android:textColor="@color/text_color_primary"
+                android:textColor="@color/text_normal_c6c6e9"
-                android:textColorHint="@color/text_color_secondary"
+                android:textColorHint="@color/text_secondary_4f516a"
                 android:textSize="@dimen/font_normal" />
 
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_marginRight="15dp"
-            android:layout_marginLeft="15dp"
             android:layout_height="1px"
-            android:background="@color/color_F5F5F5" />
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:background="@color/line_color_353548" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:orientation="horizontal"
             android:paddingLeft="15dp"
-            android:paddingRight="15dp" >
+            android:paddingRight="15dp">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:text="@string/label_user_info_birth"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_title_white"
-                android:textSize="14sp"/>
+                android:textSize="14sp" />
 
 
             <TextView
@@ -121,38 +120,38 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@null"
                 android:gravity="center_vertical|end"
                 android:hint="选择您的生日"
-                android:textColor="@color/text_color_primary"
+                android:textColor="@color/text_normal_c6c6e9"
+                android:textColorHint="@color/text_secondary_4f516a"
                 android:textSize="@dimen/font_normal" />
 
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_marginRight="15dp"
-            android:layout_marginLeft="15dp"
             android:layout_height="1px"
-            android:background="@color/color_F5F5F5" />
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:background="@color/line_color_353548" />
 
         <LinearLayout
             android:id="@+id/layout_photos"
             android:layout_width="match_parent"
             android:layout_height="50dp"
+            android:layout_marginStart="15dp"
             android:gravity="center"
-            android:orientation="horizontal"
+            android:orientation="horizontal">
-            android:layout_marginStart="15dp">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:text="@string/label_user_info_photo"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_title_white"
-                android:textSize="14sp"/>
+                android:textSize="14sp" />
 
-            <LinearLayout
+            <FrameLayout
                 android:id="@+id/lly_photo"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
@@ -162,79 +161,69 @@
                 android:layout_weight="1"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/tv_empty_photo"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@null"
-                    android:gravity="center_vertical|end"
-                    android:text="您暂时还没上传照片喔..."
-                    android:textColor="@color/text_color_secondary"
-                    android:textSize="@dimen/font_medium" />
-
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_photos"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_vertical|end" />
 
-            </LinearLayout>
+            </FrameLayout>
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:padding="15dp"
-                android:src="@mipmap/common_ic_more_arrow" />
+                android:src="@drawable/arrow_right_white" />
 
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_marginRight="15dp"
-            android:layout_marginLeft="15dp"
             android:layout_height="1px"
-            android:background="@color/color_F5F5F5" />
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:background="@color/line_color_353548" />
 
         <RelativeLayout
             android:id="@+id/rl_audio_record"
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:visibility="gone"
+            android:layout_marginStart="15dp"
             android:gravity="center_vertical"
-            android:layout_marginStart="15dp">
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:text="@string/label_user_info_audio_record"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_title_white"
-                android:textSize="14sp"/>
+                android:textSize="14sp" />
 
             <TextView
-                android:layout_toStartOf="@+id/iv_audio_record"
                 android:id="@+id/tv_voice"
-                android:visibility="gone"
                 android:layout_width="65dp"
                 android:layout_height="26dp"
+                android:layout_centerVertical="true"
+                android:layout_toStartOf="@+id/iv_audio_record"
                 android:background="@drawable/bg_modify_audio_record"
                 android:drawableStart="@drawable/icon_play"
                 android:drawablePadding="5dp"
-                android:layout_centerVertical="true"
                 android:gravity="center_vertical"
                 android:text="0''"
-                android:textSize="@dimen/font_normal" />
+                android:textSize="@dimen/font_normal"
+                android:visibility="gone" />
 
             <TextView
                 android:id="@+id/tv_no_voice"
-                android:layout_toStartOf="@+id/iv_audio_record"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:hint="@string/hint_modify_voice"
                 android:layout_centerVertical="true"
-                android:paddingRight="10dp"
+                android:layout_toStartOf="@+id/iv_audio_record"
+                android:hint="@string/hint_modify_voice"
                 android:paddingLeft="10dp"
+                android:paddingRight="10dp"
                 android:textColor="@color/text_color_primary"
                 android:textColorHint="@color/text_color_secondary"
                 android:visibility="gone" />
@@ -243,8 +232,8 @@
                 android:id="@+id/iv_audio_record"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
                 android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
                 android:padding="15dp"
                 android:src="@mipmap/common_ic_more_arrow" />
 
@@ -252,30 +241,30 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_marginRight="15dp"
-            android:layout_marginLeft="15dp"
             android:layout_height="1px"
-            android:background="@color/color_F5F5F5" />
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:background="@color/line_color_353548" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
+            android:orientation="horizontal">
-            android:layout_marginStart="15dp">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/label_user_info_desc"
-                android:textColor="@color/color_999999"
+                android:textColor="@color/text_title_white"
-                android:textSize="14sp"/>
+                android:textSize="14sp" />
 
             <LinearLayout
-                android:layout_marginTop="18dp"
-                android:layout_marginBottom="18dp"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:layout_marginBottom="18dp"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:orientation="vertical">
@@ -292,10 +281,10 @@
                         android:id="@+id/tv_desc"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:hint="@string/label_hint_desc_setting"
                         android:layout_marginStart="10dp"
-                        android:textColor="@color/text_color_primary"
+                        android:hint="@string/label_hint_desc_setting"
-                        android:textColorHint="@color/text_color_secondary" />
+                        android:textColor="@color/text_normal_c6c6e9"
+                        android:textColorHint="@color/text_secondary_4f516a" />
 
                 </LinearLayout>
 
@@ -307,16 +296,16 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:padding="15dp"
-                android:src="@mipmap/common_ic_more_arrow" />
+                android:src="@drawable/arrow_right_white" />
 
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_marginRight="15dp"
-            android:layout_marginLeft="15dp"
             android:layout_height="1px"
-            android:background="@color/color_F5F5F5" />
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:background="@color/line_color_353548" />
 
     </LinearLayout>
 </LinearLayout>

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

@@ -2,10 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
+    android:background="@color/bg_normal_1c1b22">
 
     <com.yizhuan.erban.base.TitleBar
         android:id="@+id/title_bar"
+        android:layout_marginTop="@dimen/dp_25"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 

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

@@ -2,6 +2,6 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:scaleType="centerCrop" />