From e633943a74798bfc4c7cdbe2ff63af03de23f308 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 13 Dec 2023 15:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5peko=EF=BC=9A=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8A=A0=E5=85=A5=E7=B2=89=E4=B8=9D=E5=9B=A2=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fans_team_ic_room_entrance.webp           | Bin 0 -> 2484 bytes
 app/src/main/res/values/strings.xml           |   2 +-
 .../res/layout/fragment_single_room.xml       |  23 ++++++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/fans_team_ic_room_entrance.webp

diff --git a/app/src/main/res/drawable-xxhdpi/fans_team_ic_room_entrance.webp b/app/src/main/res/drawable-xxhdpi/fans_team_ic_room_entrance.webp
new file mode 100644
index 0000000000000000000000000000000000000000..742377770a2d73fa408a0dfaef8bab5d8fceacf8
GIT binary patch
literal 2484
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8316e0711..7d86d213c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4576,7 +4576,7 @@
     <string name="layout_fragment_mini_world_category_my_empty_01">還沒加入世界哦 前往世界廣場逛逛吧</string>
     <string name="layout_fragment_mini_world_category_my_empty_02">發現世界</string>
     <string name="layout_fragment_single_room_01">主播榜</string>
-    <string name="layout_fragment_single_room_02">加入我的粉絲團吧～</string>
+    <string name="layout_fragment_single_room_02">加入粉絲團</string>
     <string name="layout_fragment_single_room_03">該主播暫未開通粉絲團</string>
     <string name="layout_fragment_single_room_04">小時榜</string>
     <string name="layout_fragment_single_room_05">首充紅包</string>
diff --git a/app/src/module_mini_world/res/layout/fragment_single_room.xml b/app/src/module_mini_world/res/layout/fragment_single_room.xml
index d0f121080..50d3e3de0 100644
--- a/app/src/module_mini_world/res/layout/fragment_single_room.xml
+++ b/app/src/module_mini_world/res/layout/fragment_single_room.xml
@@ -50,33 +50,36 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:visibility="visible">
 
-            <FrameLayout
+            <LinearLayout
                 android:id="@+id/fl_fans_team_join_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:visibility="gone">
+                android:background="@drawable/bg_fans_team_entrance"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                tools:visibility="visible">
 
                 <TextView
                     android:layout_width="wrap_content"
-                    android:layout_height="22dp"
+                    android:layout_height="25dp"
                     android:layout_gravity="bottom"
-                    android:layout_marginEnd="8dp"
-                    android:background="@drawable/bg_fans_team_entrance"
+                    android:layout_marginStart="8dp"
                     android:gravity="center"
                     android:includeFontPadding="false"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="30dp"
                     android:text="@string/layout_fragment_single_room_02"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_12" />
 
                 <ImageView
-                    android:layout_width="37dp"
-                    android:layout_height="37dp"
+                    android:layout_marginStart="6dp"
+                    android:scaleType="centerInside"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
                     android:layout_gravity="end"
+                    android:layout_marginEnd="8dp"
                     android:src="@drawable/fans_team_ic_room_entrance" />
 
-            </FrameLayout>
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/tv_fans_team_opt"