From ed75db2cf1a7ee66f3cff98199f301d658a9856f Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Mon, 3 Jan 2022 20:41:18 +0100 Subject: [PATCH] Fix use of imperialUnits preference in weather widget day selector --- .../ui/launcher/widgets/weather/WeatherWidget.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt index 17b8a053..812a9168 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt @@ -27,7 +27,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel import de.mm20.launcher2.ktx.tryStartActivity -import de.mm20.launcher2.preferences.LauncherPreferences import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.launcher.widgets.weather.WeatherWidgetWM import de.mm20.launcher2.ui.weather.AnimatedWeatherIcon @@ -69,7 +68,8 @@ fun WeatherWidget() { onDaySelected = { viewModel.selectDay(it) }, - modifier = Modifier.weight(1f) + modifier = Modifier.weight(1f), + imperialUnits = imperialUnits ) } val currentDayForecasts by viewModel.currentDayForecasts.observeAsState(emptyList()) @@ -209,10 +209,10 @@ fun WeatherDaySelector( modifier: Modifier = Modifier, days: List, selectedDay: DailyForecast, - onDaySelected: (Int) -> Unit + onDaySelected: (Int) -> Unit, + imperialUnits: Boolean ) { val menuExpanded = remember { mutableStateOf(false) } - val imperialUnits = LauncherPreferences.instance.imperialUnits val dateFormat = SimpleDateFormat("EEE") Row(modifier = modifier) { Row(