From 15cd434674051e5d29215b47862686c773625fd4 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 28 四月 2023 23:20:02 +0800
Subject: [PATCH] 代码提交
---
app/src/main/res/layout/activity_growth_experience.xml | 137 ++++++++++++++++++++++-----------------------
1 files changed, 66 insertions(+), 71 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..134d4aa 100644
--- a/app/src/main/res/layout/activity_growth_experience.xml
+++ b/app/src/main/res/layout/activity_growth_experience.xml
@@ -33,7 +33,7 @@
<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"
@@ -399,60 +399,60 @@
</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
+ 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_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"
+ <ImageView
+ android:id="@+id/iv_experience_fold"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:contentDescription="@string/iv_fold_1_description"
- android:background="@drawable/ic_unfold"
+ android:background="@{viewModel.isExperienceExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
/>
</LinearLayout>
<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
+ 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"
@@ -463,13 +463,12 @@
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" />
+ <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}"
+ />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
@@ -477,7 +476,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_normal_background"
- android:layout_marginTop="16dp"
tools:itemCount="3"
tools:listitem="@layout/item_growth_experience_relationship" />
</LinearLayout>
@@ -489,8 +487,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
@@ -549,16 +547,18 @@
</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
+ 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"
@@ -571,19 +571,18 @@
android:textStyle="bold" />
<ImageButton
- android:id="@+id/iv_fold_3"
- android:layout_width="20dp"
- android:layout_height="20dp"
+ 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" />
+ android:background="@{viewModel.isHolderExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+ />
</LinearLayout>
<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 +590,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
+ 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"
@@ -613,20 +614,18 @@
android:textStyle="bold" />
<ImageButton
- android:id="@+id/iv_fold_4"
+ 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}}"
/>
</LinearLayout>
<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 +635,35 @@
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: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"
+ app:layout_constraintTop_toBottomOf="@id/tab_layout"
/>
--
Gitblit v1.9.1