Merge branch 'develop'

Author: PartyDonut

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -49,6 +49,7 @@ body:
       multiple: true
       options:
         - Android
+        - Android TV
         - iOS
         - Linux
         - Windows
@@ -62,5 +63,11 @@ body:
       label: App Version
       description: What version of Fladder are you using?
       placeholder: e.g. v0.7.0 (267)
+  - type: input
+    id: server
+    attributes:
+      label: Jellyfin server
+      description: What is your Jellyfin setup
+      placeholder: e.g. 10.11.2 on docker,windows,macos
     validations:
       required: true

.github/workflows/build.yml

@@ -527,9 +527,9 @@ jobs:
 
           ---
 
-          📅 **Build Date:** $(date -u "+%Y-%m-%d %H:%M:%S UTC")  
-          🔧 **Build Number:** ${{ github.run_number }}  
-          📝 **Commit:** ${{ github.sha }}  
+          📅 **Build Date:** $(date -u "+%Y-%m-%d %H:%M:%S UTC")
+          🔧 **Build Number:** ${{ github.run_number }}
+          📝 **Commit:** ${{ github.sha }}
           🌿 **Branch:** develop
           EOF
 
@@ -752,7 +752,7 @@ jobs:
         include:
           - build_type: release
             identifier: DonutWare.Fladder
-            max_versions: ""
+            max_versions: "0"
           - build_type: nightly
             identifier: DonutWare.Fladder.Nightly
             max_versions: "1"

.vscode/tasks.json

@@ -118,11 +118,18 @@
 		{
 			"label": "Generate Pigeon Files",
 			"type": "shell",
-			"command": "powershell",
+			"command": "bash",
 			"args": [
-				"-Command",
-				"Get-ChildItem -Path pigeons/*.dart | ForEach-Object { dart run pigeon --input $_.FullName }"
+				"-c",
+				"for f in pigeons/*.dart; do dart run pigeon --input \"$f\"; done"
 			],
+			"windows": {
+				"command": "powershell",
+				"args": [
+					"-Command",
+					"Get-ChildItem -Path pigeons/*.dart | ForEach-Object { dart run pigeon --input $_.FullName }"
+				]
+			},
 			"group": {
 				"kind": "build",
 				"isDefault": true

README.md

@@ -32,18 +32,22 @@
 
 ## Key Features
 
-* Play media – Stream or sync content locally to your device.
-* Manage your library – Refresh content and edit metadata.
-* Multiple profiles – Lock profiles and connect to different servers.
-* Direct/Transcode playback
-* Intro/Credits skipping
+* Play media – Stream or sync content locally to your device
+* Manage your library – Refresh content and edit metadata
+* Multiple profiles – add multiple users or different servers easily switching between
+* Direct, Transcode and Offline playback
+* Media segments skipping (Intro/Credits etc.)
 * Trickplay support (timeline scrubbing)
-* Dark/Light mode
-* Simple comic book format reading support (.cbz, .crb)
-* Sync supported on Mobile/Desktop
+* Dark/Light mode and multiple color styles to pick
+* Simple comic book format reading support (.cbz, .cbr)
+* Sync items for all platforms
+* Download items and keep progress in sync
+* Keyboard shortcuts
+* Adaptive layout for all platforms
+* Next-up overview when watching a queue
 * Platforms
-  - Android
-  - Web
+  - Android + TV
+  - Web + Docker
   - macOS
   - Windows 
   - iOS 
@@ -94,31 +98,27 @@ Web/Desktop [try out the web build!](https://DonutWare.github.io/Fladder)
 > [!NOTE]
 > The GitHub hosted web build only allows `https` connections. This is a limitation on GitHub's end, for self-hosted versions `http` works fine.
 
-## In progress
-
-* [Android TV](https://github.com/DonutWare/Fladder/issues/510)
-
 ## Planned Features
 
-* Music playback* 
+* Music playback
 * Server management
 * And more???
 
 ## Download
 
 The latest executables for Windows, macOS, Linux, iOS, Android and Web can be found on the [releases page](https://github.com/DonutWare/Fladder/releases).
 
-You can pull the Docker version using the following tag: ```ghcr.io/donutware/fladder:latest```.
+You can pull the Docker version using the following tags: ```ghcr.io/donutware/fladder:latest```. or ```ghcr.io/donutware/fladder-rootless:latest```
 
 *Platform-specific installation and usage instructions can be found [here](https://github.com/DonutWare/Fladder/blob/develop/INSTALL.md).*
 
 <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>
 
 > [!WARNING]
-> For windows users, sometimes flutter applications are marked as false positives by windows defender for more info see [this issue](https://github.com/DonutWare/Fladder/issues/197#issuecomment-2568906874).
+> (Windows) Some flutter applications are marked as false positives by windows defender for more info see [this issue](https://github.com/DonutWare/Fladder/issues/197#issuecomment-2568906874).
 
 ## How to Contribute
-Interest in contributing? Here are a couple of ways you can help:
+Interested in contributing? Here are a couple of ways you can help:
 
 ### 🐛 Reporting Bugs
 - Before reporting a bug, **please ensure** that the issue hasn't been reported already.

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

@@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.media3.common.util.UnstableApi
 import nl.jknaapen.fladder.composables.controls.CustomVideoControls
+import nl.jknaapen.fladder.composables.overlays.screensavers.ScreenSaver
 import nl.jknaapen.fladder.objects.VideoPlayerObject
 import nl.jknaapen.fladder.player.ExoPlayer
 import nl.jknaapen.fladder.utility.ScaledContent
@@ -51,9 +52,11 @@ class VideoPlayerActivity : ComponentActivity() {
 fun VideoPlayerScreen(
 ) {
     val leanBackEnabled = leanBackEnabled(LocalContext.current)
-    ExoPlayer { player ->
-        ScaledContent(if (leanBackEnabled) 0.6f else 1f) {
-            CustomVideoControls(player)
+    ScreenSaver {
+        ExoPlayer { player ->
+            ScaledContent(if (leanBackEnabled) 0.6f else 1f) {
+                CustomVideoControls(player)
+            }
         }
     }
 }

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

@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v26.0.1), do not edit directly.
+// Autogenerated from Pigeon (v26.1.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
 
@@ -56,7 +56,7 @@ private object PlayerSettingsHelperPigeonUtils {
     }
     if (a is Map<*, *> && b is Map<*, *>) {
       return a.size == b.size && a.all {
-          (b as Map<Any?, Any?>).containsKey(it.key) &&
+          (b as Map<Any?, Any?>).contains(it.key) &&
           deepEquals(it.value, b[it.key])
       }
     }
@@ -65,6 +65,20 @@ private object PlayerSettingsHelperPigeonUtils {
 
 }
 
+enum class Screensaver(val raw: Int) {
+  DISABLED(0),
+  DVD(1),
+  LOGO(2),
+  TIME(3),
+  BLACK(4);
+
+  companion object {
+    fun ofRaw(raw: Int): Screensaver? {
+      return values().firstOrNull { it.raw == raw }
+    }
+  }
+}
+
 enum class VideoPlayerFit(val raw: Int) {
   FILL(0),
   CONTAIN(1),
@@ -142,7 +156,8 @@ data class PlayerSettings (
   val autoNextType: AutoNextType,
   val acceptedOrientations: List<PlayerOrientations>,
   val fillScreen: Boolean,
-  val videoFit: VideoPlayerFit
+  val videoFit: VideoPlayerFit,
+  val screensaver: Screensaver
 )
  {
   companion object {
@@ -156,7 +171,8 @@ data class PlayerSettings (
       val acceptedOrientations = pigeonVar_list[6] as List<PlayerOrientations>
       val fillScreen = pigeonVar_list[7] as Boolean
       val videoFit = pigeonVar_list[8] as VideoPlayerFit
-      return PlayerSettings(enableTunneling, skipTypes, themeColor, skipForward, skipBackward, autoNextType, acceptedOrientations, fillScreen, videoFit)
+      val screensaver = pigeonVar_list[9] as Screensaver
+      return PlayerSettings(enableTunneling, skipTypes, themeColor, skipForward, skipBackward, autoNextType, acceptedOrientations, fillScreen, videoFit, screensaver)
     }
   }
   fun toList(): List<Any?> {
@@ -170,6 +186,7 @@ data class PlayerSettings (
       acceptedOrientations,
       fillScreen,
       videoFit,
+      screensaver,
     )
   }
   override fun equals(other: Any?): Boolean {
@@ -188,30 +205,35 @@ private open class PlayerSettingsHelperPigeonCodec : StandardMessageCodec() {
     return when (type) {
       129.toByte() -> {
         return (readValue(buffer) as Long?)?.let {
-          VideoPlayerFit.ofRaw(it.toInt())
+          Screensaver.ofRaw(it.toInt())
         }
       }
       130.toByte() -> {
         return (readValue(buffer) as Long?)?.let {
-          PlayerOrientations.ofRaw(it.toInt())
+          VideoPlayerFit.ofRaw(it.toInt())
         }
       }
       131.toByte() -> {
         return (readValue(buffer) as Long?)?.let {
-          AutoNextType.ofRaw(it.toInt())
+          PlayerOrientations.ofRaw(it.toInt())
         }
       }
       132.toByte() -> {
         return (readValue(buffer) as Long?)?.let {
-          SegmentType.ofRaw(it.toInt())
+          AutoNextType.ofRaw(it.toInt())
         }
       }
       133.toByte() -> {
         return (readValue(buffer) as Long?)?.let {
-          SegmentSkip.ofRaw(it.toInt())
+          SegmentType.ofRaw(it.toInt())
         }
       }
       134.toByte() -> {
+        return (readValue(buffer) as Long?)?.let {
+          SegmentSkip.ofRaw(it.toInt())
+        }
+      }
+      135.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           PlayerSettings.fromList(it)
         }
@@ -221,28 +243,32 @@ private open class PlayerSettingsHelperPigeonCodec : StandardMessageCodec() {
   }
   override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
     when (value) {
-      is VideoPlayerFit -> {
+      is Screensaver -> {
         stream.write(129)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
-      is PlayerOrientations -> {
+      is VideoPlayerFit -> {
         stream.write(130)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
-      is AutoNextType -> {
+      is PlayerOrientations -> {
         stream.write(131)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
-      is SegmentType -> {
+      is AutoNextType -> {
         stream.write(132)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
-      is SegmentSkip -> {
+      is SegmentType -> {
         stream.write(133)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
-      is PlayerSettings -> {
+      is SegmentSkip -> {
         stream.write(134)
+        writeValue(stream, value.raw.toLong())
+      }
+      is PlayerSettings -> {
+        stream.write(135)
         writeValue(stream, value.toList())
       }
       else -> super.writeValue(stream, value)

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

@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v26.0.1), do not edit directly.
+// Autogenerated from Pigeon (v26.1.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
 

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

@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v26.0.1), do not edit directly.
+// Autogenerated from Pigeon (v26.1.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
 
@@ -59,7 +59,7 @@ private object VideoPlayerHelperPigeonUtils {
     }
     if (a is Map<*, *> && b is Map<*, *>) {
       return a.size == b.size && a.all {
-          (b as Map<Any?, Any?>).containsKey(it.key) &&
+          (b as Map<Any?, Any?>).contains(it.key) &&
           deepEquals(it.value, b[it.key])
       }
     }
@@ -593,11 +593,11 @@ private open class VideoPlayerHelperPigeonCodec : StandardMessageCodec() {
     when (value) {
       is PlaybackType -> {
         stream.write(129)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
       is MediaSegmentType -> {
         stream.write(130)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
       is SimpleItemModel -> {
         stream.write(131)