refactor(flavors): remove candidate flavor and merge with beta

.github/workflows/build.yml

@@ -15,7 +15,6 @@ on:
         options:
           - edge
           - beta
-          - candidate
           - stable
 
 jobs:
@@ -201,5 +200,4 @@ jobs:
     secrets:
       DISCORD_WEBHOOK_EDGE: ${{ secrets.DISCORD_WEBHOOK_EDGE }}
       DISCORD_WEBHOOK_BETA: ${{ secrets.DISCORD_WEBHOOK_BETA }}
-      DISCORD_WEBHOOK_CANDIDATE: ${{ secrets.DISCORD_WEBHOOK_CANDIDATE }}
       DISCORD_WEBHOOK_STABLE: ${{ secrets.DISCORD_WEBHOOK_STABLE }}

.github/workflows/notify.yml

@@ -15,8 +15,6 @@ on:
         required: true
       DISCORD_WEBHOOK_BETA:
         required: true
-      DISCORD_WEBHOOK_CANDIDATE:
-        required: true
       DISCORD_WEBHOOK_STABLE:
         required: true
 
@@ -36,7 +34,6 @@ jobs:
         env:
           DISCORD_WEBHOOK_EDGE: ${{ secrets.DISCORD_WEBHOOK_EDGE }}
           DISCORD_WEBHOOK_BETA: ${{ secrets.DISCORD_WEBHOOK_BETA }}
-          DISCORD_WEBHOOK_CANDIDATE: ${{ secrets.DISCORD_WEBHOOK_CANDIDATE }}
           DISCORD_WEBHOOK_STABLE: ${{ secrets.DISCORD_WEBHOOK_STABLE }}
           BUILD_FLAVOR: ${{ inputs.build-flavor }}
         with:
@@ -44,7 +41,6 @@ jobs:
           script: |
             switch (process.env.BUILD_FLAVOR) {
               case 'beta': return process.env.DISCORD_WEBHOOK_BETA;
-              case 'candidate': return process.env.DISCORD_WEBHOOK_CANDIDATE;
               case 'stable': return process.env.DISCORD_WEBHOOK_STABLE;
               case 'edge':
               default: return process.env.DISCORD_WEBHOOK_EDGE;

.github/workflows/prepare.yml

@@ -64,7 +64,6 @@ jobs:
             if (flavor) switch (flavor) {
               case 'edge':
               case 'beta':
-              case 'candidate':
               case 'stable':
                 return flavor;
             }

.github/workflows/publish_android.yml

@@ -44,11 +44,10 @@ jobs:
           script: |
             const ref = process.env.FLAVOR || 'edge';
             switch (ref) {
-              case 'beta': return 'alpha';
+              case 'beta': return 'beta';
-              case 'candidate': return 'beta';
               case 'stable': return 'production';
               case 'edge':
-              default: return 'internal';
+              default: return 'alpha';
             }
 
       - name: Generate Changelog

.github/workflows/publish_web.yml

@@ -64,7 +64,6 @@ jobs:
             const ref = process.env.FLAVOR || 'edge';
             switch (ref) {
               case 'beta': return '11ef2676-fc31-41b5-897b-fd21273d87ed';
-              case 'candidate': return '4636e6a1-17ef-45a2-a2b6-3d1c166fd1df';
               case 'stable': return '6634f0b1-323c-4a2f-bd0b-8f1f388673a9';
               case 'edge':
               default: return '325e197e-55f4-449a-b2bb-6831fe47bf2a';

assets/changelog_stable.json

@@ -1,46 +1,39 @@
 {
-  "motd": "Welcome to LunaSea v10.2.3!\n\nThis update adds the ability to open Tautulli library items directly in Plex and more details about activity streams.",
+  "motd": "Welcome to LunaSea v10.2.4!\n\nThis update adds direct links to the documentation to correctly set up service notifications, as well as fixes underlying issues with network image caching and text rendering due to the fading edge on horizontally scrollable text.",
   "feat": {
-    "tautulli": [
+    "settings": [
       {
-        "commit": "5cf1a06cec079aa66c77425c0ed8d4fa7897bbd3",
+        "commit": "0f4ac9a893d5b13a732db49e0bfc7b09fe7c05d9",
-        "message": "add ability to open media in Plex"
+        "message": "add direct link to documentation for service notifications"
       },
       {
-        "commit": "6de806316efaa61c5ddbac1b8f5b214949f0bcf8",
+        "commit": "5ce12795e7223a543bd037151b1a3eaa484f2634",
-        "message": "display audio language, subtitle language, and video dynamic range for activity"
+        "message": "replace all strings with localizable strings"
-      }
-    ],
-    "flutter": [
-      {
-        "commit": "6241ee462989f1f65fa8f1e18378579e2e77197b",
-        "message": "replace Skia with Impeller rendering engine"
-      },
-      {
-        "commit": "f1b831a118e56c480aae72042ee4eb7013f954b2",
-        "message": "upgrade to Flutter 3.7.7/1837b5be5f"
       }
     ]
   },
   "fix": {
-    "links": [
+    "images": [
       {
-        "commit": "596eab4bad1aa183e3c0dfc8d20a32c15ecdb78d",
+        "commit": "f1a82c06aa58fe493af2b2b0bf9ef8a93011802b",
-        "message": "use platform default method to launch URLs"
+        "message": "more efficiently cache persistent network images"
       }
     ],
-    "http": [
+    "uiux": [
       {
-        "commit": "aca5d0eb826b38ebeec33e3495045bf21e8a49c7",
+        "commit": "781727abbab0dc70d959c723c3d101e66430ac60",
-        "message": "correctly set content type for POST requests"
+        "message": "remove fading edge on horizontal scroll-views"
       }
     ],
-    "macos": [
+    "flutter": [
       {
-        "commit": "d612ae221cac741b3a36893d4bc7f05f5055c7b8",
+        "commit": "605002f5bd4b015791d3d1f260e03b4127c5020d",
-        "message": "set minimum platform version to 10.15"
+        "message": "remove unused packages"
+      },
+      {
+        "commit": "4b149b58d0eaab53a39917152ff224f7b6e93c0f",
+        "message": "translations update from Weblate"
       }
     ]
-  },
+  }
-  "refactor": {}
 }

lib/system/flavor.dart

@@ -5,13 +5,11 @@ import 'package:lunasea/widgets/ui.dart';
 
 const FLAVOR_EDGE = 'edge';
 const FLAVOR_BETA = 'beta';
-const FLAVOR_CANDIDATE = 'candidate';
 const FLAVOR_STABLE = 'stable';
 
 enum LunaFlavor {
   EDGE(FLAVOR_EDGE),
   BETA(FLAVOR_BETA),
-  CANDIDATE(FLAVOR_CANDIDATE),
   STABLE(FLAVOR_STABLE);
 
   final String key;
@@ -23,8 +21,6 @@ enum LunaFlavor {
         return LunaFlavor.EDGE;
       case FLAVOR_BETA:
         return LunaFlavor.BETA;
-      case FLAVOR_CANDIDATE:
-        return LunaFlavor.CANDIDATE;
       case FLAVOR_STABLE:
         return LunaFlavor.STABLE;
     }
@@ -35,13 +31,10 @@ enum LunaFlavor {
 
   static bool get isEdge => current == LunaFlavor.EDGE;
   static bool get isBeta => current == LunaFlavor.BETA;
-  static bool get isCandidate => current == LunaFlavor.CANDIDATE;
   static bool get isStable => current == LunaFlavor.STABLE;
 }
 
 extension LunaFlavorExtension on LunaFlavor {
-  // Returns true if the running build's flavor is "lower" than or equal to the called-on flavor.
-  /// For example, a running build of `beta` is lower than `candidate` but is not lower than `edge`.
   bool isRunningFlavor() {
     LunaFlavor flavor = LunaFlavor.current;
     if (flavor == this) return true;
@@ -51,8 +44,6 @@ extension LunaFlavorExtension on LunaFlavor {
         return false;
       case LunaFlavor.BETA:
         return flavor == LunaFlavor.EDGE;
-      case LunaFlavor.CANDIDATE:
-        return flavor == LunaFlavor.EDGE || flavor == LunaFlavor.BETA;
       case LunaFlavor.STABLE:
         return true;
     }
@@ -65,8 +56,6 @@ extension LunaFlavorExtension on LunaFlavor {
         return '$base/${this.key}/';
       case LunaFlavor.BETA:
         return '$base/${this.key}/';
-      case LunaFlavor.CANDIDATE:
-        return '$base/${this.key}/';
       case LunaFlavor.STABLE:
         return '$base/${this.key}/';
     }
@@ -78,8 +67,6 @@ extension LunaFlavorExtension on LunaFlavor {
         return 'lunasea.Edge'.tr();
       case LunaFlavor.BETA:
         return 'lunasea.Beta'.tr();
-      case LunaFlavor.CANDIDATE:
-        return 'lunasea.Candidate'.tr();
       case LunaFlavor.STABLE:
         return 'lunasea.Stable'.tr();
     }
@@ -90,8 +77,6 @@ extension LunaFlavorExtension on LunaFlavor {
       case LunaFlavor.EDGE:
         return LunaColours.red;
       case LunaFlavor.BETA:
-        return LunaColours.orange;
-      case LunaFlavor.CANDIDATE:
         return LunaColours.blue;
       case LunaFlavor.STABLE:
         return LunaColours.accent;

lib/types/log_type.dart

@@ -28,7 +28,7 @@ enum LunaLogType {
   bool get enabled {
     switch (this) {
       case LunaLogType.DEBUG:
-        return LunaFlavor.CANDIDATE.isRunningFlavor();
+        return LunaFlavor.BETA.isRunningFlavor();
       default:
         return true;
     }

package.json

@@ -39,7 +39,6 @@
     "release:changelog": "npm run release -- --dry-run",
     "release:flavor:edge": "cross-env HUSKY=0 git commit --no-verify --allow-empty -m \"release(testflight): edge\" -m \"[skip ci]\"",
     "release:flavor:beta": "cross-env HUSKY=0 git commit --no-verify --allow-empty -m \"release(testflight): beta\" -m \"[skip ci]\"",
-    "release:flavor:candidate": "cross-env HUSKY=0 git commit --no-verify --allow-empty -m \"release(testflight): candidate\" -m \"[skip ci]\"",
     "release:prepare": "npm run cocoapods:nuke && npm run generate && npm run fastlane:update"
   },
   "devDependencies": {