Skip to content

Commit 1ca0e43

Browse files
PartyDonutPartyDonut
committed
Merge branch 'develop'
2 parents 40ec3e7 + d27bd41 commit 1ca0e43

229 files changed

Lines changed: 8169 additions & 4029 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ jobs:
3636
# Extract flutter_version from .fvmrc
3737
FLUTTER_VERSION=$(jq -r '.flutter' .fvmrc)
3838
echo "flutter_version=${FLUTTER_VERSION}" >> "$GITHUB_OUTPUT"
39+
40+
# Print flutter version for logging
41+
echo "Flutter version: $FLUTTER_VERSION"
3942
shell: bash
4043

4144
build-android:
@@ -84,10 +87,10 @@ jobs:
8487
check-latest: true
8588

8689
- name: Set up Flutter
87-
uses: subosito/flutter-action@v2.16.0
90+
uses: subosito/flutter-action@v2.19.0
8891
with:
8992
channel: "stable"
90-
flutter-version: ${{needs.fetch-info.outputs.flutter-version}}
93+
flutter-version: ${{needs.fetch-info.outputs.flutter_version}}
9194
cache: true
9295
cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
9396
cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
@@ -121,10 +124,10 @@ jobs:
121124
uses: actions/checkout@v4.1.1
122125

123126
- name: Set up Flutter
124-
uses: subosito/flutter-action@v2.16.0
127+
uses: subosito/flutter-action@v2.19.0
125128
with:
126129
channel: "stable"
127-
flutter-version: ${{needs.fetch-info.outputs.flutter-version}}
130+
flutter-version: ${{needs.fetch-info.outputs.flutter_version}}
128131
cache: true
129132
cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
130133
cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
@@ -164,10 +167,10 @@ jobs:
164167
uses: actions/checkout@v4.1.1
165168

166169
- name: Set up Flutter
167-
uses: subosito/flutter-action@v2.16.0
170+
uses: subosito/flutter-action@v2.19.0
168171
with:
169172
channel: "stable"
170-
flutter-version: ${{needs.fetch-info.outputs.flutter-version}}
173+
flutter-version: ${{needs.fetch-info.outputs.flutter_version}}
171174
cache: true
172175
cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
173176
cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
@@ -200,10 +203,10 @@ jobs:
200203
uses: actions/checkout@v4.1.1
201204

202205
- name: Set up Flutter
203-
uses: subosito/flutter-action@v2.16.0
206+
uses: subosito/flutter-action@v2.19.0
204207
with:
205208
channel: "stable"
206-
flutter-version: ${{needs.fetch-info.outputs.flutter-version}}
209+
flutter-version: ${{needs.fetch-info.outputs.flutter_version}}
207210
cache: true
208211
cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
209212
cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
@@ -214,8 +217,13 @@ jobs:
214217
- name: Build macOS app
215218
run: flutter build macos --flavor production --build-number=${{ github.run_number }}
216219

220+
- name: Ensure correct app name casing
221+
run: |
222+
APP_DIR="build/macos/Build/Products/Release-production"
223+
mv "$APP_DIR/fladder.app" "$APP_DIR/Fladder.app"
224+
217225
- name: Create DMG file
218-
run: hdiutil create -format UDZO -srcfolder build/macos/Build/Products/Release-production/fladder.app build/macos/Build/Products/Release-production/macOS.dmg
226+
run: hdiutil create -format UDZO -srcfolder build/macos/Build/Products/Release-production/Fladder.app build/macos/Build/Products/Release-production/macOS.dmg
219227

220228
- name: Archive macOS artifact
221229
uses: actions/upload-artifact@v4.0.0
@@ -232,10 +240,10 @@ jobs:
232240
uses: actions/checkout@v4.1.1
233241

234242
- name: Set up Flutter
235-
uses: subosito/flutter-action@v2.16.0
243+
uses: subosito/flutter-action@v2.19.0
236244
with:
237245
channel: "stable"
238-
flutter-version: ${{needs.fetch-info.outputs.flutter-version}}
246+
flutter-version: ${{needs.fetch-info.outputs.flutter_version}}
239247
cache: true
240248
cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
241249
cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
@@ -325,10 +333,10 @@ jobs:
325333
uses: actions/checkout@v4.1.1
326334

327335
- name: Set up Flutter
328-
uses: subosito/flutter-action@v2.16.0
336+
uses: subosito/flutter-action@v2.19.0
329337
with:
330338
channel: "stable"
331-
flutter-version: ${{needs.fetch-info.outputs.flutter-version}}
339+
flutter-version: ${{needs.fetch-info.outputs.flutter_version}}
332340
cache: true
333341
cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
334342
cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"

‎.vscode/launch.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,18 @@
1010
"type": "dart",
1111
"args": [
1212
"--flavor",
13-
"development"
13+
"development",
14+
]
15+
},
16+
{
17+
"name": "Fladder Development HTPC (debug)",
18+
"request": "launch",
19+
"type": "dart",
20+
"args": [
21+
"--flavor",
22+
"development",
23+
"-a",
24+
"--htpc",
1425
]
1526
},
1627
{

‎DEVELOPEMENT.md‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# 🚀 Fladder Dev Setup
2+
3+
## 🔧 Requirements
4+
5+
Ensure the following tools are installed:
6+
7+
- [Flutter SDK](https://flutter.dev/docs/get-started/install) (latest stable)
8+
- [Android Studio](https://developer.android.com/studio) (for Android development and emulators)
9+
- [VS Code](https://code.visualstudio.com/) with:
10+
- Flutter extension
11+
- Dart extension
12+
13+
Verify your Flutter setup with:
14+
15+
```bash
16+
flutter doctor
17+
```
18+
19+
## 🚀 Quick Start
20+
21+
```bash
22+
# Clone the repository
23+
git clone https://github.com/DonutWare/Fladder.git
24+
cd Fladder
25+
26+
# Install dependencies
27+
flutter pub get
28+
```
29+
30+
## 🐧 Linux Dependencies
31+
32+
If you're on **Linux**, install the `mpv` dependency:
33+
34+
```bash
35+
sudo apt install libmpv-dev
36+
```
37+
38+
## 🛠️ Running the App
39+
40+
1. **Connect a device** or launch an emulator.
41+
2. In VS Code:
42+
- Select the target device (bottom right corner).
43+
- Press `F5` or go to **Run > Start Debugging**.
44+
- If prompted, select **"Run Anyway"**.
45+
46+
## ⚙️ Code Generation
47+
48+
Generate build files (e.g., for `json_serializable`, `freezed`, etc.):
49+
50+
```bash
51+
flutter pub run build_runner build
52+
```
53+
54+
> Tip: Use `watch` for continuous builds during development:
55+
```bash
56+
flutter pub run build_runner watch
57+
```
58+
Update localization definitions:
59+
```bash
60+
flutter gen-l10n
61+
```
62+
63+
## 🌐 Using a demo Server
64+
You can use a fake server from Jellyfin.
65+
https://demo.jellyfin.org/stable/web/

‎README.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<div align="center">
2323

24-
[![Build](https://github.com/DonutWare/Fladder/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/DonutWare/Fladder/actions/workflows/build.yml)
24+
[![Build](https://github.com/DonutWare/Fladder/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/DonutWare/Fladder/actions/workflows/build.yml)
2525
[![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/DonutWare/fladder/total)](https://github.com/DonutWare/Fladder/releases/latest)
2626
[![GitHub Release](https://img.shields.io/github/v/release/DonutWare/fladder?display_name=tag)](https://github.com/DonutWare/Fladder/releases/latest)
2727
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
@@ -53,20 +53,29 @@
5353
<details close>
5454
<summary>Mobile</summary>
5555
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Mobile/Dashboard.png?raw=true" alt="Fladder" width="200">
56+
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Mobile/Details.png?raw=true" alt="Fladder" width="200">
5657
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Mobile/Details_2.png?raw=true" alt="Fladder" width="200">
5758
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Mobile/Favourites.png?raw=true" alt="Fladder" width="200">
5859
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Mobile/Library.png?raw=true" alt="Fladder" width="200">
60+
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Mobile/Library_Search.png?raw=true" alt="Fladder" width="200">
5961
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Mobile/Resume_Tab.png?raw=true" alt="Fladder" width="200">
6062
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Mobile/Sync.png?raw=true" alt="Fladder" width="200">
63+
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Mobile/Settings.png?raw=true" alt="Fladder" width="200">
6164
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Mobile/Player.png?raw=true" alt="Fladder" width="1280">
6265
</details>
6366

6467
<details close>
6568
<summary>Tablet</summary>
6669
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Dashboard.png?raw=true" alt="Fladder" width="1280">
6770
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Details.png?raw=true" alt="Fladder" width="1280">
71+
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Details_2.png?raw=true" alt="Fladder" width="1280">
72+
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Favourites.png?raw=true" alt="Fladder" width="1280">
73+
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Library.png?raw=true" alt="Fladder" width="1280">
74+
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Library_Search.png?raw=true" alt="Fladder" width="1280">
75+
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Resume_Tab.png?raw=true" alt="Fladder" width="1280">
76+
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Sync.png?raw=true" alt="Fladder" width="1280">
6877
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Settings.png?raw=true" alt="Fladder" width="1280">
69-
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Sync.png?raw=true" alt="Fladder" width="1280">
78+
<img src="https://github.com/DonutWare/Fladder/blob/develop/assets/marketing/screenshots/Tablet/Player.png?raw=true" alt="Fladder" width="1280">
7079
</details>
7180

7281
Web/Desktop [try out the web build!](https://DonutWare.github.io/Fladder)

‎assets/marketing/screenshots/Mobile/Dashboard.png‎

565 KB
Loading

‎assets/marketing/screenshots/Mobile/Dashboard_2.png‎

-1.79 MB
Binary file not shown.

‎assets/marketing/screenshots/Mobile/Details.png‎

-204 KB
Loading

‎assets/marketing/screenshots/Mobile/Details_2.png‎

523 KB
Loading

‎assets/marketing/screenshots/Mobile/Favourites.png‎

761 KB
Loading

‎assets/marketing/screenshots/Mobile/Library.png‎

62.2 KB
Loading

0 commit comments

Comments
 (0)