Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-23 d814c978efc068425c500a553cf7ec6b4f628219

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>