blallo
/
fenix
1
0
Fork 0
Code Releases Activity

#7700 fixed linting issues

master
Marc Leclair 2020-02-04 01:15:18 -05:00 committed by Jeff Boek
parent 92b38206c7
commit 9fc5a1b0fe
1 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@ class HomeFragment : Fragment() {
data class PendingSessionDeletion(val deletionJob: (suspend () -> Unit), val sessionId: String) data class PendingSessionDeletion(val deletionJob: (suspend () -> Unit), val sessionId: String)
private lateinit var homeAppBarOffSetListener : AppBarLayout.OnOffsetChangedListener private lateinit var homeAppBarOffSetListener: AppBarLayout.OnOffsetChangedListener
private val onboarding by lazy { FenixOnboarding(requireContext()) } private val onboarding by lazy { FenixOnboarding(requireContext()) }
private lateinit var homeFragmentStore: HomeFragmentStore private lateinit var homeFragmentStore: HomeFragmentStore
private lateinit var sessionControlInteractor: SessionControlInteractor private lateinit var sessionControlInteractor: SessionControlInteractor
@ -208,8 +208,10 @@ class HomeFragment : Fragment() {
) )
updateLayout(view) updateLayout(view)
setOffset(view) setOffset(view)
sessionControlView = SessionControlView(homeFragmentStore, sessionControlView = SessionControlView(
view.sessionControlRecyclerView, sessionControlInteractor) homeFragmentStore,
view.sessionControlRecyclerView, sessionControlInteractor
)
activity.themeManager.applyStatusBarTheme(activity) activity.themeManager.applyStatusBarTheme(activity)
return view return view
} }
@ -217,13 +219,16 @@ class HomeFragment : Fragment() {
private fun updateLayout(view: View) { private fun updateLayout(view: View) {
val shouldUseBottomToolbar = view.context.settings().shouldUseBottomToolbar val shouldUseBottomToolbar = view.context.settings().shouldUseBottomToolbar
if(!shouldUseBottomToolbar){ if (!shouldUseBottomToolbar) {
view.toolbarLayout.layoutParams = CoordinatorLayout.LayoutParams(ConstraintLayout.LayoutParams.MATCH_PARENT, ConstraintLayout.LayoutParams.WRAP_CONTENT) view.toolbarLayout.layoutParams = CoordinatorLayout.LayoutParams(
ConstraintLayout.LayoutParams.MATCH_PARENT,
ConstraintLayout.LayoutParams.WRAP_CONTENT
)
.apply { .apply {
gravity = Gravity.TOP gravity = Gravity.TOP
} }
view.homeAppBar.updateLayoutParams<ViewGroup.MarginLayoutParams>{ view.homeAppBar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
topMargin = HEADER_MARGIN.dpToPx(resources.displayMetrics) topMargin = HEADER_MARGIN.dpToPx(resources.displayMetrics)
} }
@ -231,13 +236,14 @@ class HomeFragment : Fragment() {
view.homeAppBar.addOnOffsetChangedListener( view.homeAppBar.addOnOffsetChangedListener(
homeAppBarOffSetListener homeAppBarOffSetListener
) )
}else { } else {
createNewAppBarListener(0F) createNewAppBarListener(0F)
view.homeAppBar.addOnOffsetChangedListener( view.homeAppBar.addOnOffsetChangedListener(
homeAppBarOffSetListener homeAppBarOffSetListener
) )
} }
} }
@ExperimentalCoroutinesApi @ExperimentalCoroutinesApi
@SuppressWarnings("LongMethod") @SuppressWarnings("LongMethod")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@ -318,7 +324,8 @@ class HomeFragment : Fragment() {
if (onboarding.userHasBeenOnboarded()) { if (onboarding.userHasBeenOnboarded()) {
homeFragmentStore.dispatch( homeFragmentStore.dispatch(
HomeFragmentAction.ModeChange(Mode.fromBrowsingMode(newMode))) HomeFragmentAction.ModeChange(Mode.fromBrowsingMode(newMode))
)
} }
} }
} }
@ -337,12 +344,14 @@ class HomeFragment : Fragment() {
val context = requireContext() val context = requireContext()
val components = context.components val components = context.components
homeFragmentStore.dispatch(HomeFragmentAction.Change( homeFragmentStore.dispatch(
collections = components.core.tabCollectionStorage.cachedTabCollections, HomeFragmentAction.Change(
mode = currentMode.getCurrentMode(), collections = components.core.tabCollectionStorage.cachedTabCollections,
tabs = getListOfSessions().toTabs(), mode = currentMode.getCurrentMode(),
topSites = components.core.topSiteStorage.cachedTopSites tabs = getListOfSessions().toTabs(),
)) 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 {
@ -359,7 +368,8 @@ class HomeFragment : Fragment() {
}, owner = this) }, owner = this)
if (context.settings().showPrivateModeContextualFeatureRecommender && if (context.settings().showPrivateModeContextualFeatureRecommender &&
browsingModeManager.mode.isPrivate) { browsingModeManager.mode.isPrivate
) {
recommendPrivateBrowsingShortcut() recommendPrivateBrowsingShortcut()
} }
@ -499,7 +509,8 @@ 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
)
} }
} }
} }
@ -510,7 +521,9 @@ class HomeFragment : Fragment() {
homeFragmentStore.dispatch( homeFragmentStore.dispatch(
HomeFragmentAction.ModeChange( HomeFragmentAction.ModeChange(
mode = currentMode.getCurrentMode(), mode = currentMode.getCurrentMode(),
tabs = getListOfSessions().toTabs())) tabs = getListOfSessions().toTabs()
)
)
} }
} }
@ -754,8 +767,12 @@ 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)
@ -815,8 +832,8 @@ class HomeFragment : Fragment() {
private fun calculateNewOffset() { private fun calculateNewOffset() {
homeAppBarOffset = ((view!!.findViewById<AppBarLayout>(R.id.homeAppBar) homeAppBarOffset = ((view!!.findViewById<AppBarLayout>(R.id.homeAppBar)
.layoutParams as CoordinatorLayout.LayoutParams) .layoutParams as CoordinatorLayout.LayoutParams)
.behavior as AppBarLayout.Behavior).topAndBottomOffset .behavior as AppBarLayout.Behavior).topAndBottomOffset
} }
private fun setOffset(currentView: View) { private fun setOffset(currentView: View) {
@ -830,11 +847,12 @@ class HomeFragment : Fragment() {
} }
} }
private fun createNewAppBarListener(margin : Float){ private fun createNewAppBarListener(margin: Float) {
homeAppBarOffSetListener = AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset -> homeAppBarOffSetListener =
val reduceScrollRanged = appBarLayout.totalScrollRange.toFloat() - margin AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
appBarLayout.alpha = 1.0f - abs(verticalOffset / reduceScrollRanged) val reduceScrollRanged = appBarLayout.totalScrollRange.toFloat() - margin
} appBarLayout.alpha = 1.0f - abs(verticalOffset / reduceScrollRanged)
}
} }
companion object { companion object {