For #4652 - Remove activityViewModels workarounds
This commit is contained in:
parent
7b1af41b40
commit
bd2c407943
|
@ -20,7 +20,6 @@ import androidx.core.net.toUri
|
|||
import androidx.core.view.isVisible
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import androidx.preference.PreferenceManager
|
||||
|
@ -39,8 +38,8 @@ import kotlinx.coroutines.withContext
|
|||
import mozilla.appservices.places.BookmarkRoot
|
||||
import mozilla.components.browser.session.Session
|
||||
import mozilla.components.browser.state.action.ContentAction
|
||||
import mozilla.components.browser.state.selector.findTab
|
||||
import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab
|
||||
import mozilla.components.browser.state.selector.findTab
|
||||
import mozilla.components.browser.state.selector.findTabOrCustomTabOrSelectedTab
|
||||
import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
|
||||
import mozilla.components.browser.state.selector.selectedTab
|
||||
|
@ -236,9 +235,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
|
|||
requireContext().accessibilityManager.addAccessibilityStateChangeListener(this)
|
||||
}
|
||||
|
||||
private val homeViewModel: HomeScreenViewModel by activityViewModels {
|
||||
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||
}
|
||||
private val homeViewModel: HomeScreenViewModel by activityViewModels()
|
||||
|
||||
@Suppress("ComplexMethod", "LongMethod")
|
||||
@CallSuper
|
||||
|
|
|
@ -33,7 +33,6 @@ import androidx.core.view.updateLayoutParams
|
|||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import androidx.navigation.fragment.navArgs
|
||||
|
@ -113,9 +112,7 @@ class HomeFragment : Fragment() {
|
|||
private val args by navArgs<HomeFragmentArgs>()
|
||||
private lateinit var bundleArgs: Bundle
|
||||
|
||||
private val homeViewModel: HomeScreenViewModel by activityViewModels {
|
||||
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||
}
|
||||
private val homeViewModel: HomeScreenViewModel by activityViewModels()
|
||||
|
||||
private val snackbarAnchorView: View?
|
||||
get() = when (requireContext().settings().toolbarPosition) {
|
||||
|
@ -331,9 +328,6 @@ class HomeFragment : Fragment() {
|
|||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
FragmentPreDrawManager(this).execute {
|
||||
val homeViewModel: HomeScreenViewModel by activityViewModels {
|
||||
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||
}
|
||||
homeViewModel.layoutManagerState?.also { parcelable ->
|
||||
sessionControlView!!.view.layoutManager?.onRestoreInstanceState(parcelable)
|
||||
}
|
||||
|
@ -622,9 +616,6 @@ class HomeFragment : Fragment() {
|
|||
|
||||
override fun onStop() {
|
||||
super.onStop()
|
||||
val homeViewModel: HomeScreenViewModel by activityViewModels {
|
||||
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||
}
|
||||
homeViewModel.layoutManagerState =
|
||||
sessionControlView!!.view.layoutManager?.onSaveInstanceState()
|
||||
}
|
||||
|
|
|
@ -17,7 +17,6 @@ import androidx.appcompat.app.AlertDialog
|
|||
import androidx.core.content.getSystemService
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.NavDirections
|
||||
import androidx.navigation.fragment.findNavController
|
||||
|
@ -67,9 +66,7 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
|
|||
private val bookmarkInteractor: BookmarkFragmentInteractor
|
||||
get() = _bookmarkInteractor!!
|
||||
|
||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels {
|
||||
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||
}
|
||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels()
|
||||
private val desktopFolders by lazy { DesktopFolders(requireContext(), showMobileRoot = false) }
|
||||
|
||||
private var pendingBookmarkDeletionJob: (suspend () -> Unit)? = null
|
||||
|
|
|
@ -12,7 +12,6 @@ import android.view.View
|
|||
import android.view.View.GONE
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.Navigation
|
||||
import kotlinx.android.synthetic.main.fragment_edit_bookmark.*
|
||||
|
@ -36,9 +35,7 @@ import org.mozilla.fenix.library.bookmarks.friendlyRootTitle
|
|||
*/
|
||||
class AddBookmarkFolderFragment : Fragment(R.layout.fragment_edit_bookmark) {
|
||||
|
||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels {
|
||||
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||
}
|
||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels()
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
|
|
@ -19,7 +19,6 @@ import androidx.appcompat.widget.Toolbar
|
|||
import androidx.core.content.ContextCompat
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.Navigation
|
||||
import androidx.navigation.fragment.findNavController
|
||||
|
@ -57,9 +56,7 @@ import org.mozilla.fenix.library.bookmarks.friendlyRootTitle
|
|||
class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
|
||||
|
||||
private val args by navArgs<EditBookmarkFragmentArgs>()
|
||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels {
|
||||
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||
}
|
||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels()
|
||||
private var bookmarkNode: BookmarkNode? = null
|
||||
private var bookmarkParent: BookmarkNode? = null
|
||||
private var initialParentGuid: String? = null
|
||||
|
|
|
@ -13,7 +13,6 @@ import android.view.View
|
|||
import android.view.ViewGroup
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.navArgs
|
||||
import kotlinx.android.synthetic.main.fragment_select_bookmark_folder.*
|
||||
|
@ -32,9 +31,7 @@ import org.mozilla.fenix.library.bookmarks.DesktopFolders
|
|||
|
||||
class SelectBookmarkFolderFragment : Fragment() {
|
||||
|
||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels {
|
||||
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||
}
|
||||
private val sharedViewModel: BookmarksSharedViewModel by activityViewModels()
|
||||
private var bookmarkNode: BookmarkNode? = null
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
|
|
|
@ -17,7 +17,6 @@ import androidx.appcompat.app.AppCompatDialogFragment
|
|||
import androidx.core.view.isVisible
|
||||
import androidx.core.view.updatePadding
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.navigation.fragment.findNavController
|
||||
import androidx.navigation.fragment.navArgs
|
||||
|
@ -295,9 +294,7 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler
|
|||
)
|
||||
}
|
||||
|
||||
private val homeViewModel: HomeScreenViewModel by activityViewModels {
|
||||
ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
|
||||
}
|
||||
private val homeViewModel: HomeScreenViewModel by activityViewModels()
|
||||
|
||||
private fun dismissTabTrayAndNavigateHome(sessionId: String) {
|
||||
homeViewModel.sessionToDelete = sessionId
|
||||
|
|
Loading…
Reference in New Issue
Block a user