yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/yinyou_permission' into yinyou_develop

Browse Source 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
#	app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
#	app/src/main/res/layout/activity_chat_room.xml
This commit is contained in:
huangjian
2022-01-05 10:18:01 +08:00
parent 6f02ad423c 279f950390
commit 3a9d023ace
63 changed files with 1029 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nim_uikit/res/values/colors.xml
View File

@@ -61,6 +61,7 @@
<!-- setting -->
<color name="color_black_ff333333">#ff333333</color>
<color name="color_transparent10_0A333333">#0A333333</color>
<color name="color_black_ff666666">#ff666666</color>
<color name="color_black_ff999999">#ff999999</color>
<color name="color_gray_bfc2c5">#bfc2c5</color>