🔀 Merge pull request #279 from AssistantNMS/develop

🔖 2.30.1

Author: Khaoz-Topsy

.github/workflows/flutterWeb.yml

@@ -7,13 +7,13 @@ permissions:
 
 # Allow one concurrent deployment
 concurrency:
-  group: 'pages'
+  group: "pages"
   cancel-in-progress: true
 
 on:
   workflow_dispatch:
   push:
-    branches: ['main']
+    branches: ["main"]
 
 jobs:
   build:
@@ -24,9 +24,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
-          channel: 'stable' # 'stable', 'beta', 'dev' or 'master'
+          channel: "stable" # 'stable', 'beta', 'dev' or 'master'
 
       - name: Write env file
         env:
@@ -41,9 +41,9 @@ jobs:
         run: flutter build web -t lib/prod.dart --release
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
-          path: 'build/web'
+          path: "build/web"
 
       - name: Deploy GitHub Pages site
-        uses: actions/deploy-pages@v1.2.2
+        uses: actions/deploy-pages@v4

.github/workflows/flutterWindows.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: "stable" # 'stable', 'beta', 'dev' or 'master'
 

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf"
+  revision: "b25305a8832cfc6ba632a7f87ad455e319dccce8"
   channel: "stable"
 
 project_type: app
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
-      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
+      base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
     - platform: android
-      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
-      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
+      base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
     - platform: ios
-      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
-      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
+      base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
     - platform: linux
-      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
-      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
+      base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
     - platform: macos
-      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
-      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
+      base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
     - platform: web
-      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
-      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
+      base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
     - platform: windows
-      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
-      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
+      base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8
 
   # User provided section
 

.vscode/settings.json

@@ -12,6 +12,7 @@
         "favourites",
         "Imgs",
         "lifeform",
+        "Lourens",
         "NMSUI",
         "Presentor",
         "RGBO",

android/app/src/main/AndroidManifest.xml

@@ -27,5 +27,4 @@
 	<meta-data android:name="flutterEmbedding" android:value="2" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-	<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 </manifest>

assets/data/alphabetTranslations.json

@@ -298,5 +298,25 @@
   {
     "AppId": "build1173",
     "Text": "Danger very deep water"
+  },
+  {
+    "AppId": "build1175",
+    "Text": "The world of fossils"
+  },
+  {
+    "AppId": "build1178",
+    "Text": "Relics"
+  },
+  {
+    "AppId": "build1188",
+    "Text": "Big time"
+  },
+  {
+    "AppId": "build1189",
+    "Text": "975"
+  },
+  {
+    "AppId": "build1190",
+    "Text": "Big big"
   }
 ]

assets/data/catalogue.json

@@ -81,6 +81,7 @@
       "prod17",
       "prod18",
       "cur84",
+      "cur337",
       "cook122",
       "conTech90",
       "conTech100",
@@ -181,6 +182,7 @@
       "cur15",
       "raw76",
       "cur21",
+      "cur335",
       "cur292",
       "cur17",
       "cur32",