Update viewmodels usage in the sample app

evant · Apr 3, 2021 · ac7972e · ac7972e
1 parent 72222ad
commit ac7972e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 26 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -33,6 +33,9 @@ android {
     buildFeatures {
         dataBinding = true
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
@@ -42,6 +45,7 @@ dependencies {
     implementation project(':bindingcollectionadapter-viewpager2')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
+    implementation 'androidx.fragment:fragment-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentDiffRecyclerView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentDiffRecyclerView.kt
@@ -5,16 +5,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.viewModels
 import me.tatarka.bindingcollectionadapter.sample.databinding.DiffRecyclerViewBinding
 
 class FragmentDiffRecyclerView : Fragment() {
-    private lateinit var viewModel: ImmutableViewModel
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        viewModel = ViewModelProvider(this).get(ImmutableViewModel::class.java)
-    }
+    private val viewModel: ImmutableViewModel by viewModels()
 
     override fun onCreateView(
         inflater: LayoutInflater,

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentListView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentListView.kt
@@ -5,15 +5,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
 import me.tatarka.bindingcollectionadapter.sample.databinding.ListViewBinding
 
 class FragmentListView : Fragment() {
-    private lateinit var viewModel: MutableViewModel
+    private val viewModel: MutableViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProvider(this).get(MutableViewModel::class.java)
         viewModel.setCheckable(true)
     }
 

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentPagedRecyclerView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentPagedRecyclerView.kt
@@ -5,16 +5,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.viewModels
 import me.tatarka.bindingcollectionadapter.sample.databinding.PagedRecyclerViewBinding
 
 class FragmentPagedRecyclerView : Fragment() {
-    private lateinit var viewModel: ImmutableViewModel
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        viewModel = ViewModelProvider(this).get(ImmutableViewModel::class.java)
-    }
+    private val viewModel: ImmutableViewModel by viewModels()
 
     override fun onCreateView(
         inflater: LayoutInflater,

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentRecyclerView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentRecyclerView.kt
@@ -5,15 +5,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.viewModels
 import me.tatarka.bindingcollectionadapter.sample.databinding.RecyclerViewBinding
 
 class FragmentRecyclerView : Fragment() {
-    private lateinit var viewModel: MutableViewModel
+    private val viewModel: MutableViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProvider(this).get(MutableViewModel::class.java)
         viewModel.setCheckable(true)
     }
 

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentSpinnerView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentSpinnerView.kt
@@ -5,16 +5,16 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
 
 import me.tatarka.bindingcollectionadapter.sample.databinding.SpinnerViewBinding
 
 class FragmentSpinnerView : Fragment() {
-    private lateinit var viewModel: MutableViewModel
+    private val viewModel: MutableViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProvider(this).get(MutableViewModel::class.java)
         viewModel.setCheckable(false)
     }
 

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentViewPager2View.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentViewPager2View.kt
@@ -5,16 +5,16 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.tabs.TabLayoutMediator
 import me.tatarka.bindingcollectionadapter.sample.databinding.Viewpager2ViewBinding
 
 class FragmentViewPager2View : Fragment() {
-    private lateinit var viewModel: MutableViewModel
+    private val viewModel: MutableViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProvider(this).get(MutableViewModel::class.java)
         viewModel.setCheckable(true)
     }
 

diff --git a/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentViewPagerView.kt b/app/src/main/java/me/tatarka/bindingcollectionadapter/sample/FragmentViewPagerView.kt
@@ -5,16 +5,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.viewModels
 import com.google.android.material.tabs.TabLayout
 import me.tatarka.bindingcollectionadapter.sample.databinding.ViewpagerViewBinding
 
 class FragmentViewPagerView : Fragment() {
-    private lateinit var viewModel: MutableViewModel
+    private val viewModel: MutableViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        viewModel = ViewModelProvider(this).get(MutableViewModel::class.java)
         viewModel.setCheckable(true)
     }