Revert "Fix potential NPE"
This reverts commit 95798327e7cae6d27fc588447f6640a0c61faa60.
This commit is contained in:
parent
95798327e7
commit
d1b991fcbd
@ -22,11 +22,6 @@ class WeatherWidgetWM : ViewModel(), KoinComponent {
|
|||||||
|
|
||||||
private val dataStore: LauncherDataStore by inject()
|
private val dataStore: LauncherDataStore by inject()
|
||||||
|
|
||||||
val currentForecast = MutableLiveData<Forecast?>(getCurrentlySelectedForecast())
|
|
||||||
val dailyForecasts = MutableLiveData<List<DailyForecast>>(emptyList())
|
|
||||||
val currentDayForecasts = MutableLiveData<List<Forecast>>(emptyList())
|
|
||||||
val currentDailyForecast = MutableLiveData<DailyForecast>(null)
|
|
||||||
|
|
||||||
private var selectedDayIndex = 0
|
private var selectedDayIndex = 0
|
||||||
set(value) {
|
set(value) {
|
||||||
field = min(value, forecasts.lastIndex)
|
field = min(value, forecasts.lastIndex)
|
||||||
@ -71,6 +66,11 @@ class WeatherWidgetWM : ViewModel(), KoinComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val currentForecast = MutableLiveData<Forecast?>(getCurrentlySelectedForecast())
|
||||||
|
val dailyForecasts = MutableLiveData<List<DailyForecast>>(emptyList())
|
||||||
|
val currentDayForecasts = MutableLiveData<List<Forecast>>(emptyList())
|
||||||
|
val currentDailyForecast = MutableLiveData<DailyForecast>(null)
|
||||||
|
|
||||||
val hasLocationPermission = permissionsManager.hasPermission(PermissionGroup.Location).asLiveData()
|
val hasLocationPermission = permissionsManager.hasPermission(PermissionGroup.Location).asLiveData()
|
||||||
fun requestLocationPermission(context: AppCompatActivity) {
|
fun requestLocationPermission(context: AppCompatActivity) {
|
||||||
permissionsManager.requestPermission(context, PermissionGroup.Location)
|
permissionsManager.requestPermission(context, PermissionGroup.Location)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user