Merge branch 'master' into dev_blind_box

# 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
17 changed files with 115 additions and 13 deletions

View File

@@ -16,6 +16,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="0dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
android:scaleType="centerCrop"