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

Merge branch 'master' into dev_blind_box

Browse Source 
# Conflicts:
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
This commit is contained in:
18401019693
2023-05-27 18:25:14 +08:00
parent c28a91b128 9526a14ca2
commit c3b5f17f44
17 changed files with 115 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
live/src/main/res/layout/view_live_end.xml
View File

@@ -399,7 +399,6 @@
android:id="@+id/live_duration_anchor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="0"
android:textColor="@color/white"
android:textSize="16sp"