From 56de2002c66d3f200740c26a10699b4f6a47ad81 Mon Sep 17 00:00:00 2001
From: Emeric <emeric.grange@gmail.com>
Date: Wed, 9 Mar 2022 17:38:40 +0100
Subject: [PATCH] Work on CI builds, plus minor cleanups

---
 .github/workflows/builds_desktop.yml       | 19 +++++++++++++------
 .github/workflows/flatpak.yml              |  4 ++--
 assets/android/build.gradle                |  4 ++--
 qml/components_generic/DataBarCompact.qml  |  2 +-
 qml/components_generic/RoundButtonIcon.qml |  1 -
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/builds_desktop.yml b/.github/workflows/builds_desktop.yml
index 5ab0855..6de6298 100644
--- a/.github/workflows/builds_desktop.yml
+++ b/.github/workflows/builds_desktop.yml
@@ -131,12 +131,12 @@ jobs:
           modules: qt5compat qtimageformats qtcharts
           cached: 'false'
 
-      # Install NSIS
-      - name: Install NSIS
-        run: |
-             Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
-             scoop bucket add extras
-             scoop install nsis
+      # Install NSIS (already installed in 'windows-2022')
+      #- name: Install NSIS
+      #  run: |
+      #       Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
+      #       scoop bucket add extras
+      #       scoop install nsis
 
       # Build application
       - name: Build application
@@ -150,6 +150,13 @@ jobs:
         run: |
              sh deploy_windows.sh -c -p
 
+      # Upload ZIP
+      - name: Upload ZIP
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{env.EXECUTABLE}}-${{env.VERSION}}-win64.zip
+          path: ${{env.EXECUTABLE}}-${{env.VERSION}}-win64.zip
+
       # Upload NSIS installer
       - name: Upload NSIS installer
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 2796749..e44df4c 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -16,13 +16,13 @@ jobs:
   build-flatpak:
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15
+      image: bilelmoussaoui/flatpak-github-actions:freedesktop-21.08
       options: --privileged
     steps:
     - uses: actions/checkout@v2
     - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
       name: "Flatpak build"
       with:
-        bundle: watchflower.flatpak
+        bundle: qmlapptemplate.flatpak
         manifest-path: assets/linux/qmlapptemplate.flatpak.yml
         cache-key: flatpak-builder-${{ github.sha }}
diff --git a/assets/android/build.gradle b/assets/android/build.gradle
index f4034b2..358cbbe 100644
--- a/assets/android/build.gradle
+++ b/assets/android/build.gradle
@@ -58,8 +58,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     lintOptions {
diff --git a/qml/components_generic/DataBarCompact.qml b/qml/components_generic/DataBarCompact.qml
index c31afde..718e246 100644
--- a/qml/components_generic/DataBarCompact.qml
+++ b/qml/components_generic/DataBarCompact.qml
@@ -213,7 +213,7 @@ Item {
                 height: 15
                 anchors.verticalCenter: textIndicator.verticalCenter
                 anchors.leftMargin: 8
-                anchors.left:  textIndicator.right
+                anchors.left: textIndicator.right
 
                 color: Theme.colorRed
                 opacity: (warning && value > -20 && value < limitMin) ? 1 : 0
diff --git a/qml/components_generic/RoundButtonIcon.qml b/qml/components_generic/RoundButtonIcon.qml
index 12dd0d0..c8d935a 100644
--- a/qml/components_generic/RoundButtonIcon.qml
+++ b/qml/components_generic/RoundButtonIcon.qml
@@ -88,7 +88,6 @@ Item {
         Behavior on opacity { NumberAnimation { duration: 333 } }
     }
 
-
     ////////////////////////////////////////////////////////////////////////////
 
     IconSvg { // contentItem