Merge branch 'Dev-Branch' into wjc

wxr

2022-11-11 b47f91b91bc5371bba0c8801dbd648772ab331fc

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>