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

Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
This commit is contained in:
zlzw
2024-07-13 09:29:11 +08:00
parent 845b217c4d 7edd75e223
commit 9292e6f5c5
51 changed files with 1048 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/res/drawable/gift_wall_achieve_wear_disable.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="20dp"/>
<solid android:color="#7776B1"/>
</shape>

5
common/src/main/res/drawable/gift_wall_achieve_wear_sure.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="20dp"/>
<solid android:color="#FEE2BC"/>
</shape>