Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-16 b4d92451b2071c9762b519275601424e276db90d

1
2
3
4
5
6
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <color name="colorPrimary">#2c3e50</color>
    <color name="colorPrimaryDark">#1B3147</color>
    <color name="colorAccent">#3498db</color>
</resources>