Merge branch 'release/0.4.0'

.github/ISSUE_TEMPLATE/feature_request.yml → .github/DISCUSSION_TEMPLATE/ideas.yml

@@ -1,6 +1,4 @@
-name: "💡 Feature Request"
-description: Create a new ticket for a new feature request
-title: "💡 <title>"
+title: "<title>"
 labels: ["question"]
 body:
   - type: textarea

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -2,6 +2,7 @@ name: "🐛 Bug Report"
 description: Create a new ticket for a bug.
 title: "🐛 <title>"
 labels: ["bug"]
+type: "Bug"
 body:
   - type: textarea
     id: description

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: "💡 Feature Request"
+    url: "https://github.com/DonutWare/Fladder/discussions/new?category=ideas"
+    about: "Suggest a new feature or enhancement."

.github/workflows/build.yml

@@ -300,7 +300,9 @@ jobs:
           path: fladder-windows
 
       - name: Compress Windows
-        run:  zip -r Fladder-Windows-${{needs.fetch-info.outputs.version_name}}.zip fladder-windows
+        run:  |
+          cd fladder-windows
+          zip -r ../Fladder-Windows-${{needs.fetch-info.outputs.version_name}}.zip .
       
       - name: Download Artifacts iOS
         uses: actions/download-artifact@v4
@@ -327,7 +329,9 @@ jobs:
           path: fladder-linux
 
       - name: Compress Linux
-        run: zip -r Fladder-Linux-${{needs.fetch-info.outputs.version_name}}.zip fladder-linux
+        run: |
+          cd fladder-linux
+          zip -r ../Fladder-Linux-${{needs.fetch-info.outputs.version_name}}.zip .
 
       - name: Download Artifacts Web
         uses: actions/download-artifact@v4
@@ -336,7 +340,9 @@ jobs:
           path: fladder-web
 
       - name: Compress Web
-        run: zip -r Fladder-Web-${{needs.fetch-info.outputs.version_name}}.zip fladder-web
+        run: |
+          cd fladder-web
+          zip -r ../Fladder-Web-${{needs.fetch-info.outputs.version_name}}.zip .
 
       - name: Release
         uses: softprops/action-gh-release@v2

.github/workflows/checks.yaml

@@ -26,5 +26,10 @@ jobs:
       - name: Get dependencies
         run: flutter pub get
 
-      - name: Linting
-        run: flutter analyze --no-fatal-infos --no-fatal-warnings
+      - name: Setup dart
+        uses: dart-lang/setup-dart@v1
+
+      - name: Analyze Dart      
+        uses: invertase/github-action-dart-analyzer@v3
+        with:
+          custom-lint: true

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
 	"cSpell.words": [
-		"Jellyfin"
+		"Jellyfin",
+		"jellyfin"
 	],
 	"dart.flutterSdkPath": ".fvm/versions/3.24.3",
 	"search.exclude": {

.vscode/tasks.json

@@ -84,6 +84,24 @@
 			"options": {
 				"cwd": "${workspaceFolder}"
 			}
+		},
+		{
+			"type": "flutter",
+			"command": "dart",
+			"args": [
+				"run",
+				"build_runner",
+				"watch"
+			],
+			"problemMatcher": [
+				"$dart-build_runner"
+			],
+			"group": "build",
+			"label": "dart: dart pub run build_runner watch",
+			"detail": "",
+			"runOptions": {
+				"runOn": "folderOpen"
+			}
 		}
 	],
 }

build.yaml

@@ -3,7 +3,9 @@ targets:
     sources:
       - lib/$lib$
       - "**/models/**.dart"
+      - "**/models/**/**.dart"
       - "**/providers/**.dart"
+      - "**/providers/**/**.dart"
       - lib/util/**.dart
       - lib/jellyfin/**.dart
       - "**/**_screen.dart"
@@ -33,16 +35,17 @@ targets:
           ignoreNull: true
           discriminatorKey: type
           generateMethods: [decode, encode, copy, stringify]
+      chopper_generator:
+        options:
+          header: "//Generated jellyfin api code"
+          include_if_null: false
       swagger_dart_code_generator:
         options:
           input_folder: "swagger/"
           output_folder: "lib/jellyfin/"
+          generate_for: swagger/**
           with_converter: true
           build_only_models: false
           with_base_url: false
           include_if_null: false
           auto_apply: dependents
-      chopper_generator:
-        options:
-          header: "//Generated jellyfin api code"
-          include_if_null: false

lib/l10n/app_en.arb

@@ -34,7 +34,7 @@
   "@appLockAutoLogin": {},
   "appLockBiometrics": "Biometrics",
   "@appLockBiometrics": {},
-  "appLockPasscode": "Passcode",
+  "appLockPasscode": "Pass-code",
   "@appLockPasscode": {},
   "appLockTitle": "Set the log-in method for {userName}",
   "@appLockTitle": {
@@ -137,7 +137,7 @@
   "@days": {},
   "delete": "Delete",
   "@delete": {},
-  "deleteFileFromSystem": "Deleting this item {item} will delete it from both the file system and your media library.\nAre you sure you wish to continue?",
+  "deleteFileFromSystem": "Deleting this item {item} will delete it from both the file system and your media library. Are you sure you wish to continue?",
   "@deleteFileFromSystem": {
     "description": "Delete file from system",
     "placeholders": {
@@ -175,7 +175,7 @@
   "@discovered": {},
   "displayLanguage": "Display language",
   "@displayLanguage": {},
-  "downloadsClearDesc": "Remove all synced data, clearing\nall data for every synced user?",
+  "downloadsClearDesc": "Remove all synced data, clearing all data for every synced user?",
   "@downloadsClearDesc": {},
   "downloadsClearTitle": "Clear synced data",
   "@downloadsClearTitle": {},
@@ -332,7 +332,7 @@
   "@logout": {},
   "logoutUserPopupContent": "This will log out {userName} and delete the user from the app.\nYou will have to log back in on {serverName}.",
   "@logoutUserPopupContent": {
-    "description": "Pop-up for loging out the user description",
+    "description": "Pop-up for logging out the user description",
     "placeholders": {
       "userName": {
         "type": "String"
@@ -344,7 +344,7 @@
   },
   "logoutUserPopupTitle": "Log out {userName}?",
   "@logoutUserPopupTitle": {
-    "description": "Pop-up for loging out the user",
+    "description": "Pop-up for logging out the user",
     "placeholders": {
       "userName": {
         "type": "String"
@@ -486,7 +486,7 @@
   "@password": {},
   "pathClearTitle": "Clear downloads path",
   "@pathClearTitle": {},
-  "pathEditDesc": "This location is set for all users, any synced data will no longer be accessible.\nIt will remain on your storage.",
+  "pathEditDesc": "This location is set for all users, any synced data will no longer be accessible. It will remain on your storage.",
   "@pathEditDesc": {},
   "pathEditSelect": "Select downloads destination",
   "@pathEditSelect": {},
@@ -547,7 +547,7 @@
       }
     }
   },
-  "reWatch": "Rewatch",
+  "reWatch": "Re-watch",
   "@reWatch": {},
   "read": "Read {item}",
   "@read": {
@@ -807,7 +807,7 @@
   },
   "subtitleConfigurator": "Subtitle configurator",
   "@subtitleConfigurator": {},
-  "subtitleConfiguratorPlaceHolder": "This is placeholder text, \n nothing to see here.",
+  "subtitleConfiguratorPlaceHolder": "This is placeholder text, nothing to see here.",
   "@subtitleConfiguratorPlaceHolder": {},
   "subtitles": "Subtitles",
   "@subtitles": {},
@@ -826,7 +826,7 @@
   },
   "syncDeleteItemTitle": "Delete synced item",
   "@syncDeleteItemTitle": {},
-  "syncDeletePopupPermanent": "This action is permanent and will remove all localy synced files",
+  "syncDeletePopupPermanent": "This action is permanent and will remove all locally synced files",
   "@syncDeletePopupPermanent": {},
   "syncDetails": "Sync details",
   "@syncDetails": {},
@@ -1020,7 +1020,7 @@
   "@syncSelectDownloadsFolder": {},
   "syncNoFolderSetup": "No sync folder setup",
   "@syncNoFolderSetup": {},
-  "syncRemoveUnableToDeleteItem": "Unable to remove synced item, somethin went wrong",
+  "syncRemoveUnableToDeleteItem": "Unable to remove synced item, something went wrong",
   "@syncRemoveUnableToDeleteItem": {},
   "syncAddItemForSyncing": "Added {item} for syncing",
   "@syncAddItemForSyncing": {
@@ -1073,5 +1073,51 @@
   "off": "Off",
   "screenBrightness": "Screen brightness",
   "scale":"Scale",
-  "playBackSettings": "Playback Settings"
+  "playBackSettings": "Playback Settings",
+  "settingsAutoNextTitle": "Next-up preview",
+  "settingsAutoNextDesc": "Displays a next-up preview near the end if another item is queued",
+  "autoNextOffSmartTitle": "Smart",
+  "autoNextOffSmartDesc": "Shows the next-up screen when the credits start if no more then 10 seconds remain after the credits. Else it shows the next-up screen with 30 seconds of playtime remaining",
+  "autoNextOffStaticTitle": "Static",
+  "autoNextOffStaticDesc": "Show the next-up screen when 30 seconds of playtime remain",
+  "playbackRate": "Playback rate",
+  "speed": "Speed",
+  "unableToPlayMedia": "There was an error finding a compatible media type",
+  "errorOpeningMedia": "Something went wrong trying to play this media",
+  "unableToPlayBooksOnWeb": "Books are not supported on web for now",
+  "defaultFilterForLibrary": "Default filter for library",
+  "updateFilterForLibrary": "Update filter",
+  "removeFilterForLibrary": "Remove {filter}?",
+  "@removeFilterForLibrary": {
+    "description": "removeFilterForLibrary",
+    "placeholders": {
+      "filter":{
+        "type": "String"
+      }
+    }
+  },
+  "deleteFilterConfirmation": "Are you sure you want to delete this filter?",
+  "libraryFiltersLimitReached" : "Filter limit reached (10) remove some filters",
+  "libraryFiltersRemoveAll": "Remove all filters",
+  "libraryFiltersRemoveAllConfirm": "This will delete all saved filters for every library",
+  "playerSettingsOrientationTitle": "Player orientation",
+  "playerSettingsOrientationDesc": "Force the video player into certain orientations",
+  "deviceOrientationPortraitUp": "Portrait Up",
+  "deviceOrientationPortraitDown": "Portrait Down",
+  "deviceOrientationLandscapeLeft": "Landscape Left",
+  "deviceOrientationLandscapeRight": "Landscape Right",
+  "clientSettingsSchemeVariantTitle": "Scheme variant",
+  "schemeSettingsTonalSpot": "Tonal spot",
+  "schemeSettingsFidelity": "Fidelity",
+  "schemeSettingsMonochrome": "Monochrome",
+  "schemeSettingsNeutral": "Neutral",
+  "schemeSettingsVibrant": "Vibrant",
+  "schemeSettingsExpressive": "Expressive",
+  "schemeSettingsContent": "Content",
+  "schemeSettingsRainbow": "Rainbow",
+  "schemeSettingsFruitSalad": "Fruit salad",
+  "clientSettingsRequireWifiTitle": "Require Wi-Fi",
+  "clientSettingsRequireWifiDesc": "Only download when connected to a Wi-Fi network",
+  "libraryShuffleAndPlayItems": "Shuffle and play items",
+  "libraryPlayItems": "Play items"
 }

lib/l10n/app_es.arb

@@ -157,7 +157,7 @@
   },
   "descending": "Descendente",
   "@descending": {},
-  "director": "{count, plural, other{Directores} one{Director}}",
+  "director": "{count, plural, zero{Ningún director} one{Director} other{Directores}}",
   "@director": {
     "description": "director",
     "placeholders": {
@@ -682,7 +682,7 @@
     "description": "Usar para establecer un cierto valor",
     "context": "Establecer 'tiempo'"
   },
-  "setIdentityTo": "Establecer identidad a {name}",
+  "setIdentityTo": "Cambiar identidad a {name}",
   "@setIdentityTo": {
     "description": "setIdentityTo",
     "placeholders": {
@@ -1067,5 +1067,39 @@
         "type": "int"
       }
     }
-  }
+  },
+  "subtitleConfiguration": "Configuración de subtítulos",
+  "@subtitleConfiguration": {},
+  "screenBrightness": "Brillo de la pantalla",
+  "@screenBrightness": {},
+  "scale": "Escala",
+  "@scale": {},
+  "subtitle": "Subtitular",
+  "@subtitle": {},
+  "playBackSettings": "Configuración de reproducción",
+  "@playBackSettings": {},
+  "off": "Apagar",
+  "@off": {},
+  "settingsAutoNextTitle": "Vista previa a continuación",
+  "@settingsAutoNextTitle": {},
+  "settingsAutoNextDesc": "Muestra una vista previa de la siguiente entrada cerca del final si hay otro elemento en cola",
+  "@settingsAutoNextDesc": {},
+  "autoNextOffStaticTitle": "Estática",
+  "@autoNextOffStaticTitle": {},
+  "autoNextOffStaticDesc": "Mostrar la siguiente pantalla cuando queden 30 segundos de tiempo de reproducción",
+  "@autoNextOffStaticDesc": {},
+  "autoNextOffSmartTitle": "Elegante",
+  "@autoNextOffSmartTitle": {},
+  "playbackRate": "Velocidad de reproducción",
+  "@playbackRate": {},
+  "speed": "Velocidad",
+  "@speed": {},
+  "autoNextOffSmartDesc": "Muestra la siguiente pantalla cuando comienzan los créditos, si no quedan más de 10 segundos después de los créditos. Si no muestra la siguiente pantalla con 30 segundos de tiempo de reproducción restante",
+  "@autoNextOffSmartDesc": {},
+  "unableToPlayMedia": "Hubo un error al encontrar un tipo de medio compatible",
+  "@unableToPlayMedia": {},
+  "errorOpeningMedia": "Algo sucedió al reproducir este medio",
+  "@errorOpeningMedia": {},
+  "unableToPlayBooksOnWeb": "Los libros no se pueden consultar en la web por ahora",
+  "@unableToPlayBooksOnWeb": {}
 }