Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Commit

Permalink
#7700 squash commit and fixing toolbar to switxh to top with coordina…
Browse files Browse the repository at this point in the history 
…torlayout
  • Loading branch information
@MarcLeclair @boek
MarcLeclair authored and boek committed Feb 6, 2020
1 parent c0d7bc5 commit 7200759
Show file tree
Hide file tree
Showing 5 changed files with 142 additions and 96 deletions.
96 changes: 56 additions & 40 deletions app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,10 @@ import android.widget.LinearLayout
import android.widget.PopupWindow
import androidx.annotation.StringRes
import androidx.appcompat.app.AlertDialog
import androidx.constraintlayout.widget.ConstraintSet
import androidx.constraintlayout.widget.ConstraintSet.BOTTOM
import androidx.constraintlayout.widget.ConstraintSet.END
import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID
import androidx.constraintlayout.widget.ConstraintSet.START
import androidx.constraintlayout.widget.ConstraintSet.TOP
import androidx.core.view.updateLayoutParams
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.content.ContextCompat
import androidx.core.view.updateLayoutParams
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.Lifecycle
Expand All @@ -41,6 +37,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE
import androidx.transition.TransitionInflater
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.fragment_home.*
import kotlinx.android.synthetic.main.fragment_home.view.*
Expand Down Expand Up @@ -91,6 +88,7 @@ import org.mozilla.fenix.theme.ThemeManager
import org.mozilla.fenix.utils.FragmentPreDrawManager
import org.mozilla.fenix.utils.allowUndo
import org.mozilla.fenix.whatsnew.WhatsNew
import kotlin.math.abs
import kotlin.math.min

@ExperimentalCoroutinesApi
Expand All @@ -106,7 +104,7 @@ class HomeFragment : Fragment() {
}

private val browsingModeManager get() = (activity as HomeActivity).browsingModeManager

private var homeAppBarOffset = 0
private val singleSessionObserver = object : Session.Observer {
override fun onTitleChanged(session: Session, title: String) {
if (deleteAllSessionsJob == null) emitSessionChanges()
Expand Down Expand Up @@ -142,7 +140,7 @@ class HomeFragment : Fragment() {
private val onboarding by lazy { FenixOnboarding(requireContext()) }
private lateinit var homeFragmentStore: HomeFragmentStore
private lateinit var sessionControlInteractor: SessionControlInteractor
private lateinit var sessionControlView: SessionControlView
private var sessionControlView: SessionControlView? = null
private lateinit var currentMode: CurrentMode

override fun onCreate(savedInstanceState: Bundle?) {
Expand Down Expand Up @@ -195,7 +193,6 @@ class HomeFragment : Fragment() {
activity = activity,
store = homeFragmentStore,
navController = findNavController(),
homeLayout = view.homeLayout,
browsingModeManager = browsingModeManager,
lifecycleScope = viewLifecycleOwner.lifecycleScope,
closeTab = ::closeTab,
Expand All @@ -209,37 +206,32 @@ class HomeFragment : Fragment() {
)
)

sessionControlView = SessionControlView(homeFragmentStore, view.homeLayout, sessionControlInteractor)
view.homeAppBar.addOnOffsetChangedListener(
AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
appBarLayout.alpha =
1.0f - abs(verticalOffset / appBarLayout.totalScrollRange.toFloat())
}
)

updateLayout(view)
setOffset(view)

activity.themeManager.applyStatusBarTheme(activity)

sessionControlView = SessionControlView(homeFragmentStore,
view.sessionControlRecyclerView, sessionControlInteractor)
updateLayout(view)
activity.themeManager.applyStatusBarTheme(activity)
return view
}

private fun updateLayout(view: View) {
val shouldUseBottomToolbar = view.context.settings().shouldUseBottomToolbar

ConstraintSet().apply {
clone(view.homeLayout)

if (shouldUseBottomToolbar) {
connect(sessionControlView.view.id, TOP, view.wordmark.id, BOTTOM)
connect(sessionControlView.view.id, BOTTOM, view.toolbarLayout.id, TOP)

connect(view.toolbarLayout.id, BOTTOM, PARENT_ID, BOTTOM)
connect(view.privateBrowsingButton.id, TOP, PARENT_ID, TOP)
} else {
connect(sessionControlView.view.id, TOP, view.wordmark.id, TOP)
connect(sessionControlView.view.id, BOTTOM, PARENT_ID, BOTTOM)

connect(view.privateBrowsingButton.id, TOP, view.toolbarLayout.id, BOTTOM)
}
connect(sessionControlView.view.id, START, PARENT_ID, START)
connect(sessionControlView.view.id, END, PARENT_ID, END)

applyTo(view.homeLayout)
if(!shouldUseBottomToolbar){
view.toolbarLayout.layoutParams = CoordinatorLayout.LayoutParams(ConstraintLayout.LayoutParams.MATCH_PARENT, ConstraintLayout.LayoutParams.WRAP_CONTENT)
.apply {
gravity = Gravity.TOP
}
}

val headingsTopMargins = if (shouldUseBottomToolbar) { HEADER_MARGIN } else { TOP_TOOLBAR_HEADER_MARGIN }
Expand All @@ -253,7 +245,7 @@ class HomeFragment : Fragment() {
topMargin = headingsTopMargins.dpToPx(resources.displayMetrics)
}

sessionControlView.view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
sessionControlView!!.view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
topMargin = sessionControlViewTopMargin.dpToPx(resources.displayMetrics)
}

Expand All @@ -263,7 +255,6 @@ class HomeFragment : Fragment() {
}
}
}

@ExperimentalCoroutinesApi
@SuppressWarnings("LongMethod")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
Expand All @@ -274,9 +265,8 @@ class HomeFragment : Fragment() {
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
}
homeViewModel.layoutManagerState?.also { parcelable ->
sessionControlView.view.layoutManager?.onRestoreInstanceState(parcelable)
sessionControlView!!.view.layoutManager?.onRestoreInstanceState(parcelable)
}
homeLayout?.progress = homeViewModel.motionLayoutProgress
homeViewModel.layoutManagerState = null
}

Expand Down Expand Up @@ -350,6 +340,11 @@ class HomeFragment : Fragment() {
}
}

override fun onDestroyView() {
sessionControlView = null
super.onDestroyView()
}

override fun onStart() {
super.onStart()
subscribeToTabCollections()
Expand Down Expand Up @@ -476,15 +471,19 @@ class HomeFragment : Fragment() {
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
}
homeViewModel.layoutManagerState =
sessionControlView.view.layoutManager?.onSaveInstanceState()
homeViewModel.motionLayoutProgress = homeLayout?.progress ?: 0F
sessionControlView!!.view.layoutManager?.onSaveInstanceState()
}

override fun onResume() {
super.onResume()
hideToolbar()
}

override fun onPause() {
super.onPause()
calculateNewOffset()
}

private fun recommendPrivateBrowsingShortcut() {
context?.let {
val layout = LayoutInflater.from(it)
Expand Down Expand Up @@ -710,7 +709,7 @@ class HomeFragment : Fragment() {
private fun scrollToTheTop() {
lifecycleScope.launch(Main) {
delay(ANIM_SCROLL_DELAY)
sessionControlView.view.smoothScrollToPosition(0)
sessionControlView!!.view.smoothScrollToPosition(0)
}
}

Expand All @@ -720,7 +719,7 @@ class HomeFragment : Fragment() {
) {
if (view != null) {
viewLifecycleOwner.lifecycleScope.launch {
val recyclerView = sessionControlView.view
val recyclerView = sessionControlView!!.view
delay(ANIM_SCROLL_DELAY)
val tabsSize = getListOfSessions().size

Expand Down Expand Up @@ -763,7 +762,7 @@ class HomeFragment : Fragment() {
private fun animateCollection(addedTabsSize: Int, indexOfCollection: Int) {
viewLifecycleOwner.lifecycleScope.launch {
val viewHolder =
sessionControlView.view.findViewHolderForAdapterPosition(indexOfCollection)
sessionControlView!!.view.findViewHolderForAdapterPosition(indexOfCollection)
val border =
(viewHolder as? CollectionViewHolder)?.view?.findViewById<View>(R.id.selected_border)
val listener = object : Animator.AnimatorListener {
Expand Down Expand Up @@ -830,6 +829,23 @@ class HomeFragment : Fragment() {
}
}

private fun calculateNewOffset() {
homeAppBarOffset = ((view!!.findViewById<AppBarLayout>(R.id.homeAppBar)
.layoutParams as CoordinatorLayout.LayoutParams)
.behavior as AppBarLayout.Behavior).topAndBottomOffset
}

private fun setOffset(currentView: View) {
if (homeAppBarOffset <= 0) {
(currentView.homeAppBar.layoutParams as CoordinatorLayout.LayoutParams)
.behavior = AppBarLayout.Behavior().apply {
topAndBottomOffset = this@HomeFragment.homeAppBarOffset
}
} else {
currentView.homeAppBar.setExpanded(false)
}
}

companion object {
private const val NON_TAB_ITEM_NUM = 3
private const val ANIM_SCROLL_DELAY = 100L
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
package org.mozilla.fenix.home.sessioncontrol

import android.view.View
import androidx.constraintlayout.motion.widget.MotionLayout
import androidx.navigation.NavController
import androidx.navigation.fragment.FragmentNavigator
import kotlinx.coroutines.CoroutineScope
Expand Down Expand Up @@ -151,7 +150,6 @@ class DefaultSessionControlController(
private val activity: HomeActivity,
private val store: HomeFragmentStore,
private val navController: NavController,
private val homeLayout: MotionLayout,
private val browsingModeManager: BrowsingModeManager,
private val lifecycleScope: CoroutineScope,
private val closeTab: (sessionId: String) -> Unit,
Expand Down Expand Up @@ -357,7 +355,6 @@ class DefaultSessionControlController(
}

override fun handleStartBrowsingClicked() {
homeLayout.progress = 0F
hideOnboarding()
}

Expand Down
12 changes: 3 additions & 9 deletions app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
package org.mozilla.fenix.home.sessioncontrol

import android.os.Build
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.lifecycle.ProcessLifecycleOwner
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager
Expand Down Expand Up @@ -135,22 +133,18 @@ private fun collectionTabItems(collection: TabCollection) = collection.tabs.mapI
@ExperimentalCoroutinesApi
class SessionControlView(
private val homeFragmentStore: HomeFragmentStore,
private val container: ViewGroup,
override val containerView: View?,
interactor: SessionControlInteractor
) : LayoutContainer {
override val containerView: View?
get() = container

val view: RecyclerView = LayoutInflater.from(container.context)
.inflate(R.layout.component_session_control, container, true)
.findViewById(R.id.home_component)
val view: RecyclerView = containerView as RecyclerView

private val sessionControlAdapter = SessionControlAdapter(interactor)

init {
view.apply {
adapter = sessionControlAdapter
layoutManager = LinearLayoutManager(container.context)
layoutManager = LinearLayoutManager(containerView!!.context)
val itemTouchHelper =
ItemTouchHelper(
SwipeToDeleteCallback(
Expand Down
Loading

0 comments on commit 7200759

Please sign in to comment.