Merge branch 'wjc_new' into develop_new

mac

2024-05-21 d24c8a8d62caf0c0902246972a80f34edd098ba0

1
2
3
4
5
6
7
8
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <declare-styleable name="SideBar">
        <attr name="letterColor" format="color"/>
        <attr name="selectColor" format="color"/>
        <attr name="letterSize" format="dimension"/>
    </declare-styleable>
</resources>