Merge remote-tracking branch 'origin/wxr4' into dev-tzy

tzy

2021-06-09 884b594a7171a496609299c9c535e04c32316bb8

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>