yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_6.5.5'

Browse Source 
# Conflicts:
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
This commit is contained in:
zlzw
2023-09-06 10:42:05 +08:00
parent 0c5ef0befe fa8d8a7421
commit b7ba717cb9
21 changed files with 120 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
live/src/main/res/layout/view_red_packet_luck_user.xml
View File

@@ -11,8 +11,9 @@
android:id="@+id/gift_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="dadsad"
android:text="中文测试中文测试"
android:layout_weight="1"
android:maxEms="9"
android:textColor="@color/white"
android:textSize="16sp" />

2
live/src/main/res/layout/view_red_packet_user_list.xml
View File

@@ -33,7 +33,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/user_list"
android:layout_width="200dp"
android:layout_width="250dp"
tools:listitem="@layout/view_red_packet_luck_user"
android:layout_height="241dp"
android:layout_marginTop="26dp" />

47
live/src/main/res/layout/view_send_red_packet.xml
View File

@@ -148,7 +148,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="30dp">
@@ -161,19 +161,37 @@
android:text="@string/there_is_no"
android:textColor="#FDD04A"
android:textSize="13sp" />
<Button
android:id="@+id/following_anchor"
<LinearLayout
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="end"
android:layout_marginStart="5dp"
android:layout_height="70dp"
android:layout_weight="1"
android:background="@drawable/background_red_packet_select"
android:gravity="center"
android:text="@string/following_anchor"
android:textColor="#FDD04A"
android:textSize="10sp" />
android:orientation="vertical"
>
<Button
android:id="@+id/following_anchor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_gravity="end"
android:layout_marginStart="5dp"
android:background="@drawable/background_red_packet_select"
android:gravity="center"
android:text="@string/following_anchor"
android:layout_marginBottom="5dp"
android:textColor="#FDD04A"
android:textSize="10sp" />
<Button
android:id="@+id/fans_group"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_gravity="end"
android:layout_marginStart="5dp"
android:background="@drawable/background_red_packet_select"
android:gravity="center"
android:text="@string/live_send_red_packge_fans_group"
android:textColor="#FDD04A"
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -181,7 +199,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:layout_marginTop="266dp"
android:layout_marginTop="286dp"
android:layout_marginEnd="29dp">
<TextView
@@ -232,8 +250,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/background_send_red_packet_illustrate"
android:visibility="gone"
tools:visibility="visible">
android:visibility="gone">
<androidx.core.widget.NestedScrollView