From f278edbd3f0f809e4a3b59bf16d24c624a43f98d Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期四, 12 九月 2024 14:38:08 +0800
Subject: [PATCH] 修改了国籍和民族字段反转的问题

---
 app/src/main/res/layout/activity_growth_experience.xml |  324 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 194 insertions(+), 130 deletions(-)

diff --git a/app/src/main/res/layout/activity_growth_experience.xml b/app/src/main/res/layout/activity_growth_experience.xml
index 19a7b67..20ad55c 100644
--- a/app/src/main/res/layout/activity_growth_experience.xml
+++ b/app/src/main/res/layout/activity_growth_experience.xml
@@ -8,32 +8,54 @@
             name="viewModel"
             type="com.application.zhangshi_app_android.ui.function.GrowthExperienceActivityViewModel" />
     </data>
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_normal_background"
+        android:background="?attr/pageBackgroundColor"
         android:orientation="vertical"
         >
         <com.android.app_base.widget.ExtendTitleBar
+            android:id="@+id/title_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:title="鎴愰暱缁忓巻"
+            app:layout_constraintTop_toTopOf="parent"
+            app:title="鎴愰暱缁忓巻锛堜粎渚涙煡鐪嬶級"
             app:titleGravity="left"
-            />
+            app:leftIcon="@drawable/ic_back"
+            >
+            <FrameLayout
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginHorizontal="16dp"
+                android:layout_gravity="center_vertical|end"
+                android:visibility="gone"
+                >
+                <ImageView
+                    android:id="@+id/iv_operate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:background="@drawable/ic_operate"
+                    />
+            </FrameLayout>
+        </com.android.app_base.widget.ExtendTitleBar>
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
             android:orientation="vertical"
             android:paddingHorizontal="20dp"
+            app:layout_constraintTop_toBottomOf="@id/title_bar"
+            app:layout_constraintBottom_toBottomOf="parent"
             >
             <androidx.core.widget.NestedScrollView
+                android:id="@+id/nestedScrollView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 >
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="@dimen/dp_10"
+                    android:paddingBottom="20dp"
                     >
                     <TextView
                         android:id="@+id/tv_basic_information"
@@ -42,7 +64,7 @@
                         android:layout_height="wrap_content"
                         android:text="鍩烘湰淇℃伅"
                         android:textColor="#ff000000"
-                        android:textSize="@dimen/sp_20"
+                        android:textSize="20sp"
                         android:textStyle="bold"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -63,7 +85,7 @@
                             android:layout_height="@dimen/dp_20"
                             android:text="濮撳悕"
                             android:textColor="#88000000"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="12sp" />
 
                         <TextView
                             android:id="@+id/editText_name"
@@ -72,7 +94,7 @@
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
                             android:textColorHint="#6b000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
                             android:text="@{viewModel.infoLiveData.nickName}"
                             tools:text="寮犱笁" />
 
@@ -99,7 +121,7 @@
                             android:layout_height="@dimen/dp_20"
                             android:text="鏇剧敤鍚�"
                             android:textColor="#88000000"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="12sp" />
 
                         <TextView
                             android:id="@+id/editText_usedName"
@@ -107,7 +129,7 @@
                             android:layout_height="wrap_content"
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
                             tools:text="寮犲洓"
                             android:text="@{viewModel.infoLiveData.oldName}"
                             />
@@ -126,6 +148,7 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="@+id/layout_1"
                         android:layout_marginEnd="20dp"
+                        app:imageUrl="@{viewModel.infoLiveData.img}"
                         />
 
                     <LinearLayout
@@ -145,7 +168,7 @@
                             android:layout_height="@dimen/dp_20"
                             android:text="鎬у埆"
                             android:textColor="#88000000"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="12sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -153,9 +176,9 @@
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
                             android:textColorHint="#6b000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
                             tools:text="鐢�"
-                            android:text="@{String.valueOf(viewModel.infoLiveData.sex)}"
+                            android:text="@{viewModel.infoLiveData.sexStr}"
                             />
 
                         <View
@@ -178,7 +201,7 @@
                             android:layout_height="@dimen/dp_20"
                             android:text="姘戞棌"
                             android:textColor="#88000000"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="12sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -186,9 +209,9 @@
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
                             android:textColorHint="#6b000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
                             tools:text="姹夋棌"
-                            android:text="@{viewModel.infoLiveData.nationality}"
+                            android:text="@{viewModel.infoLiveData.nation}"
                             />
 
                         <View
@@ -212,7 +235,7 @@
                             android:layout_height="@dimen/dp_20"
                             android:text="鍥界睄"
                             android:textColor="#88000000"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="12sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -220,9 +243,11 @@
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
                             android:textColorHint="#6b000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
                             tools:text="涓浗"
-                            android:text="@{viewModel.infoLiveData.nation}"
+                            android:text="@{viewModel.infoLiveData.nationality}"
+                            android:ellipsize="end"
+                            android:maxLines="1"
                             />
 
                         <View
@@ -245,7 +270,7 @@
                             android:layout_height="@dimen/dp_20"
                             android:text="濠氬Щ鐘跺喌"
                             android:textColor="#88000000"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="12sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -253,9 +278,9 @@
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
                             android:textColorHint="#6b000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
                             tools:text="鏈"
-                            android:text="@{String.valueOf(viewModel.infoLiveData.maritalStatus)}"/>
+                            android:text="@{viewModel.infoLiveData.maritalStatus}"/>
 
                         <View
                             android:layout_width="match_parent"
@@ -277,7 +302,7 @@
                             android:layout_height="@dimen/dp_20"
                             android:text="鑱旂郴鏂瑰紡"
                             android:textColor="#88000000"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="12sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -285,7 +310,7 @@
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
                             android:textColorHint="#6b000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
                             tools:text="1234567890"
                             android:text="@{viewModel.infoLiveData.phoneNumber}"/>
 
@@ -311,7 +336,7 @@
                             android:layout_height="@dimen/dp_20"
                             android:text="鏀挎不闈㈣矊"
                             android:textColor="#88000000"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="12sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -319,7 +344,7 @@
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
                             android:textColorHint="#6b000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
                             tools:text="缇や紬"
                             android:text="@{viewModel.infoLiveData.politicalOutlook}"/>
 
@@ -345,7 +370,7 @@
                             android:layout_height="@dimen/dp_20"
                             android:text="韬唤璇佸彿"
                             android:textColor="#88000000"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="12sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -353,7 +378,7 @@
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
                             android:textColorHint="#6b000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
                             tools:text="440000199801010001"
                             android:text="@{viewModel.infoLiveData.idNum}"/>
 
@@ -378,7 +403,7 @@
                             android:layout_height="@dimen/dp_20"
                             android:text="鎴风睄鍦板潃"
                             android:textColor="#88000000"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="12sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -386,7 +411,7 @@
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
                             android:textColorHint="#6b000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
                             tools:text="骞夸笢鐪佸箍宸炲競鐣鍖哄皬璋峰洿琛楅亾"
                             android:text="@{viewModel.infoLiveData.locationAddress}" />
 
@@ -399,60 +424,68 @@
                     </LinearLayout>
 
                     <LinearLayout
-                        android:id="@+id/layout_8"
+                        android:id="@+id/layout_experience"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="50dp"
                         android:orientation="vertical"
                         app:layout_constraintTop_toBottomOf="@id/layout_7"
-                        tools:layout_editor_absoluteX="0dp"
                         android:layout_marginTop="16dp"
+                        tools:layout_height="wrap_content"
                         >
-                        <LinearLayout
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/layout_experience_title"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
+                            android:layout_height="50dp"
+                            android:gravity="center_vertical"
                             >
                             <TextView
                                 android:id="@+id/tv_primary_experience"
-                                android:layout_width="0dp"
+                                android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
-                                android:layout_marginTop="@dimen/dp_5"
                                 android:text="涓昏瀛︿範鍙婂伐浣滅粡鍘�"
                                 android:textColor="#ff000000"
-                                android:textSize="@dimen/sp_20"
-                                android:textStyle="bold" />
-                            <ImageButton
-                                android:id="@+id/iv_fold_1"
-                                android:layout_width="20dp"
-                                android:layout_height="20dp"
-                                android:layout_gravity="center_vertical"
-                                android:contentDescription="@string/iv_fold_1_description"
-                                android:background="@drawable/ic_unfold"
+                                android:textSize="20sp"
+                                android:textStyle="bold"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+
                                 />
-                        </LinearLayout>
+                            <ImageView
+                                android:id="@+id/iv_experience_fold"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:background="@{viewModel.isExperienceExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/rv_primary"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:background="@color/color_normal_background"
-                            android:layout_marginTop="16dp"
+                            android:layout_height="wrap_content"
                             tools:itemCount="3"
-                            tools:listitem="@layout/item_growth_experience_primary" />
-
+                            tools:listitem="@layout/item_growth_experience_primary"
+                            />
                     </LinearLayout>
 
                     <LinearLayout
-                        android:id="@+id/layout_9"
+                        android:id="@+id/layout_relation"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="50dp"
                         android:orientation="vertical"
-                        app:layout_constraintTop_toBottomOf="@id/layout_8"
-                        android:layout_marginTop="30dp"
+                        app:layout_constraintTop_toBottomOf="@id/layout_experience"
+                        android:layout_marginTop="10dp"
                         >
-                        <LinearLayout
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/layout_relation_title"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
+                            android:layout_height="50dp"
+                            android:gravity="center_vertical"
                             >
                             <TextView
                                 android:id="@+id/tv_relationship_condition"
@@ -461,23 +494,28 @@
                                 android:layout_height="wrap_content"
                                 android:text="瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�"
                                 android:textColor="#ff000000"
-                                android:textSize="@dimen/sp_20"
-                                android:textStyle="bold" />
-                            <ImageButton
-                                android:id="@+id/iv_fold_2"
-                                android:layout_width="20dp"
-                                android:layout_height="20dp"
-                                android:layout_gravity="center"
-                                android:contentDescription="@string/iv_fold_1_description"
-                                android:background="@drawable/ic_unfold" />
-                        </LinearLayout>
+                                android:textSize="20sp"
+                                android:textStyle="bold"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                />
+                            <ImageView
+                                android:id="@+id/iv_relation_fold"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@{viewModel.isRelationExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/rv_relationship"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:background="@color/color_normal_background"
-                            android:layout_marginTop="16dp"
+                            android:background="?attr/pageBackgroundColor"
                             tools:itemCount="3"
                             tools:listitem="@layout/item_growth_experience_relationship" />
                     </LinearLayout>
@@ -489,8 +527,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        app:layout_constraintTop_toBottomOf="@id/layout_9"
-                        android:layout_marginTop="30dp"
+                        app:layout_constraintTop_toBottomOf="@id/layout_relation"
+                        android:layout_marginTop="10dp"
                         >
 
                         <TextView
@@ -500,7 +538,7 @@
                             android:layout_marginTop="@dimen/dp_5"
                             android:text="绉诲眳鍥斤紙澧冿級鎯呭喌"
                             android:textColor="#ff000000"
-                            android:textSize="@dimen/sp_20"
+                            android:textSize="20sp"
                             android:textStyle="bold"
                             />
 
@@ -516,7 +554,8 @@
                             android:id="@+id/radioButton"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:checked="true"
+                            android:checked="@{viewModel.infoLiveData.outStatus==1?true:false}"
+                            android:clickable="false"
                             android:text="鏄�"
                             />
                         <View
@@ -535,13 +574,14 @@
                             android:id="@+id/editText_Residence_Number"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:paddingHorizontal="20dp"
                             android:autofillHints="creditCardNumber"
                             android:textColor="#DE000000"
-                            android:textSize="@dimen/sp_16"
+                            android:textSize="16sp"
+                            tools:text="1234567890"
+                            android:text="@{viewModel.infoLiveData.idNo}"
                             />
                         <View
-                            android:layout_width="140dp"
+                            android:layout_width="match_parent"
                             android:layout_height="1dp"
                             android:background="#6B000000"
                             android:layout_marginTop="8dp"
@@ -549,41 +589,49 @@
                     </LinearLayout>
 
                     <LinearLayout
-                        android:id="@+id/layout_11"
+                        android:id="@+id/layout_holder"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="50dp"
                         android:orientation="vertical"
-                        android:layout_marginTop="30dp"
+                        android:layout_marginTop="10dp"
                         app:layout_constraintTop_toBottomOf="@id/layout_10"
                         >
-                        <LinearLayout
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/layout_holder_title"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
+                            android:layout_height="50dp"
+                            android:gravity="center_vertical"
                             >
                             <TextView
                                 android:id="@+id/tv_certificate_condition"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
-                                android:text="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�"
+                                android:text="鎸佹湁璇佷欢鎯呭喌"
                                 android:textColor="#ff000000"
-                                android:textSize="@dimen/sp_20"
-                                android:textStyle="bold" />
+                                android:textSize="20sp"
+                                android:textStyle="bold"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                />
 
-                            <ImageButton
-                                android:id="@+id/iv_fold_3"
-                                android:layout_width="20dp"
-                                android:layout_height="20dp"
+                            <ImageView
+                                android:id="@+id/iv_holder_fold"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
                                 android:layout_gravity="center_vertical"
-                                android:background="@drawable/ic_unfold" />
-                        </LinearLayout>
+                                android:background="@{viewModel.isHolderExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/rv_certificates"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:background="@color/color_normal_background"
-                            android:layout_marginTop="16dp"
+                            android:layout_height="wrap_content"
                             tools:itemCount="3"
                             tools:listitem="@layout/item_growth_experience_holder_condition" />
                     </LinearLayout>
@@ -591,16 +639,18 @@
 
 
                     <LinearLayout
-                        android:id="@+id/layout_12"
+                        android:id="@+id/layout_abroad"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="50dp"
                         android:orientation="vertical"
-                        app:layout_constraintTop_toBottomOf="@id/layout_11"
-                        android:layout_marginTop="30dp"
+                        app:layout_constraintTop_toBottomOf="@id/layout_holder"
+                        android:layout_marginTop="10dp"
                         >
-                        <LinearLayout
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/layout_abroad_title"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
+                            android:layout_height="50dp"
+                            android:gravity="center_vertical"
                             >
                             <TextView
                                 android:id="@+id/tv_abroad_condition"
@@ -609,24 +659,29 @@
                                 android:layout_weight="1"
                                 android:text="鍑哄浗锛堝锛夋儏鍐�"
                                 android:textColor="#ff000000"
-                                android:textSize="@dimen/sp_20"
-                                android:textStyle="bold" />
+                                android:textSize="20sp"
+                                android:textStyle="bold"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                />
 
-                            <ImageButton
-                                android:id="@+id/iv_fold_4"
+                            <ImageView
+                                android:id="@+id/iv_abroad_fold"
                                 android:layout_width="20dp"
                                 android:layout_height="20dp"
                                 android:layout_gravity="center_vertical"
-                                android:background="@drawable/ic_unfold"
+                                android:background="@{viewModel.isAbroadExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
                                 />
-                        </LinearLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/rv_abroad"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:background="@color/color_normal_background"
-                            android:layout_marginTop="16dp"
+                            android:layout_height="wrap_content"
                             app:layout_constraintTop_toBottomOf="@+id/layout_11"
                             tools:itemCount="3"
                             tools:listitem="@layout/item_growth_experience_abroad_condition" />
@@ -636,39 +691,37 @@
                         android:id="@+id/tv_autobiography"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="30dp"
+                        android:layout_marginTop="20dp"
                         android:text="鑷紶"
                         android:textColor="#ff000000"
-                        android:textSize="@dimen/sp_20"
+                        android:textSize="20sp"
                         android:textStyle="bold"
                         app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/layout_12" />
+                        app:layout_constraintTop_toBottomOf="@+id/layout_abroad"
+                        />
                     <com.google.android.material.tabs.TabLayout
                         android:id="@+id/tab_layout"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:tabPaddingTop="@dimen/dp_22"
+                        android:layout_height="30dp"
+                        android:layout_marginTop="16dp"
+                        app:tabTextAppearance="@style/MyTabLayout"
+                        app:tabTextColor="#88000000"
+                        app:tabSelectedTextColor="#FF000000"
                         app:layout_constraintTop_toBottomOf="@+id/tv_autobiography"
                         app:tabMode="scrollable"
-                        app:tabGravity="fill" />
-                    <androidx.viewpager.widget.ViewPager
-                        android:id="@+id/view_pager"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_0"
-                        android:layout_weight="1"
-                        app:layout_constraintTop_toBottomOf="@id/tab_layout"/>
+                        app:tabIndicatorHeight="0dp"
+                        app:tabGravity="fill"
+                        />
                     <TextView
                         android:id="@+id/tv_fill"
-                        android:orientation="vertical"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/shape_fffad1e0_stroke"
-                        android:layout_marginBottom="20dp"
-                        android:layout_marginTop="@dimen/dp_2"
-                        android:paddingStart="10dp"
-                        android:paddingEnd="5dp"
+                        android:background="@drawable/shape_fffad1e0_stroke_0_10_10_10"
+                        android:paddingHorizontal="16dp"
                         android:paddingVertical="10dp"
-                        app:layout_constraintTop_toBottomOf="@id/view_pager"
+                        android:visibility="gone"
+                        tools:visibility="visible"
+                        app:layout_constraintTop_toBottomOf="@id/tab_layout"
                       />
 
 
@@ -676,5 +729,16 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
            </androidx.core.widget.NestedScrollView>
         </LinearLayout>
-    </LinearLayout>
+        <androidx.constraintlayout.utils.widget.ImageFilterView
+            android:id="@+id/fab_move_to_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginEnd="25dp"
+            android:layout_marginBottom="44dp"
+            app:fabCustomSize="100dp"
+            android:background="@drawable/ic_move_to_top"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

--
Gitblit v1.9.1