From 404c13d4c1d5bc887a45733018a87cee26056fc2 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Tue, 26 Jul 2022 17:31:14 +0200
Subject: [PATCH] Improve FeedViewModel factory

---
 .../schabi/newpipe/local/feed/FeedFragment.kt |  4 +--
 .../newpipe/local/feed/FeedViewModel.kt       | 28 ++++++++-----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
index f0ebabd85..899163050 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -135,8 +135,8 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         _feedBinding = FragmentFeedBinding.bind(rootView)
         super.onViewCreated(rootView, savedInstanceState)
 
-        val factory = FeedViewModel.Factory(requireContext(), groupId)
-        viewModel = ViewModelProvider(this, factory).get(FeedViewModel::class.java)
+        val factory = FeedViewModel.getFactory(requireContext(), groupId)
+        viewModel = ViewModelProvider(this, factory)[FeedViewModel::class.java]
         showPlayedItems = viewModel.getShowPlayedItemsFromPreferences()
         showFutureItems = viewModel.getShowFutureItemsFromPreferences()
         viewModel.stateLiveData.observe(viewLifecycleOwner) { it?.let(::handleResult) }
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt
index fd8c5f5de..896d815bd 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt
@@ -5,7 +5,8 @@ import androidx.core.content.edit
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
 import androidx.preference.PreferenceManager
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Flowable
@@ -139,21 +140,16 @@ class FeedViewModel(
         private fun getShowFutureItemsFromPreferences(context: Context) =
             PreferenceManager.getDefaultSharedPreferences(context)
                 .getBoolean(context.getString(R.string.feed_show_future_items_key), true)
-    }
-
-    class Factory(
-        private val context: Context,
-        private val groupId: Long = FeedGroupEntity.GROUP_ALL_ID
-    ) : ViewModelProvider.Factory {
-        @Suppress("UNCHECKED_CAST")
-        override fun <T : ViewModel> create(modelClass: Class<T>): T {
-            return FeedViewModel(
-                context.applicationContext,
-                groupId,
-                // Read initial value from preferences
-                getShowPlayedItemsFromPreferences(context.applicationContext),
-                getShowFutureItemsFromPreferences(context.applicationContext)
-            ) as T
+        fun getFactory(context: Context, groupId: Long) = viewModelFactory {
+            initializer {
+                FeedViewModel(
+                    context.applicationContext,
+                    groupId,
+                    // Read initial value from preferences
+                    getShowPlayedItemsFromPreferences(context.applicationContext),
+                    getShowFutureItemsFromPreferences(context.applicationContext)
+                )
+            }
         }
     }
 }