合并嘉乐代码并测试通过

hxb

2021-03-05 43b6e3d6a3a96e7b759b396df4f141ab105fb6bb

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>