Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ffdeae1a43e1539f9533f93d64089994db6c742b

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>