blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #7158: Improves home to search animation (#9008)

master
Sawyer Blatz 2020-03-05 13:54:54 -08:00 committed by GitHub
parent 84afb5d156
commit 28f58eb025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -10,7 +10,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.transition.TransitionInflater
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.fragment_browser.*
import kotlinx.android.synthetic.main.fragment_browser.view.*
@ -48,16 +47,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
private val windowFeature = ViewBoundFeatureWrapper<WindowFeature>()
private val searchFeature = ViewBoundFeatureWrapper<SearchFeature>()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
postponeEnterTransition()
sharedElementEnterTransition =
TransitionInflater.from(context).inflateTransition(android.R.transition.move)
.setDuration(
SHARED_TRANSITION_MS
)
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,

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

@ -33,7 +33,6 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.OnLifecycleEvent
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.FragmentNavigator
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
@ -544,11 +543,7 @@ class HomeFragment : Fragment() {
sessionId = null
)
val extras = FragmentNavigator.Extras.Builder()
.addSharedElement(toolbar_wrapper, "toolbar_wrapper_transition")
.build()
nav(R.id.homeFragment, directions, extras)
nav(R.id.homeFragment, directions)
}
private fun openSettingsScreen() {

14
app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
View File

@ -21,7 +21,6 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import androidx.transition.TransitionInflater
import kotlinx.android.synthetic.main.fragment_search.*
import kotlinx.android.synthetic.main.fragment_search.view.*
import kotlinx.android.synthetic.main.search_suggestions_onboarding.view.*
@ -57,17 +56,6 @@ class SearchFragment : Fragment(), UserInteractionHandler {
private lateinit var searchStore: SearchFragmentStore
private lateinit var searchInteractor: SearchInteractor
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
postponeEnterTransition()
sharedElementEnterTransition =
TransitionInflater.from(context).inflateTransition(android.R.transition.move)
.setDuration(SHARED_TRANSITION_MS)
requireComponents.analytics.metrics.track(Event.InteractWithSearchURLArea)
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
@ -87,6 +75,8 @@ class SearchFragment : Fragment(), UserInteractionHandler {
val isPrivate = (activity as HomeActivity).browsingModeManager.mode.isPrivate
requireComponents.analytics.metrics.track(Event.InteractWithSearchURLArea)
val showSearchSuggestions =
if (isPrivate) {
requireContext().settings().shouldShowSearchSuggestions &&

4
app/src/main/res/anim/fade_in_up.xml
View File

@ -6,9 +6,9 @@
<alpha
android:interpolator="@android:interpolator/decelerate_quad"
android:fromAlpha="0" android:toAlpha="1"
android:duration="125" />
android:duration="150" />
<translate
android:interpolator="@android:interpolator/decelerate_quad"
android:fromYDelta="7%" android:toYDelta="0%"
android:duration="125"/>
android:duration="150"/>
</set>

1
app/src/main/res/layout/component_browser_top_toolbar.xml
View File

@ -15,7 +15,6 @@
android:background="@drawable/toolbar_background_top"
android:clickable="true"
android:focusable="true"
android:transitionName="toolbar_wrapper_transition"
android:focusableInTouchMode="true"
app:layout_scrollFlags="scroll|enterAlways|snap|exitUntilCollapsed"
app:browserToolbarClearColor="?primaryText"

1
app/src/main/res/layout/fragment_home.xml
View File

@ -120,7 +120,6 @@
android:clickable="true"
android:contentDescription="@string/search_hint"
android:focusable="true"
android:transitionName="toolbar_wrapper_transition"
app:layout_constraintBottom_toBottomOf="@id/bottom_bar"
app:layout_constraintEnd_toStartOf="@+id/add_tab_button"
app:layout_constraintStart_toStartOf="parent"

1
app/src/main/res/layout/fragment_search.xml
View File

@ -38,7 +38,6 @@
android:layout_height="@dimen/browser_toolbar_height"
android:layout_margin="0dp"
android:outlineProvider="paddedBounds"
android:transitionName="toolbar_wrapper_transition"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

6
app/src/main/res/navigation/nav_graph.xml
View File

@ -69,10 +69,8 @@
<action
android:id="@+id/action_homeFragment_to_searchFragment"
app:destination="@id/searchFragment"
app:enterAnim="@anim/fade_in"
app:exitAnim="@anim/fade_out"
app:popEnterAnim="@anim/fade_in"
app:popExitAnim="@anim/fade_out" />
app:enterAnim="@anim/fade_in_up"
app:popExitAnim="@anim/fade_out_down" />
<action
android:id="@+id/action_homeFragment_to_browserFragment"
app:destination="@id/browserFragment"