2
0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-09 19:10:42 +00:00

Start MotionLayout animation to end while navigating to search fragment

This commit is contained in:
Emily Kager 2019-05-29 10:56:52 -07:00 committed by Jeff Boek
parent 8181705b58
commit d6c1f65d72
4 changed files with 37 additions and 9 deletions

View File

@ -49,7 +49,6 @@ class ToolbarComponent(
)
init {
getView().transitionName = "toolbar_transition"
bind()
applyTheme()
}

View File

@ -15,11 +15,16 @@ import android.view.ViewGroup
import android.view.ViewTreeObserver
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.constraintlayout.motion.widget.MotionLayout
import androidx.constraintlayout.motion.widget.MotionScene
import androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.PARENT_ID
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
import androidx.navigation.NavController
import androidx.navigation.NavDirections
import androidx.navigation.Navigation
import androidx.navigation.Navigator
import androidx.navigation.fragment.FragmentNavigator
import androidx.transition.TransitionInflater
import kotlinx.android.synthetic.main.fragment_home.*
@ -190,11 +195,17 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(null)
val extras =
FragmentNavigator.Extras.Builder()
.addSharedElement(it, "toolbar_transition")
.addSharedElement(toolbar_wrapper, "toolbar_wrapper_transition")
.addSharedElement(search_engine_icon, "toolbar_icon_transition")
.build()
if (homeLayout.progress == 1.0F) {
Navigation.findNavController(it).navigate(directions, extras)
} else {
homeLayout.setTransitionDuration(TRANSITION_DURATION_MOTION)
homeLayout.transitionToEnd()
val listener = getTransitionListener(Navigation.findNavController(it), directions, extras)
homeLayout.setTransitionListener(listener)
}
requireComponents.analytics.metrics.track(Event.SearchBarTapped(Event.SearchBarTapped.Source.HOME))
}
@ -224,6 +235,26 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
homeDividerShadow.bringToFront()
}
private fun getTransitionListener(
navController: NavController,
directions: NavDirections,
extras: Navigator.Extras
) = object : MotionLayout.TransitionListener {
override fun onTransitionTrigger(p0: MotionLayout?, p1: Int, p2: Boolean, p3: Float) {}
override fun allowsTransition(p0: MotionScene.Transition?): Boolean {
return true
}
override fun onTransitionStarted(p0: MotionLayout?, p1: Int, p2: Int) {
navController.navigate(directions, extras)
}
override fun onTransitionChange(p0: MotionLayout?, p1: Int, p2: Int, p3: Float) {}
override fun onTransitionCompleted(p0: MotionLayout?, p1: Int) {}
}
override fun onDestroyView() {
homeMenu = null
job.cancel()
@ -694,6 +725,7 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
override fun onProfileUpdated(profile: Profile) { emitAccountChanges() }
companion object {
private const val TRANSITION_DURATION_MOTION = 400
private const val TAB_ITEM_TRANSITION_NAME = "tab_item"
private const val toolbarPaddingDp = 12f
private const val MOTION_LAYOUT_PROGRESS_ROUND_POINT = 0.25f

View File

@ -66,8 +66,7 @@
android:id="@+id/search_engine_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="12dp"
android:transitionName="toolbar_icon_transition" />
android:layout_margin="12dp" />
<TextView
android:id="@+id/toolbar"
@ -80,8 +79,7 @@
android:padding="12dp"
android:text="@string/search_hint"
android:textColor="?primaryText"
android:textSize="15sp"
android:transitionName="toolbar_transition" />
android:textSize="15sp" />
</org.mozilla.fenix.home.SearchView>
<View

View File

@ -30,7 +30,6 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="12dp"
android:transitionName="toolbar_icon_transition"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />