blallo
/
fenix
1
0
Fork 0
Code Releases Activity

reverting linting changes that touched codes that I didn't edit

master
Marc Leclair 2020-02-05 18:46:56 -05:00 committed by Jeff Boek
parent 211a8b2583
commit 8e61c71a98
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -213,6 +213,7 @@ class HomeFragment : Fragment() {
view.sessionControlRecyclerView, sessionControlInteractor view.sessionControlRecyclerView, sessionControlInteractor
) )
activity.themeManager.applyStatusBarTheme(activity) activity.themeManager.applyStatusBarTheme(activity)
return view return view
} }
@ -324,16 +325,15 @@ class HomeFragment : Fragment() {
if (onboarding.userHasBeenOnboarded()) { if (onboarding.userHasBeenOnboarded()) {
homeFragmentStore.dispatch( homeFragmentStore.dispatch(
HomeFragmentAction.ModeChange(Mode.fromBrowsingMode(newMode)) HomeFragmentAction.ModeChange(Mode.fromBrowsingMode(newMode)))
)
} }
} }
} }
override fun onDestroyView() { override fun onDestroyView() {
super.onDestroyView()
sessionControlView = null sessionControlView = null
view!!.homeAppBar.removeOnOffsetChangedListener(homeAppBarOffSetListener) view!!.homeAppBar.removeOnOffsetChangedListener(homeAppBarOffSetListener)
super.onDestroyView()
} }
override fun onStart() { override fun onStart() {
@ -344,14 +344,12 @@ class HomeFragment : Fragment() {
val context = requireContext() val context = requireContext()
val components = context.components val components = context.components
homeFragmentStore.dispatch( homeFragmentStore.dispatch(HomeFragmentAction.Change(
HomeFragmentAction.Change( collections = components.core.tabCollectionStorage.cachedTabCollections,
collections = components.core.tabCollectionStorage.cachedTabCollections, mode = currentMode.getCurrentMode(),
mode = currentMode.getCurrentMode(), tabs = getListOfSessions().toTabs(),
tabs = getListOfSessions().toTabs(), topSites = components.core.topSiteStorage.cachedTopSites
topSites = components.core.topSiteStorage.cachedTopSites ))
)
)
requireComponents.backgroundServices.accountManager.register(currentMode, owner = this) requireComponents.backgroundServices.accountManager.register(currentMode, owner = this)
requireComponents.backgroundServices.accountManager.register(object : AccountObserver { requireComponents.backgroundServices.accountManager.register(object : AccountObserver {
@ -368,8 +366,7 @@ class HomeFragment : Fragment() {
}, owner = this) }, owner = this)
if (context.settings().showPrivateModeContextualFeatureRecommender && if (context.settings().showPrivateModeContextualFeatureRecommender &&
browsingModeManager.mode.isPrivate browsingModeManager.mode.isPrivate) {
) {
recommendPrivateBrowsingShortcut() recommendPrivateBrowsingShortcut()
} }
@ -509,8 +506,7 @@ class HomeFragment : Fragment() {
// Otherwise, we will encounter an activity token error. // Otherwise, we will encounter an activity token error.
privateBrowsingButton.post { privateBrowsingButton.post {
privateBrowsingRecommend.showAsDropDown( 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( homeFragmentStore.dispatch(
HomeFragmentAction.ModeChange( HomeFragmentAction.ModeChange(
mode = currentMode.getCurrentMode(), mode = currentMode.getCurrentMode(),
tabs = getListOfSessions().toTabs() tabs = getListOfSessions().toTabs()))
)
)
} }
} }
@ -767,12 +761,8 @@ class HomeFragment : Fragment() {
border?.visibility = View.GONE border?.visibility = View.GONE
} }
override fun onAnimationStart(animation: Animator?) { /* noop */ override fun onAnimationStart(animation: Animator?) { /* noop */ }
} override fun onAnimationRepeat(animation: Animator?) { /* noop */ }
override fun onAnimationRepeat(animation: Animator?) { /* noop */
}
override fun onAnimationEnd(animation: Animator?) { override fun onAnimationEnd(animation: Animator?) {
border?.animate()?.alpha(0.0F)?.setStartDelay(ANIM_ON_SCREEN_DELAY) border?.animate()?.alpha(0.0F)?.setStartDelay(ANIM_ON_SCREEN_DELAY)
?.setDuration(FADE_ANIM_DURATION) ?.setDuration(FADE_ANIM_DURATION)