yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	gradle.properties
#	modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
#	modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
#	modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png
#	modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png
#	modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
This commit is contained in:
wangcongtao
2020-10-09 14:22:49 +08:00
parent 44fc7eb6a1 df616975a5
commit c964cf780b
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="heart_ratingbar_width">22px</dimen>
<dimen name="heart_ratingbar_width">20px</dimen>
<dimen name="heart_ratingbar_height">16px</dimen>
<dimen name="v2x_panel_loading_top">120px</dimen>
<dimen name="v2x_share_btn_width">150px</dimen>

2
modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
View File

@@ -1054,7 +1054,7 @@
<dimen name="sp_48">48px</dimen>
<dimen name="module_common_shadow_width">-10px</dimen>
<dimen name="module_common_shadow_width_pos">10px</dimen>
<dimen name="heart_ratingbar_width">40px</dimen>
<dimen name="heart_ratingbar_width">36px</dimen>
<dimen name="heart_ratingbar_height">30px</dimen>
<dimen name="v2x_panel_loading_top">300px</dimen>
<dimen name="v2x_share_btn_width">281px</dimen>