From 45f471055e8788ecc5f530c3e562c727bfcb199a Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 18 Jan 2024 16:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E6=88=B0=E4=BB=A4=E7=9B=B8?=
 =?UTF-8?q?=E9=97=9CUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/layout/promotion_elite_popup.xml      | 4 ++--
 .../main/res/layout/war_order_exchange_details_popup.xml  | 8 +++++---
 main/src/main/res/layout/item_battlepass_exchange.xml     | 2 ++
 .../main/res/layout/item_battlepass_reward_type_top.xml   | 6 ++++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/common/src/main/res/layout/promotion_elite_popup.xml b/common/src/main/res/layout/promotion_elite_popup.xml
index 7165f16bd..f26cb0a85 100644
--- a/common/src/main/res/layout/promotion_elite_popup.xml
+++ b/common/src/main/res/layout/promotion_elite_popup.xml
@@ -63,7 +63,7 @@
                 android:text="@string/upgrade_elite_type1"
                 android:textAllCaps="false"
                 android:textColor="#F36100"
-                android:textSize="14sp" />
+                android:textSize="12sp" />
 
             <Button
                 android:id="@+id/button_enjoy"
@@ -75,7 +75,7 @@
                 android:text="@string/upgrade_elite_type2"
                 android:textAllCaps="false"
                 android:textColor="#F36100"
-                android:textSize="14sp" />
+                android:textSize="12sp" />
         </FrameLayout>
 
     </LinearLayout>
diff --git a/common/src/main/res/layout/war_order_exchange_details_popup.xml b/common/src/main/res/layout/war_order_exchange_details_popup.xml
index fd236ebaa..f0f97276a 100644
--- a/common/src/main/res/layout/war_order_exchange_details_popup.xml
+++ b/common/src/main/res/layout/war_order_exchange_details_popup.xml
@@ -32,10 +32,12 @@
         android:layout_marginTop="19dp">
         <ImageView
             android:id="@+id/exchange_particulars"
-            android:layout_width="99dp"
-            android:layout_height="99dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@mipmap/ic_integral"
+            android:layout_margin="12dp"
             android:layout_gravity="center"
-            android:scaleType="centerCrop"
+            android:scaleType="fitCenter"
             />
     </LinearLayout>
 
diff --git a/main/src/main/res/layout/item_battlepass_exchange.xml b/main/src/main/res/layout/item_battlepass_exchange.xml
index 86a44aed5..972dcda48 100644
--- a/main/src/main/res/layout/item_battlepass_exchange.xml
+++ b/main/src/main/res/layout/item_battlepass_exchange.xml
@@ -21,6 +21,7 @@
 
         <ImageView
             android:id="@+id/tab_1"
+            android:layout_margin="12dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:src="@mipmap/ic_integral"
@@ -34,6 +35,7 @@
             android:layout_width="66dp"
             android:layout_height="23.5dp"
             android:gravity="center"
+            android:alpha="0.7"
             app:layout_constraintBottom_toBottomOf="@+id/tab_1"
             android:background="@mipmap/bg_battlepass_reward_item_mark"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/main/src/main/res/layout/item_battlepass_reward_type_top.xml b/main/src/main/res/layout/item_battlepass_reward_type_top.xml
index 10ddef773..851781b05 100644
--- a/main/src/main/res/layout/item_battlepass_reward_type_top.xml
+++ b/main/src/main/res/layout/item_battlepass_reward_type_top.xml
@@ -74,6 +74,8 @@
             <ImageView
                 android:id="@+id/tab_1"
                 android:layout_width="0dp"
+                android:layout_marginBottom="14dp"
+                android:layout_margin="12dp"
                 android:layout_height="0dp"
                 android:src="@mipmap/ic_integral"
                 app:layout_constraintBottom_toBottomOf="@id/tab_1_bg"
@@ -152,6 +154,8 @@
                 android:layout_height="0dp"
                 android:src="@mipmap/ic_integral"
                 app:layout_constraintBottom_toBottomOf="@id/tab_2_bg"
+                android:layout_marginBottom="14dp"
+                android:layout_margin="12dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/tab_2_bg" />
@@ -221,6 +225,8 @@
                 android:id="@+id/tab_3"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
+                android:layout_marginBottom="14dp"
+                android:layout_margin="12dp"
                 android:src="@mipmap/ic_integral"
                 app:layout_constraintBottom_toBottomOf="@id/tab_3_bg"
                 app:layout_constraintEnd_toEndOf="parent"