fix conflict

bubendorf · Jun 29, 2023 · 7d7f7f9 · 7d7f7f9
1 parent fd4bac1
commit 7d7f7f9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/mattecarra/accapp/fragments/ProfilesFragment.kt b/app/src/main/java/mattecarra/accapp/fragments/ProfilesFragment.kt
@@ -101,7 +101,7 @@ class ProfilesFragment : ScopedFragment(),
         profilesRecycler.adapter = mProfilesAdapter
         profilesRecycler.layoutManager = LinearLayoutManager(mContext)
 
-        mProfilesViewModel = ViewModelProvider.of(this).get(ProfilesViewModel::class.java)
+        mProfilesViewModel = ViewModelProviders(this).get(ProfilesViewModel::class.java)
 
         // Observe data
         mProfilesViewModel.getLiveData().observe(viewLifecycleOwner, Observer { profiles ->

diff --git a/app/src/main/java/mattecarra/accapp/fragments/SchedulesFragment.kt b/app/src/main/java/mattecarra/accapp/fragments/SchedulesFragment.kt
@@ -41,7 +41,7 @@ class SchedulesFragment : ScopedFragment(), OnScheduleClickListener {
 
 
         activity?.let { activity ->
-            viewModel = ViewModelProvider.of(activity).get(SchedulesViewModel::class.java)
+            viewModel = ViewModelProvider(activity).get(SchedulesViewModel::class.java)
 
             adapter = ScheduleProfileListAdapter(activity)
             adapter.setOnClickListener(this)

diff --git a/app/src/main/java/mattecarra/accapp/fragments/ScriptesFragment.kt b/app/src/main/java/mattecarra/accapp/fragments/ScriptesFragment.kt
@@ -66,7 +66,7 @@ class ScriptesFragment : ScopedFragment(), OnScriptClickListener
         binding.scriptsRecyclerView.adapter = mScriptesAdapter
         binding.scriptsRecyclerView.layoutManager = LinearLayoutManager(mContext)
 
-        mScriptsViewModel = ViewModelProvider.of(this).get(ScriptsViewModel::class.java)
+        mScriptsViewModel = ViewModelProvider(this).get(ScriptsViewModel::class.java)
 
         // Observe data
         mScriptsViewModel.getLiveData().observe(viewLifecycleOwner, Observer { scripts ->