Merge branch 'release/0.3.0'

DonutWare · Oct 25, 2024 · 0fc77ab · 0fc77ab
2 parents 020562d + 612e914
commit 0fc77ab
Show file tree

Hide file tree

Showing 232 changed files with 12,156 additions and 2,518 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,14 +6,13 @@
 
 <!-- Please describe the problem that is being fixed and, if applicable, reference a GitHub issue -->
 
-Issue Number: N/A
+Resolves #issue-number
 
 ## Screenshots / Recordings
 
 <!-- This section is optional but highly recommended to show off your changes! -->
 
 ## Checklist
 
-- [ ] If a new package was added, did you ensure it works for all supported platforms? Is the package also well maintained?
-- [ ] Did you add localization for any text? If yes, did you sort the .arb file using ```arb_utils sort <INPUT_FILE>```?
-- [ ] Check that any changes are related to the issue at hand.
+- [ ] If a new package was added, did you ensure it works for all supported platforms? Is the package well maintained
+- [ ] Check that any changes are related to the issue at hand.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -63,26 +63,25 @@ jobs:
           flutter build apk --release \
             --build-name=$VERSION_NAME \
             --build-number=$GITHUB_RUN_NUMBER \
-            --dart-define=FLAVOR=release
+            --flavor production
 
           # Build AAB
           flutter build appbundle --release \
             --build-name=$VERSION_NAME \
             --build-number=$GITHUB_RUN_NUMBER \
-            --dart-define=FLAVOR=release
+            --flavor production
 
       - name: Rename APK and AAB
         run: |
-          mv build/app/outputs/flutter-apk/app-release.apk "build/app/outputs/flutter-apk/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.apk"
-          mv build/app/outputs/bundle/release/app-release.aab "build/app/outputs/bundle/release/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.aab"
+          mkdir -p build/app/outputs/android_artifacts
+          mv build/app/outputs/flutter-apk/app-production-release.apk "build/app/outputs/android_artifacts/${{ env.APP_NAME }}-Android-${{ env.VERSION_NAME }}.apk"
+          mv build/app/outputs/bundle/productionRelease/app-production-release.aab "build/app/outputs/android_artifacts/${{ env.APP_NAME }}-Android-${{ env.VERSION_NAME }}.aab"
 
       - name: Archive Android artifacts
         uses: actions/[email protected]
         with:
           name: ${{ env.APP_NAME }}-Android-${{ env.VERSION_NAME }}
-          path: |
-            build/app/outputs/flutter-apk/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.apk
-            build/app/outputs/bundle/release/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.aab
+          path: build/app/outputs/android_artifacts/            
 
   build-windows:
     #Use windows-2019, latest(2022) causes MSVCP140.dll related crashes
@@ -146,7 +145,7 @@ jobs:
           VERSION_NAME=$(grep '^version:' pubspec.yaml | cut -d ':' -f2 | cut -d '+' -f1 | tr -d ' ')
           echo "PACKAGE_NAME=$APP_NAME-iOS-$VERSION_NAME" >> $GITHUB_ENV
 
-          flutter build ipa --no-codesign --build-name=$VERSION_NAME --build-number=${{ github.run_number }}
+          flutter build ipa --no-codesign --flavor production --build-name=$VERSION_NAME --build-number=${{ github.run_number }} 
 
       - name: Create unsigned IPA
         run: |
@@ -186,17 +185,17 @@ jobs:
           VERSION_NAME=$(grep '^version:' pubspec.yaml | cut -d ':' -f2 | cut -d '+' -f1 | tr -d ' ')
           echo "PACKAGE_NAME=$APP_NAME-macOS-$VERSION_NAME" >> $GITHUB_ENV
 
-          flutter build macos --build-name=$VERSION_NAME --build-number=${{ github.run_number }}
+          flutter build macos --flavor production --build-name=$VERSION_NAME --build-number=${{ github.run_number }}
 
       - name: Create DMG file
         run: |
-          hdiutil create -format UDZO -srcfolder build/macos/Build/Products/Release/fladder.app build/macos/Build/Products/Release/${{ env.PACKAGE_NAME }}.dmg
+          hdiutil create -format UDZO -srcfolder build/macos/Build/Products/Release-production/fladder.app build/macos/Build/Products/Release-production/${{ env.PACKAGE_NAME }}.dmg
 
       - name: Archive macOS artifact
         uses: actions/[email protected]
         with:
           name: ${{ env.PACKAGE_NAME }}
-          path: build/macos/Build/Products/Release/${{ env.PACKAGE_NAME }}.dmg
+          path: build/macos/Build/Products/Release-production/${{ env.PACKAGE_NAME }}.dmg
 
   build-linux:
     runs-on: ubuntu-latest
@@ -220,7 +219,7 @@ jobs:
       - name: Get packages
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev patchelf
 
       - name: Build Linux app
         run: |
@@ -234,6 +233,14 @@ jobs:
             --build-name=$VERSION_NAME \
             --build-number=${{ github.run_number }}
 
+      - name: Fix RPATH
+        run: |
+          for lib in "build/linux/x64/release/bundle/lib"/*.so; do
+            [[ -f "$lib" && -n "$(patchelf --print-rpath "$lib")" ]] && \
+            patchelf --set-rpath '$ORIGIN' "$lib"
+          done
+          patchelf --set-rpath '$ORIGIN/lib' "build/linux/x64/release/bundle/Fladder"
+          
       - name: Archive Linux artifact
         uses: actions/upload-artifact@v4
         with:
@@ -274,6 +281,7 @@ jobs:
           path: build/web
 
       - name: Deploy to ghcr.io
+        if: startsWith(github.ref, 'refs/tags/v')
         uses: mr-smithers-excellent/docker-build-push@v6
         with:
           image: fladder
@@ -283,9 +291,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Github pages web
+        if: startsWith(github.ref, 'refs/tags/v')        
         run: flutter build web --base-href /${{ github.event.repository.name }}/ --release --build-number=$GITHUB_RUN_NUMBER
 
       - name: Deploy to GitHub Pages
+        if: startsWith(github.ref, 'refs/tags/v')        
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }} # Automatically provided by GitHub Actions

diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -26,24 +26,5 @@ jobs:
       - name: Get dependencies
         run: flutter pub get
 
-      - name: Install arb_utils to check sorting of translations
-        run: dart pub global activate arb_utils
-
-      - name: Copy translation file
-        run: cp ./lib/l10n/app_en.arb ./lib/l10n/app_en_sorted.arb
-
-      - name: Sort translation file alphabetically
-        run: arb_utils sort ./lib/l10n/app_en.arb
-
-      - name: Check sorted translations against english base
-        run: |
-          # Check if the contents of the destination file match the reference file
-          if cmp -s "./lib/l10n/app_en.arb" "./lib/l10n/app_en_sorted.arb"; then
-            echo "Translation entries are in alphabetical order."
-          else
-            echo "Translation entries are not in alphabetical order."
-            exit 1  # Fail the workflow if files are not the same
-          fi
-
       - name: Linting
         run: flutter analyze --no-fatal-infos --no-fatal-warnings
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,51 +5,62 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "fladder",
+			"name": "Fladder Development (debug)",
 			"request": "launch",
 			"type": "dart",
 			"args": [
-				"--web-port",
-				"8096"
-			],
+				"--flavor",
+				"development"
+			]
 		},
 		{
-			"name": "fladder (profile mode)",
+			"name": "Fladder Production (debug)",
 			"request": "launch",
 			"type": "dart",
-			"flutterMode": "profile",
 			"args": [
-				"--web-port",
-				"9090"
-			],
+				"--flavor",
+				"production"
+			]
 		},
 		{
-			"name": "fladder (release mode)",
+			"name": "Fladder Development (profile mode)",
 			"request": "launch",
 			"type": "dart",
-			"flutterMode": "release",
+			"flutterMode": "profile",
 			"args": [
-				"--web-port",
-				"9090"
-			],
+				"--flavor",
+				"development"
+			]
 		},
 		{
-			"name": "Android",
+			"name": "Fladder Production (profile mode)",
 			"request": "launch",
 			"type": "dart",
+			"flutterMode": "profile",
+			"args": [
+				"--flavor",
+				"production"
+			]
 		},
 		{
-			"name": "iPhone",
+			"name": "Fladder Development (release mode)",
 			"request": "launch",
 			"type": "dart",
-			"deviceId": "iphone"
+			"flutterMode": "release",
+			"args": [
+				"--flavor",
+				"development"
+			]
 		},
 		{
-			"name": "Windows",
+			"name": "Fladder Production (release mode)",
 			"request": "launch",
 			"type": "dart",
-			"flutterMode": "debug",
-			"deviceId": "windows"
+			"flutterMode": "release",
+			"args": [
+				"--flavor",
+				"production"
+			]
 		},
 		{
 			"name": "Web",
@@ -72,20 +83,5 @@
 				"9090"
 			],
 		},
-		{
-			"name": "AndroidTV",
-			"request": "launch",
-			"program": "lib/android_tv/main.dart",
-			"type": "dart",
-		},
 	],
-	"compounds": [
-		{
-			"name": "All Devices",
-			"configurations": [
-				"Windows",
-				"Android"
-			],
-		}
-	]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -75,10 +75,15 @@
 			"command": "dart",
 			"args": [
 				"run",
-				"icons_launcher:create"
+				"icons_launcher:create",
+				"--flavors",
+				"development,production"
 			],
-			"label": "dart: generate launcher icons",
-			"detail": ""
+			"label": "dart: generate icons_launcher",
+			"detail": "",
+			"options": {
+				"cwd": "${workspaceFolder}"
+			}
 		}
 	],
 }
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 
 <h1 align="center">
   <br>
-    <a href="https://github.com/DonutWare/Fladder"><img src="https://github.com/DonutWare/Fladder/blob/develop/icons/fladder_macos_icon.png?raw=true" alt="Fladder" width="200"></a>
+    <a href="https://github.com/DonutWare/Fladder"><img src="https://raw.githubusercontent.com/DonutWare/Fladder/refs/heads/develop/icons/production/fladder_macos_icon.png" alt="Fladder" width="200"></a>
   <br>
   Fladder
   <br>
@@ -12,18 +12,23 @@
 <p align="center">
   <a href="#key-features">Key Features</a> •
   <a href="#screenshots">Screenshots</a> •
-  <a href="#planned-features">Planned Featuress</a> •
+  <a href="#planned-features">Planned Features</a> •
   <a href="#download">Download</a> •
   <a href="#how-to-contribute">Contributing</a> •
   <a href="#credits">Credits</a> •
   <a href="#license">License</a>
 </p>
 
-<p align="center">
-  <a href="https://github.com/DonutWare/Fladder/actions/workflows/build.yml"><img src="https://github.com/DonutWare/Fladder/actions/workflows/build.yml/badge.svg?branch=develop" alt="Build" /></a>
-  <a href="https://github.com/DonutWare/Fladder/releases/latest"> <img alt="GitHub Downloads (all assets, all releases)" src="https://img.shields.io/github/downloads/DonutWare/fladder/total"></a>
-  <a href="https://github.com/DonutWare/Fladder/releases/latest"> <img alt="GitHub Release" src="https://img.shields.io/github/v/release/DonutWare/fladder?display_name=tag"></a>   
-</p>
+<div align="center">
+
+  [![Build](https://github.com/DonutWare/Fladder/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/DonutWare/Fladder/actions/workflows/build.yml)
+  [![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/DonutWare/fladder/total)](https://github.com/DonutWare/Fladder/releases/latest)
+  [![GitHub Release](https://img.shields.io/github/v/release/DonutWare/fladder?display_name=tag)](https://github.com/DonutWare/Fladder/releases/latest)
+  [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
+
+</div>
+
+
 
 ## Key Features
 
@@ -64,7 +69,8 @@
    <img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Sync.png?raw=true" alt="Fladder" width="1280">    
 </details>
 
-Web/Desktop [try it out the web build!](https://DonutWare.github.io/Fladder)
+Web/Desktop [try out the web build!](https://DonutWare.github.io/Fladder)
+#### Notice: The github hosted web build only allows https connections. This is a limitation on githubs end, for self-hosted versions http works fine. 
 
 ## Planned Features
 
@@ -81,9 +87,13 @@ The latest release executeables for Windows, MacOS, iOS, Android and Web can be
 The Android app is currently in testing you can help testing by joining this group https://groups.google.com/g/fladder
 
 <a href='https://play.google.com/store/apps/details?id=nl.jknaapen.fladder&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' width=250/></a>
+<!-- 
+### AltStore
+The iOS app can be installed through AltStore by adding this repo
 
-## How to Contribute
+<a href='https://shorturl.at/Pj7Z7'><img alt='Get it on AltStore' src='https://camo.githubusercontent.com/d09e24361b730206b40f7c3a5950a17ba3341e67c533e27c155ddb34f0440b44/68747470733a2f2f692e696d6775722e636f6d2f343671684541762e706e67' width=250/></a> -->
 
+## How to Contribute
 Interest in contributing? Here are a couple of ways you can help:
 
 ### 🐛 Reporting Bugs
@@ -96,6 +106,11 @@ Interest in contributing? Here are a couple of ways you can help:
 - For new features or large changes, please open a discussion or issue first to ensure that no one else is already working on it.
 - **Keep pull requests short and focused**: try to avoid fixing multiple issues in a single pull request. This helps make the review process smoother and quicker.
 
+### 🌐 Translations 
+<a href="https://hosted.weblate.org/engage/fladder/">
+<img src="https://hosted.weblate.org/widget/fladder/fladder/multi-auto.svg" alt="Translation status" />
+</a>
+
 Thank you for helping to make this project better! 🙌
 
 

diff --git a/altstore.json b/altstore.json
@@ -1,13 +1,13 @@
 {
-	"name": "PartyDonut's Repository",
+	"name": "DonutWare Repository",
 	"subtitle": "A source for Fladder and co.",
 	"iconURL": "https://avatars.githubusercontent.com/u/42371342",
 	"tintColor": "#3A2101",
 	"apps": [
 	  {
 	    "name": "Fladder",
 	    "bundleIdentifier": "nl.jknaapen.fladder",
-	    "developerName": "PartyDonut",
+	    "developerName": "DonutWare",
 	    "localizedDescription": "A Simple Jellyfin Frontend built on top of Flutter.",
 	    "iconURL": "https://github.com/DonutWare/Fladder/raw/develop/icons/fladder_macos_icon.png?raw=true",
 	    "category": "entertainment",
@@ -26,14 +26,22 @@
 	      }
 	    ],
 	    "versions": [
-	      {
-	        "version": "0.2.5",
-	        "buildVersion": "52",
-	        "date": "2024-10-16",
-            "size": 28835840,
-	        "downloadURL": "https://github.com/DonutWare/Fladder/releases/download/v0.2.5/fladder-iOS-0.2.5.ipa",
-	        "minOSVersion": "13"
-	      }
+			{
+				"version": "0.2.6",
+				"buildVersion": "56",
+				"date": "2024-10-18",
+				"size": 29129014,
+				"downloadURL": "https://github.com/DonutWare/Fladder/releases/download/v0.2.6/fladder-iOS-0.2.6.ipa",
+				"minOSVersion": "13"
+			},
+			{
+				"version": "0.2.5",
+				"buildVersion": "52",
+				"date": "2024-10-16",
+				"size": 28835840,
+				"downloadURL": "https://github.com/DonutWare/Fladder/releases/download/v0.2.5/fladder-iOS-0.2.5.ipa",
+				"minOSVersion": "13"
+			}
 	    ]
 	  }
 	],