From 43e62536361a131cfa640974a67805a918a2d7d3 Mon Sep 17 00:00:00 2001 From: Saksham Mahajan Date: Thu, 4 Jul 2024 19:42:11 +0530 Subject: [PATCH] NTP-43 | Regression fixes (#11699) Co-authored-by: saksham --- .../common/fragment/OrderStatusFragment.kt | 8 ++- .../main/res/layout/order_status_layout.xml | 49 ++++++++++--------- .../insurance/location/NaviLocationManager.kt | 6 ++- .../layout/reward_callout_widget_layout.xml | 6 +-- 4 files changed, 36 insertions(+), 33 deletions(-) diff --git a/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt index ecbef0f713..84281e7605 100644 --- a/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt +++ b/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt @@ -446,7 +446,7 @@ class OrderStatusFragment : binding.rewardLottie.isVisible = true viewModel.setRewardLottieVisibility(true) - setSpringAnimation(binding.rewardLottie, 400, 250) + setSpringAnimation(binding.rewardLottie, 600, 200) // Start the Lottie animation binding.rewardLottie.setAnimation(lottieUrl) @@ -467,13 +467,11 @@ class OrderStatusFragment : val density = resources.displayMetrics.density // Creating the spring like animation for scratch card // Create the first animation: from screenWidth to -8dp - val translationX1 = - ObjectAnimator.ofFloat(binding.rewardLottie, "translationX", screenWidth, -8 * density) + val translationX1 = ObjectAnimator.ofFloat(view, "translationX", screenWidth, -8 * density) translationX1.duration = firstTransitionDuration // Create the second animation: from -8dp to 0dp - val translationX2 = - ObjectAnimator.ofFloat(binding.rewardLottie, "translationX", -8 * density, 0f) + val translationX2 = ObjectAnimator.ofFloat(view, "translationX", -8 * density, 0f) translationX2.duration = secondTransitionDuration // Combine animations in an AnimatorSet diff --git a/android/navi-amc/src/main/res/layout/order_status_layout.xml b/android/navi-amc/src/main/res/layout/order_status_layout.xml index 45d71e7139..70910ea379 100644 --- a/android/navi-amc/src/main/res/layout/order_status_layout.xml +++ b/android/navi-amc/src/main/res/layout/order_status_layout.xml @@ -115,7 +115,7 @@ android:visibility="@{learnMoreNoteData != null ? View.VISIBLE : View.GONE}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/timeline" + app:layout_constraintTop_toBottomOf="@id/order_update" app:note="@{learnMoreNoteData}" /> + tools:visibility="gone" /> + + + + - - - diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/location/NaviLocationManager.kt b/android/navi-insurance/src/main/java/com/navi/insurance/location/NaviLocationManager.kt index 5451ded900..81eca745aa 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/location/NaviLocationManager.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/location/NaviLocationManager.kt @@ -63,7 +63,11 @@ class NaviLocationManager(private val context: Context) : Application.ActivityLi override fun onLocationResult(locationResult: LocationResult) { val location = locationResult.lastLocation val userLocation = - UserLocation(location?.latitude.toString(), location?.longitude.toString()) + UserLocation( + location?.latitude.toString(), + location?.longitude.toString(), + location?.time.toString() + ) NaviPreferenceManager.setObjectPreference( Constants.USER_LOCATION_DATA, userLocation diff --git a/android/navi-widgets/src/main/res/layout/reward_callout_widget_layout.xml b/android/navi-widgets/src/main/res/layout/reward_callout_widget_layout.xml index 98795fac62..d125d02ecc 100644 --- a/android/navi-widgets/src/main/res/layout/reward_callout_widget_layout.xml +++ b/android/navi-widgets/src/main/res/layout/reward_callout_widget_layout.xml @@ -12,7 +12,7 @@ android:id="@+id/tvTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginVertical="@dimen/dp_4" + android:layout_marginVertical="@dimen/dp_6" android:layout_marginStart="@dimen/dp_16" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -36,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_2" - android:layout_marginVertical="@dimen/dp_4" + android:layout_marginVertical="@dimen/dp_6" app:layout_constraintStart_toEndOf="@id/leftLottie" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -46,7 +46,7 @@ android:id="@+id/tvSubtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginVertical="@dimen/dp_4" + android:layout_marginVertical="@dimen/dp_6" app:layout_constraintStart_toEndOf="@id/tvAmount" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent"