From aef10d0f36efd28e3f2b86e6ec6b4d98a5dea21d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 16 Apr 2021 17:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E5=B7=B4=E8=BD=A6,?=
 =?UTF-8?q?=E5=87=BA=E7=A7=9F=E8=BD=A6=E6=A0=B7=E5=BC=8FUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/drawable/module_och_taxi_panel_bkg.xml   | 8 ++++----
 .../res/drawable/module_och_taxi_panel_distance_bkg.xml   | 6 +++---
 .../src/main/res/layout/module_och_taxi_panel.xml         | 2 --
 .../src/main/res/layout/module_mogo_och_base_fragment.xml | 2 +-
 OCH/mogo-och/src/main/res/values/dimens.xml               | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml
index e189a5b0e2..04864e072b 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_bkg.xml
@@ -5,8 +5,8 @@
             <corners android:radius="17px" />
             <gradient
                 android:angle="270"
-                android:endColor="#152147"
-                android:startColor="#354E8A" />
+                android:endColor="#3B4577"
+                android:startColor="#3B4577" />
         </shape>
     </item>
     <item
@@ -18,8 +18,8 @@
             <corners android:radius="17px" />
             <gradient
                 android:angle="270"
-                android:endColor="#141C35"
-                android:startColor="#344687" />
+                android:endColor="#3B4577"
+                android:startColor="#3B4577" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml
index fc07af2764..50d9558492 100644
--- a/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml
+++ b/OCH/mogo-och-taxi/src/main/res/drawable/module_och_taxi_panel_distance_bkg.xml
@@ -2,9 +2,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:angle="0"
-        android:centerColor="#7f080F25"
-        android:endColor="#7f121A35"
-        android:startColor="#7f131D42" />
+        android:centerColor="#80222A4E"
+        android:endColor="#80222A4E"
+        android:startColor="#80222A4E" />
     <corners
         android:bottomLeftRadius="17px"
         android:bottomRightRadius="17px"
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 4bb3ff660b..99ca32287c 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
@@ -119,8 +119,6 @@
         android:id="@+id/module_och_taxi_order_distance_container"
         android:layout_width="match_parent"
         android:layout_height="@dimen/module_och_taxi_order_distance_container_height"
-        android:layout_marginLeft="@dimen/module_och_taxi_order_distance_container_marginLeft"
-        android:layout_marginRight="@dimen/module_och_taxi_order_distance_container_marginLeft"
         android:background="@drawable/module_och_taxi_panel_distance_bkg">
 
         <TextView
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 e8f53311de..868f9b72e5 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
@@ -29,7 +29,7 @@
         android:id="@+id/module_mogo_och_station_panel_container"
         android:layout_width="300px"
         android:layout_height="270px"
-        android:layout_marginTop="10px"
+        android:layout_marginTop="16px"
         app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_autopilot_status"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
         app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" />
diff --git a/OCH/mogo-och/src/main/res/values/dimens.xml b/OCH/mogo-och/src/main/res/values/dimens.xml
index d3c782780c..c08ce46182 100644
--- a/OCH/mogo-och/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och/src/main/res/values/dimens.xml
@@ -6,7 +6,7 @@
     <dimen name="module_mogo_och_margin_bottom">46px</dimen>
     <dimen name="module_mogo_och_margin_top">24px</dimen>
 
-    <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">351px</dimen>
+    <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">345px</dimen>
     <dimen name="module_mogo_och_station_panel_container_margin_top_with_call">492px</dimen>
 
     <dimen name="module_mogo_och_autopilot_status_bg_corner">24px</dimen>