diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index 8c310905b8..4b0a45b090 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -53,7 +53,7 @@ class MainFragment : R.drawable.m1_small_map_view_dir_end) private val lineTrajectory = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, - com.mogo.eagle.core.function.map.R.drawable.taxi_map_arrow_arrived) + R.drawable.charter_p_trajectory_line) override fun getLayoutId(): Int { return R.layout.m1_main_fragment diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt similarity index 95% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt index 474338a954..94fc93bf6c 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt @@ -3,9 +3,11 @@ package com.mogo.och.bus.passenger.ui.view.bottom.impl import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet +import android.view.LayoutInflater import android.view.MotionEvent import android.view.View import androidx.appcompat.widget.AppCompatTextView +import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager @@ -24,11 +26,11 @@ import com.mogo.och.common.module.utils.SoundPoolHelper import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.m1_bottom_bar.view.* -class GoView @JvmOverloads constructor( +class GoViewWithArrive @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : AppCompatTextView(context, attrs, defStyleAttr) { +) : ConstraintLayout(context, attrs, defStyleAttr) { var applyClickListener: BottomClickView.ApplyClickLintener?=null @@ -39,6 +41,7 @@ class GoView @JvmOverloads constructor( } init { + LayoutInflater.from(context).inflate(R.layout.m1_bottom_go, this, true) setBackgroundResource(R.drawable.charter_p_bottom_center_normal) setOnTouchListener(object :OnTouchListener{ @SuppressLint("ClickableViewAccessibility") diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_1.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_1.png index 62f7d27e18..f89f87c8c6 100644 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_1.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_1.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.png index e00273748f..2ad2bbc3f8 100644 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png index b1c5a49218..ed9cff148b 100644 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.png index 999040bb75..ca8f4969c8 100644 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_normal.png index 340b0ac8ce..64671eca24 100644 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_normal.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_normal.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_press.png deleted file mode 100644 index 0fa1c55f9b..0000000000 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_press.png and /dev/null differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_go.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_go.png new file mode 100644 index 0000000000..92719bce65 Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_go.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_novice_guidance.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_novice_guidance.png new file mode 100644 index 0000000000..72f60523db Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_novice_guidance.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_trajectory_line.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_trajectory_line.png new file mode 100644 index 0000000000..5d8b34c67a Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_trajectory_line.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png index 3c520fd5e1..f28f737428 100644 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png deleted file mode 100644 index 41044e2437..0000000000 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png and /dev/null differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_order_closedoor_press.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_order_closedoor_press.xml new file mode 100644 index 0000000000..ada96a028a --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_order_closedoor_press.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml index d8844581c8..6c01b69413 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_opendoor_press.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_opendoor_press.xml new file mode 100644 index 0000000000..972d38395f --- /dev/null +++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_opendoor_press.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_bar.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_bar.xml index b6bbf7d4f5..2d9cca558f 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_bar.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_bar.xml @@ -8,11 +8,8 @@ tools:ignore="MissingDefaultResource"> - + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml index 0fab5e0bfd..c1b8af29ec 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml @@ -120,14 +120,26 @@ + + \ No newline at end of file