From 32330744f369d3b6c738488f14392b52e5b0d361 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Thu, 13 Jan 2022 01:36:02 +0100 Subject: [PATCH] Add: Source to MainNavFragment's VM --- .../com/looker/droidify/ui/fragments/ExploreFragment.kt | 2 +- .../com/looker/droidify/ui/fragments/InstalledFragment.kt | 2 +- .../com/looker/droidify/ui/fragments/LatestFragment.kt | 2 +- .../droidify/ui/viewmodels/MainNavFragmentViewModelX.kt | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt index 6a1fd447..679f8a8b 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt @@ -36,7 +36,7 @@ class ExploreFragment : MainNavFragmentX() { super.onCreate(savedInstanceState) binding = FragmentExploreXBinding.inflate(inflater, container, false) binding.lifecycleOwner = this - val viewModelFactory = MainNavFragmentViewModelX.Factory(mainActivityX.db) + val viewModelFactory = MainNavFragmentViewModelX.Factory(mainActivityX.db, source) viewModel = ViewModelProvider(this, viewModelFactory) .get(MainNavFragmentViewModelX::class.java) diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt index 6cbf3f2b..1a5e6832 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt @@ -44,7 +44,7 @@ class InstalledFragment : MainNavFragmentX() { super.onCreate(savedInstanceState) binding = FragmentInstalledXBinding.inflate(inflater, container, false) binding.lifecycleOwner = this - val viewModelFactory = MainNavFragmentViewModelX.Factory(mainActivityX.db) + val viewModelFactory = MainNavFragmentViewModelX.Factory(mainActivityX.db, source) viewModel = ViewModelProvider(this, viewModelFactory) .get(MainNavFragmentViewModelX::class.java) diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt index afc4e291..8c932278 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt @@ -44,7 +44,7 @@ class LatestFragment : MainNavFragmentX() { super.onCreate(savedInstanceState) binding = FragmentLatestXBinding.inflate(inflater, container, false) binding.lifecycleOwner = this - val viewModelFactory = MainNavFragmentViewModelX.Factory(mainActivityX.db) + val viewModelFactory = MainNavFragmentViewModelX.Factory(mainActivityX.db, source) viewModel = ViewModelProvider(this, viewModelFactory) .get(MainNavFragmentViewModelX::class.java) diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt b/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt index 30de4146..b27ff37f 100644 --- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt +++ b/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt @@ -17,7 +17,7 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class MainNavFragmentViewModelX(val db: DatabaseX) : ViewModel() { +class MainNavFragmentViewModelX(val db: DatabaseX, source: Source) : ViewModel() { private val _order = MutableStateFlow(ProductItem.Order.LAST_UPDATE) private val _sections = MutableStateFlow(ProductItem.Section.All) @@ -117,11 +117,11 @@ class MainNavFragmentViewModelX(val db: DatabaseX) : ViewModel() { } } - class Factory(val db: DatabaseX) : ViewModelProvider.Factory { + class Factory(val db: DatabaseX, val source: Source) : ViewModelProvider.Factory { @Suppress("unchecked_cast") override fun create(modelClass: Class): T { if (modelClass.isAssignableFrom(MainNavFragmentViewModelX::class.java)) { - return MainNavFragmentViewModelX(db) as T + return MainNavFragmentViewModelX(db, source) as T } throw IllegalArgumentException("Unknown ViewModel class") }