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

Merge branch 'ff' into dev

Browse Source
This commit is contained in:
liujing
2020-09-08 14:17:40 +08:00
parent b697ebe600 042beb61d5
commit 04b1844f1e
13 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 280 B

After

Width:  |  Height:  |  Size: 995 B

BIN
modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_event_panel_more.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 280 B

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 643 B

After

Width:  |  Height:  |  Size: 1.2 KiB

8
modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml
View File

@@ -1,8 +0,0 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<corners android:radius="@dimen/module_v2x_panel_icon_cor" />
<gradient android:startColor="#FF2E3141" android:endColor="#FF3F435F" android:angle="0" />
</shape>
</item>
</selector>

10
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
View File

@@ -89,10 +89,10 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="58px"-->
<!-- android:background="@drawable/v2x_shadow_shape_view"-->
<!-- app:layout_constraintBottom_toBottomOf="parent" />-->
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="58px"-->
<!-- android:background="@drawable/v2x_shadow_shape_view"-->
<!-- app:layout_constraintBottom_toBottomOf="parent" />-->
</androidx.constraintlayout.widget.ConstraintLayout>

10
modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
View File

@@ -5,15 +5,15 @@
android:id="@+id/llEventMore"
android:layout_width="@dimen/module_v2x_panel_width"
android:layout_height="@dimen/module_v2x_panel_width"
android:background="@drawable/v2x_drawable_event_more_bkg"
android:background="@drawable/v2x_shadow_bg"
android:translationY="@dimen/v2x_panel_btn_translationY"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:translationZ="1dp">
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/btnShowOrHidePanels"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/v2x_panel_btn_image_width"
android:layout_height="@dimen/v2x_panel_btn_image_width"
android:layout_centerInParent="true"
android:src="@drawable/icon_event_panel_more" />

4
modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
View File

@@ -57,7 +57,7 @@
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
<dimen name="module_v2x_des_index_width">17px</dimen>
<dimen name="module_v2x_des_index_height">15.4px</dimen>
<dimen name="module_v2x_panel_width">66px</dimen>
<dimen name="module_v2x_panel_width">74px</dimen>
<dimen name="module_v2x_panel_icon_cor">16px</dimen>
<dimen name="share_empty_icon_width">117px</dimen>
<dimen name="v2x_loading_ani_width">200px</dimen>
@@ -73,5 +73,7 @@
<dimen name="share_index_bottom_padding">15px</dimen>
<dimen name="share_btn_middle_padding">29px</dimen>
<dimen name="v2x_panel_btn_translationY">-8px</dimen>
<dimen name="v2x_panel_btn_image_width">57px</dimen>
</resources>

1
modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -56,5 +56,6 @@
<dimen name="module_v2x_des_index_height">42px</dimen>
<dimen name="module_v2x_panel_cor">16px</dimen>
<dimen name="module_v2x_panel_width">120px</dimen>
<dimen name="v2x_panel_btn_image_width">114px</dimen>
</resources>

6
modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
View File

@@ -56,7 +56,7 @@
<dimen name="module_v2x_des_index_width">31.9px</dimen>
<dimen name="module_v2x_des_index_height">26px</dimen>
<dimen name="module_v2x_panel_icon_cor">30px</dimen>
<dimen name="module_v2x_panel_width">120px</dimen>
<dimen name="module_v2x_panel_width">136px</dimen>
<dimen name="share_empty_icon_width">219px</dimen>
<dimen name="v2x_loading_ani_width">400px</dimen>
<dimen name="v2x_share_btn_width">281px</dimen>
@@ -71,5 +71,7 @@
<dimen name="share_index_bottom_padding">36px</dimen>
<dimen name="share_btn_middle_padding">54px</dimen>
<dimen name="v2x_panel_btn_translationY">-10px</dimen>
<dimen name="v2x_panel_btn_image_width">114px</dimen>
</resources>

3
modules/mogo-module-v2x/src/main/res/values/dimens.xml
View File

@@ -57,7 +57,7 @@
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
<dimen name="module_v2x_des_index_width">16px</dimen>
<dimen name="module_v2x_des_index_height">20px</dimen>
<dimen name="module_v2x_panel_width">66px</dimen>
<dimen name="module_v2x_panel_width">74px</dimen>
<dimen name="module_v2x_panel_icon_cor">16px</dimen>
<dimen name="share_empty_icon_width">117px</dimen>
<dimen name="v2x_loading_ani_width">200px</dimen>
@@ -73,6 +73,7 @@
<dimen name="share_index_bottom_padding">15px</dimen>
<dimen name="share_btn_middle_padding">29px</dimen>
<dimen name="v2x_panel_btn_translationY">-8px</dimen>
<dimen name="v2x_panel_btn_image_width">38px</dimen>

8
skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml
View File

@@ -1,8 +0,0 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<corners android:radius="@dimen/module_v2x_panel_icon_cor" />
<gradient android:startColor="#FFFFFFFF" android:endColor="#E5F5F5F5" android:angle="0" />
</shape>
</item>
</selector>

4
skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml
View File

@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_v2x_panel_icon_cor">30px</dimen>
<dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
</resources>

2
skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml
View File

@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_v2x_panel_icon_cor">16px</dimen>
<dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
</resources>