Merge remote-tracking branch 'origin/CJL-LC' into wxr4

wxr

2021-07-01 8ac39f2f962329f30ee61ee8a7abe6d6b5940dd5

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>