[2.8.0-f] bus busp taxi 适配完成

OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml

@@ -76,8 +76,8 @@
                 app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_title"
                 app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_title" />
             <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/dp_20"
+                android:layout_height="@dimen/dp_27"
                 app:layout_constraintTop_toTopOf="@+id/bus_p_cur_station_name"
                 app:layout_constraintBottom_toBottomOf="@+id/bus_p_cur_station_name"
                 app:layout_constraintRight_toLeftOf="@+id/bus_p_cur_station_name"
@@ -123,8 +123,8 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_299"
+        android:layout_height="@dimen/dp_75"
         android:layout_marginRight="@dimen/dp_40"
         android:layout_marginBottom="@dimen/dp_48"
         android:src="@drawable/bus_p_mogo_nor"

OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_no_data_common_view.xml

@@ -8,8 +8,8 @@
 
     <ImageView
         android:id="@+id/no_order_data_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_386"
+        android:layout_height="@dimen/dp_350"
         android:src="@drawable/bus_p_no_order_data"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"

OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml

@@ -165,8 +165,8 @@
 
         <ImageView
             android:id="@+id/bus_p_arrow_nor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_108"
+            android:layout_height="@dimen/dp_107"
             android:layout_marginRight="@dimen/dp_20"
             android:layout_marginBottom="@dimen/dp_370"
             android:src="@drawable/bus_p_arrow_nor"

OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml

@@ -32,16 +32,16 @@
 
     <ImageView
         android:id="@+id/bus_p_circle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="62dp"
+        android:layout_height="62dp"
         android:src="@drawable/bus_p_point_blue"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="@+id/bus_p_station"
         app:layout_constraintBottom_toBottomOf="@+id/bus_p_station"/>
     <ImageView
         android:id="@+id/bus_p_cur_arrow_bg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_12"
+        android:layout_height="@dimen/dp_61"
         android:scaleType="fitXY"
         android:layout_marginLeft="8dp"
         android:src="@drawable/bus_p_line_blue"

OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml

@@ -67,7 +67,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         layout="@layout/bus_test_bar_view"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_station_panel_container"
         app:layout_constraintLeft_toLeftOf="@id/module_mogo_och_station_panel_container"
         tools:visibility="visible"/>
@@ -206,7 +206,7 @@
         android:layout_height="wrap_content"
         android:background="#f00"
         android:text="Disable"
-        android:textSize="30sp"
+        android:textSize="@dimen/dp_60"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -216,7 +216,7 @@
         android:layout_height="wrap_content"
         android:background="#0f0"
         android:text="Enable"
-        android:textSize="30sp"
+        android:textSize="@dimen/dp_60"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotDisable" />
 
@@ -226,7 +226,7 @@
         android:layout_height="wrap_content"
         android:background="#00f"
         android:text="Running"
-        android:textSize="30sp"
+        android:textSize="@dimen/dp_60"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotEnable" />
 
@@ -236,7 +236,7 @@
         android:layout_height="wrap_content"
         android:background="#f00"
         android:text="Arrived"
-        android:textSize="30sp"
+        android:textSize="@dimen/dp_60"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotRunning" />
     <Button
@@ -245,7 +245,7 @@
         android:layout_height="wrap_content"
         android:background="#023D35"
         android:text="上传全路径"
-        android:textSize="30sp"
+        android:textSize="@dimen/dp_60"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotArrive" />
 

OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml

@@ -8,8 +8,8 @@
 
     <ImageView
         android:id="@+id/no_line_data_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_245"
+        android:layout_height="@dimen/dp_223"
         android:src="@drawable/bus_no_line_icon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"

OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml

@@ -24,8 +24,8 @@
 
     <ImageView
         android:id="@+id/busCircleIvBg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_38"
+        android:layout_height="@dimen/dp_38"
         android:src="@drawable/icon_point_grey_bus"
         android:layout_marginTop="@dimen/dp_4"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -33,16 +33,16 @@
 
     <ImageView
         android:id="@+id/busCircleIv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_38"
+        android:layout_height="@dimen/dp_38"
         android:background="@drawable/icon_point_blue_bus"
         android:layout_marginTop="@dimen/dp_4"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="@+id/busStationNameTv"/>
     <ImageView
         android:id="@+id/busArrowBg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_8"
+        android:layout_height="@dimen/dp_61"
         android:scaleType="fitXY"
         android:layout_marginTop="@dimen/dp_20"
         android:src="@drawable/icon_arrow_blue_bus"

OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml

@@ -21,8 +21,8 @@
 
     <ImageView
         android:id="@+id/switch_line_item_select_iv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_19"
+        android:layout_height="@dimen/dp_34"
         android:layout_marginEnd="@dimen/dp_80"
         android:background="@drawable/bus_line_task_arrow"
         app:layout_constraintBottom_toTopOf="@+id/v_line_task"

OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml

@@ -8,30 +8,35 @@
         android:id="@+id/bus_test_bar_current_line_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
     <TextView
         android:id="@+id/bus_test_bar_current_traj_md5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
     <TextView
         android:id="@+id/bus_test_bar_current_stop_md5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
     <TextView
         android:id="@+id/bus_test_bar_current_traj_md5_dpqp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
     <TextView
         android:id="@+id/bus_test_bar_current_stop_md5_dpqp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
 </LinearLayout>

OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.mogo.och.bus.view.VerticalDashLineView
-        android:id="@+id/module_mogo_och_bus_station_bottom_dash"
-        android:layout_width="1dp"
-        android:layout_height="30dp"
-        app:layout_constraintLeft_toLeftOf="@id/module_mogo_och_bus_station_icon"
-        app:layout_constraintRight_toRightOf="@id/module_mogo_och_bus_station_icon"
-        app:layout_constraintTop_toTopOf="@id/module_mogo_och_bus_station_name"
-        android:layout_marginTop="15dp"/>
-
-    <com.mogo.och.bus.view.VerticalDashLineView
-        android:id="@+id/module_mogo_och_bus_station_top_dash"
-        android:layout_width="1dp"
-        android:layout_height="30dp"
-        app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_bus_station_name"
-        android:layout_marginBottom="15dp"
-        app:layout_constraintLeft_toLeftOf="@id/module_mogo_och_bus_station_icon"
-        app:layout_constraintRight_toRightOf="@id/module_mogo_och_bus_station_icon" />
-    <ImageView
-        android:id="@+id/module_mogo_och_bus_station_icon"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:scaleType="center"
-        android:src="@drawable/bus_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"
-        app:layout_constraintTop_toTopOf="@id/module_mogo_och_bus_station_name" />
-    <TextView
-        android:id="@+id/module_mogo_och_bus_station_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/module_mogo_och_bus_station_name_margin_left"
-        android:text="后鲁站"
-        android:textColor="@color/bus_arrived_station_name_text_color"
-        android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
-        app:layout_constraintLeft_toRightOf="@id/module_mogo_och_bus_station_icon"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-    <TextView
-        android:id="@+id/module_mogo_och_bus_station_notice"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="起点"
-        android:textColor="@color/bus_station_notice_text_color"
-        android:textSize="@dimen/module_mogo_och_bus_station_notice_text_size"
-        android:layout_marginEnd="10dp"
-        app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_bus_station_name"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@id/module_mogo_och_bus_station_name" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-common-module/src/main/res/layout/taxi_login_view.xml

@@ -9,6 +9,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_login_bg"
         android:src="@drawable/taxi_ic_login_bg"
+        android:scaleType="fitXY"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java

@@ -2,6 +2,8 @@ package com.mogo.och.taxi.ui;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
 
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ScaleDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -36,6 +38,8 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
+import me.jessyan.autosize.utils.AutoSizeUtils;
+
 /**
  * @author congtaowang
  * @since 2021/1/18
@@ -191,13 +195,13 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             }
             tvOperationStatus.setText("暂停接单");
             mPersonalBtn.setVisibility(View.VISIBLE);
-            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.taxi_back_btn), null, null, null);
+            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_back), null, null, null);
             showPanel();
         } else {
             mDriverRole.setVisibility(View.GONE);
 //            AIAssist.getInstance(getContext()).speakTTSVoice("已接单");
             tvOperationStatus.setText("接单");
-            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.taxi_out_btn), null, null, null);
+            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_out), null, null, null);
             mPersonalBtn.setVisibility(View.GONE);
             hidPanel();
         }

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java

@@ -107,7 +107,7 @@ public class TaxiGrabOrderFragment extends BaseTaxiUIFragment implements View.On
         ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams)mOrderGrabBt.getLayoutParams();
         lp.bottomMargin = 3;
         mOrderGrabBt.setLayoutParams(lp);
-        mOrderGrabBt.setBackground(getResources().getDrawable(R.drawable.taxi_driver_grab_order_bt));
+        mOrderGrabBt.setBackground(getResources().getDrawable(R.drawable.shape_size_grab_order_bt));
         mOrderGrabBt.setText("抢单(10S)"); //开始倒计时任务
         countDownTimer = new CountDownTimer(11000,1000){
 
@@ -127,7 +127,6 @@ public class TaxiGrabOrderFragment extends BaseTaxiUIFragment implements View.On
         if (null != countDownTimer){
             countDownTimer.cancel();
         }
-        mOrderGrabBt.setTextSize(21);
         mOrderGrabBt.setText("抢单中...");
         ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams)mOrderGrabBt.getLayoutParams();
         lp.bottomMargin = 40;

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java

@@ -195,9 +195,9 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi
             }
             viewHolder.checkBoxTv.setText(datas[position]);
             if(viewHolder.checkBoxTv.getText().toString().equals(currentReasons)){
-                viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.taxi_selected_btn),null,null,null);
+                viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.shape_size_taxi_selected_btn),null,null,null);
             }else {
-                viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.taxi_unselect_btn),null,null,null);
+                viewHolder.checkBoxTv.setCompoundDrawablesWithIntrinsicBounds(context.getResources().getDrawable(R.drawable.shape_size_taxi_unselected_btn),null,null,null);
             }
             return convertView;
         }

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java

@@ -46,6 +46,8 @@ import java.util.List;
 import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
 
+import me.jessyan.autosize.utils.AutoSizeUtils;
+
 /**
  * @author: wangmingjun
  * @date: 2021/8/18
@@ -219,13 +221,13 @@ public class TaxiPersonalDialogFragment extends DialogFragment implements View.O
         TextView textView = (TextView) tab.getCustomView().findViewById(R.id.operation_tab_title);
         ImageView imageView = (ImageView) tab.getCustomView().findViewById(R.id.operation_tab_line_iv);
         if (isSelected){
-            textView.setTextSize(23);
+            textView.setTextSize(AutoSizeUtils.dp2px(getContext(),46));
             CallerLogger.INSTANCE.d(M_TAXI + TAG,"SelectTv = "+ textView.getText());
             textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
             textView.setTextColor(Color.parseColor("#FFFFFF"));
             imageView.setImageDrawable(getResources().getDrawable(R.drawable.taxi_driver_operation_tab_line));
         }else {
-            textView.setTextSize(20);
+            textView.setTextSize(AutoSizeUtils.dp2px(getContext(),40));
             CallerLogger.INSTANCE.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText());
             textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
             textView.setTextColor(Color.parseColor("#A7B6F0"));

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java

@@ -27,6 +27,8 @@ import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean;
 import java.util.ArrayList;
 import java.util.List;
 
+import me.jessyan.autosize.utils.AutoSizeUtils;
+
 /**
  * @author congtaowang
  * @since 2021/1/18
@@ -75,9 +77,9 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment {
         for (int i= 0;i < mTabTitles.length; i++){
             TabLayout.Tab tab = mTaxiOrderTab.newTab();
             tab.view.setBackgroundColor(Color.parseColor("#00000000"));
-            View tabView = View.inflate(getActivity(),R.layout.taxi_tab_item_custom,null);
-            TextView tv = tabView.findViewById(R.id.tab_title);
-            tv.setText(mTabTitles[i]);
+            TextView tabView = (TextView) View.inflate(getActivity(),R.layout.taxi_tab_item_custom,null);
+            tabView.setText(mTabTitles[i]);
+            tabView.setHeight(AutoSizeUtils.dp2px(getContext(),120));
             tab.setCustomView(tabView);
             if (0  == i){
                 mTaxiOrderTab.addTab(tab,true);
@@ -134,13 +136,13 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment {
         TextView textView = (TextView) tab.getCustomView().findViewById(R.id.tab_title);
         if (isSelected){
             textView.setBackground(getActivity().getDrawable(R.drawable.taxi_driver_tab_item_bg));
-            textView.setTextSize(20);
+            textView.setTextSize(AutoSizeUtils.dp2px(getContext(),40));
             CallerLogger.INSTANCE.d(M_TAXI + TAG,"SelectTv = "+ textView.getText());
             textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
             textView.setTextColor(Color.parseColor("#FFFFFF"));
         }else {
             textView.setBackground(null);
-            textView.setTextSize(18);
+            textView.setTextSize(AutoSizeUtils.dp2px(getContext(),36));
             CallerLogger.INSTANCE.d(M_TAXI + TAG,"unSelectTv = "+ textView.getText());
             textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
             textView.setTextColor(Color.parseColor("#CCD4F5"));

OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_autopilot_status_bg.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#2B6EFF" android:startColor="#2B6EFF" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#3B4577" android:startColor="#3B4577" />
-        </shape>
-    </item>
-</selector>
-

OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_autopilot_bg_selector.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
-    <item android:drawable="@drawable/taxi_ic_autopilot_bg_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/taxi_ic_autopilot_bg"/>
-</selector>

OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_autopilot_status_bg.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#2B6EFF" android:startColor="#2B6EFF" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#3B4577" android:startColor="#3B4577" />
-        </shape>
-    </item>
-</selector>
-

OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_speed_selector.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<!--    <item android:state_checked="true">-->
-<!--        <shape android:shape="rectangle">-->
-<!--            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />-->
-<!--            <gradient android:angle="315" android:endColor="#2B6EFF" android:startColor="#2B6EFF" />-->
-<!--        </shape>-->
-<!--    </item>-->
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
-            <gradient android:angle="315" android:endColor="#1E2E87 " android:startColor="#7792F9" />
-        </shape>
-    </item>
-</selector>
-

OCH/mogo-och-taxi/src/main/res/drawable/shape_size_grab_order_bt.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_driver_grab_order_bt"
+        android:width="@dimen/dp_380"
+        android:height="@dimen/dp_140"/>
+</layer-list >

OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_back.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_back_btn"
+        android:width="@dimen/dp_50"
+        android:height="@dimen/dp_50"/>
+</layer-list >

OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_out.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_out_btn"
+        android:width="@dimen/dp_50"
+        android:height="@dimen/dp_50"/>
+</layer-list >

OCH/mogo-och-taxi/src/main/res/drawable/shape_size_see_all_order.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_order_list_page"
+        android:width="@dimen/dp_35"
+        android:height="@dimen/dp_43"/>
+</layer-list >

OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_selected_btn.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_selected_btn"
+        android:width="@dimen/dp_63"
+        android:height="@dimen/dp_63"/>
+</layer-list >

OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_unselected_btn.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/taxi_unselect_btn"
+        android:width="@dimen/dp_63"
+        android:height="@dimen/dp_63"/>
+</layer-list >

OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg.xml

@@ -2,13 +2,13 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true">
         <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="30dp" android:bottomRightRadius="70dp" android:topLeftRadius="70dp" android:topRightRadius="30dp" />
+            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
             <gradient android:angle="315" android:endColor="#2B6EFF" android:startColor="#2B6EFF" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
-            <corners android:bottomLeftRadius="30dp" android:bottomRightRadius="70dp" android:topLeftRadius="70dp" android:topRightRadius="30dp" />
+            <corners android:bottomLeftRadius="20dp" android:bottomRightRadius="50dp" android:topLeftRadius="50dp" android:topRightRadius="20dp" />
             <gradient android:angle="315" android:endColor="#3B4577" android:startColor="#3B4577" />
         </shape>
     </item>

OCH/mogo-och-taxi/src/main/res/layout/auto_or_manual_btn_view.xml

@@ -17,7 +17,7 @@
         android:layout_marginLeft="@dimen/dp_40"
         android:text="@string/och_taxi_auto_txt"
         android:textColor="#FFFFFF"
-        android:textSize="24sp"/>
+        android:textSize="@dimen/dp_48"/>
     <TextView
         android:id="@+id/taxi_start_by_manual"
         android:layout_width="0dp"
@@ -28,6 +28,6 @@
         android:text="@string/och_taxi_manual_txt"
         android:layout_marginRight="@dimen/dp_40"
         android:textColor="#FFFFFF"
-        android:textSize="24sp"/>
+        android:textSize="@dimen/dp_48"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>