blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #4652 : Use workaround for HomeScreenViewModel (#4887)

master
Emily Kager 2019-08-22 14:35:51 -04:00 committed by Colin Lee
parent 9f154dc3a0
commit 84b0693fd2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,9 @@ class HomeFragment : Fragment(), AccountObserver {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
FragmentPreDrawManager(this).execute { FragmentPreDrawManager(this).execute {
val homeViewModel: HomeScreenViewModel by activityViewModels() val homeViewModel: HomeScreenViewModel by activityViewModels {
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
}
homeViewModel.layoutManagerState?.also { parcelable -> homeViewModel.layoutManagerState?.also { parcelable ->
sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable) sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable)
} }
@ -514,7 +516,9 @@ class HomeFragment : Fragment(), AccountObserver {
override fun onPause() { override fun onPause() {
invokePendingDeleteJobs() invokePendingDeleteJobs()
super.onPause() super.onPause()
val homeViewModel: HomeScreenViewModel by activityViewModels() val homeViewModel: HomeScreenViewModel by activityViewModels {
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
}
homeViewModel.layoutManagerState = homeViewModel.layoutManagerState =
sessionControlComponent.view.layoutManager?.onSaveInstanceState() sessionControlComponent.view.layoutManager?.onSaveInstanceState()
homeViewModel.motionLayoutProgress = homeLayout?.progress ?: 0F homeViewModel.motionLayoutProgress = homeLayout?.progress ?: 0F