diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml index adf86fabd6..94fa20a614 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml @@ -10,8 +10,8 @@ app:cardBackgroundColor="@android:color/transparent" app:cardCornerRadius="@dimen/dp_48" app:cardElevation="@dimen/dp_20" - android:layout_marginTop="@dimen/dp_30" app:cardPreventCornerOverlap="true" + android:layout_marginTop="@dimen/dp_34" app:cardUseCompatPadding="true" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -309,7 +309,7 @@ android:id="@+id/taxi_p_arrow_nor" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_30" + android:layout_marginRight="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_25" android:src="@drawable/taxi_p_arrow_nor" app:layout_constraintBottom_toBottomOf="parent" @@ -321,7 +321,7 @@ android:layout_width="@dimen/taxi_p_order_panel_width" android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_marginLeft="@dimen/dp_44" + android:layout_marginLeft="@dimen/dp_40" android:elevation="@dimen/dp_30" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -335,7 +335,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_25" - android:layout_marginTop="@dimen/dp_18" + android:layout_marginTop="@dimen/dp_8" android:letterSpacing="-0.05" android:text="0" android:textStyle="bold" @@ -345,7 +345,6 @@ android:id="@+id/taxi_p_speed_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_20" android:letterSpacing="-0.05" android:text="0" @@ -360,7 +359,7 @@ android:layout_marginLeft="@dimen/dp_12" android:text="KM/H" android:includeFontPadding="false" - android:layout_marginBottom="@dimen/dp_12" + android:layout_marginBottom="@dimen/dp_22" android:textColor="@android:color/white" android:textSize="@dimen/taxi_p_speed_unit_size" /> @@ -369,7 +368,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="@dimen/dp_40" - android:layout_marginBottom="@dimen/dp_12" + android:layout_marginBottom="@dimen/dp_22" android:gravity="right" android:text="@string/taxi_p_arrive_to_start" android:textColor="@android:color/white" diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 11b6cdd96d..034b5d4f97 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -100,7 +100,7 @@ android:id="@+id/module_mogo_och_navi_panel_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_150" + android:layout_marginTop="@dimen/dp_120" android:layout_marginRight="@dimen/dp_10" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"/> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml index 5f29c64ea0..ad3fad91cf 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml @@ -1,7 +1,8 @@ + 520px - 432px + 518px 560px 910px 800px @@ -54,6 +55,10 @@ 82px 42px - 120px - 28px + 144px + 32px + 32px + 36px + 50px + 34px \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml index d59b38a6b6..bfd5b81e2d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -63,8 +63,9 @@ 17px 31.5px + 520px - 432px + 518px 560px 910px 800px @@ -117,7 +118,11 @@ 82px 42px - 120px - 28px + 144px + 32px + 32px + 36px + 50px + 34px \ No newline at end of file