diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java index 9c1d54a25f..f46502e624 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java @@ -59,18 +59,18 @@ public class OchBusStationAdapter extends RecyclerView.Adapter @@ -125,7 +125,7 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:scaleType="fitXY" - android:src="@drawable/module_och_bus_dot_line" + android:src="@drawable/module_och_dot_line" app:layout_constraintBottom_toTopOf="@+id/blueDot" app:layout_constraintLeft_toLeftOf="@+id/greenDot" app:layout_constraintRight_toRightOf="@+id/greenDot" @@ -135,7 +135,7 @@ android:id="@+id/blueDot" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/module_mogo_och_bus_icon_arriving_station" + android:src="@drawable/module_mogo_och_icon_arriving_station" app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_order_end_station" app:layout_constraintLeft_toLeftOf="@+id/greenDot" app:layout_constraintTop_toTopOf="@+id/module_och_bus_order_end_station" /> diff --git a/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml b/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml index d777f2d0d6..25ac60ead5 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml @@ -26,7 +26,7 @@ android:layout_width="20px" android:layout_height="20px" android:scaleType="center" - android:src="@drawable/module_mogo_och_bus_icon_arrived_station" + android:src="@drawable/module_mogo_och_icon_arrived_station" app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_bus_station_name" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintVertical_bias="0.4" diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png deleted file mode 100644 index e1fd463963..0000000000 Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png and /dev/null differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png deleted file mode 100644 index 186001352c..0000000000 Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png and /dev/null differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png deleted file mode 100644 index a676a789c3..0000000000 Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png and /dev/null differ diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml index 33d370bf3f..888fec075e 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml @@ -49,7 +49,7 @@ android:id="@+id/greenDot" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/module_och_taxi_green_dot" + android:src="@drawable/module_mogo_och_icon_arriving_station" app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_start_station" /> @@ -83,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:scaleType="fitXY" - android:src="@drawable/module_och_taxi_dot_line" + android:src="@drawable/module_och_dot_line" app:layout_constraintBottom_toTopOf="@+id/blueDot" app:layout_constraintLeft_toLeftOf="@+id/greenDot" app:layout_constraintRight_toRightOf="@+id/greenDot" @@ -93,7 +93,7 @@ android:id="@+id/blueDot" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/module_och_taxi_blue_dot" + android:src="@drawable/module_mogo_och_icon_arrived_station" app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_end_station" app:layout_constraintLeft_toLeftOf="@+id/greenDot" app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_end_station" /> diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png new file mode 100644 index 0000000000..927296d690 Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png new file mode 100644 index 0000000000..8a065b66dd Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png new file mode 100644 index 0000000000..4ed57a0e30 Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png new file mode 100644 index 0000000000..ed7b293b90 Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png new file mode 100644 index 0000000000..a720a532ea Binary files /dev/null and b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png differ diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml index 8e31eb693a..f7c61df715 100644 --- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml +++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml @@ -49,9 +49,10 @@ android:textAlignment="center" android:textColor="@color/module_mogo_och_autopilot_text_color_selector" android:textSize="@dimen/module_mogo_och_autopilot_status_text_size" + android:layout_marginLeft="@dimen/module_mogo_och_autopilot_status_text_m_l" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_autopilot_status" /> + app:layout_constraintLeft_toLeftOf="parent" /> 530px 492px - 30px - 30px + 20px + 20px 70px 130px 93px 150px - 48px + 70px 24px 460px @@ -34,6 +34,7 @@ 44px 13px 12px + 224px 460px 30px diff --git a/OCH/mogo-och/src/main/res/values/dimens.xml b/OCH/mogo-och/src/main/res/values/dimens.xml index b3352fd0e7..84f4ec5a14 100644 --- a/OCH/mogo-och/src/main/res/values/dimens.xml +++ b/OCH/mogo-och/src/main/res/values/dimens.xml @@ -33,6 +33,7 @@ 30px 13px 12px + 188px 460px 30px diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png new file mode 100644 index 0000000000..3e1b96f3e3 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png new file mode 100644 index 0000000000..3e1b96f3e3 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png new file mode 100644 index 0000000000..3e1b96f3e3 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png new file mode 100644 index 0000000000..3e1b96f3e3 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png new file mode 100644 index 0000000000..3e1b96f3e3 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml new file mode 100644 index 0000000000..0b1b92b69c --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 32ac090144..f5b8e825f0 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -48,13 +48,14 @@ @@ -62,8 +63,8 @@ android:id="@+id/module_switch_model_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/module_ext_display_overview_icon_marginTop" - android:src="@drawable/model_ext_default_user_head" /> + android:layout_gravity="center" + android:src="@drawable/module_switch_map_angle" /> 36px 393px 700px + 108px + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml new file mode 100644 index 0000000000..22d28b5b60 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -0,0 +1,167 @@ + + + + 90px + 32px + 2px + 16px + 26px + 26px + 32px + + 90px + 32px + 2px + 100px + 90px + 2px + 54px + 100px + 90px + 8px + + 180px + 180px + 2px + 60px + 60px + 28px + + 32px + 2px + + 140px + 32px + 60px + 92px + 24px + 48px + 2px + 140px + 140px + 120px + 20px + 30px + 32px + 32px + + 120px + 120px + 32px + 60px + 32px + 60px + 32px + 30px + 20px + + + 120px + 60px + 60px + 32px + 48px + 80px + 28px + 26px + 44px + 44px + 18px + 34px + 26px + 28px + 30px + 30px + 30px + 20px + + 103px + 103px + + + 1058px + 210px + 144px + 159px + 159px + 70px + 70px + 56px + 83px + 24px + 40px + 60px + 50px + 12px + 10px + 40px + 30px + 34px + 24px + 28px + 23px + 17px + 17px + 36px + 36px + -2px + 95px + + 30px + 40px + 40px + 15px + 15px + 5px + 50px + 56px + 30px + 56px + 30px + 56px + 30px + 15px + 15px + + + 1000px + 390px + 200px + 200px + 240px + 30px + 120px + 120px + 10px + 22px + 28px + 28px + 30px + 90px + 90px + 6dp + 15px + 4px + 10px + 20px + + 40px + 45px + 100px + 134px + 30px + 20px + 20px + 8px + 21px + 31px + 1920px + + -1 + 0px + + 36px + 393px + 700px + 150px + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/colors.xml b/modules/mogo-module-extensions/src/main/res/values/colors.xml index e787bc7500..74cf309afe 100644 --- a/modules/mogo-module-extensions/src/main/res/values/colors.xml +++ b/modules/mogo-module-extensions/src/main/res/values/colors.xml @@ -14,4 +14,5 @@ #DB3137 #3E77F6 + #3B4577 \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index d430472dff..54c5195205 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -244,5 +244,5 @@ 400px 300px - + 108px \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png new file mode 100644 index 0000000000..76ae6f035a Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml index c4c5b9f5a3..c99774a6e4 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml @@ -12,8 +12,8 @@ 14px 44px 19px + + + 133px + 42px + 572px diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index a580148415..2344ee5dea 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -99,6 +99,11 @@ 14px 44px 19px + + + 133px + 42px + 572px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 091c72520e..b43ce52f75 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -80,6 +80,11 @@ 26px 80px 34px + + + 100px + 32px + 940px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml new file mode 100644 index 0000000000..e5e04824ef --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -0,0 +1,98 @@ + + + + 800px + + 32px + 32px + + 390px + 410px + + + 160px + + + 60px + 40px + + 80px + + 15px + 550px + 200px + 200px + 100px + 90px + 162px + 64px + 80px + 26px + 270px + 86px + 58px + 48px + 48px + 349px + 465px + 306px + 77px + 50px + 28px + 16px + 5px + 80px + 22px + + 20px + 30px + + 42px + 30px + 36px + 30px + 50px + + 120px + + 158px + + + 20px + 36px + 28px + 55px + 36px + 310px + 110px + 120px + + + 270px + 480px + 330px + 450px + + + 200px + + 75px + 32px + 26px + 80px + 34px + + + 133px + 42px + + + + 940px + 701px + 150px + 46px + 26px + + + diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 1882f8ea15..6c0cad7db0 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -113,6 +113,11 @@ 26px 80px 34px + + + 133px + 42px + 940px