diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png index d316e9eb43..62ed7bb92d 100644 Binary files a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png and b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png differ diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png index 54495679b5..34f7c0e1f2 100644 Binary files a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png and b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png differ diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png index ba83173bb5..8b4b214814 100644 Binary files a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png and b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png differ diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png index 29914bfc8c..44070336fa 100644 Binary files a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png and b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png differ diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index 05d0d58637..74bc6bf36c 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml @@ -55,8 +55,8 @@ @@ -139,8 +139,8 @@ app:layout_constraintBottom_toBottomOf="@+id/tv_next_station_title" app:layout_constraintStart_toEndOf="@+id/tv_next_station_title" android:id="@+id/iv_animal_list" - android:layout_width="@dimen/dp_25" - android:layout_height="@dimen/dp_30" + android:layout_width="@dimen/dp_18" + android:layout_height="@dimen/dp_32" android:src="@drawable/bg_p_m2_arrived_station" android:visibility="gone" android:layout_marginStart="@dimen/dp_7" /> @@ -149,14 +149,14 @@ android:id="@+id/station_name_tv" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_18" + android:layout_marginTop="@dimen/dp_6" android:ellipsize="marquee" android:marqueeRepeatLimit="marquee_forever" android:gravity="left" android:singleLine="true" android:text="@string/m2_p_empty_tv" android:textColor="@color/shuttle_color_17417B" - android:textSize="@dimen/dp_46" + android:textSize="@dimen/dp_56" android:textStyle="bold" app:customGap="0.2" app:layout_constraintStart_toStartOf="@+id/tv_next_station_title" @@ -174,9 +174,9 @@ @@ -219,15 +219,15 @@ @@ -338,7 +338,7 @@ android:format12Hour="HH:mm" android:format24Hour="HH:mm" android:gravity="center" - android:layout_marginTop="@dimen/dp_25" + android:layout_marginTop="@dimen/dp_10" app:layout_constraintTop_toTopOf="@+id/aciv_speed_time_bg" app:layout_constraintStart_toEndOf="@+id/view_split" android:layout_marginEnd="@dimen/dp_90" diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml index d9ffccbf35..c1a974d194 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml +++ b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml @@ -23,6 +23,7 @@ android:layout_width="1080dp" android:layout_height="@dimen/dp_612"/> + android:layout_marginBottom="-40dp" + app:layout_constraintBottom_toTopOf="@+id/zv_msg_pop_bottom" + app:layout_constraintEnd_toEndOf="parent" + android:layout_marginEnd="@dimen/dp_40" + /> - + + + + \ No newline at end of file