Merge branch 'develop'

.github/workflows/build.yml

@@ -4,6 +4,11 @@ on:
   push:
     branches:
       - master
+
+concurrency:
+  group: ci-release-${{ github.ref }}-1
+  cancel-in-progress: true
+
 jobs:
   build-main:
     name: Build Web - MAIN
@@ -23,7 +28,7 @@ jobs:
         uses: actions/checkout@v1
 
       - name: Setup Flutter
-        uses: subosito/flutter-action@v1
+        uses: subosito/flutter-action@v2
         with:
           flutter-version: '3.13.6'
           #channel: 'stable'

.github/workflows/flatpak.yml

@@ -6,6 +6,10 @@ on:
   #  branches:
   #    - master
 
+concurrency:
+  group: ci-release-${{ github.ref }}-1
+  cancel-in-progress: true
+
 env:
   project-id: com.invoiceninja.app
 
@@ -14,6 +18,7 @@ jobs:
     name: Build Flutter app
     env:
       api_secret: ${{secrets.api_secret}}
+      commit_secret: ${{secrets.commit_secret}}
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
@@ -58,8 +63,26 @@ jobs:
       - name: Upload app archive to workflow
         uses: actions/upload-artifact@v3
         with:
-          name: Invoice-Ninja-Archive
-          path: Invoice-Ninja-Linux-Portable.tar.gz
+          #name: Invoice-Ninja-Archive
+          #path: Invoice-Ninja-Linux-Portable.tar.gz
+          name: linux-artifacts
+          path: output/*
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: artifacts
+
+      - name: Create Draft Release & Upload artifacts
+        uses: marvinpinto/action-automatic-releases@v1.2.1
+        with:
+          repo_token: "${{secrets.commit_secret}}"
+          draft: true
+          prerelease: false
+          title: "Latest Release"
+          automatic_release_tag: "v5.0.128"
+          files: |
+            ${{ github.workspace }}/artifacts/linux-artifacts/*            
 
 #  build-flatpak:
 #    name: Build flatpak

flatpak/com.invoiceninja.app.desktop

@@ -3,10 +3,10 @@ Version=1.0
 Type=Application
 
 Name=Invoice Ninja
-Comment=An example app that counts
-Categories=Utility;Amusement;
+Comment=Create invoices, accept payments, track expenses & time tasks
+Categories=Productivity;
 
-Icon=com.example.FlutterApp
-Exec=flutter_flatpak_example
+Icon=com.invoiceninja.app
+Exec=invoiceninja_client
 Terminal=false
-StartupWMClass=flutter_flatpak_example
+StartupWMClass=invoiceninja_client

flatpak/com.invoiceninja.app.metainfo.xml

@@ -4,40 +4,29 @@
     https://www.freedesktop.org/software/appstream/metainfocreator/#/
 -->
 <component type="desktop-application">
-  <id>com.example.FlutterApp</id>
-  <name>Flutter App</name>
-  <summary>An example app that counts</summary>
-  <developer_name>Kristen McWilliam</developer_name>
-  <url type="homepage">https://github.com/Merrit/flutter_flatpak_example</url>
-  <metadata_license>MIT</metadata_license>
-  <project_license>MIT</project_license>
+  <id>com.invoiceninja.app</id>
+  <name>Invoice Ninja</name>
+  <summary>Create invoices, accept payments, track expenses &amp; time tasks</summary>
+  <developer_name>Hillel Coren</developer_name>
+  <url type="homepage">https://invoiceninja.com</url>
+  <metadata_license>AAL</metadata_license>
+  <project_license>AAL</project_license>
   <supports>
     <control>pointing</control>
     <control>keyboard</control>
     <control>touch</control>
   </supports>
   <description>
-    <p>Fast and beautiful counting app. For all your counting needs!</p>
-    <p>Features</p>
-    <ul>
-      <li>Counts!</li>
-      <li>Cooks!</li>
-      <li>Cleans!</li>
-      <li>Comets!</li>
-      <li>Dinosaurs!</li>
-      <li>.. Burritos?</li>
-      <li>Burritos!!</li>
-      <li></li>
-    </ul>
+    <p>Create invoices, accept payments, track expenses &amp; time tasks</p>
   </description>
-  <launchable type="desktop-id">com.example.FlutterApp.desktop</launchable>
+  <launchable type="desktop-id">com.invoiceninja.app.desktop</launchable>
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/Merrit/flutter_flatpak_example/main/screenshots/screenshot.png</image>
+      <image>https://github.com/invoiceninja/flutter-mobile/blob/master/samples/screenshots/1.png</image>
     </screenshot>
   </screenshots>
-  <content_rating type="oars-1.1" />
+  <content_rating type="oars-1.1"/>
   <releases>
-    <release version="1.0.0" date="2022-02-25" />
+    <release version="5.0.127" date="2023-10-31"/>
   </releases>
 </component>

lib/constants.dart

@@ -4,7 +4,7 @@ class Constants {
 }
 
 // TODO remove version once #46609 is fixed
-const String kClientVersion = '5.0.127';
+const String kClientVersion = '5.0.128';
 const String kMinServerVersion = '5.0.4';
 
 const String kAppName = 'Invoice Ninja';

pubspec.foss.yaml

@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Client for Invoice Ninja
-version: 5.0.127+127
+version: 5.0.128+128
 homepage: https://invoiceninja.com
 documentation: https://invoiceninja.github.io
 publish_to: none

pubspec.yaml

@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Client for Invoice Ninja
-version: 5.0.127+127
+version: 5.0.128+128
 homepage: https://invoiceninja.com
 documentation: https://invoiceninja.github.io
 publish_to: none

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: invoiceninja
-version: '5.0.127'
-summary: Create invoices, accept payments, track expenses & time-tasks
+version: '5.0.128'
+summary: Create invoices, accept payments, track expenses & time tasks
 description: "### Note: if the app fails to run using `snap run invoiceninja` it may help to run `/snap/invoiceninja/current/bin/invoiceninja` instead
 
 Create. Send. Get Paid.