Minor cleanups

emericg · Apr 15, 2024 · 0bec57c · 0bec57c
1 parent dceb169
commit 0bec57c
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 31 deletions.
diff --git a/.github/workflows/builds_desktop.yml b/.github/workflows/builds_desktop.yml
@@ -15,7 +15,7 @@ on:
 env:
   APP_NAME: "WatchFlower"
   APP_VERSION: "5.5"
-  QT_VERSION: "6.6.2"
+  QT_VERSION: "6.6.3"
 
 #-------------------------------------------------------------------------------
 # Workflow jobs

diff --git a/.github/workflows/builds_mobile.yml b/.github/workflows/builds_mobile.yml
@@ -15,7 +15,7 @@ on:
 env:
   APP_NAME: "WatchFlower"
   APP_VERSION: "5.5"
-  QT_VERSION: "6.6.2"
+  QT_VERSION: "6.6.3"
 
 #-------------------------------------------------------------------------------
 # Workflow jobs

diff --git a/README.md b/README.md
@@ -110,7 +110,6 @@ Please note that most Chinese devices have many names, usually no official manuf
 #### Dependencies
 
 You will need a C++17 compiler and Qt 6.5+ with the following 'additional librairies':  
-- Qt 5 Compatibility Module
 - Qt Connectivity
 - Qt Charts
 

diff --git a/assets/linux/watchflower.appdata.xml b/assets/linux/watchflower.appdata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2018-2024 Emeric Grange <emeric.grange@gmail.com> -->
+<!-- Copyright 2018 Emeric Grange <emeric.grange@gmail.com> -->
 
 <component type="desktop-application">
   <id>io.emeric.watchflower</id>
   <name>WatchFlower</name>
   <launchable type="desktop-id">watchflower.desktop</launchable>
 
-  <summary>A plant monitoring application for Bluetooth Low Energy sensors and thermometers like Xiaomi 'Flower Care' or Parrot 'Flower Power'</summary>
+  <summary>A plant monitoring application for Bluetooth Low Energy sensors and thermometers</summary>
   <description>
     <p>WatchFlower is a plant monitoring application that reads and plots data from compatible Bluetooth Low Energy sensors like Xiaomi "Flower Care" and "Ropot" or Parrot "Flower Power" and "Parrot Pot", as well as many thermometers and air quality sensors!</p>
     <p>It works with international and Chinese Xiaomi devices, doesn't require an account creation, your GPS location, nor any other personal data from you!</p>
@@ -28,7 +28,7 @@
   </description>
 
   <releases>
-    <release version="5.5" date="2024-02-01" />
+    <release version="5.5" date="2024-04-11"> <url type="details">https://github.com/emericg/WatchFlower/releases/tag/v5.5</url> </release>
     <release version="5.4" date="2024-01-17" />
     <release version="5.3" date="2023-10-03" />
     <release version="5.2" date="2023-06-30" />
@@ -48,8 +48,10 @@
   <metadata_license>CC0-1.0</metadata_license>
   <content_rating type="oars-1.1" />
 
-  <developer_name>Emeric Grange</developer_name>
-  <updatecontact>emeric.grange@gmail.com</updatecontact>
+  <developer id="io.emeric">
+    <name>Emeric Grange</name>
+  </developer>
+
   <url type="homepage">https://emeric.io/WatchFlower</url>
   <url type="contact">https://emeric.io/WatchFlower/support.html</url>
   <url type="bugtracker">https://github.com/emericg/WatchFlower/issues</url>

diff --git a/assets/linux/watchflower.flatpak.yml b/assets/linux/watchflower.flatpak.yml
@@ -47,8 +47,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz
-        sha256: b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b
+        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz
+        sha256: 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -67,8 +67,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qttools-everywhere-src-6.6.2.tar.xz
-        sha256: e6d49e9f52111287f77878ecb8b708cce682f10b03ba2476d9247603bc6c4746
+        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qttools-everywhere-src-6.7.0.tar.xz
+        sha256: c8da6b239e82fe1e23465cbf0936c0da5a334438d3fb433e19c503cbb1abee7b
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -83,8 +83,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtshadertools-everywhere-src-6.6.2.tar.xz
-        sha256: 628bead7ff4e7f42cb910f47d2adefbdea0d8c71a0234baef8ca709bf467b92f
+        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtshadertools-everywhere-src-6.7.0.tar.xz
+        sha256: 3e13f967c62f0815c901e754cbc472a2e19170da0c7a505230d559615f7998af
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -101,8 +101,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtdeclarative-everywhere-src-6.6.2.tar.xz
-        sha256: c39ce9a7c4468f7399c9ced0fbe6ef9c8d6550efc4b893297aa3cfb965b3d84c
+        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtdeclarative-everywhere-src-6.7.0.tar.xz
+        sha256: 5a0c39579a74d7cca581162c866ed0887287d4f8d5abff7ab9492d4a58fa9e2c
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -117,8 +117,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtwayland-everywhere-src-6.6.2.tar.xz
-        sha256: 9bcdd5cef7ae304e3e0435dac495367ccfb010d09f664b596ba330361941dd78
+        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz
+        sha256: d73470e4217da388d8cd2a517ee8bb373853f33c569306e80f04397845157aea
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -135,8 +135,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtimageformats-everywhere-src-6.6.2.tar.xz
-        sha256: 71584c9136d4983ad19fa2d017abbae57b055eb90c62a36bf3f45d6d21a87cb3
+        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtimageformats-everywhere-src-6.7.0.tar.xz
+        sha256: 516ce07ec8dd5a11c59816fe33ddb71d4f691d0ebbc1798ac338f23b86c029a7
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -151,8 +151,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtsvg-everywhere-src-6.6.2.tar.xz
-        sha256: 5a231d59ef1b42bfbaa5174d4ff39f8e1b4ba070ef984a70b069b4b2576d8181
+        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtsvg-everywhere-src-6.7.0.tar.xz
+        sha256: 1518f40e08ff5e6153a6e26e5b95b033413ac143b70795dc1317e7f73ebf922d
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -167,8 +167,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtconnectivity-everywhere-src-6.6.2.tar.xz
-        sha256: a36f51085883ef8ae5782826d15cef261355a822eba76ccc323f3f0b81defab7
+        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtconnectivity-everywhere-src-6.7.0.tar.xz
+        sha256: 07afd6aac19ff73c8ba1471057f43d4ef2737d6a8a772393ec907988dd71244c
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -183,8 +183,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtcharts-everywhere-src-6.6.2.tar.xz
-        sha256: b1486262ee07b4420b8cdd1525c01800186b15d4fee0669cf544fdd5e941f5f4
+        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtcharts-everywhere-src-6.7.0.tar.xz
+        sha256: 899d5498c91bfb01fde2ff2438c82adf4d4d9b3cf646e7ad7b0036dbf32b7ca4
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -199,8 +199,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qt5compat-everywhere-src-6.6.2.tar.xz
-        sha256: e07b08ab7658e4856f07e3262ab342df4ed7e7a69f2720e56bb2128729191967
+        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qt5compat-everywhere-src-6.7.0.tar.xz
+        sha256: 9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5
         x-checker-data:
           type: anitya
           project-id: 7927

diff --git a/qml/MobileApplication.qml b/qml/MobileApplication.qml
@@ -549,8 +549,8 @@ ApplicationWindow {
         anchors.bottom: parent.bottom
         height: screenPaddingNavbar
 
-        visible: (mobileMenu.visible || appContent.state === "Tutorial")
-        opacity: appWindow.isTablet ? 0.5 : 1
+        visible: (!mobileMenu.visible || appContent.state === "Tutorial")
+        opacity: appWindow.isTablet ? 0.5 : 0.95
 
         color: {
             if (appContent.state === "Tutorial") return Theme.colorHeader

diff --git a/qml/MobileMenu.qml b/qml/MobileMenu.qml
@@ -30,7 +30,7 @@ Item {
     Rectangle { // background
         anchors.fill: parent
 
-        opacity: appWindow.isTablet ? 0.95 : 1
+        opacity: 0.95
         color: appWindow.isTablet ? Theme.colorTabletmenu : Theme.colorBackground
 
         Rectangle {

diff --git a/src/SettingsManager.cpp b/src/SettingsManager.cpp
@@ -407,7 +407,10 @@ void SettingsManager::setSysTray(const bool value)
 {
     if (m_systrayEnabled != value)
     {
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
         bool trayEnable_saved = m_systrayEnabled;
+#endif
+
         m_systrayEnabled = value;
         writeSettings();