diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml new file mode 100644 index 0000000000..72ab058d93 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png deleted file mode 100755 index c1381dc44c..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png deleted file mode 100755 index c1381dc44c..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png deleted file mode 100755 index bb3e2b1195..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable/module_services_close.png deleted file mode 100755 index c1381dc44c..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable/module_services_close.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml index 1a5729e252..d4db9fff7c 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginTop="@dimen/module_services_online_car_panel_close_margin_top" - android:src="@drawable/module_services_close" /> + android:src="@drawable/module_common_close_selector" /> - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml index abf4977234..016747c2d4 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml @@ -18,5 +18,5 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:src="@drawable/v2x_panel_close" /> + android:src="@drawable/module_common_close_selector" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 9355cd3b51..2834ed9e76 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -87,7 +87,7 @@ android:layout_width="@dimen/dp_79" android:layout_height="@dimen/dp_79" android:layout_marginRight="@dimen/dp_50" - android:background="@drawable/v2x_selector_close" + android:background="@drawable/module_common_close_selector" app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml index 79f85e14d1..30bf5d605f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml @@ -26,7 +26,7 @@ android:layout_height="@dimen/dp_88" android:layout_marginEnd="@dimen/dp_32" android:layout_marginBottom="@dimen/dp_40" - android:background="@drawable/v2x_selector_close" + android:background="@drawable/module_common_close_selector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml index 705e37e58a..e86b7068cd 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:src="@drawable/v2x_panel_close" /> + android:src="@drawable/module_common_close_selector" /> diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_press_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_press_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_press_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_press_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_press_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_press_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_press_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_press_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png deleted file mode 100644 index 0bbb52b488..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png deleted file mode 100644 index e5084551a3..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml index e2ee5fc07c..72ab058d93 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file