diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt index b7b8215822..b1c1bcd84b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt @@ -46,8 +46,8 @@ open class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: In val params = window!!.attributes if(isDriver){ setContentView(R.layout.dialog_itinerary_summary) - params.height = AutoSizeUtils.dp2px(context,1200f) - params.width = AutoSizeUtils.dp2px(context,2300f) + params.height = AutoSizeUtils.dp2px(context,1284f) + params.width = AutoSizeUtils.dp2px(context,2384f) }else{ setContentView(R.layout.dialog_itinerary_summary_p) params.height = AutoSizeUtils.dp2px(context,1170f) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_itinerary_summary.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_itinerary_summary.png new file mode 100644 index 0000000000..a40815c532 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_itinerary_summary.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_itinerary_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_itinerary_summary.xml deleted file mode 100644 index 2111dab033..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_itinerary_summary.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement.xml index e9ff2ae00a..3fa35fa666 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_achievement.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service.xml index 5f5c8b4fc1..3fa35fa666 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_summary_service.xml @@ -1,11 +1,7 @@ - - - - - + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml index 5ef3c11f73..cb89f4f591 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml @@ -1,7 +1,7 @@ @@ -10,8 +10,8 @@ android:layout_height="@dimen/dp_1090" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginStart="@dimen/dp_65" + android:layout_marginStart="@dimen/dp_107" + android:layout_marginTop="@dimen/dp_79" app:roundLayoutRadius="@dimen/dp_22"> @@ -372,7 +372,7 @@ android:text="@string/summary_danger_tip" android:textSize="@dimen/sp_22" android:textColor="@color/summary_tip" - android:layout_marginBottom="@dimen/dp_77" + android:layout_marginBottom="@dimen/dp_137" android:layout_marginStart="@dimen/dp_m_10" /> @@ -384,7 +384,7 @@ android:text="@string/summary_powered" android:textSize="@dimen/sp_22" android:textColor="@color/summary_tip" - android:layout_marginBottom="@dimen/dp_77" + android:layout_marginBottom="@dimen/dp_137" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index b55f921c92..ab050fbd38 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -74,7 +74,7 @@ #FFFFFF #464646 #24313E - #2DF0FE + #2EACFF #106FF0 #6A758D #42464F diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index 5c70f7eb94..edb2344b4f 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -396,6 +396,7 @@ 358dp 359dp 360dp + 362dp 364dp 366dp 367dp @@ -1038,6 +1039,7 @@ 1047dp 1051dp 1055dp + 1058dp 1090dp 1092dp 1100dp @@ -1053,6 +1055,7 @@ 1241dp 1250dp 1261dp + 1284dp 1300dp 1373dp 1386dp @@ -1063,6 +1066,7 @@ 2080dp 2158dp 2300dp + 2384dp