lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(weather): read is_day from service instead of requiring callers to pass it.

Browse Source
This commit is contained in:
Lemmy
2026-04-02 16:26:36 -04:00
parent cd4ec47e96
commit 08e2d7f71c
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Cards/WeatherCard.qml
+2 -2
View File
@@ -117,7 +117,7 @@ NBox {
NIcon {
visible: !LocationService.taliaWeatherMascotActive || !weatherReady
anchors.centerIn: parent
icon: weatherReady ? LocationService.weatherSymbolFromCode(LocationService.data.weather.current_weather.weathercode, LocationService.data.weather.current_weather.is_day) : "weather-cloud-off"
icon: weatherReady ? LocationService.weatherSymbolFromCode(LocationService.data.weather.current_weather.weathercode) : "weather-cloud-off"
pointSize: Style.fontSizeXXXL * 1.75
color: Color.mPrimary
}
@@ -132,7 +132,7 @@ NBox {
smooth: true
mipmap: true
asynchronous: true
source: Qt.resolvedUrl(LocationService.taliaWeatherImageFromCode(currentWeatherCode, isDayTime))
source: Qt.resolvedUrl(LocationService.taliaWeatherImageFromCode(currentWeatherCode))
}
}
}
Modules/DesktopWidgets/Widgets/DesktopWeather.qml
+2 -2
View File
@@ -64,7 +64,7 @@ DraggableDesktopWidget {
NIcon {
visible: !LocationService.taliaWeatherMascotActive || !weatherReady
anchors.centerIn: parent
icon: weatherReady ? LocationService.weatherSymbolFromCode(currentWeatherCode, LocationService.data.weather.current_weather.is_day) : "weather-cloud-off"
icon: weatherReady ? LocationService.weatherSymbolFromCode(currentWeatherCode) : "weather-cloud-off"
pointSize: Math.round(Style.fontSizeXXXL * 2 * widgetScale)
color: weatherReady ? Color.mPrimary : Color.mOnSurfaceVariant
}
@@ -79,7 +79,7 @@ DraggableDesktopWidget {
smooth: true
mipmap: true
asynchronous: true
source: Qt.resolvedUrl(LocationService.taliaWeatherImageFromCode(currentWeatherCode, LocationService.data.weather.current_weather.is_day))
source: Qt.resolvedUrl(LocationService.taliaWeatherImageFromCode(currentWeatherCode))
}
}
}
Modules/LockScreen/LockScreenPanel.qml
+2 -2
View File
@@ -497,7 +497,7 @@ Item {
NIcon {
visible: !LocationService.taliaWeatherMascotActive || !weatherReady
anchors.centerIn: parent
icon: weatherReady ? LocationService.weatherSymbolFromCode(LocationService.data.weather.current_weather.weathercode, LocationService.data.weather.current_weather.is_day) : "weather-cloud-off"
icon: weatherReady ? LocationService.weatherSymbolFromCode(LocationService.data.weather.current_weather.weathercode) : "weather-cloud-off"
pointSize: Style.fontSizeXXXL
color: Color.mPrimary
}
@@ -512,7 +512,7 @@ Item {
smooth: true
mipmap: true
asynchronous: true
source: Qt.resolvedUrl(LocationService.taliaWeatherImageFromCode(LocationService.data.weather.current_weather.weathercode, LocationService.data.weather.current_weather.is_day))
source: Qt.resolvedUrl(LocationService.taliaWeatherImageFromCode(LocationService.data.weather.current_weather.weathercode))
}
}
}
Services/Location/LocationService.qml
+4 -2
View File
@@ -322,7 +322,8 @@ Singleton {
}
// --------------------------------
function weatherSymbolFromCode(code, isDay) {
function weatherSymbolFromCode(code) {
var isDay = data.weather ? data.weather.current_weather.is_day : true;
if (code === 0)
return isDay ? "weather-sun" : "weather-moon";
if (code === 1 || code === 2)
@@ -347,7 +348,8 @@ Singleton {
}
// --------------------------------
function taliaWeatherImageFromCode(code, isDay) {
function taliaWeatherImageFromCode(code) {
var isDay = data.weather ? data.weather.current_weather.is_day : true;
if (code >= 40 && code <= 49)
return Quickshell.shellDir + "/Assets/Talia/TaliaDazed.png";
if (code >= 95 && code <= 99)