Merge branch 'dev-cqy（1.5.9）' into wjc

wjc

2023-04-06 f793bebc36df45101c465efaed136c3309a19f46

1
2
3
4
5
6
7
<?xml version="1.0" encoding="UTF-8"?>
<resources>
    <dimen name="fab_margin">16dp</dimen>
    <dimen name="titleTextSize">25sp</dimen>
    <dimen name="tipTextSize">14sp</dimen>
    <dimen name="tipTitleTextSize">16sp</dimen>
</resources>