Merge remote-tracking branch 'origin/wjc' into Dev-Wxr

wxr

2023-04-11 87bc1140ac4a1dc3e46a322444a80a9ce321b57d

1
2
3
4
5
6
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <color name="colorPrimary">#6200EE</color>
    <color name="colorPrimaryDark">#3700B3</color>
    <color name="colorAccent">#03DAC5</color>
</resources>