From 8e61c71a98609df1b255cb18d6f3ce40333e7dd3 Mon Sep 17 00:00:00 2001 From: Marc Leclair Date: Wed, 5 Feb 2020 18:46:56 -0500 Subject: [PATCH] reverting linting changes that touched codes that I didn't edit --- .../org/mozilla/fenix/home/HomeFragment.kt | 38 +++++++------------ 1 file changed, 14 insertions(+), 24 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 7945b99d6..c46726c01 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -213,6 +213,7 @@ class HomeFragment : Fragment() { view.sessionControlRecyclerView, sessionControlInteractor ) activity.themeManager.applyStatusBarTheme(activity) + return view } @@ -324,16 +325,15 @@ class HomeFragment : Fragment() { if (onboarding.userHasBeenOnboarded()) { homeFragmentStore.dispatch( - HomeFragmentAction.ModeChange(Mode.fromBrowsingMode(newMode)) - ) + HomeFragmentAction.ModeChange(Mode.fromBrowsingMode(newMode))) } } } override fun onDestroyView() { + super.onDestroyView() sessionControlView = null view!!.homeAppBar.removeOnOffsetChangedListener(homeAppBarOffSetListener) - super.onDestroyView() } override fun onStart() { @@ -344,14 +344,12 @@ class HomeFragment : Fragment() { val context = requireContext() val components = context.components - homeFragmentStore.dispatch( - HomeFragmentAction.Change( - collections = components.core.tabCollectionStorage.cachedTabCollections, - mode = currentMode.getCurrentMode(), - tabs = getListOfSessions().toTabs(), - topSites = components.core.topSiteStorage.cachedTopSites - ) - ) + homeFragmentStore.dispatch(HomeFragmentAction.Change( + collections = components.core.tabCollectionStorage.cachedTabCollections, + mode = currentMode.getCurrentMode(), + tabs = getListOfSessions().toTabs(), + topSites = components.core.topSiteStorage.cachedTopSites + )) requireComponents.backgroundServices.accountManager.register(currentMode, owner = this) requireComponents.backgroundServices.accountManager.register(object : AccountObserver { @@ -368,8 +366,7 @@ class HomeFragment : Fragment() { }, owner = this) if (context.settings().showPrivateModeContextualFeatureRecommender && - browsingModeManager.mode.isPrivate - ) { + browsingModeManager.mode.isPrivate) { recommendPrivateBrowsingShortcut() } @@ -509,8 +506,7 @@ class HomeFragment : Fragment() { // Otherwise, we will encounter an activity token error. privateBrowsingButton.post { privateBrowsingRecommend.showAsDropDown( - privateBrowsingButton, 0, CFR_Y_OFFSET, Gravity.TOP or Gravity.END - ) + privateBrowsingButton, 0, CFR_Y_OFFSET, Gravity.TOP or Gravity.END) } } } @@ -521,9 +517,7 @@ class HomeFragment : Fragment() { homeFragmentStore.dispatch( HomeFragmentAction.ModeChange( mode = currentMode.getCurrentMode(), - tabs = getListOfSessions().toTabs() - ) - ) + tabs = getListOfSessions().toTabs())) } } @@ -767,12 +761,8 @@ class HomeFragment : Fragment() { border?.visibility = View.GONE } - override fun onAnimationStart(animation: Animator?) { /* noop */ - } - - override fun onAnimationRepeat(animation: Animator?) { /* noop */ - } - + override fun onAnimationStart(animation: Animator?) { /* noop */ } + override fun onAnimationRepeat(animation: Animator?) { /* noop */ } override fun onAnimationEnd(animation: Animator?) { border?.animate()?.alpha(0.0F)?.setStartDelay(ANIM_ON_SCREEN_DELAY) ?.setDuration(FADE_ANIM_DURATION)