refactor: Use Android viewmodel for application context

you-apps · Apr 20, 2024 · 8714544 · 8714544
1 parent 19bc6fd
commit 8714544
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/app/src/main/java/com/bnyro/clock/navigation/NavHost.kt b/app/src/main/java/com/bnyro/clock/navigation/NavHost.kt
@@ -27,7 +27,7 @@ fun AppNavHost(
     val alarmModel: AlarmModel = viewModel()
     val timerModel: TimerModel = viewModel()
     val stopwatchModel: StopwatchModel = viewModel()
-    val clockModel: ClockModel = viewModel(factory = ClockModel.Factory)
+    val clockModel: ClockModel = viewModel()
 
     NavHost(navController, startDestination = NavRoutes.Home.route, modifier = modifier) {
         composable(NavRoutes.Home.route,

diff --git a/app/src/main/java/com/bnyro/clock/presentation/screens/clock/model/ClockModel.kt b/app/src/main/java/com/bnyro/clock/presentation/screens/clock/model/ClockModel.kt
@@ -1,12 +1,8 @@
 package com.bnyro.clock.presentation.screens.clock.model
 
 import android.app.Application
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY
+import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
-import com.bnyro.clock.App
 import com.bnyro.clock.data.database.DatabaseHolder
 import com.bnyro.clock.domain.model.SortOrder
 import com.bnyro.clock.domain.model.TimeZone
@@ -21,12 +17,12 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
-class ClockModel(app: Application) : ViewModel() {
+class ClockModel(application: Application) : AndroidViewModel(application) {
     private val sortOrderPref =
         Preferences.instance.getString(Preferences.clockSortOrder, "").orEmpty()
     val sortOrder =
         MutableStateFlow(if (sortOrderPref.isNotEmpty()) SortOrder.valueOf(sortOrderPref) else SortOrder.ALPHABETIC)
-    private val countryTimezones = getCountryTimezones(app.applicationContext)
+    private val countryTimezones = getCountryTimezones(application.applicationContext)
     val timeZones = TimeHelper.getTimezonesForCountries(countryTimezones)
     var selectedTimeZones = combine(
         DatabaseHolder.instance.timeZonesDao().getAllStream(),
@@ -62,13 +58,4 @@ class ClockModel(app: Application) : ViewModel() {
         val time = TimeHelper.getTimeByZone(timeZone)
         return TimeHelper.formatDateTime(time, false)
     }
-
-    companion object {
-        val Factory = viewModelFactory {
-            initializer {
-                val application = this[APPLICATION_KEY] as App
-                ClockModel(application)
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/com/bnyro/clock/presentation/widgets/DigitalClockWidgetConfig.kt b/app/src/main/java/com/bnyro/clock/presentation/widgets/DigitalClockWidgetConfig.kt
@@ -130,7 +130,7 @@ fun DigitalClockWidgetSettings(
     onComplete: (DigitalClockWidgetOptions) -> Unit
 ) {
 
-    val clockModel: ClockModel = viewModel(factory = ClockModel.Factory)
+    val clockModel: ClockModel = viewModel()
     var showTimeZoneDialog by remember { mutableStateOf(false) }
 
     var customTimeZone by remember { mutableStateOf(options.timeZone) }