Merge pull request #36 from jellyflix-app/development

Development

.github/ISSUE_TEMPLATE/issue report.yml

@@ -0,0 +1,69 @@
+name: Issue Report
+description: File an issue report
+title: "[Issue]: "
+labels: [bug, triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! Please provide as much detail as necessary.
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Please describe your bug
+      description: Also tell us, what did you expect to happen?
+      placeholder: |
+        The more information that you are able to provide, the better. Did you do anything before this happened? Any screenshots or logs you can provide will be helpful.
+
+        This is my issue.
+
+        Steps to Reproduce
+          1. ...
+          2. ...
+          3. ...
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Jellyflix Version
+      description: What version of Jellyflix are you running?
+      options:
+        - 0.9.13
+        - Other
+    validations:
+      required: true
+  - type: input
+    id: version-other
+    attributes:
+      label: "if other:"
+      placeholder: Other
+  - type: dropdown
+    id: jellyfin-version
+    attributes:
+      label: Jellyfin Version
+      description: What version of Jellyfin are you running?
+      options:
+        - 10.8.13
+        - Other
+    validations:
+      required: true
+  - type: input
+    id: jellyfin-version-other
+    attributes:
+      label: "if other:"
+      placeholder: Other
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        Examples:
+        - **OS**: [iOS, Android, macOS, Windows, Linux]
+        - **OS Version**: [iOS 17.3, Android 12, macOS 14, Windows 10, Ubuntu 18.04 etc.]
+        - **Playback**: [Direct Play, Remux, Direct Stream, Transcode]
+      value: |
+        - OS:
+        - OS Version:
+        - Playback Method:
+      render: markdown
+

.github/workflows/deploy.yml

@@ -3,6 +3,12 @@ on:
   push:
     branches:
       - main
+      - development
+    paths-ignore:
+      - "README.md"
+      - "LICENSE"
+      - "CONTRIBUTING.md"
+      - "CODE_OF_CONDUCT.md"
 
 jobs:
   version:
@@ -175,6 +181,7 @@ jobs:
       run: sed -i '' 's/00.00.00+0/${{ steps.version.outputs.content }}+${{ github.run_number }}/g' pubspec.yaml
 
     - uses: johnyherangi/create-release-notes@main
+      if: ${{ github.ref == 'refs/heads/main' }}
       id: create-release-notes
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -437,6 +444,9 @@ jobs:
     steps:
       - name: Clone Repo
         uses: actions/checkout@v3
+
+      - name: Git:Enable long paths
+        run: git config --system core.longpaths true
 
       - name: Get version.txt
         uses: actions/download-artifact@v2
@@ -525,6 +535,7 @@ jobs:
           path: jellyflix-macos
 
       - uses: johnyherangi/create-release-notes@main
+        if: ${{ github.ref == 'refs/heads/main' }}
         id: create-release-notes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -537,9 +548,10 @@ jobs:
           tag: ${{ steps.version.outputs.content }}
           commit: ${{ github.sha }}
           body: ${{ steps.create-release-notes.outputs.release-notes }}
+          prerelease: ${{ github.ref == 'refs/heads/development' }}
 
   release-play-store:
-    name: Release app to open testing track
+    name: Release app to play store
     needs: [build_android]
     runs-on: ubuntu-latest
     steps:
@@ -548,11 +560,20 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: jellyflix-appbundle
-      - name: Release app to open testing track
+      - name: Release app to internal testing track
+        if: ${{ github.ref == 'refs/heads/development' }}
         uses: r0adkll/upload-google-play@v1
         with:
           serviceAccountJsonPlainText: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_KEY }}
           packageName: ${{ secrets.ANDROID_PACKAGE_NAME }}
           releaseFiles: app-release.aab
-          track: beta
-          status: draft
+          track: internal
+      # - name: Release app to open testing track
+      #   if: ${{ github.ref == 'refs/heads/main' }}
+      #   uses: r0adkll/upload-google-play@v1
+      #   with:
+      #     serviceAccountJsonPlainText: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_KEY }}
+      #     packageName: ${{ secrets.ANDROID_PACKAGE_NAME }}
+      #     releaseFiles: app-release.aab
+      #     track: beta
+      #     status: draft

README.md

@@ -1,23 +1,17 @@
-⚠️ Please keep in mind, that Jellyflix development is in its early days. There are several (visual) bugs and many features missing. If you don't like the state of Jellyflix client right now, you can help improve it by contributing 😉.
-
----
-
 # Jellyflix - Another Jellyfin client
+[![](https://img.shields.io/badge/matrix-000000?style=for-the-badge&logo=Matrix&logoColor=white)](https://matrix.to/#/%23jellyflix%3Amatrix.org)
 
 Jellyflix is a cross platform Jellyfin Client for Desktop (Mac, Windows, Linux) and Mobile (iOS, Android). It aims to be a simple to use and reliable Jellyfin client for video content. It supports downloads (coming soon).
 
 ## Download
 
-Supported platforms:
-- iOS (Build it yourself)
-- [Android](https://github.com/jellyflix-app/jellyflix/releases/latest/download/jellyflix.apk)
-- macOS (Build it yourself)
+- [iOS](https://testflight.apple.com/join/Nc1Jw9tc) (Testflight) (App Store coming soon)
+- [Android](https://github.com/jellyflix-app/jellyflix/releases/latest/download/jellyflix.apk) (Google Play coming soon)
+- [macOS](https://github.com/jellyflix-app/jellyflix/releases/latest/download/jellyflix.dmg)
 - [Windows](https://github.com/jellyflix-app/jellyflix/releases/latest/download/jellyflix-windows.zip) (untested)
-- [Linux](https://github.com/jellyflix-app/jellyflix/releases/latest/download/jellyflix-linux.zip) (untested)
+- [Linux](https://github.com/jellyflix-app/jellyflix/releases/latest/download/jellyflix-linux.zip) (needs additional dependencies, see [below](#linux))
 - [Web](https://jellyflix.kiejon.com) (technically works, but it's only intended for demo usage)
 
-I plan on releasing Jellyflix on the App Stores and Play Store in the future, when the app is stable enough.
-
 ## Contribute
 Contributions are much appreciated. You can help the development by:
 - opening issues/bug reports

ios/Podfile.lock

@@ -6,9 +6,6 @@ PODS:
     - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
-  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
   - media_kit_libs_ios_video (1.0.4):
     - Flutter
   - media_kit_native_event_loop (1.0.0):
@@ -26,7 +23,7 @@ PODS:
     - Flutter
   - sqflite (0.0.3):
     - Flutter
-    - FMDB (>= 2.7.5)
+    - FlutterMacOS
   - url_launcher_ios (0.0.1):
     - Flutter
   - volume_controller (0.0.1):
@@ -46,15 +43,11 @@ DEPENDENCIES:
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
-  - sqflite (from `.symlinks/plugins/sqflite/ios`)
+  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - volume_controller (from `.symlinks/plugins/volume_controller/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
-SPEC REPOS:
-  trunk:
-    - FMDB
-
 EXTERNAL SOURCES:
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
@@ -79,7 +72,7 @@ EXTERNAL SOURCES:
   screen_brightness_ios:
     :path: ".symlinks/plugins/screen_brightness_ios/ios"
   sqflite:
-    :path: ".symlinks/plugins/sqflite/ios"
+    :path: ".symlinks/plugins/sqflite/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   volume_controller:
@@ -92,16 +85,15 @@ SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_downloader: b7301ae057deadd4b1650dc7c05375f10ff12c39
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
-  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
-  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
+  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
+  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
 

ios/build/.last_build_id

@@ -0,0 +1 @@
+429f3cc30da3753cf181ad291d557290

l10n.yaml

@@ -0,0 +1,3 @@
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: app_localizations.dart

lib/components/desktop_image_banner.dart

@@ -7,6 +7,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:jellyflix/models/screen_paths.dart';
 import 'package:jellyflix/providers/api_provider.dart';
 import 'package:openapi/openapi.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class DesktopImageBanner extends StatefulHookConsumerWidget {
   final List<BaseItemDto> items;
@@ -70,7 +71,8 @@ class DestkopImageBannerState extends ConsumerState<DesktopImageBanner> {
                 Align(
                   alignment: Alignment.centerRight,
                   child: SizedBox(
-                    width: MediaQuery.of(context).size.width * 0.6,
+                    width: (MediaQuery.of(context).size.width * 0.6)
+                        .roundToDouble(),
                     child: ref.read(apiProvider).getImage(
                           borderRadius: BorderRadius.zero,
                           id: widget.items[index].id!,
@@ -90,7 +92,8 @@ class DestkopImageBannerState extends ConsumerState<DesktopImageBanner> {
                 Align(
                   alignment: Alignment.centerRight,
                   child: Container(
-                    width: MediaQuery.of(context).size.width * 0.6,
+                    width: (MediaQuery.of(context).size.width * 0.6)
+                        .roundToDouble(),
                     decoration: BoxDecoration(
                       gradient: LinearGradient(
                         begin: const Alignment(0.1, 0),
@@ -153,7 +156,7 @@ class DestkopImageBannerState extends ConsumerState<DesktopImageBanner> {
                                         extra: playbackInfo);
                                   }
                                 },
-                                label: const Text("Play"),
+                                label: Text(AppLocalizations.of(context)!.play),
                                 icon: const Icon(Icons.play_arrow_rounded),
                               ),
                               const SizedBox(
@@ -165,10 +168,10 @@ class DestkopImageBannerState extends ConsumerState<DesktopImageBanner> {
                                         path: ScreenPaths.detail,
                                         queryParameters: {
                                           "id": widget.items[index].id!,
-                                          "selectedIndex": "0",
                                         }).toString());
                                   },
-                                  child: const Text("More Info")),
+                                  child: Text(
+                                      AppLocalizations.of(context)!.moreInfo)),
                             ],
                           ),
                         ],