Merge branch 'develop'

Author: PartyDonut

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: PartyDonut
+buy_me_a_coffee: jopknaapen

.github/workflows/build.yml

@@ -744,25 +744,25 @@ jobs:
           publish_dir: ./build/web
 
   # Winget package submission
-  winget-package-submit:
-    runs-on: ubuntu-latest
-    needs: [check-trigger, create_release]
-    strategy:
-      matrix:
-        include:
-          - build_type: release
-            identifier: DonutWare.Fladder
-            max_versions: "0"
-          - build_type: nightly
-            identifier: DonutWare.Fladder.Nightly
-            max_versions: "1"
-    steps:
-      - name: Submit to Winget (${{ matrix.build_type }})
-        if: needs.check-trigger.outputs.build_type == matrix.build_type
-        uses: vedantmgoyal9/winget-releaser@19e706d4c9121098010096f9c495a70a7518b30f
-        with:
-          identifier: ${{ matrix.identifier }}
-          installers-regex: 'Fladder-Windows-.*-Setup\.exe$'
-          token: ${{ secrets.WINGET_TOKEN }}
-          max-versions-to-keep: ${{ matrix.max_versions || '' }}
-          release-tag: ${{ matrix.build_type == 'nightly' && env.NIGHTLY_TAG || github.ref_name }}
+  # winget-package-submit:
+  #   runs-on: ubuntu-latest
+  #   needs: [check-trigger, create_release]
+  #   strategy:
+  #     matrix:
+  #       include:
+  #         - build_type: release
+  #           identifier: DonutWare.Fladder
+  #           max_versions: "0"
+  #         - build_type: nightly
+  #           identifier: DonutWare.Fladder.Nightly
+  #           max_versions: "1"
+  #   steps:
+  #     - name: Submit to Winget (${{ matrix.build_type }})
+  #       if: needs.check-trigger.outputs.build_type == matrix.build_type
+  #       uses: vedantmgoyal9/winget-releaser@19e706d4c9121098010096f9c495a70a7518b30f
+  #       with:
+  #         identifier: ${{ matrix.identifier }}
+  #         installers-regex: 'Fladder-Windows-.*-Setup\.exe$'
+  #         token: ${{ secrets.WINGET_TOKEN }}
+  #         max-versions-to-keep: ${{ matrix.max_versions || '' }}
+  #         release-tag: ${{ matrix.build_type == 'nightly' && env.NIGHTLY_TAG || github.ref_name }}

.vscode/settings.json

@@ -5,7 +5,9 @@
     "Jellyfin",
     "LTRB",
     "LTWH",
-    "outro"
+    "outro",
+    "seerr",
+    "Seerr"
   ],
   "dart.flutterSdkPath": ".fvm/versions/3.35.1",
   "search.exclude": {

README.md

@@ -101,7 +101,6 @@ Web/Desktop [try out the web build!](https://DonutWare.github.io/Fladder)
 ## Planned Features
 
 * Music playback
-* Server management
 * And more???
 
 ## Download

android/app/build.gradle

@@ -110,13 +110,13 @@ flutter {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.09.01')
+    def composeBom = platform('androidx.compose:compose-bom:2025.12.00')
     implementation composeBom
     androidTestImplementation composeBom
     implementation('androidx.compose.material3:material3')
     implementation('androidx.compose.ui:ui-tooling-preview')
     debugImplementation('androidx.compose.ui:ui-tooling')
-    implementation('androidx.activity:activity-compose:1.11.0')
+    implementation('androidx.activity:activity-compose:1.12.1')
 
     // Media3 (ExoPlayer)
     def media3_version = "1.8.0+1"
@@ -127,11 +127,11 @@ dependencies {
     implementation("androidx.media3:media3-exoplayer-dash:$media3_version")
     implementation("androidx.media3:media3-exoplayer-hls:$media3_version")
     implementation("org.jellyfin.media3:media3-ffmpeg-decoder:$media3_version")
-    implementation("io.github.peerless2012:ass-media:0.3.0-rc03")
+    implementation("io.github.peerless2012:ass-media:0.3.0")
 
     //UI
-    implementation("io.github.rabehx:iconsax-compose:0.0.4")
+    implementation("io.github.rabehx:iconsax-compose:0.0.5")
     implementation("io.coil-kt.coil3:coil-compose:3.3.0")
     implementation("io.coil-kt.coil3:coil-network-okhttp:3.3.0")
-    implementation("com.materialkolor:material-kolor:3.0.1")
+    implementation("com.materialkolor:material-kolor:4.0.5")
 }

android/app/src/debug/AndroidManifest.xml

@@ -4,4 +4,9 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
+    
+    <!-- Used for testing android tv on macos where impeller crashes the emulator -->
+    <!-- <application>
+        <meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false" />
+    </application> -->
 </manifest>

android/app/src/main/kotlin/nl/jknaapen/fladder/VideoPlayerActivity.kt

@@ -54,7 +54,10 @@ fun VideoPlayerScreen(
     val leanBackEnabled = leanBackEnabled(LocalContext.current)
     ScreenSaver {
         ExoPlayer { player ->
-            ScaledContent(if (leanBackEnabled) 0.6f else 1f) {
+            ScaledContent(
+                scale = if (leanBackEnabled) 0.75f else 1f,
+                fontScale = if(leanBackEnabled) 1.2f else 1f,
+            ) {
                 CustomVideoControls(player)
             }
         }

android/app/src/main/kotlin/nl/jknaapen/fladder/api/PlayerSettingsHelper.g.kt

@@ -137,7 +137,8 @@ enum class SegmentType(val raw: Int) {
 enum class SegmentSkip(val raw: Int) {
   ASK(0),
   SKIP(1),
-  NONE(2);
+  SKIP_ONCE(2),
+  NONE(3);
 
   companion object {
     fun ofRaw(raw: Int): SegmentSkip? {

android/app/src/main/kotlin/nl/jknaapen/fladder/composables/controls/ItemHeader.kt

@@ -12,6 +12,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
 import coil3.compose.AsyncImage
 
 @Composable
@@ -44,7 +45,9 @@ fun ItemHeader(
                     style = MaterialTheme.typography.headlineMedium.copy(
                         color = Color.White,
                         fontWeight = FontWeight.Bold
-                    )
+                    ),
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
                 )
             }
         }

android/app/src/main/kotlin/nl/jknaapen/fladder/composables/controls/ProgressBar.kt

@@ -64,6 +64,7 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastCoerceIn
 import androidx.media3.exoplayer.ExoPlayer
@@ -143,12 +144,13 @@ internal fun ProgressBar(
                             color = Color.White,
                             fontWeight = FontWeight.Bold
                         ),
+                        modifier = Modifier.weight(1f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
                     )
                 }
             }
 
-            Spacer(modifier = Modifier.weight(1f))
-
             Videolabel(playableData?.mediaInfo?.playbackType?.name?.capitalize)
             Videolabel(playableData?.mediaInfo?.videoInformation)
         }