From 479c00bc5f76bb6633f9b1813eeb974ac5f6029c Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Mon, 20 May 2019 20:16:37 -0700 Subject: [PATCH] No Issue - Always complete motionLayout transition on restore --- app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 4 +++- .../main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 8a026afee..401f90073 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -186,7 +186,8 @@ class HomeFragment : Fragment(), CoroutineScope { override fun onViewStateRestored(savedInstanceState: Bundle?) { savedInstanceState?.apply { layoutManagerSate = getParcelable(KEY_LAYOUT_MANAGER_STATE) - homeLayout.progress = getFloat(KEY_MOTION_LAYOUT_PROGRESS) + val progress = getFloat(KEY_MOTION_LAYOUT_PROGRESS) + homeLayout.progress = if (progress > MOTION_LAYOUT_PROGRESS_ROUND_POINT) 1.0f else 0f } super.onViewStateRestored(savedInstanceState) @@ -544,5 +545,6 @@ class HomeFragment : Fragment(), CoroutineScope { private const val toolbarPaddingDp = 12f private const val KEY_MOTION_LAYOUT_PROGRESS = "motionLayout.progress" private const val KEY_LAYOUT_MANAGER_STATE = "layoutManager.state" + private const val MOTION_LAYOUT_PROGRESS_ROUND_POINT = 0.25f } } diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt b/app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt index 794af045b..945f216a8 100644 --- a/app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt +++ b/app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt @@ -6,7 +6,6 @@ package org.mozilla.fenix.onboarding import android.content.Context import android.content.SharedPreferences -import org.mozilla.fenix.BuildConfig class FenixOnboarding(private val context: Context) { private val onboardingPrefs = context.applicationContext.getSharedPreferences(