rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

Add weather skill + fix by default

This commit is contained in:
j1nx 2021-05-01 16:16:35 +02:00
parent a3032d219f
commit 53024c6949
5 changed files with 155 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildroot-external/Config.in
View File

@ -192,5 +192,6 @@ menu "Mycroft A.I. Skills"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-mycroftgui/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-pairing/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-volume/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-weather/Config.in"
endmenu
endmenu

1
buildroot-external/configs/rpi4_64-gui_defconfig
View File

@ -603,3 +603,4 @@ BR2_PACKAGE_MYCROFT_SKILL_OVOS_HOMESCREEN=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_MYCROFTGUI=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_PAIRING=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_VOLUME=y
BR2_PACKAGE_MYCROFT_SKILL_WEATHER=y

126
buildroot-external/package/mycroft-skill-weather/0001-PR160.patch Normal file
View File

@ -0,0 +1,126 @@
From 4980419c2cbc39c521e171d101a661ad9b21b057 Mon Sep 17 00:00:00 2001
From: Aditya Mehra <aix.m@outlook.com>
Date: Fri, 30 Apr 2021 15:47:51 +0530
Subject: [PATCH 1/2] Fix text resizing issue remove autofit label
---
ui/ForecastDelegate.qml | 13 +++++++++----
ui/highlow.qml | 8 ++++++--
ui/weather.qml | 3 ++-
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ui/ForecastDelegate.qml b/ui/ForecastDelegate.qml
index a4db1ce..a989714 100644
--- a/ui/ForecastDelegate.qml
+++ b/ui/ForecastDelegate.qml
@@ -30,27 +30,32 @@ WeatherDelegate {
fillMode: Image.PreserveAspectFit
running: true
}
- Mycroft.AutoFitLabel {
+ Label {
font.weight: Font.Bold
- horizontalAlignment: Text.AlignLeft
+ horizontalAlignment: Text.AlignHCenter
Layout.fillWidth: true
Layout.preferredHeight: proportionalGridUnit * 15
+ font.pixelSize: parent.height * 0.50
text: modelData.date
}
- Mycroft.AutoFitLabel {
+ Label {
font.weight: Font.Bold
Layout.fillWidth: true
Layout.preferredHeight: proportionalGridUnit * 20
rightPadding: -font.pixelSize * 0.1
+ font.pixelSize: parent.height * 0.50
+ horizontalAlignment: Text.AlignHCenter
text: modelData.max + "°"
}
- Mycroft.AutoFitLabel {
+ Label {
font.styleName: "Thin"
Layout.fillWidth: true
Layout.preferredHeight: proportionalGridUnit * 20
rightPadding: -font.pixelSize * 0.1
+ font.pixelSize: parent.height * 0.50
+ horizontalAlignment: Text.AlignHCenter
text: modelData.min + "°"
}
}
diff --git a/ui/highlow.qml b/ui/highlow.qml
index 60d638d..33e2030 100644
--- a/ui/highlow.qml
+++ b/ui/highlow.qml
@@ -9,23 +9,27 @@ import org.kde.lottie 1.0
WeatherDelegate {
id: root
- Mycroft.AutoFitLabel {
+ Label {
id: maxTemp
font.weight: Font.Bold
Layout.fillWidth: true
Layout.preferredHeight: proportionalGridUnit * 40
+ font.pixelSize: parent.height * 0.50
//The off-centering to balance the ° should be proportional as well, so we use the computed pixel size
rightPadding: -font.pixelSize * 0.1
+ horizontalAlignment: Text.AlignHCenter
text: sessionData.max + "°"
}
- Mycroft.AutoFitLabel {
+ Label {
id: minTemp
Layout.fillWidth: true
Layout.preferredHeight: proportionalGridUnit * 40
+ font.pixelSize: parent.height * 0.50
rightPadding: -font.pixelSize * 0.1
font.weight: Font.Thin
font.styleName: "Thin"
+ horizontalAlignment: Text.AlignHCenter
text: sessionData.min + "°"
}
}
diff --git a/ui/weather.qml b/ui/weather.qml
index 0bd579a..a280a31 100644
--- a/ui/weather.qml
+++ b/ui/weather.qml
@@ -32,11 +32,12 @@ WeatherDelegate {
}
}
- Mycroft.AutoFitLabel {
+ Label {
id: temperature
font.weight: Font.Bold
Layout.fillWidth: true
Layout.preferredHeight: proportionalGridUnit * 40
+ font.pixelSize: parent.height * 0.65
rightPadding: -font.pixelSize * 0.1
text: sessionData.current + "°"
}
From aeb638aed01b416b1caa1d7a2639554bb9f8bfb5 Mon Sep 17 00:00:00 2001
From: Aditya Mehra <aix.m@outlook.com>
Date: Fri, 30 Apr 2021 17:10:52 +0530
Subject: [PATCH 2/2] make sure the background is black
---
ui/WeatherDelegate.qml | 1 +
1 file changed, 1 insertion(+)
diff --git a/ui/WeatherDelegate.qml b/ui/WeatherDelegate.qml
index 9b37739..540d8c7 100644
--- a/ui/WeatherDelegate.qml
+++ b/ui/WeatherDelegate.qml
@@ -7,6 +7,7 @@ import Mycroft 1.0 as Mycroft
Mycroft.ProportionalDelegate {
id: root
+ skillBackgroundColorOverlay: Qt.rgba(0, 0, 0, 1)
function getWeatherImagery(weathercode) {
switch(weathercode) {

7
buildroot-external/package/mycroft-skill-weather/Config.in Normal file
View File

@ -0,0 +1,7 @@
config BR2_PACKAGE_MYCROFT_SKILL_WEATHER
bool "mycroft-skill-weather"
help
Mycroft AI official Weather Skill, providing
weather conditions and forecasts.
https://github.com/MycroftAI/skill-weather

20
buildroot-external/package/mycroft-skill-weather/mycroft-skill-weather.mk Normal file
View File

@ -0,0 +1,20 @@
################################################################################
#
# mycroft-skill-weather
#
################################################################################
MYCROFT_SKILL_WEATHER_VERSION = b0194125e2e03d010949ed6c89a8cf9ce7931141
MYCROFT_SKILL_WEATHER_SITE = git://github.com/MycroftAI/skill-weather
MYCROFT_SKILL_WEATHER_SITE_METHOD = git
MYCROFT_SKILL_WEATHER_DIRLOCATION = home/mycroft/.local/share/mycroft/skills
MYCROFT_SKILL_WEATHER_DIRNAME = mycroft-weather.mycroftai
define MYCROFT_SKILL_WEATHER_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_WEATHER_DIRLOCATION)/$(MYCROFT_SKILL_WEATHER_DIRNAME)
cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_WEATHER_DIRLOCATION)/$(MYCROFT_SKILL_WEATHER_DIRNAME)
cp -dpfr $(MYCROFT_SKILL_WEATHER_DL_DIR)/git/.git* \
$(TARGET_DIR)/$(MYCROFT_SKILL_WEATHER_DIRLOCATION)/$(MYCROFT_SKILL_WEATHER_DIRNAME)
endef
$(eval $(generic-package))