Merge branch 'ff' into dev

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

@@ -12,8 +12,8 @@
 
     <ImageView
         android:id="@+id/btnShowOrHidePanels"
-        android:layout_width="@dimen/v2x_panel_btn_image_width"
-        android:layout_height="@dimen/v2x_panel_btn_image_width"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:src="@drawable/icon_event_panel_more" />
 

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

@@ -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">80px</dimen>
+    <dimen name="module_v2x_panel_width">82px</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,7 +73,6 @@
     <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">65px</dimen>
 
 
 </resources>

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

@@ -56,6 +56,5 @@
     <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>

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

@@ -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">136px</dimen>
+    <dimen name="module_v2x_panel_width">140px</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>

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

@@ -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">74px</dimen>
+    <dimen name="module_v2x_panel_width">82px</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,7 +73,6 @@
     <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>