blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: Removes deprecated usage of ViewModelProviders

master
Sawyer Blatz 2019-08-07 15:50:51 -07:00 committed by Emily Kager
parent ec4d62c895
commit 9d65e665e5
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/mozilla/fenix/FenixViewModelProvider.kt
View File

@ -7,7 +7,6 @@ package org.mozilla.fenix
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
import org.mozilla.fenix.mvi.ViewState import org.mozilla.fenix.mvi.ViewState
import org.mozilla.fenix.mvi.Change import org.mozilla.fenix.mvi.Change
import org.mozilla.fenix.mvi.UIComponentViewModelBase import org.mozilla.fenix.mvi.UIComponentViewModelBase
@ -28,7 +27,7 @@ object FenixViewModelProvider {
return object : UIComponentViewModelProvider<S, C> { return object : UIComponentViewModelProvider<S, C> {
override fun fetchViewModel(): T { override fun fetchViewModel(): T {
return ViewModelProviders.of(fragment, factory).get(modelClass) return ViewModelProvider(fragment, factory).get(modelClass)
} }
} }
} }

4
app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
View File

@ -15,7 +15,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
@ -132,7 +132,7 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler {
getSessionById()?.let { session -> getSessionById()?.let { session ->
val viewModel = activity!!.run { val viewModel = activity!!.run {
ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java) ViewModelProvider(this).get(CreateCollectionViewModel::class.java)
} }
val browserToolbarController = DefaultBrowserToolbarController( val browserToolbarController = DefaultBrowserToolbarController(

4
app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt
View File

@ -10,7 +10,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import kotlinx.android.synthetic.main.fragment_create_collection.view.* import kotlinx.android.synthetic.main.fragment_create_collection.view.*
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -44,7 +44,7 @@ class CreateCollectionFragment : DialogFragment() {
val view = inflater.inflate(R.layout.fragment_create_collection, container, false) val view = inflater.inflate(R.layout.fragment_create_collection, container, false)
viewModel = activity!!.run { viewModel = activity!!.run {
ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java) ViewModelProvider(this).get(CreateCollectionViewModel::class.java)
} }
collectionCreationComponent = CollectionCreationComponent( collectionCreationComponent = CollectionCreationComponent(

3
app/src/main/java/org/mozilla/fenix/components/StoreProvider.kt
View File

@ -7,7 +7,6 @@ package org.mozilla.fenix.components
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
import androidx.lifecycle.get import androidx.lifecycle.get
import mozilla.components.lib.state.Store import mozilla.components.lib.state.Store
@ -23,7 +22,7 @@ class StoreProvider<T : Store<*, *>>(
companion object { companion object {
fun <T : Store<*, *>> get(fragment: Fragment, createStore: () -> T): T { fun <T : Store<*, *>> get(fragment: Fragment, createStore: () -> T): T {
val factory = StoreProviderFactory(createStore) val factory = StoreProviderFactory(createStore)
val viewModel: StoreProvider<T> = ViewModelProviders.of(fragment, factory).get() val viewModel: StoreProvider<T> = ViewModelProvider(fragment, factory).get()
return viewModel.store return viewModel.store
} }
} }

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

@ -23,7 +23,7 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleObserver import androidx.lifecycle.LifecycleObserver
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.OnLifecycleEvent import androidx.lifecycle.OnLifecycleEvent
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.NavHostFragment.findNavController import androidx.navigation.fragment.NavHostFragment.findNavController
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
@ -202,7 +202,7 @@ class HomeFragment : Fragment(), AccountObserver {
private fun restoreLayoutState() { private fun restoreLayoutState() {
val homeViewModel = activity?.run { val homeViewModel = activity?.run {
ViewModelProviders.of(this).get(HomeScreenViewModel::class.java) ViewModelProvider(this).get(HomeScreenViewModel::class.java)
} }
homeViewModel?.layoutManagerState?.also { parcelable -> homeViewModel?.layoutManagerState?.also { parcelable ->
sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable) sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable)
@ -541,7 +541,7 @@ class HomeFragment : Fragment(), AccountObserver {
invokePendingDeleteJobs() invokePendingDeleteJobs()
super.onPause() super.onPause()
val homeViewModel = activity?.run { val homeViewModel = activity?.run {
ViewModelProviders.of(this).get(HomeScreenViewModel::class.java) ViewModelProvider(this).get(HomeScreenViewModel::class.java)
} }
homeViewModel?.layoutManagerState = homeViewModel?.layoutManagerState =
sessionControlComponent.view.layoutManager?.onSaveInstanceState() sessionControlComponent.view.layoutManager?.onSaveInstanceState()
@ -672,7 +672,7 @@ class HomeFragment : Fragment(), AccountObserver {
val tabs = getListOfSessions().toTabs() val tabs = getListOfSessions().toTabs()
val viewModel = activity?.run { val viewModel = activity?.run {
ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java) ViewModelProvider(this).get(CreateCollectionViewModel::class.java)
} }
viewModel?.tabs = tabs viewModel?.tabs = tabs
val selectedTabs = val selectedTabs =