diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 58b6506126..f335b76534 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -128,7 +128,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { visibility = View.GONE } ObjectAnimator.ofFloat(this@ArrivedView, "alpha", alphaStart, alphaEnd).apply { - duration = 1000 + duration = 500 addListener(object :AnimatorListenerAdapter(){ override fun onAnimationEnd(animation: Animator) { d(TAG,"onAnimationEndcarrivedView") diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp b/OCH/taxi/passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp deleted file mode 100644 index 542c400274..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/values/arrays.xml b/OCH/taxi/passenger/src/main/res/values/arrays.xml index 29e26a527f..6c3d9f93ce 100644 --- a/OCH/taxi/passenger/src/main/res/values/arrays.xml +++ b/OCH/taxi/passenger/src/main/res/values/arrays.xml @@ -232,71 +232,71 @@ - @drawable/arrive_dest_000 - @drawable/arrive_dest_001 - - @drawable/arrive_dest_003 + + + @drawable/arrive_dest_002 + @drawable/arrive_dest_004 @drawable/arrive_dest_006 - @drawable/arrive_dest_007 - - @drawable/arrive_dest_009 + + @drawable/arrive_dest_008 + - @drawable/arrive_dest_011 + @drawable/arrive_dest_010 @drawable/arrive_dest_012 - @drawable/arrive_dest_013 - - @drawable/arrive_dest_015 + + @drawable/arrive_dest_014 + @drawable/arrive_dest_016 @drawable/arrive_dest_018 - @drawable/arrive_dest_019 + - - @drawable/arrive_dest_021 + @drawable/arrive_dest_020 + @drawable/arrive_dest_022 @drawable/arrive_dest_024 - @drawable/arrive_dest_025 - - @drawable/arrive_dest_027 + + @drawable/arrive_dest_026 + @drawable/arrive_dest_028 @drawable/arrive_dest_030 - @drawable/arrive_dest_031 - - @drawable/arrive_dest_033 + + @drawable/arrive_dest_032 + @drawable/arrive_dest_034 @drawable/arrive_dest_036 - @drawable/arrive_dest_037 - - @drawable/arrive_dest_039 + + @drawable/arrive_dest_038 + @drawable/arrive_dest_040 @drawable/arrive_dest_042 - @drawable/arrive_dest_043 - - @drawable/arrive_dest_045 + + @drawable/arrive_dest_044 + @drawable/arrive_dest_046 @drawable/arrive_dest_048 - @drawable/arrive_dest_049 + - - @drawable/arrive_dest_051 + @drawable/arrive_dest_050 + @drawable/arrive_dest_052 @drawable/arrive_dest_054 - @drawable/arrive_dest_055 - - @drawable/arrive_dest_057 + + @drawable/arrive_dest_056 + @drawable/arrive_dest_058 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 0b47161aae..4ecf8eac00 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -131,7 +131,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { visibility = View.GONE } ObjectAnimator.ofFloat(this@ArrivedView, "alpha", alphaStart, alphaEnd).apply { - duration = 1000 + duration = 500 addListener(object :AnimatorListenerAdapter(){ override fun onAnimationEnd(animation: Animator) { CallerLogger.d(TaxiPassengerBaseFragment.TAG,"onAnimationEndcarrivedView") diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp deleted file mode 100644 index 542c400274..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml index 04c94c32cd..ef97d83ff0 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml @@ -232,77 +232,78 @@ - @drawable/arrive_dest_000 - @drawable/arrive_dest_001 - - @drawable/arrive_dest_003 + + + @drawable/arrive_dest_002 + @drawable/arrive_dest_004 @drawable/arrive_dest_006 - @drawable/arrive_dest_007 - - @drawable/arrive_dest_009 + + @drawable/arrive_dest_008 + - @drawable/arrive_dest_011 + @drawable/arrive_dest_010 @drawable/arrive_dest_012 - @drawable/arrive_dest_013 - - @drawable/arrive_dest_015 + + @drawable/arrive_dest_014 + @drawable/arrive_dest_016 @drawable/arrive_dest_018 - @drawable/arrive_dest_019 + - - @drawable/arrive_dest_021 + @drawable/arrive_dest_020 + @drawable/arrive_dest_022 @drawable/arrive_dest_024 - @drawable/arrive_dest_025 - - @drawable/arrive_dest_027 + + @drawable/arrive_dest_026 + @drawable/arrive_dest_028 @drawable/arrive_dest_030 - @drawable/arrive_dest_031 - - @drawable/arrive_dest_033 + + @drawable/arrive_dest_032 + @drawable/arrive_dest_034 @drawable/arrive_dest_036 - @drawable/arrive_dest_037 - - @drawable/arrive_dest_039 + + @drawable/arrive_dest_038 + @drawable/arrive_dest_040 @drawable/arrive_dest_042 - @drawable/arrive_dest_043 - - @drawable/arrive_dest_045 + + @drawable/arrive_dest_044 + @drawable/arrive_dest_046 @drawable/arrive_dest_048 - @drawable/arrive_dest_049 + - - @drawable/arrive_dest_051 + @drawable/arrive_dest_050 + @drawable/arrive_dest_052 @drawable/arrive_dest_054 - @drawable/arrive_dest_055 - - @drawable/arrive_dest_057 + + @drawable/arrive_dest_056 + @drawable/arrive_dest_058 @drawable/arrive_dest_060 + @drawable/check2startautopilt_000 @drawable/check2startautopilt_001