feat：完成完善资料页UI调整

app/src/main/java/com/chwl/app/ui/login/LoginActivity.java

@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
+
 import com.netease.nim.uikit.StatusBarUtil;
 import com.chwl.app.upgrade.AppUpgradeHelper;
 import com.trello.rxlifecycle3.android.ActivityEvent;

app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java

@@ -45,11 +45,9 @@ import me.shihao.library.XRadioGroup;
 public class AddUserInfoFragment extends BaseFragment
         implements View.OnClickListener,
         TimePickerDialog.OnTimeSetListener {
-
-    private static final String TAG = "AddUserInfoFragment";
     private TextInputEditText tvNick, tvCode;
     private Button okBtn;
-    private AppCompatTextView tvRandomNick;
+    private View tvRandomNick;
     private int gender = -1;
     private XRadioGroup rgGender;
     private RadioButton rbMale;

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

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M7.585,10.663L7.456,10.687L1.623,12.127L1.579,12.148L1.494,12.173L1.409,12.212C1.336,12.247 1.284,12.277 1.244,12.307C1.185,12.353 1.13,12.404 1.081,12.457C1.047,12.496 1.025,12.534 1.012,12.575C1,12.613 0.996,12.67 1.005,12.745C1.012,12.799 1.028,12.856 1.053,12.914L1.097,13.001L4.403,18.231L4.543,18.378L4.628,18.443L4.647,18.453L4.674,18.462C4.802,18.5 4.852,18.505 4.939,18.496C5.031,18.487 5.161,18.446 5.205,18.417C5.32,18.338 5.368,18.297 5.416,18.224L5.453,18.161L6.874,14.839L6.219,16.291L7.006,16.534C8.079,16.854 9.2,17.026 10.37,17.053L10.81,17.056L11.256,17.045C14.68,16.906 17.07,15.419 18.479,12.56L18.63,12.239L18.772,11.907L18.797,11.844L18.768,11.876C18.621,12.025 18.466,12.169 18.305,12.307C17.895,12.656 17.354,13.002 16.681,13.345C15.995,13.696 15.252,13.948 14.459,14.099C13.662,14.252 12.706,14.276 11.59,14.174C10.614,14.085 9.591,13.874 8.516,13.539L8.052,13.388L7.642,13.249L8.488,11.337L8.497,11.305L8.524,11.24L8.543,11.119C8.552,11.059 8.552,11.013 8.546,10.982C8.529,10.9 8.514,10.852 8.487,10.801C8.473,10.776 8.411,10.723 8.381,10.711L8.281,10.678L8.093,10.638C7.989,10.619 7.797,10.628 7.585,10.663ZM15.242,1.503C15.192,1.497 15.131,1.5 15.061,1.514C14.982,1.53 14.935,1.549 14.895,1.579C14.844,1.619 14.796,1.668 14.754,1.721L14.697,1.802L13.835,3.671L13.492,3.541C12.235,3.063 10.835,2.813 9.285,2.787C5.841,2.723 3.361,3.997 1.79,6.619C1.667,6.829 1.551,7.048 1.44,7.274L1.279,7.62L1.199,7.806L1.393,7.621L1.693,7.36C2.105,7.017 2.657,6.683 3.354,6.349C4.055,6.014 4.803,5.783 5.59,5.658C6.378,5.533 7.333,5.533 8.453,5.656C9.431,5.762 10.451,5.994 11.521,6.352L11.983,6.514L12.392,6.662L12.204,7.056L11.436,8.653L11.409,8.762L11.407,8.826L11.41,8.878C11.417,8.962 11.422,8.975 11.469,9.05C11.505,9.109 11.601,9.183 11.713,9.214C11.863,9.255 12.067,9.267 12.306,9.249L12.491,9.23L18.505,7.903C18.468,7.903 18.442,7.907 18.423,7.913L18.401,7.921L18.577,7.837C18.62,7.818 18.661,7.796 18.705,7.77L18.774,7.728C18.812,7.705 18.862,7.663 18.926,7.598C18.958,7.565 18.977,7.534 18.988,7.501C19,7.462 19.004,7.405 18.994,7.32C18.988,7.261 18.973,7.196 18.954,7.134L18.921,7.047L15.776,1.82L15.669,1.692C15.622,1.645 15.576,1.61 15.532,1.584L15.481,1.559L15.386,1.528L15.31,1.513L15.242,1.503Z"
+      android:strokeWidth="1"
+      android:fillColor="#1E1E1F"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>

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

@@ -5,90 +5,59 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#F7F7F7"
+    android:fitsSystemWindows="true"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
-    <View
-        android:id="@+id/view_bg_top"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/bg_login_new"
-        app:layout_constraintDimensionRatio="750:666"
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_44"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center"
+        android:text="@string/layout_fragment_add_user_info_01"
+        android:textColor="@color/text_title_color"
+        android:textSize="@dimen/dp_16"
+        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_24"
-        android:layout_marginBottom="@dimen/dp_24"
-        android:fontFamily="sans-serif-medium"
-        android:text="@string/layout_fragment_add_user_info_01"
-        android:textColor="@color/text_title_color"
-        android:textSize="28sp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/view_bottom_top"/>
-
-    <View
-        android:id="@+id/view_bottom_top"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginBottom="180dp"
-        app:layout_constraintBottom_toBottomOf="@+id/view_bg_top"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <View
-        android:id="@+id/view_bg_bottom"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/shape_white_top_25dp"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/view_bottom_top" />
-
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_gender"
-        android:text="@string/select_your_gender"
-        android:textSize="@dimen/sp_16"
-        android:textColor="@color/color_1F1B4F"
-        android:textStyle="bold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_38"
-        android:layout_marginTop="48dp"
-        app:layout_constraintTop_toTopOf="@+id/view_bg_bottom"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:layout_marginTop="@dimen/dp_48"
+        android:text="@string/select_your_gender"
+        android:textColor="@color/color_1E1E1F"
+        android:textSize="@dimen/sp_16"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_detail"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/gender_cannot_modify"
-        android:textColor="@color/color_6D6B89"
+        android:textColor="@color/color_84868A"
         android:textSize="@dimen/sp_12"
-        app:layout_constraintTop_toTopOf="@+id/tv_gender"
         app:layout_constraintBottom_toBottomOf="@+id/tv_gender"
-        app:layout_constraintStart_toEndOf="@+id/tv_gender" />
+        app:layout_constraintStart_toEndOf="@+id/tv_gender"
+        app:layout_constraintTop_toTopOf="@+id/tv_gender" />
 
     <me.shihao.library.XRadioGroup
         android:id="@+id/rg_gender"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="48dp"
-        android:layout_marginEnd="48dp"
+        android:layout_marginStart="@dimen/dp_48"
+        android:layout_marginTop="@dimen/dp_31"
+        android:layout_marginEnd="@dimen/dp_48"
         android:orientation="horizontal"
-        android:layout_marginTop="@dimen/dp_16"
-        app:layout_constraintTop_toBottomOf="@+id/tv_gender"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_gender"
         tools:ignore="SpUsage">
 
         <RadioButton
@@ -117,14 +86,14 @@
     <View
         android:id="@+id/view_nick_bg"
         android:layout_width="0dp"
-        android:layout_height="52dp"
+        android:layout_height="@dimen/dp_52"
         android:layout_marginStart="@dimen/dp_36"
+        android:layout_marginTop="@dimen/dp_50"
         android:layout_marginEnd="@dimen/dp_36"
-        android:layout_marginTop="@dimen/dp_28"
-        android:background="@drawable/shape_login_btn_bg"
-        app:layout_constraintTop_toBottomOf="@+id/rg_gender"
+        android:background="@drawable/base_shape_ffffff_26dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rg_gender" />
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/tv_nick"
@@ -134,32 +103,28 @@
         android:layout_weight="1"
         android:background="@null"
         android:gravity="center_vertical"
+        android:hint="@string/please_input_name"
         android:lines="1"
         android:maxLength="8"
         android:paddingStart="@dimen/dp_24"
         android:paddingEnd="0dp"
         android:singleLine="true"
         android:textColor="@color/text_title_color"
+        android:textColorHint="#B4B7BD"
         android:textSize="@dimen/dp_14"
-        android:hint="@string/please_input_name"
-        android:textColorHint="@color/color_B3B3C3"
         app:layout_constraintBottom_toBottomOf="@id/view_nick_bg"
         app:layout_constraintEnd_toStartOf="@id/tv_random_nick"
         app:layout_constraintStart_toStartOf="@+id/view_nick_bg"
         app:layout_constraintTop_toTopOf="@id/view_nick_bg"
         tools:ignore="SpUsage" />
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <ImageView
         android:id="@+id/tv_random_nick"
-        android:text="@string/random"
-        android:textSize="@dimen/sp_14"
-        android:textColor="@color/color_1F1B4F"
         android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_marginEnd="@dimen/dp_18"
-        android:drawableStart="@drawable/ic_random_nick"
-        android:drawablePadding="@dimen/dp_4"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/dp_24"
         android:gravity="center_vertical"
+        android:src="@drawable/login_ic_refresh"
         app:layout_constraintBottom_toBottomOf="@id/view_nick_bg"
         app:layout_constraintEnd_toEndOf="@id/view_nick_bg"
         app:layout_constraintTop_toTopOf="@id/view_nick_bg" />
@@ -167,19 +132,19 @@
     <View
         android:id="@+id/view_code_bg"
         android:layout_width="0dp"
-        android:layout_height="52dp"
-        android:layout_marginStart="36dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="36dp"
-        android:background="@drawable/shape_login_btn_bg"
-        app:layout_constraintTop_toBottomOf="@+id/view_nick_bg"
+        android:layout_height="@dimen/dp_52"
+        android:layout_marginStart="@dimen/dp_36"
+        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginEnd="@dimen/dp_36"
+        android:background="@drawable/base_shape_ffffff_26dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view_nick_bg" />
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/tv_code"
         android:layout_width="0dp"
-        android:layout_height="52dp"
+        android:layout_height="@dimen/dp_52"
         android:layout_weight="1"
         android:background="@null"
         android:gravity="center_vertical"
@@ -190,7 +155,7 @@
         android:paddingEnd="@dimen/dp_24"
         android:singleLine="true"
         android:textColor="@color/text_title_color"
-        android:textColorHint="@color/color_B3B3C3"
+        android:textColorHint="#B4B7BD"
         android:textSize="@dimen/dp_14"
         app:layout_constraintBottom_toBottomOf="@id/view_code_bg"
         app:layout_constraintEnd_toEndOf="@id/view_code_bg"
@@ -201,17 +166,17 @@
     <Button
         android:id="@+id/ok_btn"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="@drawable/selector_common_confirm"
-        android:text="@string/layout_fragment_add_user_info_04"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_15"
+        android:layout_height="@dimen/dp_48"
         android:layout_marginStart="@dimen/dp_36"
+        android:layout_marginTop="@dimen/dp_28"
         android:layout_marginEnd="@dimen/dp_36"
-        app:layout_constraintTop_toBottomOf="@+id/view_code_bg"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@drawable/base_selector_theme_26dp"
+        android:text="@string/layout_fragment_add_user_info_04"
+        android:textColor="@color/base_selector_color_theme_btn"
+        android:textSize="@dimen/sp_16"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view_code_bg"
         tools:ignore="SpUsage" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -571,7 +571,7 @@
     <!-- 输入框背景颜色 -->
     <color name="bg_edit_e8e8f6">#E8E8F6</color>
     <!-- 标题文字颜色 -->
-    <color name="text_title_color">#1F1B4F</color>
+    <color name="text_title_color">#1E1E1F</color>
     <!-- 常用文字颜色 -->
     <color name="text_normal_c6c6e9">#FF333333</color>
     <!-- 日期等次级文案 -->

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

@@ -3355,7 +3355,7 @@
     <string name="layout_fans_list_item_01">我的我的我的我的我的我的</string>
     <string name="layout_fans_list_item_new_01">我的我的我的我的我的我的</string>
     <string name="layout_floating_live_mini_view_01">宮澤艾裏斯宮澤艾裏斯宮澤艾裏斯</string>
-    <string name="layout_fragment_add_user_info_01">註冊</string>
+    <string name="layout_fragment_add_user_info_01">完善資料</string>
     <string name="layout_fragment_add_user_info_02">昵稱</string>
     <string name="layout_fragment_add_user_info_03">邀請碼</string>
     <string name="layout_fragment_add_user_info_04">完成</string>