lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix use of imperialUnits preference in weather widget day selector

Browse Source
This commit is contained in:
MM20 2022-01-03 20:41:18 +01:00
parent d84bbe3011
commit ed75db2cf1
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
View File

@ -27,7 +27,6 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import de.mm20.launcher2.ktx.tryStartActivity import de.mm20.launcher2.ktx.tryStartActivity
import de.mm20.launcher2.preferences.LauncherPreferences
import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.R
import de.mm20.launcher2.ui.launcher.widgets.weather.WeatherWidgetWM import de.mm20.launcher2.ui.launcher.widgets.weather.WeatherWidgetWM
import de.mm20.launcher2.ui.weather.AnimatedWeatherIcon import de.mm20.launcher2.ui.weather.AnimatedWeatherIcon
@ -69,7 +68,8 @@ fun WeatherWidget() {
onDaySelected = { onDaySelected = {
viewModel.selectDay(it) viewModel.selectDay(it)
}, },
modifier = Modifier.weight(1f) modifier = Modifier.weight(1f),
imperialUnits = imperialUnits
) )
} }
val currentDayForecasts by viewModel.currentDayForecasts.observeAsState(emptyList()) val currentDayForecasts by viewModel.currentDayForecasts.observeAsState(emptyList())
@ -209,10 +209,10 @@ fun WeatherDaySelector(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
days: List<DailyForecast>, days: List<DailyForecast>,
selectedDay: DailyForecast, selectedDay: DailyForecast,
onDaySelected: (Int) -> Unit onDaySelected: (Int) -> Unit,
imperialUnits: Boolean
) { ) {
val menuExpanded = remember { mutableStateOf(false) } val menuExpanded = remember { mutableStateOf(false) }
val imperialUnits = LauncherPreferences.instance.imperialUnits
val dateFormat = SimpleDateFormat("EEE") val dateFormat = SimpleDateFormat("EEE")
Row(modifier = modifier) { Row(modifier = modifier) {
Row( Row(