Merge branch 'master' into dev_proguard

Browse Source

...

This commit is contained in:

zlzw

2023-06-05 16:42:18 +08:00

parent 34c569ecb5 cd2e176f0a

commit c8c4352284

158 changed files with 6013 additions and 788 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

common/src/main/res/mipmap-xxhdpi/bg_gift_completely.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 32 KiB

BIN

common/src/main/res/mipmap-xxhdpi/icon_013x.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.8 KiB

BIN

common/src/main/res/mipmap-xxhdpi/icon_cry_face.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 46 KiB

BIN

common/src/main/res/mipmap-xxhdpi/icon_female_default.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

common/src/main/res/mipmap-xxhdpi/icon_female_highlight.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 26 KiB

BIN

common/src/main/res/mipmap-xxhdpi/icon_live.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.2 KiB

BIN

common/src/main/res/mipmap-xxhdpi/icon_male_default.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

common/src/main/res/mipmap-xxhdpi/icon_male_highlighted.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 26 KiB

BIN

common/src/main/res/mipmap-xxhdpi/icon_smiling_face.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 45 KiB