1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-25 05:52:50 -05:00

weather: m/s wind units and feels like

fixes #1463
fixes #1456
This commit is contained in:
bbedward
2026-01-22 14:44:40 -05:00
parent acdd1d2ec4
commit f24ecf1b99
6 changed files with 69 additions and 17 deletions

View File

@@ -47,10 +47,17 @@ Rectangle {
readonly property var humidity: WeatherService.formatPercent(root.forecastData?.humidity)
readonly property string humidityText: humidity ?? "--"
readonly property var wind: WeatherService.formatSpeed(root.forecastData?.wind)
readonly property var wind: {
SettingsData.windSpeedUnit;
SettingsData.useFahrenheit;
return WeatherService.formatSpeed(root.forecastData?.wind);
}
readonly property string windText: wind ?? "--"
readonly property var pressure: WeatherService.formatPressure(root.forecastData?.pressure)
readonly property var pressure: {
SettingsData.useFahrenheit;
return WeatherService.formatPressure(root.forecastData?.pressure);
}
readonly property string pressureText: pressure ?? "--"
readonly property var precipitation: root.forecastData?.precipitationProbability

View File

@@ -229,10 +229,17 @@ Item {
}
}
StyledText {
property var feelsLike: SettingsData.useFahrenheit ? (WeatherService.weather.feelsLikeF || WeatherService.weather.tempF) : (WeatherService.weather.feelsLike || WeatherService.weather.temp)
text: I18n.tr("Feels Like %1°", "weather feels like temperature").arg(feelsLike)
font.pixelSize: Theme.fontSizeSmall
color: Theme.withAlpha(Theme.surfaceText, 0.7)
}
StyledText {
text: WeatherService.weather.city || ""
font.pixelSize: Theme.fontSizeMedium
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
color: Theme.withAlpha(Theme.surfaceText, 0.7)
visible: text.length > 0
}
}
@@ -253,7 +260,7 @@ Item {
id: sunriseIcon
name: "wb_twilight"
size: Theme.iconSize - 6
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
color: Theme.withAlpha(Theme.surfaceText, 0.6)
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
}
@@ -272,7 +279,7 @@ Item {
}
}
font.pixelSize: Theme.fontSizeSmall
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
color: Theme.withAlpha(Theme.surfaceText, 0.6)
anchors.left: sunriseIcon.right
anchors.leftMargin: Theme.spacingXS
anchors.verticalCenter: parent.verticalCenter