From 93db808f8bbebdbe1f5ee951dcafae2e7bf2504e Mon Sep 17 00:00:00 2001
From: Martin <13046765170@163.com>
Date: Sat, 13 Jul 2024 17:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=88=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dialog_gift_wall_tab2_classic_info.xml    | 252 +++++++++---------
 1 file changed, 119 insertions(+), 133 deletions(-)

diff --git a/common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml b/common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml
index 8c8c36be9..21f4d5955 100644
--- a/common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml
+++ b/common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml
@@ -167,101 +167,96 @@
                 <LinearLayout
                     android:id="@+id/topLayout"
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
                     android:gravity="bottom"
+                    android:orientation="horizontal"
                     app:layout_constraintTop_toBottomOf="@+id/imageView7">
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
+                    <RelativeLayout
                         android:id="@+id/two_layout"
                         android:layout_width="0dp"
+                        android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:layout_height="wrap_content">
+                        android:gravity="bottom">
 
                         <ImageView
                             android:id="@+id/imageView17"
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentBottom="true"
                             android:adjustViewBounds="true"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
+                            android:scaleType="centerCrop"
                             app:srcCompat="@mipmap/gift_wall_tab2_classic_info_bg_two" />
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/userAvatar2Layout"
-                            android:layout_width="58dp"
-                            android:layout_height="58dp"
-                            android:layout_marginTop="41dp"
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentBottom="true"
                             android:layout_marginEnd="10dp"
-                            android:layout_marginBottom="10dp"
-                            android:background="@mipmap/gift_wall_tab2_classic_info_avatar1"
-                            app:layout_constraintBottom_toTopOf="@+id/imageView12"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent">
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
 
-                            <com.makeramen.roundedimageview.RoundedImageView
-                                android:id="@+id/user_avatar_2"
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:id="@+id/userAvatar2Layout"
+                                android:layout_width="58dp"
+                                android:layout_height="58dp"
+                                android:layout_marginTop="41dp"
+                                android:background="@mipmap/gift_wall_tab2_classic_info_avatar1">
+
+                                <com.makeramen.roundedimageview.RoundedImageView
+                                    android:id="@+id/user_avatar_2"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="1dp"
+                                    android:src="@mipmap/icon_avatar_placeholder"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:riv_oval="true" />
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+
+                            <ImageView
+                                android:id="@+id/imageView12"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginEnd="1dp"
-                                android:src="@mipmap/icon_avatar_placeholder"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:riv_oval="true" />
-                        </androidx.constraintlayout.widget.ConstraintLayout>
+                                android:layout_marginBottom="5dp"
+                                app:srcCompat="@mipmap/gift_wall_tab2_classic_info_twwo" />
 
-                        <ImageView
-                            android:id="@+id/imageView12"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            app:layout_constraintBottom_toTopOf="@+id/user_name_2"
-                            app:layout_constraintEnd_toEndOf="@+id/userAvatar2Layout"
-                            app:layout_constraintStart_toStartOf="@+id/userAvatar2Layout"
-                            app:srcCompat="@mipmap/gift_wall_tab2_classic_info_twwo" />
+                            <TextView
+                                android:id="@+id/user_name_2"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_above="@+id/user_value_2"
+                                android:ellipsize="end"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:text="TextView"
+                                android:textColor="#FFFFFF"
+                                android:textSize="14sp" />
 
-                        <TextView
-                            android:id="@+id/user_name_2"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="10dp"
-                            android:ellipsize="end"
-                            android:gravity="center"
-                            android:maxLines="1"
-                            android:text="TextView"
-                            android:textColor="#FFFFFF"
-                            android:textSize="14sp"
-                            app:layout_constraintBottom_toTopOf="@+id/user_value_2"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
+                            <TextView
+                                android:id="@+id/user_value_2"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentBottom="true"
+                                android:layout_marginBottom="5dp"
+                                android:text="TextView"
+                                android:textColor="#FFFFFF"
+                                android:textSize="20sp" />
 
-                        <TextView
-                            android:id="@+id/user_value_2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0dp"
-                            android:layout_marginBottom="5dp"
-                            android:text="TextView"
-                            android:textColor="#FFFFFF"
-                            android:textSize="20sp"
-                            app:layout_constraintBottom_toBottomOf="@+id/imageView17"
-                            app:layout_constraintEnd_toEndOf="@+id/user_name_2"
-                            app:layout_constraintStart_toStartOf="@+id/user_name_2" />
+                        </LinearLayout>
 
-                    </androidx.constraintlayout.widget.ConstraintLayout>
+                    </RelativeLayout>
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/one_layout"
                         android:layout_width="0dp"
-                        android:layout_weight="1"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="18dp">
+                        android:layout_marginTop="18dp"
+                        android:layout_weight="1">
 
                         <ImageView
                             android:id="@+id/imageView9"
@@ -277,7 +272,6 @@
                             android:id="@+id/userAvatar1Layout"
                             android:layout_width="70dp"
                             android:layout_height="70dp"
-                            android:layout_marginBottom="10dp"
                             android:background="@mipmap/gift_wall_tab2_classic_info_avatar1"
                             app:layout_constraintBottom_toTopOf="@+id/imageView11"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -335,86 +329,78 @@
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
+                    <RelativeLayout
                         android:id="@+id/three_layout"
                         android:layout_width="0dp"
-                        android:layout_weight="1"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp">
+                        android:layout_marginEnd="5dp"
+                        android:layout_weight="1">
 
                         <ImageView
                             android:id="@+id/imageView16"
-                            android:layout_width="0dp"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_alignParentBottom="true"
                             android:adjustViewBounds="true"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
+                            android:scaleType="centerCrop"
                             app:srcCompat="@mipmap/gift_wall_tab2_classic_info_bg_three" />
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/userAvatar3Layout"
-                            android:layout_width="44dp"
-                            android:layout_height="44dp"
-                            android:layout_marginStart="10dp"
-                            android:layout_marginTop="39dp"
-                            android:layout_marginBottom="10dp"
-                            android:background="@mipmap/gift_wall_tab2_classic_info_avatar1"
-                            app:layout_constraintBottom_toTopOf="@+id/imageView13"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent">
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="10dp"
+                            android:layout_alignParentBottom="true"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
 
-                            <com.makeramen.roundedimageview.RoundedImageView
-                                android:id="@+id/user_avatar_3"
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:id="@+id/userAvatar3Layout"
+                                android:layout_width="44dp"
+                                android:layout_height="44dp"
+                                android:layout_marginTop="39dp"
+                                android:background="@mipmap/gift_wall_tab2_classic_info_avatar1">
+
+                                <com.makeramen.roundedimageview.RoundedImageView
+                                    android:id="@+id/user_avatar_3"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:src="@mipmap/icon_avatar_placeholder"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:riv_oval="true" />
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+
+                            <ImageView
+                                android:id="@+id/imageView13"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:src="@mipmap/icon_avatar_placeholder"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:riv_oval="true" />
-                        </androidx.constraintlayout.widget.ConstraintLayout>
+                                android:layout_marginBottom="3dp"
+                                app:srcCompat="@mipmap/gift_wall_tab2_classic_info_three" />
 
-                        <ImageView
-                            android:id="@+id/imageView13"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="3dp"
-                            app:layout_constraintBottom_toTopOf="@+id/user_name_3"
-                            app:layout_constraintEnd_toEndOf="@+id/userAvatar3Layout"
-                            app:layout_constraintStart_toStartOf="@+id/userAvatar3Layout"
-                            app:srcCompat="@mipmap/gift_wall_tab2_classic_info_three" />
+                            <TextView
+                                android:id="@+id/user_name_3"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:text="TextView"
+                                android:textColor="#FFFFFF"
+                                android:textSize="14sp" />
 
-                        <TextView
-                            android:id="@+id/user_name_3"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="10dp"
-                            android:ellipsize="end"
-                            android:gravity="center"
-                            android:maxLines="1"
-                            android:text="TextView"
-                            android:textColor="#FFFFFF"
-                            android:textSize="14sp"
-                            app:layout_constraintBottom_toTopOf="@+id/user_value_3"
-                            app:layout_constraintEnd_toEndOf="@+id/imageView16"
-                            app:layout_constraintStart_toStartOf="@+id/imageView16" />
+                            <TextView
+                                android:id="@+id/user_value_3"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="5dp"
+                                android:text="TextView"
+                                android:textColor="#FFFFFF"
+                                android:textSize="20sp" />
+                        </LinearLayout>
 
-                        <TextView
-                            android:id="@+id/user_value_3"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0dp"
-                            android:layout_marginBottom="5dp"
-                            android:text="TextView"
-                            android:textColor="#FFFFFF"
-                            android:textSize="20sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="@+id/user_name_3"
-                            app:layout_constraintStart_toStartOf="@+id/user_name_3" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
+                    </RelativeLayout>
 
                 </LinearLayout>