Fix SelectQualityAction crashing when opening menu

(cherry picked from commit 044ce67110)

.gitattributes

@@ -5,5 +5,3 @@
 
 CONTRIBUTORS.md merge=union
 app/src/main/res/values*/strings.xml merge=union
-
-design/src/main/kotlin/token/* linguist-generated

.github/ISSUE_TEMPLATE/bug-report-playback.yaml

@@ -4,24 +4,6 @@ labels:
   - bug
   - playback
 body:
-  - type: checkboxes
-    id: before-posting
-    attributes:
-      label: "This issue respects the following points:"
-      description: All conditions are **required**.
-      options:
-        - label: I have discussed this issue in the [Jellyfin forum](https://forum.jellyfin.org/) and/or [troubleshooting chat](https://jellyfin.org/contact) before opening this issue.
-          required: true
-        - label: This issue is **not** already reported on [GitHub](https://github.com/jellyfin/jellyfin-androidtv/issues?q=is%3Aopen+is%3Aissue) _(I've searched it)_.
-          required: true
-        - label: I agree to follow Jellyfin's [Code of Conduct](https://jellyfin.org/docs/general/community-standards.html#code-of-conduct).
-          required: true
-        - label: This report addresses only a single issue; If you encounter multiple issues, kindly create separate reports for each one.
-          required: true
-  - type: markdown
-    attributes:
-      value: |
-        ## Bug information  
   - type: textarea
     id: description
     attributes:
@@ -38,38 +20,10 @@ body:
         Instead, I expect …
     validations:
       required: true
-  - type: textarea
-    id: mediainfo
-    attributes:
-      label: Media info of the file
-      description: |
-        Please share the media information for the file causing issues. You can use a variety of tools to retrieve this information.
-        - Use ffprobe (`ffprobe ./file.mp4`)
-        - Copy the media info from the web interface
-      placeholder: Paste media info…
-      render: shell
-  - type: textarea
-    id: mediacapabilitiesreport
-    attributes:
-      label: Media capabilities report
-      description: |
-        Please share the media capability report generated from within the app. To do some follow these steps:
-        1. Open the Jellyfin for Android TV app
-        2. Connect to a server **that you have admin access to**
-        3. Go to Preferences -> Playback -> Advanced playback preferences
-        4. On the bottom, press the "Report playback capabilities to server" button
-        5. Go to the logs in your Jellyfin dashboard (in your browser)
-        6. Open the newest log file, it should be named similar to `upload_Jellyfin Android TV[...].log`
-        7. Press the "Download" button and paste the file contents
-      placeholder: Paste capability report contents…
-  - type: markdown
-    attributes:
-      value: |
-        ## Logs
   - type: textarea
     id: logs
     attributes:
-      label: Client logs
+      label: Logs
       description: |
         Please paste your crash logs here if applicable. You can find these in your servers dashboard under "logs".
         The file name should start with "upload_org.jellyfin.androidtv".
@@ -83,34 +37,31 @@ body:
         Please paste your FFmpeg logs here. You can find these in your servers dashboard under "logs".
       placeholder: Paste logs…
       render: shell
-  - type: markdown
+  - type: textarea
+    id: mediainfo
     attributes:
-      value: |
-        ## Environment
+      label: Media info of the file
+      description: |
+        Please share the media information for the file causing issues. You can use a variety of tools to retrieve this information.
+        - Use ffprobe (`ffprobe ./file.mp4`)
+        - Use the Media Info tool (set to text format, download here: https://mediaarea.net/en/MediaInfo)
+        - Copy the media info from the web interface
+      placeholder: Paste media info…
+      render: shell
   - type: input
     id: app-version
     attributes:
       label: Application version
       description: The version of the installed Jellyfin Android TV app.
-      placeholder: 0.18.2
+      placeholder: 0.14.0
     validations:
       required: true
-  - type: dropdown
-    id: installation-source
-    attributes:
-      label: Where did you install the app from?
-      description: Choose the appropriate app store or installation method.
-      options:
-        - Google Play Store
-        - Amazon Appstore
-        - F-Droid
-        - Sideloaded APK
   - type: input
     id: device-info
     attributes:
       label: Device information
       description: Manufacturer and model
-      placeholder: Nvidia Shield TV Pro (2019), Fire TV Stick HD (2020)
+      placeholder: Nvidia Shield Pro (2017), Amazon Fire TV Stick v1 (2014)
     validations:
       required: true
   - type: input
@@ -118,7 +69,7 @@ body:
     attributes:
       label: Android version
       description: Version of the OS and other information (e.g. custom ROM / OEM skin)
-      placeholder: Android 13, Fire OS 7
+      placeholder: Android 9, Fire OS 7
     validations:
       required: true
   - type: input
@@ -126,18 +77,6 @@ body:
     attributes:
       label: Jellyfin server version
       description: If on unstable, please specify the commit hash.
-      placeholder: 10.10.2
+      placeholder: 10.8.1
     validations:
       required: true
-  - type: markdown
-    attributes:
-      value: |
-        ## Additional
-  - type: input
-    id: other-sources
-    attributes:
-      label: Other sources
-      description: Please link the related forum topics or chat messages that prompted you open this issue.
-      placeholder: https://forum.jellyfin.org/…
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -3,24 +3,6 @@ description: Create a bug report
 labels:
   - bug
 body:
-  - type: checkboxes
-    id: before-posting
-    attributes:
-      label: "This issue respects the following points:"
-      description: All conditions are **required**.
-      options:
-        - label: I have discussed this issue in the [Jellyfin forum](https://forum.jellyfin.org/) and/or [troubleshooting chat](https://jellyfin.org/contact) before opening this issue.
-          required: true
-        - label: This issue is **not** already reported on [GitHub](https://github.com/jellyfin/jellyfin-androidtv/issues?q=is%3Aopen+is%3Aissue) _(I've searched it)_.
-          required: true
-        - label: I agree to follow Jellyfin's [Code of Conduct](https://jellyfin.org/docs/general/community-standards.html#code-of-conduct).
-          required: true
-        - label: This report addresses only a single issue; If you encounter multiple issues, kindly create separate reports for each one.
-          required: true
-  - type: markdown
-    attributes:
-      value: |
-        ## Bug information  
   - type: textarea
     id: description
     attributes:
@@ -46,16 +28,12 @@ body:
         The file name should start with "upload_org.jellyfin.androidtv".
         Make sure that they don't contain any sensitive information like server URL, auth tokens or passwords.
       placeholder: Paste logs…
-  - type: markdown
-    attributes:
-      value: |
-        ## Environment
   - type: input
     id: app-version
     attributes:
       label: Application version
       description: The version of the installed Jellyfin Android TV app.
-      placeholder: 0.18.2
+      placeholder: 0.14.0
     validations:
       required: true
   - type: dropdown
@@ -64,16 +42,15 @@ body:
       label: Where did you install the app from?
       description: Choose the appropriate app store or installation method.
       options:
-        - Google Play Store
+        - Google Play
         - Amazon Appstore
-        - F-Droid
         - Sideloaded APK
   - type: input
     id: device-info
     attributes:
       label: Device information
       description: Manufacturer and model
-      placeholder: Nvidia Shield TV Pro (2019), Fire TV Stick HD (2020)
+      placeholder: Nvidia Shield Pro (2017), Amazon Fire TV Stick v1 (2014)
     validations:
       required: true
   - type: input
@@ -81,7 +58,7 @@ body:
     attributes:
       label: Android version
       description: Version of the OS and other information (e.g. custom ROM / OEM skin)
-      placeholder: Android 13, Fire OS 7
+      placeholder: Android 9, Fire OS 7
     validations:
       required: true
   - type: input
@@ -89,18 +66,6 @@ body:
     attributes:
       label: Jellyfin server version
       description: If on unstable, please specify the commit hash.
-      placeholder: 10.10.2
+      placeholder: 10.8.1
     validations:
       required: true
-  - type: markdown
-    attributes:
-      value: |
-        ## Additional
-  - type: input
-    id: other-sources
-    attributes:
-      label: Other sources
-      description: Please link the related forum topics or chat messages that prompted you open this issue.
-      placeholder: https://forum.jellyfin.org/…
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/feature-request.yaml

@@ -3,54 +3,12 @@ description: Request a new feature
 labels:
   - enhancement
 body:
-  - type: checkboxes
-    id: before-posting
-    attributes:
-      label: "This request respects the following points:"
-      description: All conditions are **required**.
-      options:
-        - label: This request is **not** already on [GitHub](https://github.com/jellyfin/jellyfin-androidtv/labels/enhancement) _(I've searched it)_.
-          required: true
-        - label: I agree to follow Jellyfin's [Code of Conduct](https://jellyfin.org/docs/general/community-standards.html#code-of-conduct).
-          required: true
   - type: textarea
+    id: description
     attributes:
-      label: Problem description
-      description: Describe the issue you are experiencing or the gap you are trying to address.
-      placeholder: |
-        The Android TV app does not support displaying lyrics, while the Jellyfin web interface does.
-        This creates an inconsistent user experience across platforms.
+      label: Describe the feature you'd like
+      description: |
+        A clear and concise description of what you want to request.
+        You can also attach screenshots or screen recordings to help explain your request.
     validations:
       required: true
-  - type: textarea
-    attributes:
-      label: Proposed solution
-      description: Provide a detailed description of what you would like to see implemented or changed.
-      placeholder: |
-        The app could display lyrics in the screensaver. Additionally, a lyrics section could be integrated into the page that opens when music is played.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Alternatives considered
-      description: Outline any other approaches you have thought about or explored to solve the problem.
-      placeholder: |
-        An alternative approach could involve adding a dedicated "Lyrics" button in the app, similar to the Jellyfin web interface.
-        Users could press this button to open a full-screen lyrics view.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional information
-      description: Include any relevant details, resources, or screenshots that might help in understanding or implementing the request.
-      placeholder: Add any additional context here.
-    validations:
-      required: false
-  - type: input
-    id: other-sources
-    attributes:
-      label: Other sources
-      description: If this topic has been discussed outside of GitHub, please link it.
-      placeholder: https://forum.jellyfin.org/…
-    validations:
-      required: false

.github/pull_request_template.md

@@ -1,15 +1,11 @@
 <!--
 Ensure your title is short, descriptive, and in the imperative mood (Fix X, Change Y, instead of Fixed X, Changed Y).
-For a good inspiration of what to write in commit messages and PRs please review https://chris.beams.io/posts/git-commit/ and our https://jellyfin.org/docs/general/contributing/issues/ page.
+For a good inspiration of what to write in commit messages and PRs please review https://chris.beams.io/posts/git-commit/ and our https://docs.jellyfin.org/general/contributing/issues.html page.
 -->
 
 **Changes**
 <!-- Describe your changes here in 1-5 sentences. -->
 
-**Code assistance**
-<!-- If code assistance was used, describe how it contributed
-e.g., code generated by LLM, explanation of code base, debugging guidance. -->
-
 **Issues**
 <!-- Tag any issues that this PR solves here.
 ex. Fixes # -->

.github/workflows/app-build.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - release-*
   pull_request:
 
 permissions:
@@ -13,23 +12,23 @@ permissions:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Setup Java
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version-file: .tools-versions
+          java-version: 17
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
       - name: Assemble debug APKs
         run: ./gradlew assembleDebug
       - name: Create publish bundle
         run: mkdir -p build/gh-app-publish/; find app/build/ -iname "*.apk" -exec mv "{}" build/gh-app-publish/ \;
       - name: Upload artifacts
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: build-artifacts
           retention-days: 14

.github/workflows/app-lint.yaml

@@ -14,21 +14,21 @@ permissions:
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Setup Java
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version-file: .tools-versions
+          java-version: 17
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
       - name: Run detekt and lint tasks
         run: ./gradlew detekt lint
       - name: Upload SARIF files
-        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/upload-sarif@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
         if: ${{ always() }}
         with:
           sarif_file: .

.github/workflows/app-publish.yaml

@@ -8,18 +8,18 @@ on:
 jobs:
   publish:
     name: Publish
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: ${{ contains(github.repository_owner, 'jellyfin') }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Setup Java
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version-file: .tools-versions
+          java-version: 17
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
       - name: Set JELLYFIN_VERSION
         run: echo "JELLYFIN_VERSION=$(echo ${GITHUB_REF#refs/tags/v} | tr / -)" >> $GITHUB_ENV
       - name: Assemble release files
@@ -70,7 +70,7 @@ jobs:
           remote_user: ${{ secrets.REPO_USER }}
           remote_key: ${{ secrets.REPO_KEY }}
       - name: Update repo.jellyfin.org symlinks
-        uses: appleboy/ssh-action@0ff4204d59e8e51228ff73bce53f80d53301dee2 # v1.2.5
+        uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
         with:
           host: ${{ secrets.REPO_HOST }}
           username: ${{ secrets.REPO_USER }}

.github/workflows/app-test.yaml

@@ -13,16 +13,16 @@ permissions:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Setup Java
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version-file: .tools-versions
+          java-version: 17
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
       - name: Run test task
         run: ./gradlew test

.github/workflows/gradlew-validate.yaml

@@ -14,9 +14,9 @@ permissions:
 jobs:
   validate:
     name: Validate
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/wrapper-validation@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

.github/workflows/repo-merge-conflict.yaml

@@ -9,10 +9,10 @@ on:
 jobs:
   triage:
     name: Triage
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: ${{ contains(github.repository_owner, 'jellyfin') }}
     steps:
-      - uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
+      - uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
         with:
           dirtyLabel: merge conflict
           repoToken: ${{ secrets.JF_BOT_TOKEN }}

.github/workflows/repo-stale.yaml

@@ -12,10 +12,10 @@ permissions:
 jobs:
   triage:
     name: Triage
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: ${{ contains(github.repository_owner, 'jellyfin') }}
     steps:
-      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         with:
           repo-token: ${{ secrets.JF_BOT_TOKEN }}
           days-before-stale: 120

.tools-versions

@@ -1 +0,0 @@
-java 21

CONTRIBUTORS.md

@@ -14,8 +14,6 @@
  - [mohd-akram](https://github.com/mohd-akram)
  - [3l0w](https://github.com/3l0w)
  - [MajMongoose](https://github.com/majmongoose)
- - [Olaren15](https://github.com/Olaren15)
- - [dtrexler](https://github.com/dtrexler)
 
 # Emby Contributors
 

README.md

@@ -25,6 +25,9 @@
 <a href="https://matrix.to/#/+jellyfin:matrix.org">
 <img alt="Chat on Matrix" src="https://img.shields.io/matrix/jellyfin:matrix.org.svg?logo=matrix"/>
 </a>
+<a href="https://www.reddit.com/r/jellyfin">
+<img alt="Join our Subreddit" src="https://img.shields.io/badge/reddit-r%2Fjellyfin-%23FF5700.svg"/>
+</a>
 <br/>
 <a href="https://play.google.com/store/apps/details?id=org.jellyfin.androidtv">
 <img width="153" alt="Jellyfin on Google Play" src="https://jellyfin.org/images/store-icons/google-play.png"/>
@@ -39,39 +42,48 @@
 <a href="https://repo.jellyfin.org/releases/client/androidtv/">Download archive</a>
 </p>
 
-Jellyfin Android TV is a Jellyfin client for Android TV, Nvidia Shield, and Amazon Fire TV devices. We welcome all contributions and pull
-requests! If you have a larger feature in mind please open an issue so we can discuss the implementation before you start. 
-
-## Building
-
-The app uses Gradle and requires the Android SDK. We recommend using Android Studio, which includes all required dependencies, for
-development and building. For manual building without Android Studio make sure a compatible JDK and Android SDK are installed and in your
-PATH, then use the Gradle wrapper (`./gradlew`) to build the project with the `assembleDebug` Gradle task to generate an apk file:
-
-```shell
-./gradlew assembleDebug
-```
-
-The task will create an APK file in the `/app/build/outputs/apk/debug` directory. This APK file uses a different app-id from our stable
-builds and can be manually installed to your device.
-
-## Branching
-
-The `master` branch is the primary development branch and the target for all pull requests. It is **unstable** and may contain breaking
-changes or unresolved bugs. For production deployments and forks, always use the latest `release-x.y.z` branch. Do not base production work
-or long-lived forks on `master`.
-
-Release branches are created at the start of a beta cycle and are kept up to date with each published release. Maintainers will cherry-pick
-selected changes into release branches as needed for backports. These branches are reused for subsequent patch releases.
+Jellyfin Android TV is a Jellyfin client for Android TV, Nvidia Shield, and Amazon Fire TV devices.
+We welcome all contributions and pull requests! If you have a larger feature in mind please open an
+issue so we can discuss the implementation before you start. 
 
 ## Translating
 
-Translations can be improved very easily from our [Weblate](https://translate.jellyfin.org/projects/jellyfin-android/jellyfin-androidtv)
-instance. Look through the following graphic to see if your native language could use some work! We cannot accept changes to translation
-files via pull requests.
+Translations can be improved very easily from our
+[Weblate](https://translate.jellyfin.org/projects/jellyfin-android/jellyfin-androidtv) instance.
+Look through the following graphic to see if your native language could use some work!
 
-<p align="center">
 <a href="https://translate.jellyfin.org/engage/jellyfin-android/">
 <img alt="Detailed Translation Status" src="https://translate.jellyfin.org/widgets/jellyfin-android/-/jellyfin-androidtv/multi-auto.svg"/>
 </a>
-</p>
+
+## Build Process
+
+### Dependencies
+
+- Android Studio
+
+### Build
+
+1. Clone or download this repository
+
+   ```sh
+   git clone https://github.com/jellyfin/jellyfin-androidtv.git
+   cd jellyfin-androidtv
+   ```
+
+2. Open the project in Android Studio and run it from there or build an APK directly through Gradle:
+
+   ```sh
+   ./gradlew assembleDebug
+   ```
+   
+   Add the Android SDK to your PATH environment variable or create the ANDROID_SDK_ROOT variable for
+   this to work.
+
+### Deploy to device/emulator
+
+   ```sh
+   ./gradlew installDebug
+   ```
+
+*You can also replace the "Debug" with "Release" to get an optimized release binary.*

android-lint.xml

@@ -13,13 +13,12 @@
     <issue id="MangledCRLF" severity="warning" />
     <issue id="NegativeMargin" severity="warning" />
     <issue id="NoHardKeywords" severity="warning" />
+    <issue id="NotificationPermission">
+        <ignore regexp="com.bumptech.glide.request.target.NotificationTarget" />
+    </issue>
     <issue id="Registered" severity="warning" />
     <issue id="RequiredSize" severity="error" />
     <issue id="Typos" severity="ignore" />
     <issue id="UnknownNullness" severity="informational" />
     <issue id="UnusedIds" severity="ignore" />
-    <issue id="UnusedAttribute">
-        <ignore regexp="usesCleartextTraffic" />
-        <ignore regexp="networkSecurityConfig" />
-    </issue>
 </lint>

app/build.gradle.kts

@@ -1,8 +1,9 @@
 plugins {
-	alias(libs.plugins.aboutlibraries)
-	alias(libs.plugins.android.application)
-	alias(libs.plugins.kotlin.compose)
+	id("com.android.application")
+	kotlin("android")
 	alias(libs.plugins.kotlin.serialization)
+	alias(libs.plugins.kotlin.compose)
+	alias(libs.plugins.aboutlibraries)
 }
 
 android {
@@ -17,13 +18,13 @@ android {
 		applicationId = namespace
 		versionName = project.getVersionName()
 		versionCode = getVersionCode(versionName!!)
+		setProperty("archivesBaseName", "jellyfin-androidtv-v$versionName")
 	}
 
 	buildFeatures {
 		buildConfig = true
 		viewBinding = true
 		compose = true
-		resValues = true
 	}
 
 	compileOptions {
@@ -31,8 +32,8 @@ android {
 	}
 
 	buildTypes {
-		release {
-			proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+		val release by getting {
+			isMinifyEnabled = false
 
 			// Set package names used in various XML files
 			resValue("string", "app_id", namespace!!)
@@ -45,7 +46,7 @@ android {
 			buildConfigField("boolean", "DEVELOPMENT", "false")
 		}
 
-		debug {
+		val debug by getting {
 			// Use different application id to run release and debug at the same time
 			applicationIdSuffix = ".debug"
 
@@ -73,9 +74,12 @@ android {
 	}
 }
 
-base.archivesName.set("jellyfin-androidtv-v${project.getVersionName()}")
+aboutLibraries {
+	// Remove the "generated" timestamp to allow for reproducible builds
+	excludeFields = arrayOf("generated")
+}
 
-tasks.register("versionTxt") {
+val versionTxt by tasks.registering {
 	val path = layout.buildDirectory.asFile.get().resolve("version.txt")
 
 	doLast {
@@ -87,12 +91,12 @@ tasks.register("versionTxt") {
 
 dependencies {
 	// Jellyfin
-	implementation(projects.design)
 	implementation(projects.playback.core)
 	implementation(projects.playback.jellyfin)
 	implementation(projects.playback.media3.exoplayer)
 	implementation(projects.playback.media3.session)
 	implementation(projects.preference)
+	implementation(libs.jellyfin.apiclient)
 	implementation(libs.jellyfin.sdk) {
 		// Change version if desired
 		val sdkVersion = findProperty("sdk.version")?.toString()
@@ -110,12 +114,10 @@ dependencies {
 	// Android(x)
 	implementation(libs.androidx.core)
 	implementation(libs.androidx.activity)
-	implementation(libs.androidx.activity.compose)
 	implementation(libs.androidx.fragment)
 	implementation(libs.androidx.fragment.compose)
 	implementation(libs.androidx.leanback.core)
 	implementation(libs.androidx.leanback.preference)
-	implementation(libs.androidx.navigation3.ui)
 	implementation(libs.androidx.preference)
 	implementation(libs.androidx.appcompat)
 	implementation(libs.androidx.tvprovider)
@@ -127,18 +129,15 @@ dependencies {
 	implementation(libs.androidx.cardview)
 	implementation(libs.androidx.startup)
 	implementation(libs.bundles.androidx.compose)
-	implementation(libs.accompanist.permissions)
 
 	// Dependency Injection
 	implementation(libs.bundles.koin)
 
 	// Media players
 	implementation(libs.androidx.media3.exoplayer)
-	implementation(libs.androidx.media3.datasource.okhttp)
 	implementation(libs.androidx.media3.exoplayer.hls)
 	implementation(libs.androidx.media3.ui)
 	implementation(libs.jellyfin.androidx.media3.ffmpeg.decoder)
-	implementation(libs.libass.media3)
 
 	// Markdown
 	implementation(libs.bundles.markwon)

app/proguard-rules.pro

@@ -1 +0,0 @@
--dontwarn org.commonmark.ext.gfm.strikethrough.Strikethrough

app/src/main/AndroidManifest.xml

@@ -35,11 +35,6 @@
                 android:host="youtube.com"
                 android:scheme="https" />
         </intent>
-
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:mimeType="video/*" />
-        </intent>
     </queries>
 
     <application
@@ -52,11 +47,22 @@
         android:icon="@mipmap/app_icon"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/Theme.Jellyfin"
         android:usesCleartextTraffic="true">
 
+        <!-- Legacy service required for AccountManagerMigration -->
+        <service
+            android:name=".auth.service.AuthenticatorService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
+
         <!-- Screensaver -->
         <service
             android:name=".integration.dream.LibraryDreamService"
@@ -102,8 +108,9 @@
         <activity
             android:name=".ui.startup.StartupActivity"
             android:exported="true"
-            android:launchMode="singleTask"
             android:noHistory="true"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -125,9 +132,14 @@
         <!-- Main application -->
         <activity
             android:name=".ui.browsing.MainActivity"
-            android:launchMode="singleTask"
+            android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustNothing" />
 
+        <activity
+            android:name=".ui.preference.PreferencesActivity"
+            android:screenOrientation="behind"
+            android:theme="@style/Theme.Jellyfin.Preferences" />
+
         <activity android:name=".ui.playback.ExternalPlayerActivity" />
     </application>
 </manifest>

app/src/main/java/org/jellyfin/androidtv/SessionInitializer.kt

@@ -5,7 +5,6 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.startup.AppInitializer
 import androidx.startup.Initializer
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.jellyfin.androidtv.auth.repository.SessionRepository
 import org.jellyfin.androidtv.di.KoinInitializer
@@ -18,7 +17,7 @@ class SessionInitializer : Initializer<Unit> {
 			.koin
 
 		// Restore system session
-		ProcessLifecycleOwner.get().lifecycleScope.launch(Dispatchers.IO) {
+		ProcessLifecycleOwner.get().lifecycleScope.launch {
 			koin.get<SessionRepository>().restoreSession(destroyOnly = false)
 		}
 	}

app/src/main/java/org/jellyfin/androidtv/auth/AccountManagerMigration.kt

@@ -0,0 +1,48 @@
+package org.jellyfin.androidtv.auth
+
+import android.accounts.AccountManager
+import android.content.Context
+import androidx.core.content.getSystemService
+import org.jellyfin.androidtv.BuildConfig
+import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
+import org.jellyfin.sdk.model.serializer.toUUIDOrNull
+import timber.log.Timber
+import java.util.UUID
+
+class AccountManagerMigration(
+	context: Context,
+) {
+	private val accountManager = requireNotNull(context.getSystemService<AccountManager>())
+
+	fun migrate(
+		servers: Map<UUID, AuthenticationStoreServer>,
+	) = servers.mapValues { (serverId, server) ->
+		Timber.i("Migrating server $serverId (${server.name})")
+		server.copy(
+			users = server.users.mapValues { (userId, user) ->
+				val accessToken = getAccessToken(serverId, userId)
+				Timber.i("Migrating user $userId (${user.name}): ${if (accessToken != null) "success" else "no token"}")
+				user.copy(accessToken = accessToken)
+			}
+		)
+	}
+
+	@Suppress("MissingPermission")
+	private fun getAccessToken(serverId: UUID, userId: UUID): String? = runCatching {
+		accountManager.getAccountsByType(ACCOUNT_TYPE)
+			.firstOrNull {
+				val validServerId = accountManager.getUserData(it, ACCOUNT_DATA_SERVER)?.toUUIDOrNull() == serverId
+				val validUserId = accountManager.getUserData(it, ACCOUNT_DATA_ID)?.toUUIDOrNull() == userId
+
+				validServerId && validUserId
+			}
+			?.let { account -> accountManager.peekAuthToken(account, ACCOUNT_ACCESS_TOKEN_TYPE) }
+	}.getOrNull()
+
+	companion object {
+		const val ACCOUNT_TYPE = BuildConfig.APPLICATION_ID
+		const val ACCOUNT_DATA_ID = "$ACCOUNT_TYPE.id"
+		const val ACCOUNT_DATA_SERVER = "$ACCOUNT_TYPE.server"
+		const val ACCOUNT_ACCESS_TOKEN_TYPE = "$ACCOUNT_TYPE.access_token"
+	}
+}

app/src/main/java/org/jellyfin/androidtv/auth/apiclient/ApiBinder.kt

@@ -0,0 +1,48 @@
+package org.jellyfin.androidtv.auth.apiclient
+
+import org.jellyfin.androidtv.auth.repository.Session
+import org.jellyfin.androidtv.auth.store.AuthenticationStore
+import org.jellyfin.androidtv.util.sdk.legacy
+import org.jellyfin.apiclient.interaction.ApiClient
+import org.jellyfin.apiclient.model.apiclient.ServerInfo
+import org.jellyfin.sdk.model.DeviceInfo
+import timber.log.Timber
+
+class ApiBinder(
+	private val api: ApiClient,
+	private val authenticationStore: AuthenticationStore,
+) {
+	fun updateSession(session: Session?, deviceInfo: DeviceInfo): Boolean {
+		@Suppress("TooGenericExceptionCaught")
+		val success = try {
+			updateSessionInternal(session, deviceInfo)
+		} catch (throwable: Throwable) {
+			Timber.e(throwable, "Unable to update legacy API session.")
+			false
+		}
+
+		return success
+	}
+
+	private fun updateSessionInternal(session: Session?, deviceInfo: DeviceInfo): Boolean {
+		if (session == null) return true
+
+		val server = authenticationStore.getServer(session.serverId)
+		if (server == null) {
+			Timber.e("Could not bind API because server ${session.serverId} was not found in the store.")
+			return false
+		}
+
+		api.device = deviceInfo.legacy()
+		api.SetAuthenticationInfo(session.accessToken, session.userId.toString())
+		api.EnableAutomaticNetworking(ServerInfo().apply {
+			id = session.serverId.toString()
+			name = server.name
+			address = server.address.removeSuffix("/")
+			userId = session.userId.toString()
+			accessToken = session.accessToken
+		})
+
+		return true
+	}
+}

app/src/main/java/org/jellyfin/androidtv/auth/model/QuickConnectState.kt

@@ -3,7 +3,7 @@ package org.jellyfin.androidtv.auth.model
 sealed class QuickConnectState
 
 /**
- * State unknown until first poll completed.
+ * State unknown untill first poll completed.
  */
 data object UnknownQuickConnectState : QuickConnectState()
 

app/src/main/java/org/jellyfin/androidtv/auth/model/Server.kt

@@ -18,7 +18,7 @@ data class Server(
 	val setupCompleted: Boolean = true,
 	var dateLastAccessed: Instant = Instant.MIN,
 ) {
-	val serverVersion = version?.let(ServerVersion::fromString)
+	private val serverVersion = version?.let(ServerVersion::fromString)
 	val versionSupported = serverVersion != null && serverVersion >= ServerRepository.minimumServerVersion
 
 	operator fun compareTo(other: ServerVersion): Int = serverVersion?.compareTo(other) ?: -1

app/src/main/java/org/jellyfin/androidtv/auth/repository/AuthenticationRepository.kt

@@ -1,11 +1,9 @@
 package org.jellyfin.androidtv.auth.repository
 
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.flowOn
 import org.jellyfin.androidtv.auth.model.ApiClientErrorLoginState
 import org.jellyfin.androidtv.auth.model.AuthenticateMethod
 import org.jellyfin.androidtv.auth.model.AuthenticatedState
@@ -23,10 +21,7 @@ import org.jellyfin.androidtv.auth.model.ServerVersionNotSupported
 import org.jellyfin.androidtv.auth.model.User
 import org.jellyfin.androidtv.auth.store.AuthenticationPreferences
 import org.jellyfin.androidtv.auth.store.AuthenticationStore
-import org.jellyfin.androidtv.util.apiclient.JellyfinImage
-import org.jellyfin.androidtv.util.apiclient.JellyfinImageSource
-import org.jellyfin.androidtv.util.apiclient.getUrl
-import org.jellyfin.androidtv.util.apiclient.primaryImage
+import org.jellyfin.androidtv.util.ImageHelper
 import org.jellyfin.androidtv.util.sdk.forUser
 import org.jellyfin.sdk.Jellyfin
 import org.jellyfin.sdk.api.client.ApiClient
@@ -34,10 +29,10 @@ import org.jellyfin.sdk.api.client.exception.ApiClientException
 import org.jellyfin.sdk.api.client.exception.TimeoutException
 import org.jellyfin.sdk.api.client.extensions.authenticateUserByName
 import org.jellyfin.sdk.api.client.extensions.authenticateWithQuickConnect
+import org.jellyfin.sdk.api.client.extensions.imageApi
 import org.jellyfin.sdk.api.client.extensions.userApi
 import org.jellyfin.sdk.model.DeviceInfo
 import org.jellyfin.sdk.model.api.AuthenticationResult
-import org.jellyfin.sdk.model.api.ImageType
 import org.jellyfin.sdk.model.api.UserDto
 import timber.log.Timber
 import java.time.Instant
@@ -60,6 +55,9 @@ class AuthenticationRepositoryImpl(
 	private val defaultDeviceInfo: DeviceInfo,
 ) : AuthenticationRepository {
 	override fun authenticate(server: Server, method: AuthenticateMethod): Flow<LoginState> {
+		// Check server version first
+		if (!server.versionSupported) return flowOf(ServerVersionNotSupported(server))
+
 		return when (method) {
 			is AutomaticAuthenticateMethod -> authenticateAutomatic(server, method.user)
 			is CredentialAuthenticateMethod -> authenticateCredential(server, method.username, method.password)
@@ -96,7 +94,7 @@ class AuthenticationRepositoryImpl(
 		}
 
 		emitAll(authenticateAuthenticationResult(server, result))
-	}.flowOn(Dispatchers.IO)
+	}
 
 	private fun authenticateQuickConnect(server: Server, secret: String) = flow {
 		val api = jellyfin.createApi(server.address, deviceInfo = defaultDeviceInfo)
@@ -114,7 +112,7 @@ class AuthenticationRepositoryImpl(
 		}
 
 		emitAll(authenticateAuthenticationResult(server, result))
-	}.flowOn(Dispatchers.IO)
+	}
 
 	private fun authenticateAuthenticationResult(server: Server, result: AuthenticationResult) = flow {
 		val accessToken = result.accessToken ?: return@flow emit(RequireSignInState)
@@ -124,7 +122,7 @@ class AuthenticationRepositoryImpl(
 			serverId = server.id,
 			name = userInfo.name!!,
 			accessToken = result.accessToken,
-			imageTag = userInfo.primaryImage?.tag,
+			imageTag = userInfo.primaryImageTag,
 			lastUsed = Instant.now().toEpochMilli(),
 		)
 
@@ -134,18 +132,16 @@ class AuthenticationRepositoryImpl(
 			emit(AuthenticatedState)
 		} else {
 			Timber.w("Failed to set active session after authenticating")
-			if (!server.versionSupported) emit(ServerVersionNotSupported(server))
-			else emit(RequireSignInState)
+			emit(RequireSignInState)
 		}
-	}.flowOn(Dispatchers.IO)
+	}
 
 	private fun authenticateToken(server: Server, user: User) = flow {
 		emit(AuthenticatingState)
 
 		val success = setActiveSession(user, server)
 		if (!success) {
-			if (!server.versionSupported) emit(ServerVersionNotSupported(server))
-			else emit(RequireSignInState)
+			emit(RequireSignInState)
 		} else try {
 			// Update user info
 			val userInfo by userApiClient.userApi.getCurrentUser()
@@ -159,7 +155,7 @@ class AuthenticationRepositoryImpl(
 			Timber.e(err, "Unable to get current user data")
 			emit(ApiClientErrorLoginState(err))
 		}
-	}.flowOn(Dispatchers.IO)
+	}
 
 	private suspend fun authenticateFinish(server: Server, userInfo: UserDto, accessToken: String) {
 		val currentUser = authenticationStore.getUser(server.id, userInfo.id)
@@ -167,11 +163,11 @@ class AuthenticationRepositoryImpl(
 		val updatedUser = currentUser?.copy(
 			name = userInfo.name!!,
 			lastUsed = Instant.now().toEpochMilli(),
-			imageTag = userInfo.primaryImage?.tag,
+			imageTag = userInfo.primaryImageTag,
 			accessToken = accessToken,
 		) ?: AuthenticationStoreUser(
 			name = userInfo.name!!,
-			imageTag = userInfo.primaryImage?.tag,
+			imageTag = userInfo.primaryImageTag,
 			accessToken = accessToken,
 		)
 		authenticationStore.putUser(server.id, userInfo.id, updatedUser)
@@ -203,15 +199,11 @@ class AuthenticationRepositoryImpl(
 		else false
 	}
 
-	override fun getUserImageUrl(server: Server, user: User): String? = user.imageTag?.let { primaryImageTag ->
-		JellyfinImage(
-			item = user.id,
-			source = JellyfinImageSource.USER,
-			type = ImageType.PRIMARY,
-			tag = primaryImageTag,
-			blurHash = null,
-			aspectRatio = null,
-			index = null
+	override fun getUserImageUrl(server: Server, user: User): String? = user.imageTag?.let { tag ->
+		jellyfin.createApi(server.address).imageApi.getUserImageUrl(
+			userId = user.id,
+			tag = tag,
+			maxHeight = ImageHelper.MAX_PRIMARY_IMAGE_HEIGHT
 		)
-	}?.getUrl(jellyfin.createApi(server.address))
+	}
 }

app/src/main/java/org/jellyfin/androidtv/auth/repository/ServerRepository.kt

@@ -1,14 +1,11 @@
 package org.jellyfin.androidtv.auth.repository
 
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
 import org.jellyfin.androidtv.auth.model.ConnectedState
 import org.jellyfin.androidtv.auth.model.ConnectingState
@@ -26,7 +23,7 @@ import org.jellyfin.sdk.api.client.extensions.systemApi
 import org.jellyfin.sdk.discovery.RecommendedServerInfo
 import org.jellyfin.sdk.discovery.RecommendedServerInfoScore
 import org.jellyfin.sdk.model.ServerVersion
-import org.jellyfin.sdk.model.api.BrandingOptionsDto
+import org.jellyfin.sdk.model.api.BrandingOptions
 import org.jellyfin.sdk.model.api.ServerDiscoveryInfo
 import org.jellyfin.sdk.model.serializer.toUUID
 import timber.log.Timber
@@ -39,23 +36,20 @@ import java.util.UUID
 interface ServerRepository {
 	val storedServers: StateFlow<List<Server>>
 	val discoveredServers: StateFlow<List<Server>>
-	val currentServer: StateFlow<Server?>
 
 	suspend fun loadStoredServers()
 	suspend fun loadDiscoveryServers()
 
-	fun setCurrentServer(server: Server?)
-
 	fun addServer(address: String): Flow<ServerAdditionState>
-	suspend fun getServer(id: UUID, eagerUpdate: Boolean = false): Server?
-	suspend fun updateServer(server: Server, force: Boolean = false): Boolean
+	suspend fun getServer(id: UUID): Server?
+	suspend fun updateServer(server: Server): Boolean
 	suspend fun deleteServer(server: UUID): Boolean
 
 	companion object {
 		val minimumServerVersion = Jellyfin.minimumVersion.copy(build = null)
 		val recommendedServerVersion = Jellyfin.apiVersion.copy(build = null)
 
-		val upcomingMinimumServerVersion = ServerVersion(10, 11, 0)
+		val upcomingMinimumServerVersion = ServerVersion(10, 9, 0)
 	}
 }
 
@@ -70,9 +64,6 @@ class ServerRepositoryImpl(
 	private val _discoveredServers = MutableStateFlow(emptyList<Server>())
 	override val discoveredServers = _discoveredServers.asStateFlow()
 
-	private val _currentServer = MutableStateFlow<Server?>(null)
-	override val currentServer = _currentServer.asStateFlow()
-
 	// Loading data
 	override suspend fun loadStoredServers() {
 		authenticationStore.getServers()
@@ -93,10 +84,6 @@ class ServerRepositoryImpl(
 			}
 	}
 
-	override fun setCurrentServer(server: Server?) {
-		_currentServer.value = server
-	}
-
 	// Mutating data
 	override fun addServer(address: String): Flow<ServerAdditionState> = flow {
 		Timber.i("Adding server %s", address)
@@ -108,14 +95,13 @@ class ServerRepositoryImpl(
 
 		val goodRecommendations = mutableListOf<RecommendedServerInfo>()
 		val badRecommendations = mutableListOf<RecommendedServerInfo>()
-		val greatRecommendation = jellyfin.discovery.getRecommendedServers(addressCandidates).firstOrNull { recommendedServer ->
+		val greatRecommendaton = jellyfin.discovery.getRecommendedServers(addressCandidates).firstOrNull { recommendedServer ->
 			when (recommendedServer.score) {
 				RecommendedServerInfoScore.GREAT -> true
 				RecommendedServerInfoScore.GOOD -> {
 					goodRecommendations += recommendedServer
 					false
 				}
-
 				else -> {
 					badRecommendations += recommendedServer
 					false
@@ -123,9 +109,9 @@ class ServerRepositoryImpl(
 			}
 		}
 
-		Timber.i(buildString {
+		Timber.d(buildString {
 			append("Recommendations: ")
-			if (greatRecommendation == null) append(0)
+			if (greatRecommendaton == null) append(0)
 			else append(1)
 			append(" great, ")
 			append(goodRecommendations.size)
@@ -134,7 +120,7 @@ class ServerRepositoryImpl(
 			append(" bad")
 		})
 
-		val chosenRecommendation = greatRecommendation ?: goodRecommendations.firstOrNull()
+		val chosenRecommendation = greatRecommendaton ?: goodRecommendations.firstOrNull()
 		if (chosenRecommendation != null && chosenRecommendation.systemInfo.isSuccess) {
 			// Get system info
 			val systemInfo = chosenRecommendation.systemInfo.getOrThrow()
@@ -173,17 +159,13 @@ class ServerRepositoryImpl(
 				.mapValues { (_, entry) -> entry.flatMap { server -> server.issues } }
 			emit(UnableToConnectState(addressCandidatesWithIssues))
 		}
-	}.flowOn(Dispatchers.IO)
+	}
 
-	override suspend fun getServer(id: UUID, eagerUpdate: Boolean): Server? {
+	override suspend fun getServer(id: UUID): Server? {
 		val server = authenticationStore.getServer(id) ?: return null
 
 		val updatedServer = try {
-			val forceUpdate = eagerUpdate && server.version
-				?.let(ServerVersion::fromString)
-				?.let { version -> version < ServerRepository.minimumServerVersion } == true
-
-			updateServerInternal(id, server, forceUpdate)
+			updateServerInternal(id, server)
 		} catch (err: ApiClientException) {
 			Timber.e(err, "Unable to update server")
 			null
@@ -192,12 +174,12 @@ class ServerRepositoryImpl(
 		return (updatedServer ?: server).asServer(id)
 	}
 
-	override suspend fun updateServer(server: Server, force: Boolean): Boolean {
+	override suspend fun updateServer(server: Server): Boolean {
 		// Only update existing servers
 		val serverInfo = authenticationStore.getServer(server.id) ?: return false
 
 		return try {
-			updateServerInternal(server.id, serverInfo, force) != null
+			updateServerInternal(server.id, serverInfo) != null
 		} catch (err: ApiClientException) {
 			Timber.e(err, "Unable to update server")
 
@@ -205,32 +187,25 @@ class ServerRepositoryImpl(
 		}
 	}
 
-	private suspend fun updateServerInternal(
-		id: UUID,
-		server: AuthenticationStoreServer,
-		forceUpdate: Boolean
-	): AuthenticationStoreServer? {
+	private suspend fun updateServerInternal(id: UUID, server: AuthenticationStoreServer): AuthenticationStoreServer? {
 		val now = Instant.now().toEpochMilli()
 
 		// Only update every 10 minutes
-		if (now - server.lastRefreshed < 600000 && server.version != null && !forceUpdate) return null
+		if (now - server.lastRefreshed < 600000 && server.version != null) return null
 
-		val newServer = withContext(Dispatchers.IO) {
-			val api = jellyfin.createApi(server.address)
+		val api = jellyfin.createApi(server.address)
+		// Get login disclaimer
+		val branding = api.getBrandingOptionsOrDefault()
+		val systemInfo by api.systemApi.getPublicSystemInfo()
 
-			// Get login disclaimer
-			val branding = api.getBrandingOptionsOrDefault()
-			val systemInfo by api.systemApi.getPublicSystemInfo()
-
-			server.copy(
-				name = systemInfo.serverName ?: server.name,
-				version = systemInfo.version ?: server.version,
-				loginDisclaimer = branding.loginDisclaimer ?: server.loginDisclaimer,
-				splashscreenEnabled = branding.splashscreenEnabled,
-				setupCompleted = systemInfo.startupWizardCompleted ?: server.setupCompleted,
-				lastRefreshed = now
-			)
-		}
+		val newServer = server.copy(
+			name = systemInfo.serverName ?: server.name,
+			version = systemInfo.version ?: server.version,
+			loginDisclaimer = branding.loginDisclaimer ?: server.loginDisclaimer,
+			splashscreenEnabled = branding.splashscreenEnabled,
+			setupCompleted = systemInfo.startupWizardCompleted ?: server.setupCompleted,
+			lastRefreshed = now
+		)
 		authenticationStore.putServer(id, newServer)
 
 		return newServer
@@ -262,7 +237,7 @@ class ServerRepositoryImpl(
 		brandingApi.getBrandingOptions().content
 	} catch (exception: InvalidContentException) {
 		Timber.w(exception, "Invalid branding options response, using default value")
-		BrandingOptionsDto(
+		BrandingOptions(
 			loginDisclaimer = null,
 			customCss = null,
 			splashscreenEnabled = false,

app/src/main/java/org/jellyfin/androidtv/auth/repository/ServerUserRepository.kt

@@ -1,7 +1,5 @@
 package org.jellyfin.androidtv.auth.repository
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.auth.model.PrivateUser
 import org.jellyfin.androidtv.auth.model.PublicUser
 import org.jellyfin.androidtv.auth.model.Server
@@ -49,9 +47,7 @@ class ServerUserRepositoryImpl(
 		val api = jellyfin.createApi(server.address)
 
 		return try {
-			val users = withContext(Dispatchers.IO) {
-				api.userApi.getPublicUsers().content
-			}
+			val users by api.userApi.getPublicUsers()
 			users.mapNotNull(UserDto::toPublicUser)
 		} catch (err: ApiClientException) {
 			Timber.e(err, "Unable to retrieve public users")

app/src/main/java/org/jellyfin/androidtv/auth/repository/SessionRepository.kt

@@ -1,6 +1,5 @@
 package org.jellyfin.androidtv.auth.repository
 
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -8,7 +7,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import org.jellyfin.androidtv.auth.model.Server
+import org.jellyfin.androidtv.auth.apiclient.ApiBinder
 import org.jellyfin.androidtv.auth.store.AuthenticationPreferences
 import org.jellyfin.androidtv.auth.store.AuthenticationStore
 import org.jellyfin.androidtv.preference.PreferencesRepository
@@ -49,6 +48,7 @@ interface SessionRepository {
 
 class SessionRepositoryImpl(
 	private val authenticationPreferences: AuthenticationPreferences,
+	private val apiBinder: ApiBinder,
 	private val authenticationStore: AuthenticationStore,
 	private val userApiClient: ApiClient,
 	private val preferencesRepository: PreferencesRepository,
@@ -112,15 +112,13 @@ class SessionRepositoryImpl(
 	override fun destroyCurrentSession() {
 		Timber.i("Destroying current session")
 
-		userRepository.setCurrentUser(null)
-		serverRepository.setCurrentServer(null)
+		userRepository.updateCurrentUser(null)
 		_currentSession.value = null
+		apiBinder.updateSession(null, userApiClient.deviceInfo)
 		_state.value = SessionRepositoryState.READY
 	}
 
 	private suspend fun setCurrentSession(session: Session?): Boolean {
-		var server: Server? = null
-
 		if (session != null) {
 			// No change in session - don't switch
 			if (currentSession.value?.userId == session.userId) return true
@@ -130,40 +128,40 @@ class SessionRepositoryImpl(
 			authenticationPreferences[AuthenticationPreferences.lastUserId] = session.userId.toString()
 
 			// Check if server version is supported
-			server = serverRepository.getServer(session.serverId, true)
+			val server = serverRepository.getServer(session.serverId)
 			if (server == null || !server.versionSupported) return false
 		}
 
 		// Update session after binding the apiclient settings
 		val deviceInfo = session?.let { defaultDeviceInfo.forUser(it.userId) } ?: defaultDeviceInfo
-		Timber.i("Updating current session. userId=${session?.userId} server=${server?.serverVersion}")
+		val success = apiBinder.updateSession(session, deviceInfo)
+		Timber.i("Updating current session. userId=${session?.userId} apiBindingSuccess=${success}")
 
-		val applied = userApiClient.applySession(session, deviceInfo)
-		if (applied && session != null) {
-			try {
-				val user = withContext(Dispatchers.IO) {
-					userApiClient.userApi.getCurrentUser().content
+		if (success) {
+			val applied = userApiClient.applySession(session, deviceInfo)
+
+			if (applied && session != null) {
+				try {
+					val user by userApiClient.userApi.getCurrentUser()
+					userRepository.updateCurrentUser(user)
+				} catch (err: ApiClientException) {
+					Timber.e(err, "Unable to authenticate: bad response when getting user info")
+					destroyCurrentSession()
+					return false
 				}
-				userRepository.setCurrentUser(user)
-				serverRepository.setCurrentServer(server)
-			} catch (err: ApiClientException) {
-				Timber.e(err, "Unable to authenticate: bad response when getting user info")
-				destroyCurrentSession()
-				return false
+
+				// Update crash reporting URL
+				val crashReportUrl = userApiClient.clientLogApi.logFileUrl()
+				telemetryPreferences[TelemetryPreferences.crashReportUrl] = crashReportUrl
+				telemetryPreferences[TelemetryPreferences.crashReportToken] = session.accessToken
+			} else {
+				userRepository.updateCurrentUser(null)
 			}
+			preferencesRepository.onSessionChanged()
+			_currentSession.value = session
+		} else destroyCurrentSession()
 
-			// Update crash reporting URL
-			val crashReportUrl = userApiClient.clientLogApi.logFileUrl()
-			telemetryPreferences[TelemetryPreferences.crashReportUrl] = crashReportUrl
-			telemetryPreferences[TelemetryPreferences.crashReportToken] = session.accessToken
-		} else {
-			userRepository.setCurrentUser(null)
-			serverRepository.setCurrentServer(null)
-		}
-		preferencesRepository.onSessionChanged()
-		_currentSession.value = session
-
-		return true
+		return success
 	}
 
 	private fun createLastUserSession(): Session? {

app/src/main/java/org/jellyfin/androidtv/auth/repository/UserRepository.kt

@@ -10,13 +10,13 @@ import org.jellyfin.sdk.model.api.UserDto
 interface UserRepository {
 	val currentUser: StateFlow<UserDto?>
 
-	fun setCurrentUser(user: UserDto?)
+	fun updateCurrentUser(user: UserDto?)
 }
 
 class UserRepositoryImpl : UserRepository {
 	override val currentUser = MutableStateFlow<UserDto?>(null)
 
-	override fun setCurrentUser(user: UserDto?) {
+	override fun updateCurrentUser(user: UserDto?) {
 		currentUser.value = user
 	}
 }

app/src/main/java/org/jellyfin/androidtv/auth/service/AuthenticatorService.kt

@@ -0,0 +1,79 @@
+package org.jellyfin.androidtv.auth.service
+
+import android.accounts.AbstractAccountAuthenticator
+import android.accounts.Account
+import android.accounts.AccountAuthenticatorResponse
+import android.accounts.AccountManager
+import android.app.Service
+import android.content.Intent
+import android.os.Bundle
+import android.os.IBinder
+import androidx.core.os.bundleOf
+import org.jellyfin.androidtv.ui.preference.PreferencesActivity
+
+class AuthenticatorService : Service() {
+	private val authenticator by lazy {
+		Authenticator(this)
+	}
+
+	override fun onBind(intent: Intent): IBinder? = authenticator.iBinder
+
+	private inner class Authenticator(
+		private val service: AuthenticatorService
+	) : AbstractAccountAuthenticator(service) {
+		private val unsupportedOperationBundle = bundleOf(
+			AccountManager.KEY_ERROR_CODE to AccountManager.ERROR_CODE_REMOTE_EXCEPTION,
+			AccountManager.KEY_ERROR_MESSAGE to "Unsupported operation"
+		)
+
+		override fun addAccount(
+			response: AccountAuthenticatorResponse,
+			accountType: String,
+			authTokenType: String?,
+			requiredFeatures: Array<String>?,
+			options: Bundle,
+		): Bundle = unsupportedOperationBundle
+
+		override fun confirmCredentials(
+			response: AccountAuthenticatorResponse,
+			account: Account,
+			options: Bundle?,
+		): Bundle = unsupportedOperationBundle
+
+		override fun editProperties(
+			response: AccountAuthenticatorResponse,
+			accountType: String,
+		): Bundle = bundleOf(
+			AccountManager.KEY_INTENT to Intent(service, PreferencesActivity::class.java)
+		)
+
+		override fun getAccountRemovalAllowed(
+			response: AccountAuthenticatorResponse,
+			account: Account,
+		): Bundle = bundleOf(
+			AccountManager.KEY_BOOLEAN_RESULT to true
+		)
+
+		override fun getAuthToken(
+			response: AccountAuthenticatorResponse,
+			account: Account,
+			authTokenType: String,
+			options: Bundle,
+		): Bundle = unsupportedOperationBundle
+
+		override fun getAuthTokenLabel(authTokenType: String): String? = null
+
+		override fun hasFeatures(
+			response: AccountAuthenticatorResponse,
+			account: Account,
+			features: Array<String>,
+		): Bundle = unsupportedOperationBundle
+
+		override fun updateCredentials(
+			response: AccountAuthenticatorResponse,
+			account: Account,
+			authTokenType: String?,
+			options: Bundle?,
+		): Bundle = unsupportedOperationBundle
+	}
+}

app/src/main/java/org/jellyfin/androidtv/auth/store/AuthenticationStore.kt

@@ -2,6 +2,7 @@ package org.jellyfin.androidtv.auth.store
 
 import android.content.Context
 import kotlinx.serialization.SerializationException
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
@@ -12,6 +13,7 @@ import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.contextual
+import org.jellyfin.androidtv.auth.AccountManagerMigration
 import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
 import org.jellyfin.androidtv.auth.model.AuthenticationStoreUser
 import org.jellyfin.sdk.model.serializer.UUIDSerializer
@@ -26,6 +28,7 @@ import java.util.UUID
  */
 class AuthenticationStore(
 	private val context: Context,
+	private val accountManagerMigration: AccountManagerMigration,
 ) {
 	private val storePath
 		get() = context.filesDir.resolve("authentication_store.json")
@@ -56,13 +59,11 @@ class AuthenticationStore(
 
 		// Check for version
 		return when (root["version"]?.jsonPrimitive?.intOrNull) {
-			// Migration was removed, clear stored servers
-			1 -> {
-				Timber.e("Migrating from version 1 is no longer possible")
-				emptyMap()
-			}
+			1 -> json.decodeFromJsonElement<Map<UUID, AuthenticationStoreServer>>(root["servers"]!!)
+				// Add access tokens from account manager to stored users and save the migrated data
+				.let { servers -> accountManagerMigration.migrate(servers) }
+				.also { servers -> write(servers) }
 
-			// Current version, return as-is
 			2 -> json.decodeFromJsonElement<Map<UUID, AuthenticationStoreServer>>(root["servers"]!!)
 
 			null -> {

app/src/main/java/org/jellyfin/androidtv/constant/Codec.kt

@@ -66,7 +66,6 @@ object Codec {
 		const val VP8 = "vp8"
 		const val VP9 = "vp9"
 		const val AV1 = "av1"
-		const val VC1 = "vc1"
 	}
 
 	object Subtitle {

app/src/main/java/org/jellyfin/androidtv/constant/QueryType.kt

@@ -18,6 +18,7 @@ enum class QueryType {
 	LiveTvProgram,
 	LiveTvRecording,
 	StaticItems,
+	StaticAudioQueueItems,
 	Artists,
 	AlbumArtists,
 	AudioPlaylists,

app/src/main/java/org/jellyfin/androidtv/data/compat/AudioOptions.kt

@@ -1,6 +1,7 @@
 package org.jellyfin.androidtv.data.compat
 
-import org.jellyfin.sdk.model.api.DeviceProfile
+import org.jellyfin.apiclient.model.dlna.DeviceProfile
+import org.jellyfin.apiclient.model.dlna.EncodingContext
 import org.jellyfin.sdk.model.api.MediaSourceInfo
 import java.util.UUID
 
@@ -21,4 +22,11 @@ open class AudioOptions {
 	 * Example: DeviceProfile supports five channel, but user only has stereo speakers
 	 */
 	var maxAudioChannels: Int? = null
+
+	/**
+	 * The application's configured quality setting
+	 */
+	var maxBitrate: Int? = null
+
+	var context = EncodingContext.Streaming
 }

app/src/main/java/org/jellyfin/androidtv/data/compat/PlaybackException.kt

@@ -1,7 +1,7 @@
 package org.jellyfin.androidtv.data.compat
 
-import org.jellyfin.sdk.model.api.PlaybackErrorCode
+import org.jellyfin.apiclient.model.dlna.PlaybackErrorCode
 
 class PlaybackException : RuntimeException() {
-	var errorCode = PlaybackErrorCode.NOT_ALLOWED
+	var errorCode = PlaybackErrorCode.NotAllowed
 }

app/src/main/java/org/jellyfin/androidtv/data/compat/StreamBuilder.java

@@ -0,0 +1,97 @@
+package org.jellyfin.androidtv.data.compat;
+
+import org.jellyfin.androidtv.util.Utils;
+import org.jellyfin.apiclient.model.dlna.SubtitleDeliveryMethod;
+import org.jellyfin.apiclient.model.dlna.SubtitleProfile;
+import org.jellyfin.apiclient.model.entities.MediaStream;
+import org.jellyfin.apiclient.model.session.PlayMethod;
+
+public class StreamBuilder
+{
+    public static SubtitleProfile getSubtitleProfile(org.jellyfin.sdk.model.api.MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod)
+    {
+        if (playMethod != PlayMethod.Transcode && !subtitleStream.isExternal())
+        {
+            // Look for supported embedded subs
+            for (SubtitleProfile profile : subtitleProfiles)
+            {
+                if (!profile.SupportsLanguage(subtitleStream.getLanguage()))
+                {
+                    continue;
+                }
+
+                if (profile.getMethod() != SubtitleDeliveryMethod.Embed)
+                {
+                    continue;
+                }
+
+                if (subtitleStream.isTextSubtitleStream() == MediaStream.IsTextFormat(profile.getFormat()) && Utils.equalsIgnoreCase(profile.getFormat(), subtitleStream.getCodec()))
+                {
+                    return profile;
+                }
+            }
+        }
+
+        // Look for an external or hls profile that matches the stream type (text/graphical) and doesn't require conversion
+        SubtitleProfile tempVar = new SubtitleProfile();
+        tempVar.setMethod(SubtitleDeliveryMethod.Encode);
+        tempVar.setFormat(subtitleStream.getCodec());
+        SubtitleProfile tempVar2 = getExternalSubtitleProfile(subtitleStream, subtitleProfiles, playMethod, false);
+        SubtitleProfile tempVar3 = getExternalSubtitleProfile(subtitleStream, subtitleProfiles, playMethod, true);
+        return (tempVar2 != null) ? tempVar2 : (tempVar3 != null) ? tempVar3 : tempVar;
+    }
+
+    private static SubtitleProfile getExternalSubtitleProfile(org.jellyfin.sdk.model.api.MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod, boolean allowConversion)
+    {
+        for (SubtitleProfile profile : subtitleProfiles)
+        {
+            if (profile.getMethod() != SubtitleDeliveryMethod.External && profile.getMethod() != SubtitleDeliveryMethod.Hls)
+            {
+                continue;
+            }
+
+            if (profile.getMethod() == SubtitleDeliveryMethod.Hls && playMethod != PlayMethod.Transcode)
+            {
+                continue;
+            }
+
+            if (!profile.SupportsLanguage(subtitleStream.getLanguage()))
+            {
+                continue;
+            }
+
+            if ((profile.getMethod() == SubtitleDeliveryMethod.External && subtitleStream.isTextSubtitleStream() == MediaStream.IsTextFormat(profile.getFormat())) || (profile.getMethod() == SubtitleDeliveryMethod.Hls && subtitleStream.isTextSubtitleStream()))
+            {
+                boolean requiresConversion = !Utils.equalsIgnoreCase(subtitleStream.getCodec(), profile.getFormat());
+
+                if (!requiresConversion)
+                {
+                    return profile;
+                }
+
+                if (!allowConversion)
+                {
+                    continue;
+                }
+
+                if (subtitleStream.isTextSubtitleStream() && subtitleStream.getSupportsExternalStream() && supportsSubtitleConversionTo(subtitleStream, profile.getFormat()))
+                {
+                    return profile;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static boolean supportsSubtitleConversionTo(org.jellyfin.sdk.model.api.MediaStream mediaStream, String codec)
+    {
+        if (!mediaStream.isTextSubtitleStream())
+        {
+            return false;
+        }
+
+        // Can't convert from this
+        return !("ass".equalsIgnoreCase(mediaStream.getCodec()) || "ssa".equalsIgnoreCase(mediaStream.getCodec()) || "ass".equalsIgnoreCase(codec) || "ssa".equalsIgnoreCase(codec));
+    }
+}

app/src/main/java/org/jellyfin/androidtv/data/compat/StreamInfo.java

@@ -1,10 +1,16 @@
 package org.jellyfin.androidtv.data.compat;
 
+import org.jellyfin.androidtv.util.Utils;
+import org.jellyfin.apiclient.model.dlna.DeviceProfile;
+import org.jellyfin.apiclient.model.dlna.EncodingContext;
+import org.jellyfin.apiclient.model.dlna.SubtitleDeliveryMethod;
+import org.jellyfin.apiclient.model.dlna.SubtitleProfile;
+import org.jellyfin.apiclient.model.dlna.TranscodeSeekInfo;
+import org.jellyfin.apiclient.model.session.PlayMethod;
+import org.jellyfin.sdk.model.api.MediaProtocol;
 import org.jellyfin.sdk.model.api.MediaSourceInfo;
 import org.jellyfin.sdk.model.api.MediaStream;
 import org.jellyfin.sdk.model.api.MediaStreamType;
-import org.jellyfin.sdk.model.api.PlayMethod;
-import org.jellyfin.sdk.model.api.SubtitleDeliveryMethod;
 
 import java.util.ArrayList;
 import java.util.UUID;
@@ -30,14 +36,24 @@ public class StreamInfo {
         MediaUrl = value;
     }
 
-    private PlayMethod playMethod = PlayMethod.DIRECT_PLAY;
+    private PlayMethod PlayMethod = getPlayMethod().values()[0];
 
     public final PlayMethod getPlayMethod() {
-        return playMethod;
+        return PlayMethod;
     }
 
     public final void setPlayMethod(PlayMethod value) {
-        playMethod = value;
+        PlayMethod = value;
+    }
+
+    private EncodingContext Context = EncodingContext.values()[0];
+
+    public final EncodingContext getContext() {
+        return Context;
+    }
+
+    public final void setContext(EncodingContext value) {
+        Context = value;
     }
 
     private String Container;
@@ -50,6 +66,26 @@ public class StreamInfo {
         Container = value;
     }
 
+    private long StartPositionTicks;
+
+    public final long getStartPositionTicks() {
+        return StartPositionTicks;
+    }
+
+    public final void setStartPositionTicks(long value) {
+        StartPositionTicks = value;
+    }
+
+    private DeviceProfile DeviceProfile;
+
+    public final DeviceProfile getDeviceProfile() {
+        return DeviceProfile;
+    }
+
+    public final void setDeviceProfile(DeviceProfile value) {
+        DeviceProfile = value;
+    }
+
     private Long RunTimeTicks = null;
 
     public final Long getRunTimeTicks() {
@@ -60,6 +96,12 @@ public class StreamInfo {
         RunTimeTicks = value;
     }
 
+    private TranscodeSeekInfo TranscodeSeekInfo = getTranscodeSeekInfo().values()[0];
+
+    public final TranscodeSeekInfo getTranscodeSeekInfo() {
+        return TranscodeSeekInfo;
+    }
+
     private MediaSourceInfo MediaSource;
 
     public final MediaSourceInfo getMediaSource() {
@@ -70,10 +112,10 @@ public class StreamInfo {
         MediaSource = value;
     }
 
-    public final org.jellyfin.sdk.model.api.SubtitleDeliveryMethod getSubtitleDeliveryMethod() {
-        Integer subtitleStreamIndex = MediaSource.getDefaultSubtitleStreamIndex();
-        if (subtitleStreamIndex == null || subtitleStreamIndex == -1) return SubtitleDeliveryMethod.DROP;
-        return MediaSource.getMediaStreams().get(subtitleStreamIndex).getDeliveryMethod();
+    private SubtitleDeliveryMethod SubtitleDeliveryMethod = getSubtitleDeliveryMethod().values()[0];
+
+    public final SubtitleDeliveryMethod getSubtitleDeliveryMethod() {
+        return SubtitleDeliveryMethod;
     }
 
     private String PlaySessionId;
@@ -90,6 +132,69 @@ public class StreamInfo {
         return getMediaSource() == null ? null : getMediaSource().getId();
     }
 
+    public final ArrayList<SubtitleStreamInfo> getSubtitleProfiles(boolean includeSelectedTrackOnly, String baseUrl, String accessToken) {
+        return getSubtitleProfiles(includeSelectedTrackOnly, false, baseUrl, accessToken);
+    }
+
+    public final ArrayList<SubtitleStreamInfo> getSubtitleProfiles(boolean includeSelectedTrackOnly, boolean enableAllProfiles, String baseUrl, String accessToken) {
+        ArrayList<SubtitleStreamInfo> list = new ArrayList<SubtitleStreamInfo>();
+
+        // HLS will preserve timestamps so we can just grab the full subtitle stream
+        long startPositionTicks = getPlayMethod() == PlayMethod.Transcode ? getStartPositionTicks() : 0;
+
+        if (!includeSelectedTrackOnly) {
+            if (getMediaSource() == null) return list;
+
+            for (org.jellyfin.sdk.model.api.MediaStream stream : getMediaSource().getMediaStreams()) {
+                if (stream.getType() == org.jellyfin.sdk.model.api.MediaStreamType.SUBTITLE) {
+                    addSubtitleProfiles(list, stream, enableAllProfiles, baseUrl, accessToken, startPositionTicks);
+                }
+            }
+        }
+
+        return list;
+    }
+
+    private void addSubtitleProfiles(ArrayList<SubtitleStreamInfo> list, org.jellyfin.sdk.model.api.MediaStream stream, boolean enableAllProfiles, String baseUrl, String accessToken, long startPositionTicks) {
+        if (enableAllProfiles) {
+            for (SubtitleProfile profile : getDeviceProfile().getSubtitleProfiles()) {
+                SubtitleStreamInfo info = getSubtitleStreamInfo(stream, baseUrl, accessToken, startPositionTicks, new SubtitleProfile[]{profile});
+
+                list.add(info);
+            }
+        } else {
+            SubtitleStreamInfo info = getSubtitleStreamInfo(stream, baseUrl, accessToken, startPositionTicks, getDeviceProfile().getSubtitleProfiles());
+
+            list.add(info);
+        }
+    }
+
+    private SubtitleStreamInfo getSubtitleStreamInfo(org.jellyfin.sdk.model.api.MediaStream stream, String baseUrl, String accessToken, long startPositionTicks, SubtitleProfile[] subtitleProfiles) {
+        SubtitleProfile subtitleProfile = StreamBuilder.getSubtitleProfile(stream, subtitleProfiles, getPlayMethod());
+        SubtitleStreamInfo tempVar = new SubtitleStreamInfo();
+        String tempVar2 = stream.getLanguage();
+        tempVar.setName((tempVar2 != null) ? tempVar2 : "Unknown");
+        tempVar.setFormat(subtitleProfile.getFormat());
+        tempVar.setIndex(stream.getIndex());
+        tempVar.setDeliveryMethod(subtitleProfile.getMethod());
+        tempVar.setDisplayTitle(stream.getDisplayTitle());
+        SubtitleStreamInfo info = tempVar;
+
+        if (info.getDeliveryMethod() == SubtitleDeliveryMethod.External) {
+            if (getMediaSource().getProtocol() == MediaProtocol.FILE || !stream.getCodec().equalsIgnoreCase(subtitleProfile.getFormat())) {
+                info.setUrl(String.format("%1$s/Videos/%2$s/%3$s/Subtitles/%4$s/%5$s/Stream.%6$s", baseUrl, getItemId(), getMediaSourceId(), String.valueOf(stream.getIndex()), String.valueOf(startPositionTicks), subtitleProfile.getFormat()));
+
+                if (!Utils.isEmpty(accessToken)) {
+                    info.setUrl(info.getUrl() + "?api_key=" + accessToken);
+                }
+            } else {
+                info.setUrl(stream.getPath());
+            }
+        }
+
+        return info;
+    }
+
     public final ArrayList<MediaStream> getSelectableAudioStreams() {
         return getSelectableStreams(MediaStreamType.AUDIO);
     }

app/src/main/java/org/jellyfin/androidtv/data/compat/SubtitleStreamInfo.kt

@@ -0,0 +1,12 @@
+package org.jellyfin.androidtv.data.compat
+
+import org.jellyfin.apiclient.model.dlna.SubtitleDeliveryMethod
+
+class SubtitleStreamInfo {
+	var url: String? = null
+	var name: String? = null
+	var format: String? = null
+	var displayTitle: String? = null
+	var index = 0
+	var deliveryMethod = SubtitleDeliveryMethod.Encode
+}

app/src/main/java/org/jellyfin/androidtv/data/eventhandling/SocketHandler.kt

@@ -2,15 +2,12 @@ package org.jellyfin.androidtv.data.eventhandling
 
 import android.content.Context
 import android.media.AudioManager
+import android.os.Build
 import android.widget.Toast
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.coroutineScope
-import androidx.lifecycle.repeatOnLifecycle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.data.model.DataRefreshService
@@ -19,7 +16,6 @@ import org.jellyfin.androidtv.ui.navigation.Destinations
 import org.jellyfin.androidtv.ui.navigation.NavigationRepository
 import org.jellyfin.androidtv.ui.playback.MediaManager
 import org.jellyfin.androidtv.ui.playback.PlaybackControllerContainer
-import org.jellyfin.androidtv.ui.playback.setSubtitleIndex
 import org.jellyfin.androidtv.util.PlaybackHelper
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.exception.ApiClientException
@@ -53,109 +49,103 @@ class SocketHandler(
 	private val audioManager: AudioManager,
 	private val itemLauncher: ItemLauncher,
 	private val playbackHelper: PlaybackHelper,
-	private val lifecycle: Lifecycle,
 ) {
-	init {
-		lifecycle.coroutineScope.launch(Dispatchers.IO) {
-			lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) {
-				subscribe(this)
-			}
-		}
-	}
+	private val coroutineScope = CoroutineScope(Dispatchers.IO)
 
 	suspend fun updateSession() {
 		try {
-			withContext(Dispatchers.IO) {
-				api.sessionApi.postCapabilities(
-					playableMediaTypes = listOf(MediaType.VIDEO, MediaType.AUDIO),
-					supportsMediaControl = true,
-					supportedCommands = buildList {
-						add(GeneralCommandType.DISPLAY_CONTENT)
-						add(GeneralCommandType.SET_SUBTITLE_STREAM_INDEX)
-						add(GeneralCommandType.SET_AUDIO_STREAM_INDEX)
+			api.sessionApi.postCapabilities(
+				playableMediaTypes = listOf(MediaType.VIDEO, MediaType.AUDIO),
+				supportsMediaControl = true,
+				supportedCommands = buildList {
+					add(GeneralCommandType.DISPLAY_CONTENT)
+					add(GeneralCommandType.SET_SUBTITLE_STREAM_INDEX)
+					add(GeneralCommandType.SET_AUDIO_STREAM_INDEX)
 
-						add(GeneralCommandType.DISPLAY_MESSAGE)
-						add(GeneralCommandType.SEND_STRING)
+					add(GeneralCommandType.DISPLAY_MESSAGE)
+					add(GeneralCommandType.SEND_STRING)
 
-						// Note: These are used in the PlaySessionSocketService
-						if (!audioManager.isVolumeFixed) {
-							add(GeneralCommandType.VOLUME_UP)
-							add(GeneralCommandType.VOLUME_DOWN)
-							add(GeneralCommandType.SET_VOLUME)
+					// Note: These are used in the PlaySessionSocketService
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !audioManager.isVolumeFixed) {
+						add(GeneralCommandType.VOLUME_UP)
+						add(GeneralCommandType.VOLUME_DOWN)
+						add(GeneralCommandType.SET_VOLUME)
 
-							add(GeneralCommandType.MUTE)
-							add(GeneralCommandType.UNMUTE)
-							add(GeneralCommandType.TOGGLE_MUTE)
-						}
-					},
-				)
-			}
+						add(GeneralCommandType.MUTE)
+						add(GeneralCommandType.UNMUTE)
+						add(GeneralCommandType.TOGGLE_MUTE)
+					}
+				},
+			)
 		} catch (err: ApiClientException) {
 			Timber.e(err, "Unable to update capabilities")
+			return
 		}
 	}
 
-	private fun subscribe(coroutineScope: CoroutineScope) = api.webSocket.apply {
-		// Library
-		subscribe<LibraryChangedMessage>()
-			.onEach { message -> message.data?.let(::onLibraryChanged) }
-			.launchIn(coroutineScope)
+	init {
+		api.webSocket.apply {
+			// Library
+			subscribe<LibraryChangedMessage>()
+				.onEach { message -> message.data?.let(::onLibraryChanged) }
+				.launchIn(coroutineScope)
 
-		// Media playback
-		subscribe<PlayMessage>()
-			.onEach { message -> onPlayMessage(message) }
-			.launchIn(coroutineScope)
+			// Media playback
+			subscribe<PlayMessage>()
+				.onEach { message -> onPlayMessage(message) }
+				.launchIn(coroutineScope)
 
-		subscribe<PlaystateMessage>()
-			.onEach { message -> onPlayStateMessage(message) }
-			.launchIn(coroutineScope)
+			subscribe<PlaystateMessage>()
+				.onEach { message -> onPlayStateMessage(message) }
+				.launchIn(coroutineScope)
 
-		subscribeGeneralCommand(GeneralCommandType.SET_SUBTITLE_STREAM_INDEX)
-			.onEach { message ->
-				val index = message["index"]?.toIntOrNull() ?: return@onEach
+			subscribeGeneralCommand(GeneralCommandType.SET_SUBTITLE_STREAM_INDEX)
+				.onEach { message ->
+					val index = message["index"]?.toIntOrNull() ?: return@onEach
 
-				withContext(Dispatchers.Main) {
-					playbackControllerContainer.playbackController?.setSubtitleIndex(index)
-				}
-			}
-			.launchIn(coroutineScope)
-
-		subscribeGeneralCommand(GeneralCommandType.SET_AUDIO_STREAM_INDEX)
-			.onEach { message ->
-				val index = message["index"]?.toIntOrNull() ?: return@onEach
-
-				withContext(Dispatchers.Main) {
-					playbackControllerContainer.playbackController?.switchAudioStream(index)
-				}
-			}
-			.launchIn(coroutineScope)
-
-		// General commands
-		subscribeGeneralCommand(GeneralCommandType.DISPLAY_CONTENT)
-			.onEach { message ->
-				val itemId by message
-				val itemType by message
-
-				val itemUuid = itemId?.toUUIDOrNull()
-				val itemKind = itemType?.let { type ->
-					BaseItemKind.entries.find { value ->
-						value.serialName.equals(type, true)
+					withContext(Dispatchers.Main) {
+						playbackControllerContainer.playbackController?.switchSubtitleStream(index)
 					}
 				}
+				.launchIn(coroutineScope)
 
-				if (itemUuid != null && itemKind != null) onDisplayContent(itemUuid, itemKind)
-			}
-			.launchIn(coroutineScope)
+			subscribeGeneralCommand(GeneralCommandType.SET_AUDIO_STREAM_INDEX)
+				.onEach { message ->
+					val index = message["index"]?.toIntOrNull() ?: return@onEach
 
-		subscribeGeneralCommands(setOf(GeneralCommandType.DISPLAY_MESSAGE, GeneralCommandType.SEND_STRING))
-			.onEach { message ->
-				val header by message
-				val text by message
-				val string by message
+					withContext(Dispatchers.Main) {
+						playbackControllerContainer.playbackController?.switchAudioStream(index)
+					}
+				}
+				.launchIn(coroutineScope)
 
-				onDisplayMessage(header, text ?: string)
-			}
-			.launchIn(coroutineScope)
+			// General commands
+			subscribeGeneralCommand(GeneralCommandType.DISPLAY_CONTENT)
+				.onEach { message ->
+					val itemId by message
+					val itemType by message
+
+					val itemUuid = itemId?.toUUIDOrNull()
+					val itemKind = itemType?.let { type ->
+						BaseItemKind.entries.find { value ->
+							value.serialName.equals(type, true)
+						}
+					}
+
+					if (itemUuid != null && itemKind != null) onDisplayContent(itemUuid, itemKind)
+				}
+				.launchIn(coroutineScope)
+
+			subscribeGeneralCommands(setOf(GeneralCommandType.DISPLAY_MESSAGE, GeneralCommandType.SEND_STRING))
+				.onEach { message ->
+					val header by message
+					val text by message
+					val string by message
+
+					onDisplayMessage(header, text ?: string)
+				}
+				.launchIn(coroutineScope)
+		}
 	}
 
 	private fun onLibraryChanged(info: LibraryUpdateInfo) {
@@ -171,14 +161,13 @@ class SocketHandler(
 	}
 
 	private fun onPlayMessage(message: PlayMessage) {
-		val itemIds = message.data?.itemIds ?: return
+		val itemId = message.data?.itemIds?.firstOrNull() ?: return
 
 		runCatching {
 			playbackHelper.retrieveAndPlay(
-				itemIds,
+				itemId,
 				false,
 				message.data?.startPositionTicks,
-				message.data?.startIndex,
 				context
 			)
 		}.onFailure { Timber.w(it, "Failed to start playback") }

app/src/main/java/org/jellyfin/androidtv/data/model/ChapterItemInfo.kt

@@ -1,11 +1,10 @@
 package org.jellyfin.androidtv.data.model
 
-import org.jellyfin.androidtv.util.apiclient.JellyfinImage
 import java.util.UUID
 
 data class ChapterItemInfo(
 	val itemId: UUID,
 	val name: String?,
 	val startPositionTicks: Long,
-	val image: JellyfinImage?,
+	val imagePath: String?,
 )

app/src/main/java/org/jellyfin/androidtv/data/repository/ExternalAppRepository.kt

@@ -1,62 +0,0 @@
-package org.jellyfin.androidtv.data.repository
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ActivityInfo
-import android.content.pm.ResolveInfo
-import androidx.core.net.toUri
-import org.jellyfin.androidtv.preference.UserPreferences
-import org.jellyfin.androidtv.util.componentName
-
-class ExternalAppRepository(
-	private val userPreferences: UserPreferences,
-) {
-	companion object {
-		const val SAMPLE_VIDEO_URL = "http://jellyfin.local/query.mp4"
-		const val MEDIA_TYPE_VIDEO = "video/*"
-	}
-
-	private val externalPlayerAppIntent = Intent(Intent.ACTION_VIEW).apply {
-		setDataAndTypeAndNormalize(SAMPLE_VIDEO_URL.toUri(), MEDIA_TYPE_VIDEO)
-	}
-
-	fun getExternalPlayerApps(context: Context): List<ResolveInfo> = context.packageManager
-		.queryIntentActivities(externalPlayerAppIntent, 0)
-		// Hide apps with priority below zero (system stubs)
-		.filter { it.priority >= 0 }
-
-	fun getCurrentExternalPlayerApp(context: Context): ActivityInfo? {
-		// Validate if external app should be used at all
-		val useExternalPlayer = userPreferences[UserPreferences.useExternalPlayer]
-		if (!useExternalPlayer) return null
-
-		// Resolve external app information
-		val resolvedInfo = userPreferences[UserPreferences.externalPlayerComponentName]
-			.takeIf { it.isNotEmpty() }
-			?.let(ComponentName::unflattenFromString)
-			?.runCatching { context.packageManager.getActivityInfo(this, 0) }
-			?.getOrNull()
-		if (resolvedInfo != null) return resolvedInfo
-
-		// Fallback in case the app is uninstalled or unavailable for some other reason
-		val externalApps = getExternalPlayerApps(context)
-
-		// System default
-		val systemDefault = externalApps.find { it.isDefault }?.activityInfo
-		if (systemDefault != null) return systemDefault
-
-		// First compatible, or none
-		return externalApps.firstOrNull()?.activityInfo
-	}
-
-	fun setExternalPlayerapp(activityInfo: ActivityInfo?) {
-		if (activityInfo == null) {
-			userPreferences[UserPreferences.useExternalPlayer] = false
-			userPreferences[UserPreferences.externalPlayerComponentName] = ""
-		} else {
-			userPreferences[UserPreferences.useExternalPlayer] = true
-			userPreferences[UserPreferences.externalPlayerComponentName] = activityInfo.componentName.flattenToShortString()
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/data/repository/ItemMutationRepository.kt

@@ -1,7 +1,5 @@
 package org.jellyfin.androidtv.data.repository
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.data.model.DataRefreshService
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.extensions.playStateApi
@@ -21,8 +19,8 @@ class ItemMutationRepositoryImpl(
 ) : ItemMutationRepository {
 	override suspend fun setFavorite(item: UUID, favorite: Boolean): UserItemDataDto {
 		val response by when {
-			favorite -> withContext(Dispatchers.IO) { api.userLibraryApi.markFavoriteItem(itemId = item) }
-			else -> withContext(Dispatchers.IO) { api.userLibraryApi.unmarkFavoriteItem(itemId = item) }
+			favorite -> api.userLibraryApi.markFavoriteItem(itemId = item)
+			else -> api.userLibraryApi.unmarkFavoriteItem(itemId = item)
 		}
 
 		dataRefreshService.lastFavoriteUpdate = Instant.now()
@@ -31,8 +29,8 @@ class ItemMutationRepositoryImpl(
 
 	override suspend fun setPlayed(item: UUID, played: Boolean): UserItemDataDto {
 		val response by when {
-			played -> withContext(Dispatchers.IO) { api.playStateApi.markPlayedItem(itemId = item) }
-			else -> withContext(Dispatchers.IO) { api.playStateApi.markUnplayedItem(itemId = item) }
+			played -> api.playStateApi.markPlayedItem(itemId = item)
+			else -> api.playStateApi.markUnplayedItem(itemId = item)
 		}
 
 		return response

app/src/main/java/org/jellyfin/androidtv/data/repository/ItemRepository.kt

@@ -1,25 +0,0 @@
-package org.jellyfin.androidtv.data.repository
-
-import org.jellyfin.sdk.model.api.ItemFields
-
-object ItemRepository {
-	val itemFields = setOf(
-		ItemFields.CAN_DELETE,
-		ItemFields.CHANNEL_INFO,
-		ItemFields.CHAPTERS,
-		ItemFields.CHILD_COUNT,
-		ItemFields.CUMULATIVE_RUN_TIME_TICKS,
-		ItemFields.DATE_CREATED,
-		ItemFields.DISPLAY_PREFERENCES_ID,
-		ItemFields.GENRES,
-		ItemFields.ITEM_COUNTS,
-		ItemFields.MEDIA_SOURCE_COUNT,
-		ItemFields.MEDIA_SOURCES,
-		ItemFields.MEDIA_STREAMS,
-		ItemFields.OVERVIEW,
-		ItemFields.PATH,
-		ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-		ItemFields.TAGLINES,
-		ItemFields.TRICKPLAY,
-	)
-}

app/src/main/java/org/jellyfin/androidtv/data/repository/UserViewsRepository.kt

@@ -1,9 +1,7 @@
 package org.jellyfin.androidtv.data.repository
 
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.extensions.userViewsApi
 import org.jellyfin.sdk.model.api.BaseItemDto
@@ -23,9 +21,10 @@ class UserViewsRepositoryImpl(
 	override val views = flow {
 		val views by api.userViewsApi.getUserViews()
 		val filteredViews = views.items
+			.orEmpty()
 			.filter { isSupported(it.collectionType) }
 		emit(filteredViews)
-	}.flowOn(Dispatchers.IO)
+	}
 
 	override fun isSupported(collectionType: CollectionType?) = collectionType !in unsupportedCollectionTypes
 	override fun allowViewSelection(collectionType: CollectionType?) = collectionType !in disallowViewSelectionCollectionTypes

app/src/main/java/org/jellyfin/androidtv/data/service/BackgroundService.kt

@@ -3,9 +3,9 @@ package org.jellyfin.androidtv.data.service
 import android.content.Context
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
-import coil3.ImageLoader
-import coil3.request.ImageRequest
-import coil3.toBitmap
+import androidx.core.graphics.drawable.toBitmap
+import coil.ImageLoader
+import coil.request.ImageRequest
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.MainScope
@@ -15,15 +15,13 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import org.jellyfin.androidtv.auth.model.Server
 import org.jellyfin.androidtv.preference.UserPreferences
-import org.jellyfin.androidtv.preference.constant.BackdropBehavior
-import org.jellyfin.androidtv.util.apiclient.getUrl
-import org.jellyfin.androidtv.util.apiclient.itemBackdropImages
-import org.jellyfin.androidtv.util.apiclient.parentBackdropImages
 import org.jellyfin.sdk.Jellyfin
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.extensions.imageApi
 import org.jellyfin.sdk.model.api.BaseItemDto
+import org.jellyfin.sdk.model.api.ImageType
 import java.time.Instant
+import java.util.UUID
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
@@ -56,23 +54,38 @@ class BackgroundService(
 	val blurBackground get() = _blurBackground.asStateFlow()
 	val enabled get() = _enabled.asStateFlow()
 
+	// Helper function for [setBackground]
+	private fun List<String>?.getUrls(itemId: UUID?): List<String> {
+		// Check for nullability
+		if (itemId == null || isNullOrEmpty()) return emptyList()
+
+		return mapIndexed { index, tag ->
+			api.imageApi.getItemImageUrl(
+				itemId = itemId,
+				imageType = ImageType.BACKDROP,
+				tag = tag,
+				imageIndex = index,
+				fillWidth = context.resources.displayMetrics.widthPixels,
+				fillHeight = context.resources.displayMetrics.heightPixels,
+			)
+		}
+	}
+
 	/**
 	 * Use all available backdrops from [baseItem] as background.
 	 */
 	fun setBackground(baseItem: BaseItemDto?) {
-		val backdropBehavior = userPreferences[UserPreferences.backdropBehavior]
-
 		// Check if item is set and backgrounds are enabled
-		if (baseItem == null || backdropBehavior == BackdropBehavior.DISABLED)
+		if (baseItem == null || !userPreferences[UserPreferences.backdropEnabled])
 			return clearBackgrounds()
 
 		// Enable blur for backdrops
-		_blurBackground.value = backdropBehavior == BackdropBehavior.BACKDROP_WITH_BLUR
+		_blurBackground.value = true
 
 		// Get all backdrop urls
-		val backdropUrls = (baseItem.itemBackdropImages + baseItem.parentBackdropImages)
-			.map { it.getUrl(api) }
-			.toSet()
+		val itemBackdropUrls = baseItem.backdropImageTags.getUrls(baseItem.id)
+		val parentBackdropUrls = baseItem.parentBackdropImageTags.getUrls(baseItem.parentBackdropItemId)
+		val backdropUrls = itemBackdropUrls.union(parentBackdropUrls)
 
 		loadBackgrounds(backdropUrls)
 	}
@@ -82,7 +95,7 @@ class BackgroundService(
 	 */
 	fun setBackground(server: Server) {
 		// Check if item is set and backgrounds are enabled
-		if (userPreferences[UserPreferences.backdropBehavior] == BackdropBehavior.DISABLED)
+		if (!userPreferences[UserPreferences.backdropEnabled])
 			return clearBackgrounds()
 
 		// Check if splashscreen is enabled in (cached) branding options
@@ -111,7 +124,7 @@ class BackgroundService(
 			_backgrounds = backdropUrls.mapNotNull { url ->
 				imageLoader.execute(
 					request = ImageRequest.Builder(context).data(url).build()
-				).image?.toBitmap()?.asImageBitmap()
+				).drawable?.toBitmap()?.asImageBitmap()
 			}
 
 			// Go to first background

app/src/main/java/org/jellyfin/androidtv/di/AppModule.kt

@@ -2,16 +2,10 @@ package org.jellyfin.androidtv.di
 
 import android.content.Context
 import android.os.Build
-import androidx.lifecycle.ProcessLifecycleOwner
-import coil3.ImageLoader
-import coil3.annotation.ExperimentalCoilApi
-import coil3.gif.AnimatedImageDecoder
-import coil3.gif.GifDecoder
-import coil3.network.NetworkFetcher
-import coil3.network.okhttp.OkHttpNetworkFetcherFactory
-import coil3.serviceLoaderEnabled
-import coil3.svg.SvgDecoder
-import coil3.util.Logger
+import coil.ImageLoader
+import coil.decode.GifDecoder
+import coil.decode.ImageDecoderDecoder
+import coil.decode.SvgDecoder
 import org.jellyfin.androidtv.BuildConfig
 import org.jellyfin.androidtv.auth.repository.ServerRepository
 import org.jellyfin.androidtv.auth.repository.UserRepository
@@ -20,7 +14,6 @@ import org.jellyfin.androidtv.data.eventhandling.SocketHandler
 import org.jellyfin.androidtv.data.model.DataRefreshService
 import org.jellyfin.androidtv.data.repository.CustomMessageRepository
 import org.jellyfin.androidtv.data.repository.CustomMessageRepositoryImpl
-import org.jellyfin.androidtv.data.repository.ExternalAppRepository
 import org.jellyfin.androidtv.data.repository.ItemMutationRepository
 import org.jellyfin.androidtv.data.repository.ItemMutationRepositoryImpl
 import org.jellyfin.androidtv.data.repository.NotificationsRepository
@@ -29,22 +22,18 @@ import org.jellyfin.androidtv.data.repository.UserViewsRepository
 import org.jellyfin.androidtv.data.repository.UserViewsRepositoryImpl
 import org.jellyfin.androidtv.data.service.BackgroundService
 import org.jellyfin.androidtv.integration.dream.DreamViewModel
-import org.jellyfin.androidtv.ui.InteractionTrackerViewModel
+import org.jellyfin.androidtv.ui.ScreensaverViewModel
 import org.jellyfin.androidtv.ui.itemhandling.ItemLauncher
 import org.jellyfin.androidtv.ui.navigation.Destinations
 import org.jellyfin.androidtv.ui.navigation.NavigationRepository
 import org.jellyfin.androidtv.ui.navigation.NavigationRepositoryImpl
+import org.jellyfin.androidtv.ui.picture.PictureViewerViewModel
 import org.jellyfin.androidtv.ui.playback.PlaybackControllerContainer
 import org.jellyfin.androidtv.ui.playback.nextup.NextUpViewModel
-import org.jellyfin.androidtv.ui.playback.segment.MediaSegmentRepository
-import org.jellyfin.androidtv.ui.playback.segment.MediaSegmentRepositoryImpl
-import org.jellyfin.androidtv.ui.playback.stillwatching.StillWatchingViewModel
-import org.jellyfin.androidtv.ui.player.photo.PhotoPlayerViewModel
 import org.jellyfin.androidtv.ui.search.SearchFragmentDelegate
 import org.jellyfin.androidtv.ui.search.SearchRepository
 import org.jellyfin.androidtv.ui.search.SearchRepositoryImpl
 import org.jellyfin.androidtv.ui.search.SearchViewModel
-import org.jellyfin.androidtv.ui.settings.compat.SettingsViewModel
 import org.jellyfin.androidtv.ui.startup.ServerAddViewModel
 import org.jellyfin.androidtv.ui.startup.StartupViewModel
 import org.jellyfin.androidtv.ui.startup.UserLoginViewModel
@@ -52,76 +41,68 @@ import org.jellyfin.androidtv.util.KeyProcessor
 import org.jellyfin.androidtv.util.MarkdownRenderer
 import org.jellyfin.androidtv.util.PlaybackHelper
 import org.jellyfin.androidtv.util.apiclient.ReportingHelper
-import org.jellyfin.androidtv.util.coil.CoilTimberLogger
-import org.jellyfin.androidtv.util.coil.createCoilConnectivityChecker
 import org.jellyfin.androidtv.util.sdk.SdkPlaybackHelper
+import org.jellyfin.androidtv.util.sdk.legacy
+import org.jellyfin.apiclient.AppInfo
+import org.jellyfin.apiclient.android
+import org.jellyfin.apiclient.logging.AndroidLogger
 import org.jellyfin.sdk.android.androidDevice
-import org.jellyfin.sdk.api.client.HttpClientOptions
-import org.jellyfin.sdk.api.okhttp.OkHttpFactory
 import org.jellyfin.sdk.createJellyfin
 import org.jellyfin.sdk.model.ClientInfo
+import org.jellyfin.sdk.model.DeviceInfo
+import org.koin.android.ext.koin.androidApplication
 import org.koin.android.ext.koin.androidContext
-import org.koin.core.module.dsl.viewModel
+import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
+import org.jellyfin.apiclient.Jellyfin as JellyfinApiClient
 import org.jellyfin.sdk.Jellyfin as JellyfinSdk
 
 val defaultDeviceInfo = named("defaultDeviceInfo")
 
 val appModule = module {
-	// SDK
+	// New SDK
 	single(defaultDeviceInfo) { androidDevice(get()) }
-	single { OkHttpFactory() }
-	single { HttpClientOptions() }
 	single {
 		createJellyfin {
 			context = androidContext()
 
 			// Add client info
-			val clientName = buildString {
-				append("Jellyfin Android TV")
-				if (BuildConfig.DEBUG) append(" (debug)")
-			}
-			clientInfo = ClientInfo(clientName, BuildConfig.VERSION_NAME)
+			clientInfo = ClientInfo("Android TV", BuildConfig.VERSION_NAME)
 			deviceInfo = get(defaultDeviceInfo)
 
 			// Change server version
 			minimumServerVersion = ServerRepository.minimumServerVersion
-
-			// Use our own shared factory instance
-			apiClientFactory = get<OkHttpFactory>()
-			socketConnectionFactory = get<OkHttpFactory>()
 		}
 	}
 
 	single {
 		// Create an empty API instance, the actual values are set by the SessionRepository
-		get<JellyfinSdk>().createApi(httpClientOptions = get<HttpClientOptions>())
+		get<JellyfinSdk>().createApi()
 	}
 
-	single { SocketHandler(get(), get(), get(), get(), get(), get(), get(), get(), get(), ProcessLifecycleOwner.get().lifecycle) }
+	single { SocketHandler(get(), get(), get(), get(), get(), get(), get(), get(), get()) }
 
-	// Coil (images)
+	// Old apiclient
 	single {
-		val okHttpFactory = get<OkHttpFactory>()
-		val httpClientOptions = get<HttpClientOptions>()
+		JellyfinApiClient {
+			appInfo = AppInfo("Android TV", BuildConfig.VERSION_NAME)
+			logger = AndroidLogger()
+			android(androidApplication())
+		}
+	}
 
-		@OptIn(ExperimentalCoilApi::class)
-		OkHttpNetworkFetcherFactory(
-			callFactory = { okHttpFactory.createClient(httpClientOptions) },
-			connectivityChecker = ::createCoilConnectivityChecker,
+	single {
+		get<JellyfinApiClient>().createApi(
+			device = get<DeviceInfo>(defaultDeviceInfo).legacy()
 		)
 	}
 
+	// Coil (images)
 	single {
 		ImageLoader.Builder(androidContext()).apply {
-			serviceLoaderEnabled(false)
-			logger(CoilTimberLogger(if (BuildConfig.DEBUG) Logger.Level.Warn else Logger.Level.Error))
-
 			components {
-				add(get<NetworkFetcher.Factory>())
-
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) add(AnimatedImageDecoder.Factory())
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) add(ImageDecoderDecoder.Factory())
 				else add(GifDecoder.Factory())
 				add(SvgDecoder.Factory())
 			}
@@ -131,7 +112,6 @@ val appModule = module {
 	// Non API related
 	single { DataRefreshService() }
 	single { PlaybackControllerContainer() }
-	single { InteractionTrackerViewModel(get(), get()) }
 
 	single<UserRepository> { UserRepositoryImpl() }
 	single<UserViewsRepository> { UserViewsRepositoryImpl(get()) }
@@ -140,26 +120,23 @@ val appModule = module {
 	single<CustomMessageRepository> { CustomMessageRepositoryImpl() }
 	single<NavigationRepository> { NavigationRepositoryImpl(Destinations.home) }
 	single<SearchRepository> { SearchRepositoryImpl(get()) }
-	single<MediaSegmentRepository> { MediaSegmentRepositoryImpl(get(), get()) }
-	single<ExternalAppRepository> { ExternalAppRepository(get()) }
 
 	viewModel { StartupViewModel(get(), get(), get(), get()) }
 	viewModel { UserLoginViewModel(get(), get(), get(), get(defaultDeviceInfo)) }
 	viewModel { ServerAddViewModel(get()) }
-	viewModel { NextUpViewModel(get(), get(), get()) }
-	viewModel { StillWatchingViewModel(get(), get(), get(), get()) }
-	viewModel { PhotoPlayerViewModel(get()) }
+	viewModel { NextUpViewModel(get(), get(), get(), get()) }
+	viewModel { PictureViewerViewModel(get()) }
+	viewModel { ScreensaverViewModel(get()) }
 	viewModel { SearchViewModel(get()) }
 	viewModel { DreamViewModel(get(), get(), get(), get(), get()) }
-	viewModel { SettingsViewModel() }
 
 	single { BackgroundService(get(), get(), get(), get(), get()) }
 
 	single { MarkdownRenderer(get()) }
 	single { ItemLauncher() }
 	single { KeyProcessor() }
-	single { ReportingHelper(get(), get()) }
-	single<PlaybackHelper> { SdkPlaybackHelper(get(), get(), get(), get()) }
+	single { ReportingHelper() }
+	single<PlaybackHelper> { SdkPlaybackHelper(get(), get(), get(), get(), get(), get(), get()) }
 
 	factory { (context: Context) -> SearchFragmentDelegate(context, get(), get()) }
 }

app/src/main/java/org/jellyfin/androidtv/di/AuthModule.kt

@@ -1,5 +1,7 @@
 package org.jellyfin.androidtv.di
 
+import org.jellyfin.androidtv.auth.AccountManagerMigration
+import org.jellyfin.androidtv.auth.apiclient.ApiBinder
 import org.jellyfin.androidtv.auth.repository.AuthenticationRepository
 import org.jellyfin.androidtv.auth.repository.AuthenticationRepositoryImpl
 import org.jellyfin.androidtv.auth.repository.ServerRepository
@@ -13,7 +15,8 @@ import org.jellyfin.androidtv.auth.store.AuthenticationStore
 import org.koin.dsl.module
 
 val authModule = module {
-	single { AuthenticationStore(get()) }
+	single { AccountManagerMigration(get()) }
+	single { AuthenticationStore(get(), get()) }
 	single { AuthenticationPreferences(get()) }
 
 	single<AuthenticationRepository> {
@@ -22,11 +25,8 @@ val authModule = module {
 	single<ServerRepository> { ServerRepositoryImpl(get(), get()) }
 	single<ServerUserRepository> { ServerUserRepositoryImpl(get(), get()) }
 	single<SessionRepository> {
-		SessionRepositoryImpl(get(), get(), get(), get(), get(defaultDeviceInfo), get(), get(), get())
+		SessionRepositoryImpl(get(), get(), get(), get(), get(), get(defaultDeviceInfo), get(), get(), get())
 	}
 
-	factory {
-		val serverRepository = get<ServerRepository>()
-		serverRepository.currentServer.value?.serverVersion ?: ServerRepository.minimumServerVersion
-	}
+	single { ApiBinder(get(), get()) }
 }

app/src/main/java/org/jellyfin/androidtv/di/PlaybackModule.kt

@@ -6,49 +6,40 @@ import android.app.PendingIntent
 import android.content.Intent
 import android.os.Build
 import androidx.core.app.NotificationManagerCompat
-import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.media3.datasource.HttpDataSource
-import androidx.media3.datasource.okhttp.OkHttpDataSource
+import org.jellyfin.androidtv.BuildConfig
 import org.jellyfin.androidtv.R
 import org.jellyfin.androidtv.preference.UserPreferences
 import org.jellyfin.androidtv.preference.UserSettingPreferences
 import org.jellyfin.androidtv.ui.browsing.MainActivity
+import org.jellyfin.androidtv.ui.playback.GarbagePlaybackLauncher
 import org.jellyfin.androidtv.ui.playback.MediaManager
-import org.jellyfin.androidtv.ui.playback.PlaybackLauncher
+import org.jellyfin.androidtv.ui.playback.RewritePlaybackLauncher
 import org.jellyfin.androidtv.ui.playback.VideoQueueManager
 import org.jellyfin.androidtv.ui.playback.rewrite.RewriteMediaManager
-import org.jellyfin.androidtv.util.profile.createDeviceProfile
 import org.jellyfin.playback.core.playbackManager
 import org.jellyfin.playback.jellyfin.jellyfinPlugin
 import org.jellyfin.playback.media3.exoplayer.ExoPlayerOptions
 import org.jellyfin.playback.media3.exoplayer.exoPlayerPlugin
 import org.jellyfin.playback.media3.session.MediaSessionOptions
 import org.jellyfin.playback.media3.session.media3SessionPlugin
-import org.jellyfin.sdk.api.client.HttpClientOptions
-import org.jellyfin.sdk.api.okhttp.OkHttpFactory
-import org.jellyfin.sdk.model.api.MediaSegmentType
+import org.jellyfin.sdk.api.client.ApiClient
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.scope.Scope
 import org.koin.dsl.module
-import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import org.jellyfin.androidtv.ui.playback.PlaybackManager as LegacyPlaybackManager
 
 val playbackModule = module {
 	single { LegacyPlaybackManager(get()) }
 	single { VideoQueueManager() }
-	single<MediaManager> { RewriteMediaManager(get(), get()) }
+	single<MediaManager> { RewriteMediaManager(get(), get(), get(), get()) }
 
-	single { PlaybackLauncher(get(), get(), get(), get()) }
+	factory {
+		val preferences = get<UserPreferences>()
+		val useRewrite = preferences[UserPreferences.playbackRewriteVideoEnabled] && BuildConfig.DEVELOPMENT
 
-	single<HttpDataSource.Factory> {
-		val okHttpFactory = get<OkHttpFactory>()
-		val httpClientOptions = get<HttpClientOptions>().copy(
-			// Disable request timeout for media playback as this causes issues with Live TV
-			requestTimeout = Duration.ZERO
-		)
-
-		OkHttpDataSource.Factory(okHttpFactory.createClient(httpClientOptions))
+		if (useRewrite) RewritePlaybackLauncher()
+		else GarbagePlaybackLauncher(get())
 	}
 
 	single { createPlaybackManager() }
@@ -65,16 +56,13 @@ fun Scope.createPlaybackManager() = playbackManager(androidContext()) {
 			notificationChannelId,
 			NotificationManager.IMPORTANCE_LOW
 		)
-		channel.setShowBadge(false)
 		NotificationManagerCompat.from(get()).createNotificationChannel(channel)
 	}
 
-	val userPreferences = get<UserPreferences>()
+	val api = get<ApiClient>()
 	val exoPlayerOptions = ExoPlayerOptions(
-		preferFfmpeg = userPreferences[UserPreferences.preferExoPlayerFfmpeg],
-		enableLibass = userPreferences[UserPreferences.assDirectPlay],
-		enableDebugLogging = userPreferences[UserPreferences.debuggingEnabled],
-		baseDataSourceFactory = get<HttpDataSource.Factory>(),
+		httpConnectTimeout = api.httpClientOptions.connectTimeout,
+		httpReadTimeout = api.httpClientOptions.requestTimeout
 	)
 	install(exoPlayerPlugin(get(), exoPlayerOptions))
 
@@ -86,8 +74,7 @@ fun Scope.createPlaybackManager() = playbackManager(androidContext()) {
 	)
 	install(media3SessionPlugin(get(), mediaSessionOptions))
 
-	val deviceProfileBuilder = { createDeviceProfile(androidContext(), userPreferences, get()) }
-	install(jellyfinPlugin(get(), deviceProfileBuilder, setOf(MediaSegmentType.INTRO), ProcessLifecycleOwner.get().lifecycle))
+	install(jellyfinPlugin(get()))
 
 	// Options
 	val userSettingPreferences = get<UserSettingPreferences>()

app/src/main/java/org/jellyfin/androidtv/integration/LeanbackChannelWorker.kt

@@ -7,10 +7,8 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
-import androidx.core.content.edit
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.toBitmap
-import androidx.core.net.toUri
 import androidx.tvprovider.media.tv.Channel
 import androidx.tvprovider.media.tv.ChannelLogoUtils
 import androidx.tvprovider.media.tv.PreviewProgram
@@ -23,38 +21,38 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.data.repository.ItemRepository
 import org.jellyfin.androidtv.data.repository.UserViewsRepository
 import org.jellyfin.androidtv.integration.provider.ImageProvider
 import org.jellyfin.androidtv.preference.UserPreferences
 import org.jellyfin.androidtv.ui.startup.StartupActivity
 import org.jellyfin.androidtv.util.ImageHelper
-import org.jellyfin.androidtv.util.apiclient.getUrl
-import org.jellyfin.androidtv.util.apiclient.itemImages
-import org.jellyfin.androidtv.util.apiclient.parentImages
 import org.jellyfin.androidtv.util.dp
 import org.jellyfin.androidtv.util.sdk.isUsable
 import org.jellyfin.androidtv.util.stripHtml
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.exception.ApiClientException
 import org.jellyfin.sdk.api.client.exception.TimeoutException
+import org.jellyfin.sdk.api.client.extensions.imageApi
 import org.jellyfin.sdk.api.client.extensions.itemsApi
 import org.jellyfin.sdk.api.client.extensions.tvShowsApi
 import org.jellyfin.sdk.api.client.extensions.userLibraryApi
 import org.jellyfin.sdk.api.client.extensions.userViewsApi
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemKind
+import org.jellyfin.sdk.model.api.ImageFormat
 import org.jellyfin.sdk.model.api.ImageType
+import org.jellyfin.sdk.model.api.ItemFields
 import org.jellyfin.sdk.model.api.MediaType
 import org.jellyfin.sdk.model.extensions.ticks
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import timber.log.Timber
 import java.time.Instant
-import java.time.ZoneId
+import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import kotlin.time.Duration
 
+
 /**
  * Manages channels on the android tv home screen.
  *
@@ -102,39 +100,39 @@ class LeanbackChannelWorker(
 			// Get channel URIs
 			val latestMediaChannel = getChannelUri(
 				"latest_media", Channel.Builder()
-					.setType(TvContractCompat.Channels.TYPE_PREVIEW)
-					.setDisplayName(context.getString(R.string.home_section_latest_media))
-					.setAppLinkIntent(Intent(context, StartupActivity::class.java))
-					.build(),
+				.setType(TvContractCompat.Channels.TYPE_PREVIEW)
+				.setDisplayName(context.getString(R.string.home_section_latest_media))
+				.setAppLinkIntent(Intent(context, StartupActivity::class.java))
+				.build(),
 				default = true
 			)
 			val myMediaChannel = getChannelUri(
 				"my_media", Channel.Builder()
-					.setType(TvContractCompat.Channels.TYPE_PREVIEW)
-					.setDisplayName(context.getString(R.string.lbl_my_media))
-					.setAppLinkIntent(Intent(context, StartupActivity::class.java))
-					.build()
+				.setType(TvContractCompat.Channels.TYPE_PREVIEW)
+				.setDisplayName(context.getString(R.string.lbl_my_media))
+				.setAppLinkIntent(Intent(context, StartupActivity::class.java))
+				.build()
 			)
 			val nextUpChannel = getChannelUri(
 				"next_up", Channel.Builder()
-					.setType(TvContractCompat.Channels.TYPE_PREVIEW)
-					.setDisplayName(context.getString(R.string.lbl_next_up))
-					.setAppLinkIntent(Intent(context, StartupActivity::class.java))
-					.build()
+				.setType(TvContractCompat.Channels.TYPE_PREVIEW)
+				.setDisplayName(context.getString(R.string.lbl_next_up))
+				.setAppLinkIntent(Intent(context, StartupActivity::class.java))
+				.build()
 			)
 			val latestMoviesChannel = getChannelUri(
 				"latest_movies", Channel.Builder()
-					.setType(TvContractCompat.Channels.TYPE_PREVIEW)
-					.setDisplayName(context.getString(R.string.lbl_movies))
-					.setAppLinkIntent(Intent(context, StartupActivity::class.java))
-					.build()
+				.setType(TvContractCompat.Channels.TYPE_PREVIEW)
+				.setDisplayName(context.getString(R.string.lbl_movies))
+				.setAppLinkIntent(Intent(context, StartupActivity::class.java))
+				.build()
 			)
 			val latestEpisodesChannel = getChannelUri(
 				"latest_episodes", Channel.Builder()
-					.setType(TvContractCompat.Channels.TYPE_PREVIEW)
-					.setDisplayName(context.getString(R.string.lbl_new_episodes))
-					.setAppLinkIntent(Intent(context, StartupActivity::class.java))
-					.build()
+				.setType(TvContractCompat.Channels.TYPE_PREVIEW)
+				.setDisplayName(context.getString(R.string.lbl_new_episodes))
+				.setAppLinkIntent(Intent(context, StartupActivity::class.java))
+				.build()
 			)
 			val preferParentThumb = userPreferences[UserPreferences.seriesThumbnailsEnabled]
 
@@ -146,21 +144,18 @@ class LeanbackChannelWorker(
 				latestEpisodes to latestEpisodesChannel,
 				myMedia to myMediaChannel,
 			).forEach { (items, channel) ->
-				if (channel == null) {
-					Timber.e("Skipping channel because it was not available")
-				} else {
-					items.map { item ->
-						createPreviewProgram(
-							channel,
-							item,
-							preferParentThumb
-						)
-					}.let {
-						context.contentResolver.bulkInsert(
-							TvContractCompat.PreviewPrograms.CONTENT_URI,
-							it.toTypedArray()
-						)
-					}
+				Timber.d("Updating channel %s", channel)
+				items.map { item ->
+					createPreviewProgram(
+						channel,
+						item,
+						preferParentThumb
+					)
+				}.let {
+					context.contentResolver.bulkInsert(
+						TvContractCompat.PreviewPrograms.CONTENT_URI,
+						it.toTypedArray()
+					)
 				}
 			}
 			updateWatchNext(resumeItems + nextUpItems)
@@ -183,46 +178,35 @@ class LeanbackChannelWorker(
 	 * update or create the channel. The [name] parameter is used to store the id and should be
 	 * unique.
 	 */
-	private fun getChannelUri(name: String, settings: Channel, default: Boolean = false): Uri? {
+	private fun getChannelUri(name: String, settings: Channel, default: Boolean = false): Uri {
 		val store = context.getSharedPreferences("leanback_channels", Context.MODE_PRIVATE)
-		var uri: Uri? = null
 
-		// Try and re-use our existing channel definition
-		if (store.contains(name)) {
-			uri = store.getString(name, null)?.toUri()
-
-			if (uri != null) {
-				val result = context.contentResolver.update(uri, settings.toContentValues(), null, null)
-				// If we did not affect exactly 1 row there might be something wrong, so recreate it
-				if (result != 1) uri = null
+		val uri = if (store.contains(name)) {
+			// Retrieve uri and update content resolver
+			Uri.parse(store.getString(name, null)).also { uri ->
+				context.contentResolver.update(uri, settings.toContentValues(), null, null)
 			}
-		}
-
-		if (uri == null) {
-			// Create new channel
-			uri = context.contentResolver.insert(
+		} else {
+			// Create new channel and save uri
+			context.contentResolver.insert(
 				TvContractCompat.Channels.CONTENT_URI,
 				settings.toContentValues()
-			)
-
-			// Set as default row to display (we can request one row to automatically be added to the home screen)
-			if (uri != null && default) {
-				TvContractCompat.requestChannelBrowsable(context, ContentUris.parseId(uri))
+			)!!.also { uri ->
+				store.edit().putString(name, uri.toString()).apply()
+				if (default) {
+					// Set as default row to display (we can request one row to automatically be added to the home screen)
+					TvContractCompat.requestChannelBrowsable(context, ContentUris.parseId(uri))
+				}
 			}
-
-			// Save uri to shared preferences
-			store.edit { putString(name, uri?.toString()) }
 		}
 
 		// Update logo
-		if (uri != null) {
-			ResourcesCompat.getDrawable(context.resources, R.mipmap.app_icon, context.theme)?.let {
-				ChannelLogoUtils.storeChannelLogo(
-					context,
-					ContentUris.parseId(uri),
-					it.toBitmap(80.dp(context), 80.dp(context))
-				)
-			}
+		ResourcesCompat.getDrawable(context.resources, R.mipmap.app_icon, context.theme)?.let {
+			ChannelLogoUtils.storeChannelLogo(
+				context,
+				ContentUris.parseId(uri),
+				it.toBitmap(80.dp(context), 80.dp(context))
+			)
 		}
 
 		return uri
@@ -237,6 +221,7 @@ class LeanbackChannelWorker(
 
 		// Add new items
 		return response.items
+			.orEmpty()
 			.filter { userViewsRepository.isSupported(it.collectionType) }
 	}
 
@@ -247,12 +232,35 @@ class LeanbackChannelWorker(
 	private fun BaseItemDto.getPosterArtImageUrl(
 		preferParentThumb: Boolean
 	): Uri = when {
-		type == BaseItemKind.MOVIE || type == BaseItemKind.SERIES -> itemImages[ImageType.PRIMARY]
-		(preferParentThumb || !itemImages.contains(ImageType.PRIMARY)) && parentImages.contains(ImageType.THUMB) -> parentImages[ImageType.THUMB]
-		else -> itemImages[ImageType.PRIMARY]
-	}.let { image ->
-		ImageProvider.getImageUri(image?.getUrl(api) ?: imageHelper.getResourceUrl(context, R.drawable.tile_land_tv))
-	}
+		type == BaseItemKind.MOVIE || type == BaseItemKind.SERIES -> api.imageApi.getItemImageUrl(
+			itemId = id,
+			imageType = ImageType.PRIMARY,
+			format = ImageFormat.WEBP,
+			width = 106.dp(context),
+			height = 153.dp(context),
+			tag = imageTags?.get(ImageType.PRIMARY),
+		)
+
+		(preferParentThumb || imageTags?.contains(ImageType.PRIMARY) != true) && parentThumbItemId != null -> api.imageApi.getItemImageUrl(
+			itemId = parentThumbItemId!!,
+			imageType = ImageType.THUMB,
+			format = ImageFormat.WEBP,
+			width = 272.dp(context),
+			height = 153.dp(context),
+			tag = imageTags?.get(ImageType.THUMB),
+		)
+
+		imageTags?.containsKey(ImageType.PRIMARY) == true -> api.imageApi.getItemImageUrl(
+			itemId = id,
+			imageType = ImageType.PRIMARY,
+			format = ImageFormat.WEBP,
+			width = 272.dp(context),
+			height = 153.dp(context),
+			tag = imageTags?.get(ImageType.PRIMARY),
+		)
+
+		else -> imageHelper.getResourceUrl(context, R.drawable.tile_land_tv)
+	}.let(ImageProvider::getImageUri)
 
 	/**
 	 * Gets the resume and next up episodes. The returned pair contains two lists:
@@ -263,13 +271,13 @@ class LeanbackChannelWorker(
 		withContext(Dispatchers.IO) {
 			val resume = async {
 				api.itemsApi.getResumeItems(
-					fields = ItemRepository.itemFields,
+					fields = listOf(ItemFields.DATE_CREATED),
 					imageTypeLimit = 1,
 					limit = 10,
 					mediaTypes = listOf(MediaType.VIDEO),
 					includeItemTypes = listOf(BaseItemKind.EPISODE, BaseItemKind.MOVIE),
 					excludeActiveSessions = true,
-				).content.items
+				).content.items.orEmpty()
 			}
 
 			val nextUp = async {
@@ -277,8 +285,8 @@ class LeanbackChannelWorker(
 					imageTypeLimit = 1,
 					limit = 10,
 					enableResumable = false,
-					fields = ItemRepository.itemFields,
-				).content.items
+					fields = listOf(ItemFields.DATE_CREATED),
+				).content.items.orEmpty()
 			}
 
 			// Concat
@@ -289,7 +297,9 @@ class LeanbackChannelWorker(
 		withContext(Dispatchers.IO) {
 			val latestEpisodes = async {
 				api.userLibraryApi.getLatestMedia(
-					fields = ItemRepository.itemFields,
+					fields = listOf(
+						ItemFields.OVERVIEW,
+					),
 					limit = 50,
 					includeItemTypes = listOf(BaseItemKind.EPISODE),
 					isPlayed = false
@@ -298,7 +308,9 @@ class LeanbackChannelWorker(
 
 			val latestMovies = async {
 				api.userLibraryApi.getLatestMedia(
-					fields = ItemRepository.itemFields,
+					fields = listOf(
+						ItemFields.OVERVIEW,
+					),
 					limit = 50,
 					includeItemTypes = listOf(BaseItemKind.MOVIE),
 					isPlayed = false
@@ -307,7 +319,9 @@ class LeanbackChannelWorker(
 
 			val latestMedia = async {
 				api.userLibraryApi.getLatestMedia(
-					fields = ItemRepository.itemFields,
+					fields = listOf(
+						ItemFields.OVERVIEW,
+					),
 					limit = 50,
 					includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES),
 					isPlayed = false
@@ -348,11 +362,23 @@ class LeanbackChannelWorker(
 			)
 			.setTitle(item.seriesName ?: item.name)
 			.setEpisodeTitle(if (item.type == BaseItemKind.EPISODE) item.name else null)
+			.setSeasonNumber(seasonString, item.parentIndexNumber ?: 0)
+			.setEpisodeNumber(episodeString, item.indexNumber ?: 0)
 			.setDescription(item.overview?.stripHtml())
 			.setReleaseDate(
 				if (item.premiereDate != null) DateTimeFormatter.ISO_DATE.format(item.premiereDate)
 				else null
 			)
+			.setDurationMillis(
+				if (item.runTimeTicks?.ticks != null) {
+					// If we are resuming, we need to show remaining time, cause GoogleTV
+					// ignores setLastPlaybackPositionMillis
+					val duration = item.runTimeTicks?.ticks ?: Duration.ZERO
+					val playbackPosition = item.userData?.playbackPositionTicks?.ticks
+						?: Duration.ZERO
+					(duration - playbackPosition).inWholeMilliseconds.toInt()
+				} else 0
+			)
 			.setPosterArtUri(imageUri)
 			.setPosterArtAspectRatio(
 				when (item.type) {
@@ -366,22 +392,8 @@ class LeanbackChannelWorker(
 				putExtra(StartupActivity.EXTRA_ITEM_ID, item.id.toString())
 				putExtra(StartupActivity.EXTRA_ITEM_IS_USER_VIEW, item.type == BaseItemKind.COLLECTION_FOLDER)
 			})
-			.setDurationMillis(
-				if (item.runTimeTicks?.ticks != null) {
-					// If we are resuming, we need to show remaining time, cause GoogleTV
-					// ignores setLastPlaybackPositionMillis
-					val duration = item.runTimeTicks?.ticks ?: Duration.ZERO
-					val playbackPosition = item.userData?.playbackPositionTicks?.ticks
-						?: Duration.ZERO
-					(duration - playbackPosition).inWholeMilliseconds.toInt()
-				} else 0
-			)
-			.apply {
-				if ((item.parentIndexNumber ?: 0) > 0)
-					setSeasonNumber(seasonString, item.parentIndexNumber!!)
-				if ((item.indexNumber ?: 0) > 0)
-					setEpisodeNumber(episodeString, item.indexNumber!!)
-			}.build().toContentValues()
+			.build()
+			.toContentValues()
 	}
 
 	/**
@@ -389,57 +401,16 @@ class LeanbackChannelWorker(
 	 * or other types of media. Uses the [nextUpItems] parameter to store items returned by a
 	 * NextUpQuery().
 	 */
-	@SuppressLint("RestrictedApi")
 	private fun updateWatchNext(nextUpItems: List<BaseItemDto>) {
-		deletePrograms(nextUpItems)
+		// Delete current items
+		context.contentResolver.delete(WatchNextPrograms.CONTENT_URI, null, null)
 
-		// Get current watch next state
-		val currentWatchNextPrograms = getCurrentWatchNext()
-
-		// Create all programs in nextUpItems but not in watch next
-		val programsToAdd = nextUpItems
-			.filter { next -> currentWatchNextPrograms.none { it.internalProviderId == next.id.toString() } }
+		// Add new items
 		context.contentResolver.bulkInsert(
 			WatchNextPrograms.CONTENT_URI,
-			programsToAdd.map { item -> getBaseItemAsWatchNextProgram(item).toContentValues() }
-				.toTypedArray())
-	}
-
-	/**
-	 * Delete stale programs from the watch next row. Items that don't need to be touched are
-	 * kept as is, so they keep their ordering in the watch next row.
-	 */
-	@SuppressLint("RestrictedApi")
-	private fun deletePrograms(nextUpItems: List<BaseItemDto>) {
-		// Retrieve current watch next row
-		val currentWatchNextPrograms = getCurrentWatchNext()
-
-		// Find all stale programs to delete
-		val deletedByUser = currentWatchNextPrograms.filter { !it.isBrowsable }
-		val noLongerInWatchNext =
-			currentWatchNextPrograms.filter { (nextUpItems).none { next -> it.internalProviderId == next.id.toString() } }
-		val continueWatching = currentWatchNextPrograms.filter { it.watchNextType == WatchNextPrograms.WATCH_NEXT_TYPE_CONTINUE }
-
-		// Delete the programs
-		(deletedByUser + noLongerInWatchNext + continueWatching)
-			.forEach { context.contentResolver.delete(TvContractCompat.buildWatchNextProgramUri(it.id), null, null) }
-	}
-
-	/**
-	 * Retrieves the current watch next row state.
-	 */
-	@SuppressLint("RestrictedApi")
-	private fun getCurrentWatchNext(): MutableList<WatchNextProgram> {
-		val currentWatchNextPrograms: MutableList<WatchNextProgram> = mutableListOf()
-		context.contentResolver.query(WatchNextPrograms.CONTENT_URI, WatchNextProgram.PROJECTION, null, null, null)
-			.use { cursor ->
-				if (cursor != null && cursor.moveToFirst()) {
-					do {
-						currentWatchNextPrograms.add(WatchNextProgram.fromCursor(cursor))
-					} while (cursor.moveToNext())
-				}
-			}
-		return currentWatchNextPrograms
+			nextUpItems.map { item -> getBaseItemAsWatchNextProgram(item).toContentValues() }
+				.toTypedArray()
+		)
 	}
 
 	/**
@@ -461,51 +432,39 @@ class LeanbackChannelWorker(
 				setPosterArtAspectRatio(WatchNextPrograms.ASPECT_RATIO_MOVIE_POSTER)
 			}
 
-			// Name and episode details
-			if (item.seriesName != null) {
-				setTitle(item.seriesName)
-				setEpisodeTitle(item.name)
-
-				item.indexNumber?.takeIf { it > 0 }?.let { setEpisodeNumber(it) }
-				item.parentIndexNumber?.takeIf { it > 0 }?.let { setSeasonNumber(it) }
-			} else {
-				setTitle(item.name)
-			}
-
-			setDescription(item.overview?.stripHtml())
+			// Name
+			if (item.seriesName != null) setTitle("${item.seriesName} - ${item.name}")
+			else setTitle(item.name)
 
 			// Poster
 			setPosterArtUri(item.getPosterArtImageUrl(preferParentThumb))
 
+			// Use date created or fallback to current time if unavailable
+			var engagement = item.dateCreated
+
 			when {
 				// User has started playing the episode
 				(item.userData?.playbackPositionTicks ?: 0) > 0 -> {
 					setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_CONTINUE)
 					setLastPlaybackPositionMillis(item.userData!!.playbackPositionTicks.ticks.inWholeMilliseconds.toInt())
 					// Use last played date to prioritize
-
-					setLastEngagementTimeUtcMillis(
-						item.userData?.lastPlayedDate?.atZone(ZoneId.systemDefault())?.toInstant()?.toEpochMilli()
-							?: Instant.now().toEpochMilli()
-					)
+					engagement = item.userData?.lastPlayedDate
 				}
 				// First episode of the season
-				item.indexNumber == 1 -> {
-					setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEW)
-					setLastEngagementTimeUtcMillis(
-						item.dateCreated?.atZone(ZoneId.systemDefault())?.toInstant()?.toEpochMilli()
-							?: Instant.now().toEpochMilli()
-					)
-				}
+				item.indexNumber == 1 -> setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEW)
 				// Default
-				else -> {
-					setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEXT)
-					setLastEngagementTimeUtcMillis(Instant.now().toEpochMilli())
-				}
+				else -> setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEXT)
 			}
 
-			// Runtime has been determined
-			item.runTimeTicks?.ticks?.let { setDurationMillis(it.inWholeMilliseconds.toInt()) }
+			setLastEngagementTimeUtcMillis(
+				engagement?.toInstant(ZoneOffset.UTC)?.toEpochMilli()
+					?: Instant.now().toEpochMilli()
+			)
+
+			// Episode runtime has been determined
+			item.runTimeTicks?.let { runTimeTicks ->
+				setDurationMillis(runTimeTicks.ticks.inWholeMilliseconds.toInt())
+			}
 
 			// Set intent to open the episode
 			setIntent(Intent(context, StartupActivity::class.java).apply {

app/src/main/java/org/jellyfin/androidtv/integration/MediaContentProvider.kt

@@ -9,22 +9,19 @@ import android.database.Cursor
 import android.database.MatrixCursor
 import android.net.Uri
 import android.provider.BaseColumns
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.BuildConfig
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.data.repository.ItemRepository
 import org.jellyfin.androidtv.integration.provider.ImageProvider
 import org.jellyfin.androidtv.util.ImageHelper
-import org.jellyfin.androidtv.util.apiclient.getUrl
-import org.jellyfin.androidtv.util.apiclient.itemImages
 import org.jellyfin.androidtv.util.sdk.isUsable
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.extensions.imageApi
 import org.jellyfin.sdk.api.client.extensions.itemsApi
 import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
 import org.jellyfin.sdk.model.api.ImageType
+import org.jellyfin.sdk.model.api.ItemFields
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import timber.log.Timber
@@ -64,9 +61,8 @@ class MediaContentProvider : ContentProvider(), KoinComponent {
 
 				val limit = uri.getQueryParameter(SearchManager.SUGGEST_PARAMETER_LIMIT)?.toIntOrNull()
 					?: DEFAULT_LIMIT
-				return runBlocking { getSuggestions(query, limit) }
+				return getSuggestions(query, limit)
 			}
-
 			else -> throw IllegalArgumentException("Unknown Uri: $uri")
 		}
 	}
@@ -79,7 +75,7 @@ class MediaContentProvider : ContentProvider(), KoinComponent {
 			searchTerm = query,
 			recursive = true,
 			limit = limit,
-			fields = ItemRepository.itemFields
+			fields = setOf(ItemFields.TAGLINES)
 		)
 
 		items
@@ -88,7 +84,7 @@ class MediaContentProvider : ContentProvider(), KoinComponent {
 		null
 	}
 
-	private suspend fun getSuggestions(query: String, limit: Int) = withContext(Dispatchers.IO) {
+	private fun getSuggestions(query: String, limit: Int) = runBlocking {
 		val searchResult = searchItems(query, limit)
 		if (searchResult != null) Timber.d("Query resulted in %d items", searchResult.totalRecordCount)
 
@@ -108,10 +104,10 @@ class MediaContentProvider : ContentProvider(), KoinComponent {
 
 		MatrixCursor(columns).also { cursor ->
 			searchResult?.items?.forEach { item ->
-				val imageUri = ImageProvider.getImageUri(
-					item.itemImages[ImageType.PRIMARY]?.getUrl(api)
-						?: imageHelper.getResourceUrl(context!!, R.drawable.tile_land_tv)
-				)
+				val imageUri = if (item.imageTags?.contains(ImageType.PRIMARY) == true)
+					ImageProvider.getImageUri(api.imageApi.getItemImageUrl(item.id, ImageType.PRIMARY))
+				else
+					imageHelper.getResourceUrl(context!!, R.drawable.tile_land_tv)
 
 				cursor.newRow().apply {
 					add(BaseColumns._ID, item.id)

app/src/main/java/org/jellyfin/androidtv/integration/dream/DreamViewModel.kt

@@ -2,43 +2,39 @@ package org.jellyfin.androidtv.integration.dream
 
 import android.annotation.SuppressLint
 import android.content.Context
+import androidx.core.graphics.drawable.toBitmap
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import coil3.ImageLoader
-import coil3.request.ImageRequest
-import coil3.toBitmap
+import coil.ImageLoader
+import coil.request.ImageRequest
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.cancellable
+import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.integration.dream.model.DreamContent
 import org.jellyfin.androidtv.preference.UserPreferences
-import org.jellyfin.androidtv.util.apiclient.getUrl
-import org.jellyfin.androidtv.util.apiclient.itemBackdropImages
-import org.jellyfin.androidtv.util.apiclient.itemImages
-import org.jellyfin.playback.core.PlaybackManager
-import org.jellyfin.playback.core.queue.queue
-import org.jellyfin.playback.jellyfin.queue.baseItem
+import org.jellyfin.androidtv.ui.playback.AudioEventListener
+import org.jellyfin.androidtv.ui.playback.MediaManager
+import org.jellyfin.androidtv.ui.playback.PlaybackController
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.extensions.imageApi
 import org.jellyfin.sdk.api.client.extensions.itemsApi
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemKind
+import org.jellyfin.sdk.model.api.ImageFormat
 import org.jellyfin.sdk.model.api.ImageType
 import org.jellyfin.sdk.model.api.ItemSortBy
 import timber.log.Timber
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
 @SuppressLint("StaticFieldLeak")
@@ -46,18 +42,35 @@ class DreamViewModel(
 	private val api: ApiClient,
 	private val imageLoader: ImageLoader,
 	private val context: Context,
-	playbackManager: PlaybackManager,
+	private val mediaManager: MediaManager,
 	private val userPreferences: UserPreferences,
 ) : ViewModel() {
-	@OptIn(ExperimentalCoroutinesApi::class)
-	private val _mediaContent = playbackManager.queue.entry
-		.map { entry ->
-			entry
-				?.takeIf { it.visibleInScreensaver }
-				?.baseItem
-				?.let { baseItem -> DreamContent.NowPlaying(entry, baseItem) }
+	private val _mediaContent = callbackFlow {
+		trySend(mediaManager.currentAudioItem)
+
+		val listener = object : AudioEventListener {
+			override fun onPlaybackStateChange(
+				newState: PlaybackController.PlaybackState,
+				currentItem: BaseItemDto?
+			) {
+				trySend(currentItem)
+			}
+
+			override fun onQueueStatusChanged(hasQueue: Boolean) {
+				trySend(mediaManager.currentAudioItem)
+			}
 		}
-		.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
+
+		mediaManager.addAudioEventListener(listener)
+		awaitClose { mediaManager.removeAudioEventListener(listener) }
+	}
+		.distinctUntilChanged()
+		.map { it?.let(DreamContent::NowPlaying) }
+		.stateIn(
+			viewModelScope,
+			SharingStarted.WhileSubscribed(),
+			DreamContent.NowPlaying(mediaManager.currentAudioItem)
+		)
 
 	private val _libraryContent = flow {
 		// Load first library item after 2 seconds
@@ -65,19 +78,15 @@ class DreamViewModel(
 		emit(null)
 		delay(2.seconds)
 
-		val requireParentalRating = userPreferences[UserPreferences.screensaverAgeRatingRequired]
-		val maxParentalRating = userPreferences[UserPreferences.screensaverAgeRatingMax]
-		emitAll(
-			getRandomLibraryShowcaseItems(
-				requireParentalRating = requireParentalRating,
-				maxParentalRating = maxParentalRating,
-				// A batch size of 60 should be equal to 30 minutes of items
-				batchSize = 60,
-				emitDelay = 30.seconds,
-				noItemsDelay = 2.minutes,
-				errorDelay = 3.seconds,
-			)
-		)
+		while (true) {
+			val next = getRandomLibraryShowcase()
+			if (next != null) {
+				emit(next)
+				delay(30.seconds)
+			} else {
+				delay(3.seconds)
+			}
+		}
 	}
 		.distinctUntilChanged()
 		.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
@@ -90,71 +99,70 @@ class DreamViewModel(
 		initialValue = _mediaContent.value ?: _libraryContent.value ?: DreamContent.Logo,
 	)
 
-	private fun getRandomLibraryShowcaseItems(
-		requireParentalRating: Boolean,
-		maxParentalRating: Int,
-		batchSize: Int,
-		emitDelay: Duration,
-		noItemsDelay: Duration,
-		errorDelay: Duration,
-	): Flow<DreamContent.LibraryShowcase?> = flow {
-		while (true) {
-			val items = try {
-				withContext(Dispatchers.IO) {
-					val response by api.itemsApi.getItems(
-						includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES),
-						recursive = true,
-						sortBy = listOf(ItemSortBy.RANDOM),
-						limit = batchSize,
-						imageTypes = listOf(ImageType.BACKDROP),
-						maxOfficialRating = if (maxParentalRating == -1) null else maxParentalRating.toString(),
-						hasParentalRating = if (requireParentalRating) true else null,
-					)
-					response.items
+	private suspend fun getRandomLibraryShowcase(): DreamContent.LibraryShowcase? {
+		val requireParentalRating = userPreferences[UserPreferences.screensaverAgeRatingRequired]
+		val maxParentalRating = userPreferences[UserPreferences.screensaverAgeRatingMax]
+
+		try {
+			val response by api.itemsApi.getItems(
+				includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES),
+				recursive = true,
+				sortBy = listOf(ItemSortBy.RANDOM),
+				limit = 5,
+				imageTypes = listOf(ImageType.BACKDROP),
+				maxOfficialRating = if (maxParentalRating == -1) null else maxParentalRating.toString(),
+				hasParentalRating = if (requireParentalRating) true else null,
+			)
+
+			val item = response.items?.firstOrNull { item ->
+				!item.backdropImageTags.isNullOrEmpty()
+			} ?: return null
+
+			Timber.i("Loading random library showcase item ${item.id}")
+
+			val backdropTag = item.backdropImageTags!!.randomOrNull()
+				?: item.imageTags?.get(ImageType.BACKDROP)
+
+			val logoTag = item.imageTags?.get(ImageType.LOGO)
+
+			val backdropUrl = api.imageApi.getItemImageUrl(
+				itemId = item.id,
+				imageType = ImageType.BACKDROP,
+				tag = backdropTag,
+				format = ImageFormat.WEBP,
+			)
+
+			val logoUrl = api.imageApi.getItemImageUrl(
+				itemId = item.id,
+				imageType = ImageType.LOGO,
+				tag = logoTag,
+				format = ImageFormat.WEBP,
+			)
+
+			val (logo, backdrop) = withContext(Dispatchers.IO) {
+				val logoDeferred = async {
+					imageLoader.execute(
+						request = ImageRequest.Builder(context).data(logoUrl).build()
+					).drawable?.toBitmap()
 				}
-			} catch (err: ApiClientException) {
-				Timber.e(err)
-				null
-			}
 
-			if (items == null) {
-				emit(null)
-				delay(errorDelay)
-			} else if (items.isEmpty()) {
-				emit(null)
-				delay(noItemsDelay)
-			} else {
-				for (item in items) {
-					if (item.itemBackdropImages.isEmpty()) continue
-					val showcase = item.asLibraryShowcase() ?: continue
-					emit(showcase)
-					delay(emitDelay)
+				val backdropDeferred = async {
+					imageLoader.execute(
+						request = ImageRequest.Builder(context).data(backdropUrl).build()
+					).drawable?.toBitmap()
 				}
+
+				awaitAll(logoDeferred, backdropDeferred)
 			}
-		}
-	}.cancellable()
 
-	private suspend fun BaseItemDto.asLibraryShowcase(): DreamContent.LibraryShowcase? = withContext(Dispatchers.IO) {
-		val logoUrl = itemImages[ImageType.LOGO]?.getUrl(api)
-		val backdropUrl = itemBackdropImages.randomOrNull()?.getUrl(api)
-
-		// Require a backdrop
-		if (backdropUrl == null) return@withContext null
-
-		// Only attempt to load logo if there is one, wrap in async {} to load it parallel with the backdrop
-		val logo = logoUrl?.let { url ->
-			async {
-				imageLoader.execute(
-					request = ImageRequest.Builder(context).data(url).build()
-				).image?.toBitmap()
+			if (backdrop == null) {
+				return null
 			}
+
+			return DreamContent.LibraryShowcase(item, backdrop, logo)
+		} catch (err: ApiClientException) {
+			Timber.e(err)
+			return null
 		}
-
-		val backdrop = imageLoader.execute(
-			request = ImageRequest.Builder(context).data(backdropUrl).build()
-		).image?.toBitmap()
-
-		if (backdrop == null) null
-		else DreamContent.LibraryShowcase(this@asLibraryShowcase, backdrop, logo?.await())
 	}
 }

app/src/main/java/org/jellyfin/androidtv/integration/dream/ScreensaverQueueElement.kt

@@ -1,12 +0,0 @@
-package org.jellyfin.androidtv.integration.dream
-
-import org.jellyfin.playback.core.element.ElementKey
-import org.jellyfin.playback.core.element.requiredElement
-import org.jellyfin.playback.core.queue.QueueEntry
-
-private val visibleInScreensaverKey = ElementKey<Boolean>("visibleInScreensaver")
-
-/**
- * Get or set whether this [QueueEntry] is shown in the screensaver.
- */
-var QueueEntry.visibleInScreensaver by requiredElement(visibleInScreensaverKey) { false }

app/src/main/java/org/jellyfin/androidtv/integration/dream/composable/DreamContentLibraryShowcase.kt

@@ -2,10 +2,9 @@ package org.jellyfin.androidtv.integration.dream.composable
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -15,10 +14,10 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.tv.material3.Text
 import org.jellyfin.androidtv.integration.dream.model.DreamContent
-import org.jellyfin.androidtv.ui.base.Text
 import org.jellyfin.androidtv.ui.composable.ZoomBox
-import org.jellyfin.androidtv.ui.composable.modifier.overscan
+import org.jellyfin.androidtv.ui.composable.overscan
 
 @Composable
 fun DreamContentLibraryShowcase(
@@ -51,17 +50,12 @@ fun DreamContentLibraryShowcase(
 			.overscan(),
 	) {
 		if (content.logo != null) {
-			BoxWithConstraints {
-				Image(
-					bitmap = content.logo.asImageBitmap(),
-					contentDescription = content.item.name,
-					modifier = Modifier
-						.sizeIn(
-							maxWidth = maxWidth * 0.35f,
-							maxHeight = 75.dp
-						)
-				)
-			}
+			Image(
+				bitmap = content.logo.asImageBitmap(),
+				contentDescription = content.item.name,
+				modifier = Modifier
+					.height(75.dp)
+			)
 		} else {
 			Text(
 				text = content.item.name.orEmpty(),

app/src/main/java/org/jellyfin/androidtv/integration/dream/composable/DreamContentNowPlaying.kt

@@ -14,39 +14,36 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.tv.material3.Text
 import org.jellyfin.androidtv.integration.dream.model.DreamContent
-import org.jellyfin.androidtv.ui.base.SeekbarDefaults
-import org.jellyfin.androidtv.ui.base.Text
 import org.jellyfin.androidtv.ui.composable.AsyncImage
-import org.jellyfin.androidtv.ui.composable.LyricsDtoBox
 import org.jellyfin.androidtv.ui.composable.blurHashPainter
-import org.jellyfin.androidtv.ui.composable.modifier.fadingEdges
-import org.jellyfin.androidtv.ui.composable.modifier.overscan
-import org.jellyfin.androidtv.ui.composable.rememberPlayerProgress
-import org.jellyfin.androidtv.ui.player.base.PlayerSeekbar
-import org.jellyfin.androidtv.util.apiclient.albumPrimaryImage
-import org.jellyfin.androidtv.util.apiclient.getUrl
-import org.jellyfin.androidtv.util.apiclient.itemImages
-import org.jellyfin.androidtv.util.apiclient.parentImages
-import org.jellyfin.playback.core.PlaybackManager
-import org.jellyfin.playback.core.model.PlayState
-import org.jellyfin.playback.jellyfin.lyrics.lyrics
-import org.jellyfin.playback.jellyfin.lyrics.lyricsFlow
+import org.jellyfin.androidtv.ui.composable.overscan
+import org.jellyfin.androidtv.ui.playback.AudioEventListener
+import org.jellyfin.androidtv.ui.playback.MediaManager
 import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.extensions.imageApi
+import org.jellyfin.sdk.model.api.ImageFormat
 import org.jellyfin.sdk.model.api.ImageType
+import org.jellyfin.sdk.model.extensions.ticks
 import org.koin.compose.koinInject
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 
 @Composable
 fun DreamContentNowPlaying(
@@ -55,17 +52,21 @@ fun DreamContentNowPlaying(
 	modifier = Modifier.fillMaxSize(),
 ) {
 	val api = koinInject<ApiClient>()
-	val playbackManager = koinInject<PlaybackManager>()
-	val lyrics = content.entry.run { lyricsFlow.collectAsState(lyrics) }.value
+	val mediaManager = koinInject<MediaManager>()
+	val item = content.item ?: return@Box
 
-	val primaryImage = content.item.itemImages[ImageType.PRIMARY]
-		?: content.item.albumPrimaryImage
-		?: content.item.parentImages[ImageType.PRIMARY]
+	val primaryImageTag = item.imageTags?.get(ImageType.PRIMARY)
+	val (imageItemId, imageTag) = when {
+		primaryImageTag != null -> item.id to primaryImageTag
+		(item.albumId != null && item.albumPrimaryImageTag != null) -> item.albumId to item.albumPrimaryImageTag
+		else -> null to null
+	}
 
-	// Background
-	if (primaryImage?.blurHash != null) {
+	val imageBlurHash =
+		imageTag?.let { tag -> item.imageBlurHashes?.get(ImageType.PRIMARY)?.get(tag) }
+	if (imageBlurHash != null) {
 		Image(
-			painter = blurHashPainter(primaryImage.blurHash, IntSize(32, 32)),
+			painter = blurHashPainter(imageBlurHash, IntSize(32, 32)),
 			contentDescription = null,
 			alignment = Alignment.Center,
 			contentScale = ContentScale.Crop,
@@ -75,29 +76,7 @@ fun DreamContentNowPlaying(
 		DreamContentVignette()
 	}
 
-	// Lyrics overlay (on top of background)
-	if (lyrics != null) {
-		val playState by remember { playbackManager.state.playState }.collectAsState()
-
-		// Using the progress animation causes the layout to recompose, which we need for synced lyrics to work
-		// we don't actually use the animation value here
-		rememberPlayerProgress(playbackManager)
-
-		LyricsDtoBox(
-			lyricDto = lyrics,
-			currentTimestamp = playbackManager.state.positionInfo.active,
-			duration = playbackManager.state.positionInfo.duration,
-			paused = playState != PlayState.PLAYING,
-			fontSize = 22.sp,
-			color = Color.White,
-			modifier = Modifier
-				.fillMaxSize()
-				.fadingEdges(vertical = 250.dp)
-				.padding(horizontal = 50.dp),
-		)
-	}
-
-	// Metadata overlay (includes title / progress)
+	// Overlay
 	Row(
 		verticalAlignment = Alignment.Bottom,
 		horizontalArrangement = Arrangement.spacedBy(20.dp),
@@ -105,10 +84,15 @@ fun DreamContentNowPlaying(
 			.align(Alignment.BottomStart)
 			.overscan(),
 	) {
-		if (primaryImage != null) {
+		if (imageItemId != null) {
 			AsyncImage(
-				url = primaryImage.getUrl(api),
-				blurHash = primaryImage.blurHash,
+				url = api.imageApi.getItemImageUrl(
+					itemId = imageItemId,
+					imageType = ImageType.PRIMARY,
+					tag = imageTag,
+					format = ImageFormat.WEBP,
+				),
+				blurHash = imageBlurHash,
 				scaleType = ImageView.ScaleType.CENTER_CROP,
 				modifier = Modifier
 					.size(128.dp)
@@ -121,7 +105,7 @@ fun DreamContentNowPlaying(
 				.padding(bottom = 10.dp)
 		) {
 			Text(
-				text = content.item.name.orEmpty(),
+				text = item.name.orEmpty(),
 				style = TextStyle(
 					color = Color.White,
 					fontSize = 26.sp,
@@ -129,7 +113,7 @@ fun DreamContentNowPlaying(
 			)
 
 			Text(
-				text = content.item.run {
+				text = item.run {
 					val artistNames = artists.orEmpty()
 					val albumArtistNames = albumArtists?.mapNotNull { it.name }.orEmpty()
 
@@ -147,16 +131,33 @@ fun DreamContentNowPlaying(
 
 			Spacer(modifier = Modifier.height(10.dp))
 
-			PlayerSeekbar(
-				playbackManager = playbackManager,
-				colors = SeekbarDefaults.colors(
-					backgroundColor = Color.White.copy(alpha = 0.2f),
-					progressColor = Color.White,
-					bufferColor = Color.Transparent,
-				),
+			var progress by remember { mutableFloatStateOf(0f) }
+			DisposableEffect(Unit) {
+				val listener = object : AudioEventListener {
+					override fun onProgress(pos: Long) {
+						val duration = item.runTimeTicks?.ticks ?: Duration.ZERO
+						progress = (pos.milliseconds / duration).toFloat()
+					}
+				}
+
+				mediaManager.addAudioEventListener(listener)
+
+				onDispose {
+					mediaManager.removeAudioEventListener(listener)
+				}
+			}
+
+			Box(
 				modifier = Modifier
 					.fillMaxWidth()
 					.height(4.dp)
+					.clip(RoundedCornerShape(2.dp))
+					.drawWithContent {
+						// Background
+						drawRect(Color.White, alpha = 0.2f)
+						// Foreground
+						drawRect(Color.White, size = size.copy(width = size.width * progress))
+					}
 			)
 		}
 	}

app/src/main/java/org/jellyfin/androidtv/integration/dream/composable/DreamHeader.kt

@@ -1,32 +1,72 @@
 package org.jellyfin.androidtv.integration.dream.composable
 
+import android.text.format.DateUtils
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import org.jellyfin.androidtv.ui.composable.modifier.overscan
-import org.jellyfin.androidtv.ui.shared.toolbar.ToolbarClock
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.tv.material3.Text
+import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.ui.composable.overscan
+import org.jellyfin.androidtv.ui.composable.rememberCurrentTime
 
 @Composable
 fun DreamHeader(
+	showLogo: Boolean,
 	showClock: Boolean,
-) = Box(
-	modifier = Modifier
-		.fillMaxWidth()
-		.overscan(),
 ) {
-	// Clock
-	AnimatedVisibility(
-		visible = showClock,
-		enter = fadeIn(),
-		exit = fadeOut(),
+	Row(
+		horizontalArrangement = Arrangement.SpaceBetween,
 		modifier = Modifier
-			.align(Alignment.TopEnd),
+			.fillMaxWidth()
+			.overscan(),
 	) {
-		ToolbarClock()
+		// Logo
+		AnimatedVisibility(
+			visible = showLogo,
+			enter = fadeIn(),
+			exit = fadeOut(),
+			modifier = Modifier.height(41.dp),
+		) {
+			Image(
+				painter = painterResource(R.drawable.app_logo),
+				contentDescription = stringResource(R.string.app_name),
+			)
+		}
+
+		Spacer(
+			modifier = Modifier
+				.fillMaxWidth(0f)
+		)
+
+		// Clock
+		AnimatedVisibility(
+			visible = showClock,
+			enter = fadeIn(),
+			exit = fadeOut(),
+		) {
+			val time = rememberCurrentTime()
+			Text(
+				text = DateUtils.formatDateTime(LocalContext.current, time, DateUtils.FORMAT_SHOW_TIME),
+				style = TextStyle(
+					color = Color.White,
+					fontSize = 20.sp
+				),
+			)
+		}
 	}
 }

app/src/main/java/org/jellyfin/androidtv/integration/dream/composable/DreamView.kt

@@ -36,6 +36,7 @@ fun DreamView(
 
 	// Header overlay
 	DreamHeader(
+		showLogo = content != DreamContent.Logo,
 		showClock = showClock,
 	)
 }

app/src/main/java/org/jellyfin/androidtv/integration/dream/model/DreamContent.kt

@@ -1,11 +1,10 @@
 package org.jellyfin.androidtv.integration.dream.model
 
 import android.graphics.Bitmap
-import org.jellyfin.playback.core.queue.QueueEntry
 import org.jellyfin.sdk.model.api.BaseItemDto
 
 sealed interface DreamContent {
 	data object Logo : DreamContent
 	data class LibraryShowcase(val item: BaseItemDto, val backdrop: Bitmap, val logo: Bitmap?) : DreamContent
-	data class NowPlaying(val entry: QueueEntry, val item: BaseItemDto) : DreamContent
+	data class NowPlaying(val item: BaseItemDto?) : DreamContent
 }

app/src/main/java/org/jellyfin/androidtv/integration/provider/ImageProvider.kt

@@ -9,10 +9,8 @@ import android.os.Build
 import android.os.ParcelFileDescriptor
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.net.toUri
-import coil3.ImageLoader
-import coil3.asDrawable
-import coil3.request.ImageRequest
-import coil3.request.error
+import coil.ImageLoader
+import coil.request.ImageRequest
 import org.jellyfin.androidtv.BuildConfig
 import org.jellyfin.androidtv.R
 import org.koin.android.ext.android.inject
@@ -39,8 +37,8 @@ class ImageProvider : ContentProvider() {
 			data(src)
 			error(R.drawable.placeholder_icon)
 			target(
-				onSuccess = { image -> writeDrawable(image.asDrawable(context!!.resources), outputStream) },
-				onError = { image -> writeDrawable(requireNotNull(image?.asDrawable(context!!.resources)), outputStream) }
+				onSuccess = { drawable -> writeDrawable(drawable, outputStream) },
+				onError = { drawable -> writeDrawable(requireNotNull(drawable), outputStream) }
 			)
 		}.build())
 

app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt

@@ -1,27 +1,21 @@
 package org.jellyfin.androidtv.preference
 
 import android.content.Context
+import android.view.KeyEvent
 import androidx.preference.PreferenceManager
-import org.jellyfin.androidtv.preference.UserPreferences.Companion.screensaverInAppEnabled
 import org.jellyfin.androidtv.preference.constant.AppTheme
 import org.jellyfin.androidtv.preference.constant.AudioBehavior
-import org.jellyfin.androidtv.preference.constant.BackdropBehavior
 import org.jellyfin.androidtv.preference.constant.ClockBehavior
 import org.jellyfin.androidtv.preference.constant.NextUpBehavior
+import org.jellyfin.androidtv.preference.constant.RatingType
 import org.jellyfin.androidtv.preference.constant.RefreshRateSwitchingBehavior
-import org.jellyfin.androidtv.preference.constant.StillWatchingBehavior
 import org.jellyfin.androidtv.preference.constant.WatchedIndicatorBehavior
-import org.jellyfin.androidtv.preference.constant.ZoomMode
-import org.jellyfin.androidtv.ui.playback.segment.MediaSegmentAction
-import org.jellyfin.androidtv.ui.playback.segment.toMediaSegmentActionsString
 import org.jellyfin.preference.booleanPreference
 import org.jellyfin.preference.enumPreference
-import org.jellyfin.preference.floatPreference
 import org.jellyfin.preference.intPreference
 import org.jellyfin.preference.longPreference
 import org.jellyfin.preference.store.SharedPreferenceStore
 import org.jellyfin.preference.stringPreference
-import org.jellyfin.sdk.model.api.MediaSegmentType
 import kotlin.time.Duration.Companion.minutes
 
 /**
@@ -41,9 +35,19 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		var appTheme = enumPreference("app_theme", AppTheme.DARK)
 
 		/**
-		 * Behavior of app background while browsing
+		 * Enable background images while browsing
 		 */
-		var backdropBehavior = enumPreference("backdrop_behavior", BackdropBehavior.BACKDROP_WITH_BLUR)
+		var backdropEnabled = booleanPreference("pref_show_backdrop", true)
+
+		/**
+		 * Show premieres on home screen
+		 */
+		var premieresEnabled = booleanPreference("pref_enable_premieres", false)
+
+		/**
+		 * Enable management of media like deleting items when the user has sufficient permisisons.
+		 */
+		var mediaManagementEnabled = booleanPreference("enable_media_management", false)
 
 		/* Playback - General*/
 		/**
@@ -77,32 +81,17 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		 */
 		var cinemaModeEnabled = booleanPreference("pref_enable_cinema_mode", true)
 
-		/**
-		 * Enable still watching
-		 */
-		var stillWatchingBehavior = enumPreference("enable_still_watching", StillWatchingBehavior.DISABLED)
-
 		/* Playback - Video */
 		/**
 		 * Whether to use an external playback application or not.
 		 */
 		var useExternalPlayer = booleanPreference("external_player", false)
 
-		/**
-		 * Component name for the external playback application.
-		 */
-		var externalPlayerComponentName = stringPreference("external_player_component", "")
-
 		/**
 		 * Change refresh rate to match media when device supports it
 		 */
 		var refreshRateSwitchingBehavior = enumPreference("refresh_rate_switching_behavior", RefreshRateSwitchingBehavior.DISABLED)
 
-		/**
-		 * Whether ExoPlayer should prefer FFmpeg renderers to core ones.
-		 */
-		var preferExoPlayerFfmpeg = booleanPreference("exoplayer_prefer_ffmpeg", defaultValue = false)
-
 		/* Playback - Audio related */
 		/**
 		 * Preferred behavior for audio streaming.
@@ -125,6 +114,16 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		 */
 		var liveTvDirectPlayEnabled = booleanPreference("pref_live_direct", true)
 
+		/**
+		 * Shortcut used for changing the audio track
+		 */
+		var shortcutAudioTrack = intPreference("shortcut_audio_track", KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK)
+
+		/**
+		 * Shortcut used for changing the subtitle track
+		 */
+		var shortcutSubtitleTrack = intPreference("shortcut_subtitle_track", KeyEvent.KEYCODE_CAPTIONS)
+
 		/* Developer options */
 		/**
 		 * Show additional debug information
@@ -141,6 +140,11 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		 */
 		var clockBehavior = enumPreference("pref_clock_behavior", ClockBehavior.ALWAYS)
 
+		/**
+		 * Set which ratings provider should show on MyImageCardViews
+		 */
+		var defaultRatingType = enumPreference("pref_rating_type", RatingType.RATING_TOMATOES)
+
 		/**
 		 * Set when watched indicators should show on MyImageCardViews
 		 */
@@ -152,35 +156,30 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		var seriesThumbnailsEnabled = booleanPreference("pref_enable_series_thumbnails", true)
 
 		/**
-		 * Subtitles foreground color
+		 * Enable subtitles background
 		 */
-		var subtitlesBackgroundColor = longPreference("subtitles_background_color", 0x00FFFFFF)
+		var subtitlesBackgroundEnabled = booleanPreference("subtitles_background_enabled", true)
 
 		/**
-		 * Subtitles bold text
+		 * Subtitles font size
 		 */
-		var subtitlesTextWeight = intPreference("subtitles_text_weight", 400)
+		var subtitlesSize = intPreference("subtitles_size", 28)
+
+		/**
+		 * Subtitles stroke size
+		 */
+		var subtitleStrokeSize = intPreference("subtitles_stroke_size", 0)
+
+		/**
+		 * Subtitles position
+		 */
+		var subtitlePosition = intPreference("subtitles_position", 40)
 
 		/**
 		 * Subtitles foreground color
 		 */
 		var subtitlesTextColor = longPreference("subtitles_text_color", 0xFFFFFFFF)
 
-		/**
-		 * Subtitles stroke color
-		 */
-		var subtitleTextStrokeColor = longPreference("subtitles_text_stroke_color", 0xFF000000)
-
-		/**
-		 * Subtitles font size
-		 */
-		var subtitlesTextSize = floatPreference("subtitles_text_size", 24f)
-
-		/**
-		 * Subtitles offset
-		 */
-		var subtitlesOffsetPosition = floatPreference("subtitles_offset_position", 0.08f)
-
 		/**
 		 * Show screensaver in app
 		 */
@@ -202,40 +201,9 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		var screensaverAgeRatingRequired = booleanPreference("screensaver_agerating_required", true)
 
 		/**
-		 * Delay when starting video playback after loading the video player.
+		 * Enable reactive homepage
 		 */
-		var videoStartDelay = longPreference("video_start_delay", 0)
-
-		/**
-		 * The actions to take for each media segment type. Managed by the [MediaSegmentRepository].
-		 */
-		var mediaSegmentActions = stringPreference(
-			key = "media_segment_actions",
-			defaultValue = mapOf(
-				MediaSegmentType.INTRO to MediaSegmentAction.ASK_TO_SKIP,
-				MediaSegmentType.OUTRO to MediaSegmentAction.ASK_TO_SKIP,
-			).toMediaSegmentActionsString()
-		)
-
-		/**
-		 * Preferred behavior for player aspect ratio (zoom mode).
-		 */
-		var playerZoomMode = enumPreference("player_zoom_mode", ZoomMode.FIT)
-
-		/**
-		 * Enable TrickPlay in legacy player user interface while seeking.
-		 */
-		var trickPlayEnabled = booleanPreference("trick_play_enabled", false)
-
-		/**
-		 * Enable libass.
-		 */
-		var assDirectPlay = booleanPreference("libass_enabled", false)
-
-		/**
-		 * Enable PGS subtitle direct-play.
-		 */
-		var pgsDirectPlay = booleanPreference("pgs_enabled", true)
+		var homeReactive = booleanPreference("home_reactive", false)
 	}
 
 	init {
@@ -248,30 +216,6 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 				// Enable playback rewrite for music
 				putBoolean("playback_new_audio", true)
 			}
-
-			// v0.17.z to v0.18.0
-			migration(toVersion = 8) {
-				// Set subtitle background color to black if it was enabled in a previous version
-				val subtitlesBackgroundEnabled = it.getBoolean("subtitles_background_enabled", true)
-				putLong("subtitles_background_color", if (subtitlesBackgroundEnabled) 0XFF000000L else 0X00FFFFFFL)
-
-				// Set subtitle text stroke color to black if it was enabled in a previous version
-				val subtitleStrokeSize = it.getInt("subtitles_stroke_size", 0)
-				putLong("subtitles_text_stroke_color", if (subtitleStrokeSize > 0) 0XFF000000L else 0X00FFFFFFL)
-			}
-
-			// v0.19.0 to v0.20.0
-			migration(toVersion = 9) {
-				// Reset subtitle text size as we changed from fractional sizing to absolute sizing
-				remove("subtitles_text_size")
-
-				// Set the BackdropBehavior if it was enabled in a previous version
-				val backdropEnabled = it.getBoolean("pref_show_backdrop", true)
-				putString(
-					"backdrop_behavior",
-					if (backdropEnabled) BackdropBehavior.BACKDROP_WITH_BLUR.name else BackdropBehavior.DISABLED.name
-				)
-			}
 		}
 	}
 }

app/src/main/java/org/jellyfin/androidtv/preference/UserSettingPreferences.kt

@@ -24,26 +24,10 @@ class UserSettingPreferences(
 		val homesection4 = enumPreference("homesection4", HomeSectionType.LIVE_TV)
 		val homesection5 = enumPreference("homesection5", HomeSectionType.NEXT_UP)
 		val homesection6 = enumPreference("homesection6", HomeSectionType.LATEST_MEDIA)
-		val homesection7 = enumPreference("homesection7", HomeSectionType.NONE)
-		val homesection8 = enumPreference("homesection8", HomeSectionType.NONE)
-		val homesection9 = enumPreference("homesection9", HomeSectionType.NONE)
 	}
 
-	val homesections = listOf(
-		homesection0,
-		homesection1,
-		homesection2,
-		homesection3,
-		homesection4,
-		homesection5,
-		homesection6,
-		homesection7,
-		homesection8,
-		homesection9,
-	)
-
-	val activeHomesections
-		get() = homesections
+	val homesections
+		get() = listOf(homesection0, homesection1, homesection2, homesection3, homesection4, homesection5, homesection6)
 			.map(::get)
 			.filterNot { it == HomeSectionType.NONE }
 }

app/src/main/java/org/jellyfin/androidtv/preference/constant/BackdropBehavior.kt

@@ -1,20 +0,0 @@
-package org.jellyfin.androidtv.preference.constant
-
-import org.jellyfin.androidtv.R
-import org.jellyfin.preference.PreferenceEnum
-
-enum class BackdropBehavior(
-	override val nameRes: Int,
-) : PreferenceEnum {
-	DISABLED(R.string.state_disabled),
-
-	/**
-	 * When selected, backdrop is shown with a blur effect.
-	 */
-	BACKDROP_WITH_BLUR(R.string.backdrop_behavior_with_blur),
-
-	/**
-	 * When selected, backdrop is shown without any blur effect.
-	 */
-	BACKDROP_WITHOUT_BLUR(R.string.backdrop_behavior_without_blur),
-}

app/src/main/java/org/jellyfin/androidtv/preference/constant/RatingType.kt

@@ -0,0 +1,23 @@
+package org.jellyfin.androidtv.preference.constant
+
+import org.jellyfin.androidtv.R
+import org.jellyfin.preference.PreferenceEnum
+
+enum class RatingType(
+	override val nameRes: Int,
+) : PreferenceEnum {
+	/**
+	 * Sets default rating type to tomatoes.
+	 */
+	RATING_TOMATOES(R.string.lbl_tomatoes),
+
+	/**
+	 * Sets the default rating type to stars.
+	 */
+	RATING_STARS(R.string.lbl_stars),
+
+	/**
+	 * Sets the default rating type to hidden.
+	 */
+	RATING_HIDDEN(R.string.lbl_hidden),
+}

app/src/main/java/org/jellyfin/androidtv/preference/constant/StillWatchingBehavior.kt

@@ -1,63 +0,0 @@
-package org.jellyfin.androidtv.preference.constant
-
-import org.jellyfin.androidtv.R
-import org.jellyfin.preference.PreferenceEnum
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.hours
-
-enum class StillWatchingBehavior(
-	override val nameRes: Int,
-	val enabled: Boolean,
-	val episodeCount: Int,
-	val minDuration: Duration,
-) : PreferenceEnum {
-	/**
-	 * Shorter than default. Show screen at 2 episodes or 60 minutes of uninterrupted watch time.
-	 */
-	SHORT(
-		nameRes = R.string.lbl_still_watching_short,
-		enabled = true,
-		episodeCount = 2,
-		minDuration = 1.hours,
-	),
-
-	/**
-	 * Default behavior for still watching. Show screen at 3 episodes or 90 minutes of uninterrupted watch time.
-	 */
-	DEFAULT(
-		nameRes = R.string.lbl_still_watching_default,
-		enabled = true,
-		episodeCount = 3,
-		minDuration = 1.5.hours,
-	),
-
-	/**
-	 * Longer than default. Show screen at 5 episodes or 150 minutes of uninterrupted watch time.
-	 */
-	LONG(
-		nameRes = R.string.lbl_still_watching_long,
-		enabled = true,
-		episodeCount = 5,
-		minDuration = 2.5.hours,
-	),
-
-	/**
-	 * Much longer than default. Show screen at 8 episodes or 240 minutes of uninterrupted watch time.
-	 */
-	VERY_LONG(
-		nameRes = R.string.lbl_still_watching_very_long,
-		enabled = true,
-		episodeCount = 8,
-		minDuration = 4.hours,
-	),
-
-	/**
-	 * Disables still watching screen.
-	 */
-	DISABLED(
-		nameRes = R.string.state_disabled,
-		enabled = false,
-		episodeCount = 0,
-		minDuration = Duration.ZERO,
-	)
-}

app/src/main/java/org/jellyfin/androidtv/preference/constant/ZoomMode.kt

@@ -1,24 +0,0 @@
-package org.jellyfin.androidtv.preference.constant
-
-import org.jellyfin.androidtv.R
-import org.jellyfin.preference.PreferenceEnum
-
-enum class ZoomMode(
-	override val nameRes: Int,
-) : PreferenceEnum {
-	/**
-	 * Sets the zoom mode to normal (fit).
-	 */
-	FIT(R.string.lbl_fit),
-
-	/**
-	 * Sets the zoom mode to auto crop.
-	 */
-	AUTO_CROP(R.string.lbl_auto_crop),
-
-	/**
-	 * Sets the zoom mode to stretch.
-	 */
-	STRETCH(R.string.lbl_stretch),
-}
-

app/src/main/java/org/jellyfin/androidtv/preference/store/DisplayPreferencesStore.kt

@@ -1,7 +1,5 @@
 package org.jellyfin.androidtv.preference.store
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import org.jellyfin.preference.Preference
 import org.jellyfin.preference.PreferenceEnum
 import org.jellyfin.preference.migration.MigrationContext
@@ -58,12 +56,10 @@ abstract class DisplayPreferencesStore(
 
 	override suspend fun update(): Boolean {
 		try {
-			val result = withContext(Dispatchers.IO) {
-				api.displayPreferencesApi.getDisplayPreferences(
-					displayPreferencesId = displayPreferencesId,
-					client = app
-				).content
-			}
+			val result by api.displayPreferencesApi.getDisplayPreferences(
+				displayPreferencesId = displayPreferencesId,
+				client = app
+			)
 			displayPreferencesDto = result
 			cachedPreferences = result.customPrefs.toMutableMap()
 
@@ -86,9 +82,6 @@ abstract class DisplayPreferencesStore(
 	override fun getLong(key: String, defaultValue: Long) =
 		cachedPreferences[key]?.toLongOrNull() ?: defaultValue
 
-	override fun getFloat(key: String, defaultValue: Float) =
-		cachedPreferences[key]?.toFloatOrNull() ?: defaultValue
-
 	override fun getBool(key: String, defaultValue: Boolean) =
 		cachedPreferences[key]?.toBooleanStrictOrNull() ?: defaultValue
 
@@ -103,10 +96,6 @@ abstract class DisplayPreferencesStore(
 		cachedPreferences[key] = value.toString()
 	}
 
-	override fun setFloat(key: String, value: Float) {
-		cachedPreferences[key] = value.toString()
-	}
-
 	override fun setBool(key: String, value: Boolean) {
 		cachedPreferences[key] = value.toString()
 	}

app/src/main/java/org/jellyfin/androidtv/telemetry/TelemetryService.kt

@@ -18,11 +18,6 @@ import org.acra.sender.ReportSenderFactory
 import org.jellyfin.androidtv.BuildConfig
 import org.jellyfin.androidtv.R
 import org.jellyfin.androidtv.preference.TelemetryPreferences
-import org.jellyfin.androidtv.util.appendCodeBlock
-import org.jellyfin.androidtv.util.appendItem
-import org.jellyfin.androidtv.util.appendSection
-import org.jellyfin.androidtv.util.appendValue
-import org.jellyfin.androidtv.util.buildMarkdown
 import org.jellyfin.sdk.api.client.util.AuthorizationHeaderBuilder
 import java.net.HttpURLConnection
 import java.net.URL
@@ -68,12 +63,8 @@ object TelemetryService {
 			// Create connection
 			val connection = URL(url).openConnection() as HttpURLConnection
 			// Add authorization
-			val clientName = buildString {
-				append("Jellyfin Android TV")
-				if (BuildConfig.DEBUG) append(" (debug)")
-			}
 			val authorization = AuthorizationHeaderBuilder.buildHeader(
-				clientName = clientName,
+				clientName = BuildConfig.APPLICATION_ID,
 				clientVersion = BuildConfig.VERSION_NAME,
 				deviceId = "",
 				deviceName = "",
@@ -94,7 +85,31 @@ object TelemetryService {
 			throw ReportSenderException("Unable to send crash report to server", e)
 		}
 
-		private fun CrashReportData.toReport(): String = buildMarkdown {
+		private fun StringBuilder.appendSection(name: String, content: StringBuilder.() -> Unit) {
+			appendLine("### $name")
+			appendLine()
+			content()
+			appendLine()
+		}
+
+		private fun StringBuilder.appendItem(name: String, value: StringBuilder.() -> Unit) {
+			append("***$name***: ")
+			value()
+			appendLine("  ")
+		}
+
+		private fun StringBuilder.appendCodeBlock(language: String, code: String?) {
+			appendLine()
+			appendLine("```$language")
+			appendLine(code ?: "<null>")
+			append("```")
+		}
+
+		private fun StringBuilder.appendValue(value: String?) {
+			append("`", value ?: "<null>", "`")
+		}
+
+		private fun CrashReportData.toReport(): String = buildString {
 			// Header
 			appendLine("---")
 			appendLine("client: Jellyfin for Android TV")
@@ -103,7 +118,6 @@ object TelemetryService {
 			appendLine("type: crash_report")
 			appendLine("format: markdown")
 			appendLine("---")
-			appendLine()
 
 			// Content
 			appendSection("Logs") {

app/src/main/java/org/jellyfin/androidtv/ui/AsyncImageView.kt

@@ -1,25 +1,18 @@
 package org.jellyfin.androidtv.ui
 
-import android.app.ActivityManager
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.widget.ImageView
 import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.content.getSystemService
 import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.doOnAttach
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import coil3.ImageLoader
-import coil3.asImage
-import coil3.request.ImageRequest
-import coil3.request.crossfade
-import coil3.request.target
-import coil3.request.transformations
-import coil3.transform.CircleCropTransformation
+import coil.ImageLoader
+import coil.request.ImageRequest
+import coil.transform.CircleCropTransformation
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.R
@@ -42,7 +35,6 @@ class AsyncImageView @JvmOverloads constructor(
 	private val lifeCycleOwner get() = findViewTreeLifecycleOwner()
 	private val styledAttributes = context.obtainStyledAttributes(attrs, R.styleable.AsyncImageView, defStyleAttr, 0)
 	private val imageLoader by inject<ImageLoader>()
-	private var loadJob: Job? = null
 
 	/**
 	 * The duration of the crossfade when changing switching the images of the url, blurhash and
@@ -68,15 +60,11 @@ class AsyncImageView @JvmOverloads constructor(
 		aspectRatio: Double = 1.0,
 		blurHashResolution: Int = 32,
 	) = doOnAttach {
-		// Cancel the previous load if still running
-		loadJob?.cancel()
-
-		loadJob = lifeCycleOwner?.lifecycleScope?.launch(Dispatchers.IO) {
+		lifeCycleOwner?.lifecycleScope?.launch {
 			var placeholderOrBlurHash = placeholder
 
 			// Only show blurhash if an image is going to be loaded from the network
-			val isLowRamDevice = context.getSystemService<ActivityManager>()?.isLowRamDevice == true
-			if (url != null && blurHash != null && !isLowRamDevice) withContext(Dispatchers.IO) {
+			if (url != null && blurHash != null) withContext(Dispatchers.IO) {
 				val blurHashBitmap = BlurHashDecoder.decode(
 					blurHash,
 					if (aspectRatio > 1) round(blurHashResolution * aspectRatio).toInt() else blurHashResolution,
@@ -86,27 +74,25 @@ class AsyncImageView @JvmOverloads constructor(
 			}
 
 			// Start loading image or placeholder
-			val request = if (url == null) {
-				ImageRequest.Builder(context).apply {
+			if (url == null) {
+				imageLoader.enqueue(ImageRequest.Builder(context).apply {
 					target(this@AsyncImageView)
 					data(placeholder)
 					if (circleCrop) transformations(CircleCropTransformation())
-				}.build()
+				}.build())
 			} else {
-				ImageRequest.Builder(context).apply {
+				imageLoader.enqueue(ImageRequest.Builder(context).apply {
 					val crossFadeDurationMs = crossFadeDuration.inWholeMilliseconds.toInt()
 					if (crossFadeDurationMs > 0) crossfade(crossFadeDurationMs)
 					else crossfade(false)
 
 					target(this@AsyncImageView)
 					data(url)
-					placeholder(placeholderOrBlurHash?.asImage())
+					placeholder(placeholderOrBlurHash)
 					if (circleCrop) transformations(CircleCropTransformation())
-					error(placeholder?.asImage())
-				}.build()
+					error(placeholder)
+				}.build())
 			}
-
-			imageLoader.enqueue(request).job.await()
 		}
 	}
 }

app/src/main/java/org/jellyfin/androidtv/ui/ClockUserView.kt

@@ -4,12 +4,16 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.RelativeLayout
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.auth.repository.UserRepository
 import org.jellyfin.androidtv.databinding.ClockUserBugBinding
 import org.jellyfin.androidtv.preference.UserPreferences
 import org.jellyfin.androidtv.preference.constant.ClockBehavior
 import org.jellyfin.androidtv.ui.navigation.Destinations
 import org.jellyfin.androidtv.ui.navigation.NavigationRepository
+import org.jellyfin.androidtv.util.ImageHelper
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -21,7 +25,9 @@ class ClockUserView @JvmOverloads constructor(
 ) : RelativeLayout(context, attrs, defStyleAttr, defStyleRes), KoinComponent {
 	private val binding: ClockUserBugBinding = ClockUserBugBinding.inflate(LayoutInflater.from(context), this, true)
 	private val userPreferences by inject<UserPreferences>()
+	private val userRepository by inject<UserRepository>()
 	private val navigationRepository by inject<NavigationRepository>()
+	private val imageHelper by inject<ImageHelper>()
 
 	var isVideoPlayer = false
 		set(value) {
@@ -34,6 +40,15 @@ class ClockUserView @JvmOverloads constructor(
 	init {
 		updateClockVisibility()
 
+		val currentUser = userRepository.currentUser.value
+
+		binding.clockUserImage.load(
+			url = currentUser?.let(imageHelper::getPrimaryImageUrl),
+			placeholder = ContextCompat.getDrawable(context, R.drawable.ic_user)
+		)
+
+		binding.clockUserImage.isVisible = currentUser != null
+
 		binding.home.setOnClickListener {
 			navigationRepository.reset(Destinations.home, clearHistory = true)
 		}

app/src/main/java/org/jellyfin/androidtv/ui/FadeViewSwitcherLayout.kt

@@ -0,0 +1,61 @@
+package org.jellyfin.androidtv.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.view.animation.AlphaAnimation
+import android.widget.FrameLayout
+import androidx.annotation.IntRange
+
+class FadeViewSwitcherLayout @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = 0,
+	defStyleRes: Int = 0,
+) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
+	companion object {
+		const val VIEW_NONE = -1
+	}
+
+	private var currentView = VIEW_NONE
+	private val nextViewId
+		get() = if (currentView >= childCount - 1) 0 else currentView + 1
+	private val previousViewId
+		get() = if (currentView <= 0) childCount - 1 else currentView - 1
+
+	override fun onViewAdded(child: View?) {
+		super.onViewAdded(child)
+
+		// Hide new views by default
+		child?.alpha = 0f
+	}
+
+	fun showNextView() = showView(nextViewId)
+	fun showPreviousView() = showView(previousViewId)
+	fun hideAllViews() = showView(VIEW_NONE)
+
+	fun <V : View> getNextView() = getChildAt(nextViewId) as V
+	fun <V : View> getCurrentView() = if (currentView == VIEW_NONE) null else currentView as V
+	fun <V : View> getPreviousView() = getChildAt(previousViewId) as V
+
+	fun showView(@IntRange(from = -1) view: Int) {
+		// TODO: right now crossfades, need to be smarter to hide old view after new view is completely visible
+		if (currentView != VIEW_NONE) getChildAt(currentView).fadeOut()
+		if (view != VIEW_NONE) getChildAt(view).fadeIn()
+
+		currentView = view
+	}
+
+	private fun View.fadeIn() {
+		alpha = 1f
+		startAnimation(AlphaAnimation(0f, 1f).apply {
+			duration = 1_000
+			fillAfter = true
+		})
+	}
+
+	private fun View.fadeOut() = startAnimation(AlphaAnimation(1f, 0f).apply {
+		duration = 1_000
+		fillAfter = true
+	})
+}

app/src/main/java/org/jellyfin/androidtv/ui/InteractionTrackerViewModel.kt

@@ -1,160 +0,0 @@
-package org.jellyfin.androidtv.ui
-
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-import org.jellyfin.androidtv.preference.UserPreferences
-import org.jellyfin.androidtv.ui.playback.PlaybackControllerContainer
-import org.jellyfin.sdk.model.api.BaseItemDto
-import org.jellyfin.sdk.model.api.BaseItemKind
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
-
-class InteractionTrackerViewModel(
-	private val userPreferences: UserPreferences,
-	private val playbackControllerContainer: PlaybackControllerContainer
-) : ViewModel() {
-	// Screensaver
-
-	private var timer: Job? = null
-	private var locks = 0
-
-	// Still Watching
-
-	private var isWatchingEpisodes = false
-	private var episodeCount = 0
-	private var watchTime = 0L
-	private var episodeWasInterrupted: Boolean = false
-
-	// Preferences
-
-	private val inAppEnabled get() = userPreferences[UserPreferences.screensaverInAppEnabled]
-	private val timeout get() = userPreferences[UserPreferences.screensaverInAppTimeout].milliseconds
-	private val stillWatchingBehavior get() = userPreferences[UserPreferences.stillWatchingBehavior]
-
-	// State
-
-	private val _screensaverVisible = MutableStateFlow(false)
-	val visible get() = _screensaverVisible.asStateFlow()
-
-	private val _keepScreenOn = MutableStateFlow(inAppEnabled)
-	val keepScreenOn get() = _keepScreenOn.asStateFlow()
-
-	var activityPaused: Boolean = false
-		set(value) {
-			field = value
-			notifyInteraction(canCancel = true, userInitiated = false)
-		}
-
-	init {
-		notifyInteraction(canCancel = true, userInitiated = false)
-	}
-
-	fun getShowStillWatching(): Boolean {
-		if (!stillWatchingBehavior.enabled) return false
-
-		if (stillWatchingBehavior.episodeCount > 0 && episodeCount >= stillWatchingBehavior.episodeCount) return true
-		if (stillWatchingBehavior.minDuration > Duration.ZERO && watchTime.milliseconds >= stillWatchingBehavior.minDuration) return true
-
-		return false
-	}
-
-	fun notifyStartSession(item: BaseItemDto, items: List<BaseItemDto>) {
-		// No need to track when only watching 1 episode
-		if (item.type == BaseItemKind.EPISODE && items.size > 1) {
-			resetSession()
-			episodeWasInterrupted = false
-		}
-	}
-
-	fun notifyStillWatching() {
-		resetSession()
-	}
-
-	fun onEpisodeWatched() {
-		if (!episodeWasInterrupted) episodeCount++
-		watchTime += playbackControllerContainer.playbackController?.duration ?: 0
-		episodeWasInterrupted = false
-	}
-
-	fun notifyStart(item: BaseItemDto) {
-		if (item.type == BaseItemKind.EPISODE) isWatchingEpisodes = true
-	}
-
-	fun notifyInteraction(canCancel: Boolean, userInitiated: Boolean) {
-		// Cancel pending screensaver timer (if any)
-		timer?.cancel()
-
-		// If watching episodes, reset episode count and watch time
-		if (isWatchingEpisodes && userInitiated) {
-			resetSession()
-			episodeWasInterrupted = true
-		}
-
-		// Hide screensaver when interacted with allowed cancellation or when disabled
-		if (_screensaverVisible.value && (canCancel || !inAppEnabled || activityPaused)) {
-			_screensaverVisible.value = false
-		}
-
-		// Create new timer to show screensaver when enabled
-		if (inAppEnabled && !activityPaused && locks == 0) {
-			timer = viewModelScope.launch {
-				delay(timeout)
-				_screensaverVisible.value = true
-			}
-		}
-
-		// Update KEEP_SCREEN_ON flag value
-		_keepScreenOn.value = inAppEnabled || locks > 0
-	}
-
-	/**
-	 * Create a lock that prevents the screensaver for running until the returned function is called
-	 * or the lifecycle is destroyed.
-	 *
-	 * @return Function to cancel the lock
-	 */
-	fun addLifecycleLock(lifecycle: Lifecycle): () -> Unit {
-		if (lifecycle.currentState == Lifecycle.State.DESTROYED) return {}
-
-		val lock = ScreensaverLock(lifecycle)
-		lock.activate()
-		return lock::cancel
-	}
-
-	private inner class ScreensaverLock(private val lifecycle: Lifecycle) : LifecycleEventObserver {
-		private var active: Boolean = false
-
-		override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
-			if (event == Lifecycle.Event.ON_DESTROY) cancel()
-		}
-
-		fun activate() {
-			if (active) return
-			lifecycle.addObserver(this)
-			locks++
-			notifyInteraction(canCancel = true, userInitiated = false)
-			active = true
-		}
-
-		fun cancel() {
-			if (!active) return
-			locks--
-			lifecycle.removeObserver(this)
-			notifyInteraction(canCancel = false, userInitiated = false)
-			active = false
-		}
-	}
-
-	private fun resetSession() {
-		watchTime = 0L
-		episodeCount = 0
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/ItemListViewHelper.kt

@@ -2,24 +2,27 @@ package org.jellyfin.androidtv.ui
 
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.jellyfin.androidtv.data.repository.ItemRepository
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.extensions.itemsApi
+import org.jellyfin.sdk.model.api.ItemFields
 import org.koin.java.KoinJavaComponent
 
 fun ItemListView.refresh() {
 	val api by KoinJavaComponent.inject<ApiClient>(ApiClient::class.java)
 
 	findViewTreeLifecycleOwner()?.lifecycleScope?.launch {
-		val response = withContext(Dispatchers.IO) {
-			api.itemsApi.getItems(
-				ids = mItemIds,
-				fields = ItemRepository.itemFields
-			).content
-		}
+		val response by api.itemsApi.getItems(
+			ids = mItemIds,
+			fields = setOf(
+				ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+				ItemFields.OVERVIEW,
+				ItemFields.ITEM_COUNTS,
+				ItemFields.DISPLAY_PREFERENCES_ID,
+				ItemFields.CHILD_COUNT,
+				ItemFields.MEDIA_SOURCES,
+			)
+		)
 
 		response.items?.forEachIndexed { index, item ->
 			val view = mList.getChildAt(index)

app/src/main/java/org/jellyfin/androidtv/ui/LiveProgramDetailPopup.java

@@ -24,7 +24,7 @@ import org.jellyfin.androidtv.data.model.DataRefreshService;
 import org.jellyfin.androidtv.ui.livetv.LiveTvGuide;
 import org.jellyfin.androidtv.ui.livetv.TvManager;
 import org.jellyfin.androidtv.util.Utils;
-import org.jellyfin.androidtv.util.apiclient.EmptyResponse;
+import org.jellyfin.androidtv.util.apiclient.EmptyLifecycleAwareResponse;
 import org.jellyfin.sdk.model.api.BaseItemDto;
 import org.koin.java.KoinJavaComponent;
 
@@ -48,13 +48,13 @@ public class LiveProgramDetailPopup {
     private Button mFirstButton;
     private Button mSeriesSettingsButton;
 
-    private EmptyResponse mTuneAction;
+    private EmptyLifecycleAwareResponse mTuneAction;
 
     private View mAnchor;
     private int mPosLeft;
     private int mPosTop;
 
-    public LiveProgramDetailPopup(Context context, LifecycleOwner lifecycleOwner, LiveTvGuide tvGuide, int width, EmptyResponse tuneAction) {
+    public LiveProgramDetailPopup(Context context, LifecycleOwner lifecycleOwner, LiveTvGuide tvGuide, int width, EmptyLifecycleAwareResponse tuneAction) {
         mContext = context;
         lifecycle = lifecycleOwner.getLifecycle();
         mTvGuide = tvGuide;
@@ -247,7 +247,7 @@ public class LiveProgramDetailPopup {
         tune.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mTuneAction != null) mTuneAction.onResponse();
+                if (mTuneAction != null && mTuneAction.getActive()) mTuneAction.onResponse();
                 mPopup.dismiss();
             }
         });

app/src/main/java/org/jellyfin/androidtv/ui/LiveProgramDetailPopupHelper.kt

@@ -1,9 +1,7 @@
 package org.jellyfin.androidtv.ui
 
 import androidx.lifecycle.coroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.data.repository.ItemMutationRepository
 import org.jellyfin.androidtv.util.getActivity
 import org.jellyfin.sdk.api.client.ApiClient
@@ -34,9 +32,7 @@ fun LiveProgramDetailPopup.cancelTimer(
 
 	lifecycle.coroutineScope.launch {
 		runCatching {
-			withContext(Dispatchers.IO) {
-				api.liveTvApi.cancelTimer(timerId)
-			}
+			api.liveTvApi.cancelTimer(timerId)
 		}.onSuccess {
 			callback()
 		}
@@ -51,9 +47,7 @@ fun LiveProgramDetailPopup.cancelSeriesTimer(
 
 	lifecycle.coroutineScope.launch {
 		runCatching {
-			withContext(Dispatchers.IO) {
-				api.liveTvApi.cancelSeriesTimer(seriesTimerId)
-			}
+			api.liveTvApi.cancelSeriesTimer(seriesTimerId)
 		}.onSuccess {
 			callback()
 		}
@@ -94,12 +88,10 @@ fun LiveProgramDetailPopup.recordProgram(
 
 	lifecycle.coroutineScope.launch {
 		runCatching {
-			withContext(Dispatchers.IO) {
-				val seriesTimer by api.liveTvApi.getDefaultTimer(programId.toString())
-				val timer = seriesTimer.asTimerInfoDto()
-				api.liveTvApi.createTimer(timer)
-				api.liveTvApi.getProgram(programId.toString()).content
-			}
+			val seriesTimer by api.liveTvApi.getDefaultTimer(programId.toString())
+			val timer = seriesTimer.asTimerInfoDto()
+			api.liveTvApi.createTimer(timer)
+			api.liveTvApi.getProgram(programId.toString()).content
 		}.onSuccess { program ->
 			callback(program)
 		}
@@ -114,11 +106,9 @@ fun LiveProgramDetailPopup.recordSeries(
 
 	lifecycle.coroutineScope.launch {
 		runCatching {
-			withContext(Dispatchers.IO) {
-				val timer by api.liveTvApi.getDefaultTimer(programId.toString())
-				api.liveTvApi.createSeriesTimer(timer)
-				api.liveTvApi.getProgram(programId.toString()).content
-			}
+			val timer by api.liveTvApi.getDefaultTimer(programId.toString())
+			api.liveTvApi.createSeriesTimer(timer)
+			api.liveTvApi.getProgram(programId.toString()).content
 		}.onSuccess { program ->
 			callback(program)
 		}
@@ -133,9 +123,7 @@ fun LiveProgramDetailPopup.getSeriesTimer(
 
 	lifecycle.coroutineScope.launch {
 		runCatching {
-			withContext(Dispatchers.IO) {
-				api.liveTvApi.getSeriesTimer(seriesTimerId).content
-			}
+			api.liveTvApi.getSeriesTimer(seriesTimerId).content
 		}.onSuccess { seriesTimer ->
 			callback(seriesTimer)
 		}

app/src/main/java/org/jellyfin/androidtv/ui/NowPlayingView.kt

@@ -2,157 +2,103 @@ package org.jellyfin.androidtv.ui
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.ImageView
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.togetherWith
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.platform.AbstractComposeView
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
+import android.view.LayoutInflater
+import android.widget.FrameLayout
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.core.view.setPadding
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.base.JellyfinTheme
-import org.jellyfin.androidtv.ui.base.ProvideTextStyle
-import org.jellyfin.androidtv.ui.base.Text
-import org.jellyfin.androidtv.ui.base.button.ButtonBase
-import org.jellyfin.androidtv.ui.composable.AsyncImage
-import org.jellyfin.androidtv.ui.composable.rememberPlayerProgress
-import org.jellyfin.androidtv.ui.composable.rememberQueueEntry
+import org.jellyfin.androidtv.databinding.ViewNowPlayingBinding
 import org.jellyfin.androidtv.ui.navigation.Destinations
 import org.jellyfin.androidtv.ui.navigation.NavigationRepository
-import org.jellyfin.androidtv.util.apiclient.albumPrimaryImage
-import org.jellyfin.androidtv.util.apiclient.getUrl
-import org.jellyfin.androidtv.util.apiclient.itemImages
-import org.jellyfin.androidtv.util.apiclient.parentImages
-import org.jellyfin.playback.core.PlaybackManager
-import org.jellyfin.playback.jellyfin.queue.baseItem
-import org.jellyfin.playback.jellyfin.queue.baseItemFlow
-import org.jellyfin.sdk.api.client.ApiClient
-import org.jellyfin.sdk.model.api.ImageType
-import org.koin.compose.koinInject
-
-@Composable
-fun NowPlayingComposable(
-	modifier: Modifier = Modifier,
-	onFocusableChange: (focusable: Boolean) -> Unit,
-) {
-	val api = koinInject<ApiClient>()
-	val playbackManager = koinInject<PlaybackManager>()
-	val navigationRepository = koinInject<NavigationRepository>()
-
-	val entry by rememberQueueEntry(playbackManager)
-	val item = entry?.run { baseItemFlow.collectAsState(baseItem) }?.value
-	val progress = rememberPlayerProgress(playbackManager)
-
-	LaunchedEffect(item == null) { onFocusableChange(item != null) }
-
-	AnimatedContent(
-		modifier = modifier,
-		targetState = item,
-		transitionSpec = { fadeIn() togetherWith fadeOut() },
-	) { item ->
-		if (item != null) {
-			ButtonBase(
-				onClick = { navigationRepository.navigate(Destinations.nowPlaying) },
-				modifier = Modifier
-					.widthIn(100.dp, 250.dp)
-			) {
-				ProvideTextStyle(
-					value = TextStyle.Default.copy(
-						fontSize = 12.sp,
-					)
-				) {
-					Row(
-						horizontalArrangement = Arrangement.spacedBy(6.dp),
-						verticalAlignment = Alignment.CenterVertically,
-						modifier = Modifier
-							.padding(3.dp)
-					) {
-						val image = item.itemImages[ImageType.PRIMARY] ?: item.albumPrimaryImage ?: item.parentImages[ImageType.PRIMARY]
-						val progressFillColor = JellyfinTheme.colorScheme.rangeControlFill
-
-						AsyncImage(
-							url = image?.getUrl(api),
-							blurHash = image?.blurHash,
-							placeholder = ContextCompat.getDrawable(LocalContext.current, R.drawable.ic_album),
-							aspectRatio = image?.aspectRatio ?: 1f,
-							modifier = Modifier
-								.size(35.dp)
-								.clip(CircleShape)
-								.drawWithContent {
-									drawContent()
-
-									val width = 3.dp.toPx()
-
-									// Background
-									drawCircle(
-										style = Stroke(width),
-										color = Color.Black,
-										alpha = 0.4f,
-									)
-									// Foreground
-									drawArc(
-										style = Stroke(width, cap = StrokeCap.Round),
-										color = progressFillColor,
-										useCenter = false,
-										startAngle = -90f,
-										sweepAngle = 360f * progress,
-									)
-								},
-							scaleType = ImageView.ScaleType.CENTER_CROP,
-						)
-
-						Column(
-							verticalArrangement = Arrangement.SpaceAround,
-							modifier = Modifier
-								.padding(start = 2.dp, end = 8.dp)
-						) {
-							// Name
-							Text(text = item.name.orEmpty(), maxLines = 1, overflow = TextOverflow.Ellipsis, fontWeight = FontWeight.Bold)
-							val artists = item.artists ?: item.albumArtists ?: item.albumArtist?.let(::listOf)
-							Text(text = artists?.joinToString(", ").orEmpty(), maxLines = 1, overflow = TextOverflow.Ellipsis)
-						}
-					}
-				}
-			}
-		}
-	}
-}
+import org.jellyfin.androidtv.ui.playback.AudioEventListener
+import org.jellyfin.androidtv.ui.playback.MediaManager
+import org.jellyfin.androidtv.ui.playback.PlaybackController
+import org.jellyfin.androidtv.util.ImageHelper
+import org.jellyfin.androidtv.util.TimeUtils
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 class NowPlayingView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	defStyle: Int = 0
-) : AbstractComposeView(context, attrs, defStyle) {
-	@Composable
-	override fun Content() = NowPlayingComposable(
-		// Workaround for older Android versions unable to find focus in our toolbar view when the NowPlayingView is added but inactive
-		onFocusableChange = { focusable ->
-			isFocusable = focusable
-			descendantFocusability = if (focusable) FOCUS_AFTER_DESCENDANTS else FOCUS_BLOCK_DESCENDANTS
+	defStyleAttr: Int = 0,
+	defStyleRes: Int = R.style.Button_Default,
+) : FrameLayout(context, attrs, defStyleAttr, defStyleRes), KoinComponent {
+	val binding = ViewNowPlayingBinding.inflate(LayoutInflater.from(context), this, true)
+
+	private val mediaManager by inject<MediaManager>()
+	private val navigationRepository by inject<NavigationRepository>()
+	private val imageHelper by inject<ImageHelper>()
+	private var currentDuration: String = ""
+
+	init {
+		setPadding(0)
+
+		if (!isInEditMode) setOnClickListener {
+			navigationRepository.navigate(Destinations.nowPlaying)
 		}
-	)
+	}
+
+	override fun onAttachedToWindow() {
+		super.onAttachedToWindow()
+
+		if (!isInEditMode) {
+			// hook our events
+			mediaManager.addAudioEventListener(audioEventListener)
+
+			if (mediaManager.hasAudioQueueItems()) {
+				isVisible = true
+				setInfo(mediaManager.currentAudioItem!!)
+				setStatus(mediaManager.currentAudioPosition)
+			} else isVisible = false
+		}
+	}
+
+	override fun onDetachedFromWindow() {
+		super.onDetachedFromWindow()
+
+		if (!isInEditMode) mediaManager.removeAudioEventListener(audioEventListener)
+	}
+
+	private fun setInfo(item: org.jellyfin.sdk.model.api.BaseItemDto) {
+		val placeholder = ContextCompat.getDrawable(context, R.drawable.ic_album)
+		val blurHash = item.imageBlurHashes?.get(org.jellyfin.sdk.model.api.ImageType.PRIMARY)?.get(item.imageTags?.get(org.jellyfin.sdk.model.api.ImageType.PRIMARY))
+		binding.npIcon.load(imageHelper.getPrimaryImageUrl(item), blurHash, placeholder, item.primaryImageAspectRatio ?: 1.0)
+
+		currentDuration = TimeUtils.formatMillis(if (item.runTimeTicks != null) item.runTimeTicks!! / 10_000 else 0)
+		binding.npDesc.text = if (item.albumArtist != null) item.albumArtist else item.name
+	}
+
+	private fun setStatus(pos: Long) {
+		binding.npStatus.text = resources.getString(R.string.lbl_status, TimeUtils.formatMillis(pos), currentDuration)
+	}
+
+	fun showDescription(show: Boolean) {
+		binding.npDesc.isVisible = show
+	}
+
+	private var audioEventListener: AudioEventListener = object : AudioEventListener {
+		override fun onPlaybackStateChange(newState: PlaybackController.PlaybackState, currentItem: org.jellyfin.sdk.model.api.BaseItemDto?) {
+			when {
+				currentItem == null -> Unit
+				newState == PlaybackController.PlaybackState.PLAYING -> setInfo(currentItem)
+				newState == PlaybackController.PlaybackState.IDLE && isShown -> setStatus(mediaManager.currentAudioPosition)
+			}
+		}
+
+		override fun onProgress(pos: Long) {
+			if (isShown) setStatus(pos)
+		}
+
+		override fun onQueueStatusChanged(hasQueue: Boolean) {
+			isVisible = hasQueue
+
+			if (hasQueue) {
+				// may have just added one so update display
+				setInfo(mediaManager.currentAudioItem!!)
+				setStatus(mediaManager.currentAudioPosition)
+			}
+		}
+	}
 }

app/src/main/java/org/jellyfin/androidtv/ui/NumberSpinnerView.kt

@@ -0,0 +1,31 @@
+package org.jellyfin.androidtv.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import org.jellyfin.androidtv.databinding.ViewNumberSpinnerBinding
+
+class NumberSpinnerView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = 0,
+	defStyleRes: Int = 0,
+) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
+	val binding = ViewNumberSpinnerBinding.inflate(LayoutInflater.from(context), this, true)
+
+	var increment = 10L
+	var valueChangedListener: ValueChangedListener<Long>? = null
+
+	var value = 0L
+		set(value) {
+			field = value
+			binding.value.text = value.toString()
+			valueChangedListener?.onValueChanged(value)
+		}
+
+	init {
+		binding.increase.setOnClickListener { value += increment }
+		binding.decrease.setOnClickListener { value -= increment }
+	}
+}

app/src/main/java/org/jellyfin/androidtv/ui/RecordPopupHelper.kt

@@ -1,9 +1,7 @@
 package org.jellyfin.androidtv.ui
 
 import androidx.lifecycle.coroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.util.getActivity
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.extensions.liveTvApi
@@ -43,11 +41,9 @@ fun RecordPopup.updateSeriesTimer(
 
 	lifecycle.coroutineScope.launch {
 		runCatching {
-			withContext(Dispatchers.IO) {
-				val id = seriesTimer.id
-				if (id == null) api.liveTvApi.createSeriesTimer(seriesTimer)
-				else api.liveTvApi.updateSeriesTimer(id, seriesTimer)
-			}
+			val id = seriesTimer.id
+			if (id == null) api.liveTvApi.createSeriesTimer(seriesTimer)
+			else api.liveTvApi.updateSeriesTimer(id, seriesTimer)
 		}.onSuccess {
 			callback()
 		}
@@ -62,11 +58,9 @@ fun RecordPopup.updateTimer(
 
 	lifecycle.coroutineScope.launch {
 		runCatching {
-			withContext(Dispatchers.IO) {
-				val id = timer.id
-				if (id == null) api.liveTvApi.createTimer(timer)
-				else api.liveTvApi.updateTimer(id, timer)
-			}
+			val id = timer.id
+			if (id == null) api.liveTvApi.createTimer(timer)
+			else api.liveTvApi.updateTimer(id, timer)
 		}.onSuccess {
 			callback()
 		}
@@ -92,9 +86,7 @@ fun RecordPopup.getLiveTvProgram(
 
 	lifecycle.coroutineScope.launch {
 		runCatching {
-			withContext(Dispatchers.IO) {
-				api.liveTvApi.getProgram(id.toString()).content
-			}
+			api.liveTvApi.getProgram(id.toString()).content
 		}.onSuccess { program ->
 			callback(program)
 		}

app/src/main/java/org/jellyfin/androidtv/ui/ScreensaverLock.kt

@@ -1,33 +0,0 @@
-package org.jellyfin.androidtv.ui
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.lifecycle.compose.LocalLifecycleOwner
-import org.koin.compose.koinInject
-
-private typealias Lock = () -> Unit
-
-@Composable
-fun ScreensaverLock(
-	enabled: Boolean
-) {
-	val viewModel = koinInject<InteractionTrackerViewModel>()
-	val lifecycleOwner = LocalLifecycleOwner.current
-
-	var lock by remember { mutableStateOf<Lock?>(null) }
-
-	DisposableEffect(enabled, lifecycleOwner) {
-		if (enabled && lock == null) {
-			lock = viewModel.addLifecycleLock(lifecycleOwner.lifecycle)
-		}
-
-		onDispose {
-			lock?.invoke()
-			lock = null
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/ScreensaverViewModel.kt

@@ -0,0 +1,103 @@
+package org.jellyfin.androidtv.ui
+
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import org.jellyfin.androidtv.preference.UserPreferences
+import kotlin.time.Duration.Companion.milliseconds
+
+class ScreensaverViewModel(
+	private val userPreferences: UserPreferences,
+) : ViewModel() {
+	private var timer: Job? = null
+	private var locks = 0
+
+	// Preferences
+
+	val inAppEnabled get() = userPreferences[UserPreferences.screensaverInAppEnabled]
+	private val timeout get() = userPreferences[UserPreferences.screensaverInAppTimeout].milliseconds
+
+	// State
+
+	private val _visible = MutableStateFlow(false)
+	val visible get() = _visible.asStateFlow()
+
+	private val _keepScreenOn = MutableStateFlow(inAppEnabled)
+	val keepScreenOn get() = _keepScreenOn.asStateFlow()
+
+	var activityPaused: Boolean = false
+		set(value) {
+			field = value
+			notifyInteraction(true)
+		}
+
+	init {
+		notifyInteraction(true)
+	}
+
+	fun notifyInteraction(canCancel: Boolean) {
+		// Cancel pending timer (if any)
+		timer?.cancel()
+
+		// Hide when interacted with allowed cancelation or when disabled
+		if (_visible.value && (canCancel || !inAppEnabled || activityPaused)) {
+			_visible.value = false
+		}
+
+		// Create new timer to show screensaver when enabled
+		if (inAppEnabled && !activityPaused && locks == 0) {
+			timer = viewModelScope.launch {
+				delay(timeout)
+				_visible.value = true
+			}
+		}
+
+		// Update KEEP_SCREEN_ON flag value
+		_keepScreenOn.value = inAppEnabled || locks > 0
+	}
+
+	/**
+	 * Create a lock that prevents the screensaver for running until the returned function is called
+	 * or the lifecycle is destroyed.
+	 *
+	 * @return Function to cancel the lock
+	 */
+	fun addLifecycleLock(lifecycle: Lifecycle): () -> Unit {
+		if (lifecycle.currentState == Lifecycle.State.DESTROYED) return {}
+
+		val lock = ScreensaverLock(lifecycle)
+		lock.activate()
+		return lock::cancel
+	}
+
+	private inner class ScreensaverLock(private val lifecycle: Lifecycle) : LifecycleEventObserver {
+		private var active: Boolean = false
+
+		override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+			if (event == Lifecycle.Event.ON_DESTROY) cancel()
+		}
+
+		fun activate() {
+			if (active) return
+			lifecycle.addObserver(this)
+			locks++
+			notifyInteraction(true)
+			active = true
+		}
+
+		fun cancel() {
+			if (!active) return
+			locks--
+			lifecycle.removeObserver(this)
+			notifyInteraction(false)
+			active = false
+		}
+	}
+}

app/src/main/java/org/jellyfin/androidtv/ui/ServerButtonView.kt

@@ -1,118 +1,86 @@
 package org.jellyfin.androidtv.ui
 
 import android.content.Context
-import android.graphics.Rect
-import android.os.Build
 import android.util.AttributeSet
 import android.view.KeyEvent
-import androidx.compose.foundation.interaction.FocusInteraction
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.AbstractComposeView
-import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.base.CircularProgressIndicator
-import org.jellyfin.androidtv.ui.base.Icon
-import org.jellyfin.androidtv.ui.base.LocalTextStyle
-import org.jellyfin.androidtv.ui.base.ProvideTextStyle
-import org.jellyfin.androidtv.ui.base.Text
-import org.jellyfin.androidtv.ui.base.button.ButtonBase
-import org.jellyfin.androidtv.ui.base.button.ButtonDefaults
+import org.jellyfin.androidtv.databinding.ViewButtonServerBinding
 import org.jellyfin.androidtv.util.MenuBuilder
 import org.jellyfin.androidtv.util.popupMenu
 import org.jellyfin.androidtv.util.showIfNotEmpty
 
-@Composable
-fun ServerButton(
-	icon: @Composable () -> Unit,
-	name: @Composable () -> Unit,
-	address: @Composable () -> Unit,
-	version: @Composable () -> Unit,
-	onClick: () -> Unit,
-	modifier: Modifier = Modifier,
-	interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-	shape: Shape = ButtonDefaults.Shape,
-) {
-	ButtonBase(
-		onClick = onClick,
-		modifier = modifier,
-		interactionSource = interactionSource,
-		shape = shape,
-	) {
-		Row(
-			horizontalArrangement = Arrangement.spacedBy(8.dp),
-			verticalAlignment = Alignment.CenterVertically,
-			modifier = Modifier
-				.fillMaxSize()
-				.padding(horizontal = 16.dp, vertical = 8.dp)
-		) {
-			icon()
-
-			Column(
-				modifier = Modifier
-					.weight(1f)
-					.fillMaxHeight(),
-				verticalArrangement = Arrangement.SpaceBetween,
-			) {
-				ProvideTextStyle(LocalTextStyle.current.copy(fontSize = 14.sp)) {
-					name()
-				}
-
-				ProvideTextStyle(LocalTextStyle.current.copy(fontSize = 12.sp)) {
-					address()
-				}
-			}
-
-			Box(modifier = Modifier.align(Alignment.Bottom)) {
-				ProvideTextStyle(LocalTextStyle.current.copy(fontSize = 12.sp)) {
-					version()
-				}
-			}
-		}
-	}
-}
-
 class ServerButtonView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
 	defStyleAttr: Int = 0,
-) : AbstractComposeView(context, attrs, defStyleAttr) {
-	var name by mutableStateOf("")
-	var address by mutableStateOf("")
-	var version by mutableStateOf<String?>(null)
-	var state by mutableStateOf(State.DEFAULT)
-	private var focused by mutableStateOf(false)
+	defStyleRes: Int = 0,
+) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
+	val binding = ViewButtonServerBinding.inflate(LayoutInflater.from(context), this, true)
 
 	init {
 		isFocusable = true
-		descendantFocusability = FOCUS_BLOCK_DESCENDANTS
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) defaultFocusHighlightEnabled = false
+		isClickable = true
+		descendantFocusability = ViewGroup.FOCUS_BLOCK_DESCENDANTS
+		foreground = ResourcesCompat.getDrawable(resources, R.drawable.ripple, context.theme)
 	}
 
+	var name: String
+		get() = binding.serverName.text.toString()
+		set(value) {
+			binding.serverName.text = value
+		}
+
+	var address: String
+		get() = binding.serverAddress.text.toString()
+		set(value) {
+			binding.serverAddress.text = value
+		}
+
+	var version: String?
+		get() = binding.serverVersion.text?.toString()
+		set(value) {
+			binding.serverVersion.text = value
+		}
+
+
+	private var _state: State = State.DEFAULT
+	var state: State
+		get() = _state
+		set(value) {
+			_state = value
+
+			when (_state) {
+				State.DEFAULT -> {
+					binding.iconDefault.isVisible = true
+					binding.iconDefault.setImageResource(R.drawable.ic_house)
+					binding.iconProgress.isVisible = false
+				}
+				State.EDIT -> {
+					binding.iconDefault.isVisible = true
+					binding.iconDefault.setImageResource(R.drawable.ic_house_edit)
+					binding.iconProgress.isVisible = false
+				}
+				State.CONNECTING -> {
+					binding.iconDefault.isInvisible = true
+					binding.iconProgress.isVisible = true
+				}
+				State.ERROR -> {
+					binding.iconDefault.isVisible = true
+					binding.iconDefault.setImageResource(R.drawable.ic_error)
+					binding.iconProgress.isVisible = false
+				}
+			}
+		}
+
 	fun setPopupMenu(init: MenuBuilder.() -> Unit) {
 		setOnLongClickListener {
-			popupMenu(context, this, init = init).showIfNotEmpty()
+			popupMenu(context, binding.root, init = init).showIfNotEmpty()
 		}
 	}
 
@@ -125,59 +93,6 @@ class ServerButtonView @JvmOverloads constructor(
 		return false
 	}
 
-	override fun onFocusChanged(gainFocus: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
-		super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
-
-		focused = gainFocus
-	}
-
-	@Composable
-	override fun Content() {
-		val interactionSource = remember { MutableInteractionSource() }
-
-		// Forward focus events to the interaction source
-		val focusInteraction = remember { FocusInteraction.Focus() }
-		LaunchedEffect(focused) {
-			if (focused) interactionSource.emit(focusInteraction)
-			else interactionSource.emit(FocusInteraction.Unfocus(focusInteraction))
-		}
-
-		ServerButton(
-			icon = {
-				when (state) {
-					State.DEFAULT -> Icon(
-						imageVector = ImageVector.vectorResource(R.drawable.ic_house),
-						contentDescription = null,
-					)
-
-					State.EDIT -> Icon(
-						imageVector = ImageVector.vectorResource(R.drawable.ic_house_edit),
-						contentDescription = null,
-					)
-
-					State.CONNECTING -> CircularProgressIndicator(
-						modifier = Modifier.size(24.dp)
-					)
-
-					State.ERROR -> Icon(
-						imageVector = ImageVector.vectorResource(R.drawable.ic_error),
-						contentDescription = null,
-					)
-				}
-			},
-			name = { Text(name) },
-			address = { Text(address) },
-			version = { Text(version.orEmpty()) },
-			interactionSource = interactionSource,
-			// Use the old shape as the Android View implementation is only used in legacy UI
-			shape = RoundedCornerShape(3.dp),
-			// New implementation doesn't end up at 51.dp by default so force the old size
-			modifier = Modifier.height(51.dp),
-			// We use our own click handler for the view
-			onClick = {}
-		)
-	}
-
 	enum class State {
 		DEFAULT,
 		EDIT,

app/src/main/java/org/jellyfin/androidtv/ui/ValueChangedListener.kt

@@ -0,0 +1,5 @@
+package org.jellyfin.androidtv.ui
+
+fun interface ValueChangedListener<T> {
+	fun onValueChanged(value: T)
+}

app/src/main/java/org/jellyfin/androidtv/ui/base/Badge.kt

@@ -1,36 +0,0 @@
-package org.jellyfin.androidtv.ui.base
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.unit.dp
-import org.jellyfin.design.Tokens
-
-@Composable
-fun Badge(
-	modifier: Modifier = Modifier,
-	shape: Shape = CircleShape,
-	containerColor: Color = JellyfinTheme.colorScheme.badge,
-	contentColor: Color = JellyfinTheme.colorScheme.onBadge,
-	content: @Composable BoxScope.() -> Unit,
-) {
-	ProvideTextStyle(JellyfinTheme.typography.badge.copy(color = contentColor)) {
-		Box(
-			modifier = modifier
-				.defaultMinSize(minWidth = 24.dp, minHeight = 24.dp)
-				.background(containerColor, shape)
-				.padding(Tokens.Space.spaceXs),
-			contentAlignment = Alignment.Center,
-		) {
-			content()
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/BaseScreen.kt

@@ -1,29 +0,0 @@
-package org.jellyfin.androidtv.ui.base
-
-import androidx.compose.foundation.focusGroup
-import androidx.compose.foundation.layout.Box
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-
-@Composable
-@Stable
-fun BaseScreen(
-	content: @Composable () -> Unit,
-) {
-	// Work around a focus issue with our current fragment based navigation approach
-	// by always focusing the screen contents whenever the screen is created
-	val focusRequester = remember { FocusRequester() }
-	Box(
-		modifier = Modifier
-			.focusRequester(focusRequester)
-			.focusGroup()
-	) {
-		content()
-	}
-	LaunchedEffect(focusRequester) { focusRequester.requestFocus() }
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/CircularProgressIndicator.kt

@@ -1,48 +0,0 @@
-package org.jellyfin.androidtv.ui.base
-
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.graphics.drawscope.Stroke
-
-@Composable
-fun CircularProgressIndicator(
-	modifier: Modifier = Modifier,
-	color: Color = LocalTextStyle.current.color,
-) {
-	val infiniteTransition = rememberInfiniteTransition()
-	val rotation by infiniteTransition.animateFloat(
-		initialValue = 0f,
-		targetValue = 360f,
-		animationSpec = infiniteRepeatable(
-			animation = tween(
-				durationMillis = 1_500, // 1.5 seconds
-				easing = LinearEasing,
-			)
-		)
-	)
-
-	Canvas(
-		modifier = modifier
-			.aspectRatio(1f)
-			.rotate(rotation)
-	) {
-		drawArc(
-			color = color,
-			startAngle = 0f,
-			sweepAngle = 270f,
-			useCenter = false,
-			style = Stroke(width = 4f, cap = StrokeCap.Round)
-		)
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/Icon.kt

@@ -1,82 +0,0 @@
-package org.jellyfin.androidtv.ui.base
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.size
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.paint
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.ImageBitmap
-import androidx.compose.ui.graphics.painter.BitmapPainter
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.graphics.toolingGraphicsLayer
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.graphics.vector.rememberVectorPainter
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.role
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun Icon(
-	imageVector: ImageVector,
-	contentDescription: String?,
-	modifier: Modifier = Modifier,
-	tint: Color = LocalTextStyle.current.color,
-) = Icon(
-	painter = rememberVectorPainter(imageVector),
-	contentDescription = contentDescription,
-	modifier = modifier,
-	tint = tint,
-)
-
-@Composable
-fun Icon(
-	bitmap: ImageBitmap,
-	contentDescription: String?,
-	modifier: Modifier = Modifier,
-	tint: Color = LocalTextStyle.current.color,
-) = Icon(
-	painter = remember(bitmap) { BitmapPainter(bitmap) },
-	contentDescription = contentDescription,
-	modifier = modifier,
-	tint = tint,
-)
-
-@Composable
-fun Icon(
-	painter: Painter,
-	contentDescription: String?,
-	modifier: Modifier = Modifier,
-	tint: Color = LocalTextStyle.current.color,
-) {
-	val colorFilter = remember(tint) { tint.takeUnless { it == Color.Unspecified }?.let(ColorFilter::tint) }
-	val semantics = if (contentDescription != null) Modifier.semantics {
-		this.contentDescription = contentDescription
-		this.role = Role.Image
-	} else Modifier
-
-	Box(
-		modifier
-			.toolingGraphicsLayer()
-			.defaultSizeFor(painter)
-			.paint(painter, colorFilter = colorFilter, contentScale = ContentScale.Fit)
-			.then(semantics)
-	)
-}
-
-private fun Modifier.defaultSizeFor(painter: Painter) = then(
-	if (painter.intrinsicSize == Size.Unspecified || painter.intrinsicSize.isInfinite()) {
-		Modifier.size(20.dp)
-	} else {
-		Modifier
-	}
-)
-
-private fun Size.isInfinite() = width.isInfinite() && height.isInfinite()
-

app/src/main/java/org/jellyfin/androidtv/ui/base/JellyfinTheme.kt

@@ -1,36 +0,0 @@
-package org.jellyfin.androidtv.ui.base
-
-import androidx.compose.foundation.LocalOverscrollFactory
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.ReadOnlyComposable
-
-@Composable
-fun JellyfinTheme(
-	colorScheme: ColorScheme = JellyfinTheme.colorScheme,
-	shapes: Shapes = JellyfinTheme.shapes,
-	typography: Typography = JellyfinTheme.typography,
-	content: @Composable () -> Unit
-) {
-	CompositionLocalProvider(
-		LocalColorScheme provides colorScheme,
-		LocalShapes provides shapes,
-		LocalTypography provides typography,
-		LocalTextStyle provides LocalTextStyle.current.merge(typography.default),
-		// Disable overscroll
-		LocalOverscrollFactory provides null,
-	) {
-		content()
-	}
-}
-
-object JellyfinTheme {
-	val colorScheme: ColorScheme
-		@Composable @ReadOnlyComposable get() = LocalColorScheme.current
-
-	val typography: Typography
-		@Composable @ReadOnlyComposable get() = LocalTypography.current
-
-	val shapes: Shapes
-		@Composable @ReadOnlyComposable get() = LocalShapes.current
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/ProfilePicture.kt

@@ -1,54 +0,0 @@
-package org.jellyfin.androidtv.ui.base
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.vectorResource
-import coil3.compose.AsyncImagePainter
-import coil3.compose.rememberAsyncImagePainter
-import org.jellyfin.androidtv.R
-
-@Composable
-fun ProfilePicture(
-	url: String?,
-	modifier: Modifier = Modifier,
-	contentDescription: String? = null,
-	iconPadding: PaddingValues = PaddingValues.Zero,
-) {
-	Box(
-		modifier = modifier
-	) {
-		val userImagePainter = rememberAsyncImagePainter(url)
-		val userImageState by userImagePainter.state.collectAsState()
-		val userImageVisible = userImageState is AsyncImagePainter.State.Success
-
-		if (!userImageVisible) {
-			Icon(
-				imageVector = ImageVector.vectorResource(R.drawable.ic_user),
-				contentDescription = contentDescription,
-				modifier = Modifier
-					.align(Alignment.Center)
-					.padding(iconPadding)
-					.fillMaxSize()
-			)
-		} else {
-			Image(
-				painter = userImagePainter,
-				contentDescription = contentDescription,
-				contentScale = ContentScale.Crop,
-				modifier = Modifier
-					.aspectRatio(1f)
-			)
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/Seekbar.kt

@@ -1,191 +0,0 @@
-package org.jellyfin.androidtv.ui.base
-
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.focusable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.layout.Box
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.geometry.CornerRadius
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.key.Key
-import androidx.compose.ui.input.key.KeyEventType
-import androidx.compose.ui.input.key.key
-import androidx.compose.ui.input.key.onKeyEvent
-import androidx.compose.ui.input.key.type
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.times
-
-@Immutable
-data class SeekbarColors(
-	val backgroundColor: Color,
-	val bufferColor: Color,
-	val progressColor: Color,
-	val knobColor: Color,
-)
-
-object SeekbarDefaults {
-	@ReadOnlyComposable
-	@Composable
-	fun colors(
-		backgroundColor: Color = JellyfinTheme.colorScheme.rangeControlBackground,
-		bufferColor: Color = JellyfinTheme.colorScheme.seekbarBuffer,
-		progressColor: Color = JellyfinTheme.colorScheme.rangeControlFill,
-		knobColor: Color = JellyfinTheme.colorScheme.rangeControlKnob,
-	) = SeekbarColors(
-		backgroundColor = backgroundColor,
-		bufferColor = bufferColor,
-		progressColor = progressColor,
-		knobColor = knobColor,
-	)
-}
-
-@Composable
-fun Seekbar(
-	modifier: Modifier = Modifier,
-	interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-	progress: Duration = Duration.ZERO,
-	buffer: Duration = Duration.ZERO,
-	duration: Duration = Duration.ZERO,
-	seekForwardAmount: Duration = duration / 100,
-	seekRewindAmount: Duration = duration / 100,
-	onScrubbing: ((scrubbing: Boolean) -> Unit)? = null,
-	onSeek: ((progress: Duration) -> Unit)? = null,
-	enabled: Boolean = true,
-	colors: SeekbarColors = SeekbarDefaults.colors(),
-) {
-	val durationMs = duration.inWholeMilliseconds.toFloat().coerceAtLeast(1f)
-	val progressPercentage = progress.inWholeMilliseconds.toFloat() / durationMs
-	val bufferPercentage = buffer.inWholeMilliseconds.toFloat() / durationMs
-	val seekForwardPercentage = seekForwardAmount.inWholeMilliseconds.toFloat() / durationMs
-	val seekRewindPercentage = seekRewindAmount.inWholeMilliseconds.toFloat() / durationMs
-
-	Seekbar(
-		modifier = modifier,
-		interactionSource = interactionSource,
-		progress = progressPercentage,
-		buffer = bufferPercentage,
-		seekForwardAmount = seekForwardPercentage,
-		seekRewindAmount = seekRewindPercentage,
-		onScrubbing = onScrubbing,
-		onSeek = if (onSeek == null) null else { progress -> onSeek(progress.toDouble() * duration) },
-		enabled = enabled,
-		colors = colors,
-	)
-}
-
-@Composable
-fun Seekbar(
-	modifier: Modifier = Modifier,
-	interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-	progress: Float = 0f,
-	buffer: Float = 0f,
-	seekForwardAmount: Float = 0.01f,
-	seekRewindAmount: Float = 0.01f,
-	onScrubbing: ((scrubbing: Boolean) -> Unit)? = null,
-	onSeek: ((progress: Float) -> Unit)? = null,
-	enabled: Boolean = true,
-	colors: SeekbarColors = SeekbarDefaults.colors(),
-) {
-	val coroutineScope = rememberCoroutineScope()
-	val focused by interactionSource.collectIsFocusedAsState()
-	var progressOverride by remember { mutableStateOf<Float?>(null) }
-	val visibleProgress = progressOverride ?: progress
-	val knobAlpha by animateFloatAsState(if (focused) 1f else 0f)
-	var scrubCancelJob by remember { mutableStateOf<Job?>(null) }
-
-	Box(
-		modifier = modifier
-			.onKeyEvent {
-				if (!enabled) return@onKeyEvent false
-
-				val isForward = it.key == Key.DirectionRight
-				val isRewind = it.key == Key.DirectionLeft
-				val isScrubbing = isForward || isRewind
-				val isKeyUp = it.type == KeyEventType.KeyUp
-				val isKeyDown = it.type == KeyEventType.KeyDown
-
-				val newProgress = when {
-					isKeyDown && isForward -> (visibleProgress + seekForwardAmount).coerceAtMost(1f)
-					isKeyDown && isRewind -> (visibleProgress - seekRewindAmount).coerceAtLeast(0f)
-					else -> visibleProgress
-				}
-
-				if (isScrubbing && isKeyDown && onScrubbing != null) {
-					scrubCancelJob?.cancel()
-					onScrubbing(true)
-				}
-
-				if (visibleProgress != newProgress) {
-					progressOverride = newProgress
-					if (onSeek != null) onSeek(newProgress)
-				}
-
-				if (isScrubbing && isKeyUp && onScrubbing != null) {
-					scrubCancelJob?.cancel()
-					scrubCancelJob = coroutineScope.launch {
-						delay(300.milliseconds)
-						onScrubbing(false)
-						progressOverride = null
-					}
-				}
-
-				return@onKeyEvent isScrubbing
-			}
-			.focusable(interactionSource = interactionSource, enabled = enabled)
-			.drawWithContent {
-				val barCornerRadius = CornerRadius(size.minDimension, size.minDimension)
-
-				// Background bar
-				drawRoundRect(
-					color = colors.backgroundColor,
-					cornerRadius = barCornerRadius,
-				)
-
-				// Buffer bar
-				if (buffer > 0f) {
-					drawRoundRect(
-						color = colors.bufferColor,
-						size = size.copy(
-							width = buffer * size.width,
-						),
-						cornerRadius = barCornerRadius,
-					)
-				}
-
-				// Progress bar
-				if (visibleProgress > 0f) {
-					drawRoundRect(
-						color = colors.progressColor,
-						size = size.copy(
-							width = visibleProgress * size.width,
-						),
-						cornerRadius = barCornerRadius,
-					)
-				}
-
-				// Progress knob
-				drawCircle(
-					color = colors.knobColor,
-					alpha = knobAlpha,
-					center = center.copy(
-						x = visibleProgress * size.width,
-					),
-					radius = size.minDimension * 2,
-				)
-			}
-	)
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/Text.kt

@@ -1,122 +0,0 @@
-package org.jellyfin.androidtv.ui.base
-
-import androidx.compose.foundation.text.BasicText
-import androidx.compose.foundation.text.InlineTextContent
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.compositionLocalOf
-import androidx.compose.runtime.structuralEqualityPolicy
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.CompositingStrategy
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.graphics.takeOrElse
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.TextLayoutResult
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.TextUnit
-
-@Composable
-fun Text(
-	text: String,
-	modifier: Modifier = Modifier,
-	color: Color = Color.Unspecified,
-	fontSize: TextUnit = TextUnit.Unspecified,
-	fontStyle: FontStyle? = null,
-	fontWeight: FontWeight? = null,
-	fontFamily: FontFamily? = null,
-	letterSpacing: TextUnit = TextUnit.Unspecified,
-	textDecoration: TextDecoration? = null,
-	textAlign: TextAlign? = null,
-	lineHeight: TextUnit = TextUnit.Unspecified,
-	overflow: TextOverflow = TextOverflow.Clip,
-	softWrap: Boolean = true,
-	maxLines: Int = Int.MAX_VALUE,
-	minLines: Int = 1,
-	onTextLayout: (TextLayoutResult) -> Unit = {},
-	style: TextStyle = LocalTextStyle.current
-) {
-	val textColor = color.takeOrElse { style.color.takeOrElse { Color.Black } }
-
-	BasicText(
-		text = text,
-		modifier = modifier.graphicsLayer { this.compositingStrategy = CompositingStrategy.Offscreen },
-		style = style.merge(
-			color = textColor,
-			fontSize = fontSize,
-			fontWeight = fontWeight,
-			textAlign = textAlign ?: TextAlign.Unspecified,
-			lineHeight = lineHeight,
-			fontFamily = fontFamily,
-			textDecoration = textDecoration,
-			fontStyle = fontStyle,
-			letterSpacing = letterSpacing
-		),
-		onTextLayout = onTextLayout,
-		overflow = overflow,
-		softWrap = softWrap,
-		maxLines = maxLines,
-		minLines = minLines
-	)
-}
-
-@Composable
-fun Text(
-	text: AnnotatedString,
-	modifier: Modifier = Modifier,
-	color: Color = Color.Unspecified,
-	fontSize: TextUnit = TextUnit.Unspecified,
-	fontStyle: FontStyle? = null,
-	fontWeight: FontWeight? = null,
-	fontFamily: FontFamily? = null,
-	letterSpacing: TextUnit = TextUnit.Unspecified,
-	textDecoration: TextDecoration? = null,
-	textAlign: TextAlign? = null,
-	lineHeight: TextUnit = TextUnit.Unspecified,
-	overflow: TextOverflow = TextOverflow.Clip,
-	softWrap: Boolean = true,
-	maxLines: Int = Int.MAX_VALUE,
-	minLines: Int = 1,
-	inlineContent: Map<String, InlineTextContent> = mapOf(),
-	onTextLayout: (TextLayoutResult) -> Unit = {},
-	style: TextStyle = LocalTextStyle.current
-) {
-	val textColor = color.takeOrElse { style.color.takeOrElse { Color.Black } }
-
-	BasicText(
-		text = text,
-		modifier = modifier.graphicsLayer { this.compositingStrategy = CompositingStrategy.Offscreen },
-		style =
-			style.merge(
-				color = textColor,
-				fontSize = fontSize,
-				fontWeight = fontWeight,
-				textAlign = textAlign ?: TextAlign.Unspecified,
-				lineHeight = lineHeight,
-				fontFamily = fontFamily,
-				textDecoration = textDecoration,
-				fontStyle = fontStyle,
-				letterSpacing = letterSpacing
-			),
-		onTextLayout = onTextLayout,
-		overflow = overflow,
-		softWrap = softWrap,
-		maxLines = maxLines,
-		minLines = minLines,
-		inlineContent = inlineContent
-	)
-}
-
-val LocalTextStyle = compositionLocalOf(structuralEqualityPolicy()) { TypographyDefaults.Default }
-
-@Composable
-fun ProvideTextStyle(value: TextStyle, content: @Composable () -> Unit) {
-	val mergedStyle = LocalTextStyle.current.merge(value)
-	CompositionLocalProvider(LocalTextStyle provides mergedStyle, content = content)
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/button/Button.kt

@@ -1,115 +0,0 @@
-package org.jellyfin.androidtv.ui.base.button
-
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.unit.dp
-import org.jellyfin.androidtv.ui.base.JellyfinTheme
-
-object ButtonDefaults {
-	val Shape: Shape = CircleShape
-	val ContentPadding: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 10.dp)
-
-	@ReadOnlyComposable
-	@Composable
-	fun colors(
-		containerColor: Color = JellyfinTheme.colorScheme.button,
-		contentColor: Color = JellyfinTheme.colorScheme.onButton,
-		focusedContainerColor: Color = JellyfinTheme.colorScheme.buttonFocused,
-		focusedContentColor: Color = JellyfinTheme.colorScheme.onButtonFocused,
-		disabledContainerColor: Color = JellyfinTheme.colorScheme.buttonDisabled,
-		disabledContentColor: Color = JellyfinTheme.colorScheme.onButtonDisabled,
-	) = ButtonColors(
-		containerColor = containerColor,
-		contentColor = contentColor,
-		focusedContainerColor = focusedContainerColor,
-		focusedContentColor = focusedContentColor,
-		disabledContainerColor = disabledContainerColor,
-		disabledContentColor = disabledContentColor,
-	)
-}
-
-@Composable
-fun Button(
-	onClick: () -> Unit,
-	modifier: Modifier = Modifier,
-	onLongClick: (() -> Unit)? = null,
-	enabled: Boolean = true,
-	shape: Shape = ButtonDefaults.Shape,
-	colors: ButtonColors = ButtonDefaults.colors(),
-	contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
-	interactionSource: MutableInteractionSource? = null,
-	content: @Composable RowScope.() -> Unit
-) {
-	ButtonBase(
-		onClick = onClick,
-		modifier = modifier,
-		onLongClick = onLongClick,
-		enabled = enabled,
-		shape = shape,
-		colors = colors,
-		interactionSource = interactionSource,
-	) {
-		ButtonRow(
-			contentPadding = contentPadding,
-			content = content,
-		)
-	}
-}
-
-@Composable
-fun ProgressButton(
-	progress: Float,
-	onClick: () -> Unit,
-	modifier: Modifier = Modifier,
-	onLongClick: (() -> Unit)? = null,
-	enabled: Boolean = true,
-	shape: Shape = ButtonDefaults.Shape,
-	colors: ButtonColors = ButtonDefaults.colors(),
-	contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
-	interactionSource: MutableInteractionSource? = null,
-	content: @Composable RowScope.() -> Unit
-) {
-	ProgressButtonBase(
-		progress = progress,
-		onClick = onClick,
-		modifier = modifier,
-		onLongClick = onLongClick,
-		enabled = enabled,
-		shape = shape,
-		colors = colors,
-		interactionSource = interactionSource,
-	) {
-		ButtonRow(
-			contentPadding = contentPadding,
-			content = content,
-		)
-	}
-}
-
-@Composable
-private fun ButtonRow(
-	contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
-	content: @Composable RowScope.() -> Unit,
-) = Row(
-	modifier = Modifier
-		.defaultMinSize(
-			minWidth = 58.dp,
-			minHeight = 40.dp
-		)
-		.padding(contentPadding),
-	horizontalArrangement = Arrangement.Center,
-	verticalAlignment = Alignment.CenterVertically,
-	content = content
-)

app/src/main/java/org/jellyfin/androidtv/ui/base/button/ButtonBase.kt

@@ -1,62 +0,0 @@
-package org.jellyfin.androidtv.ui.base.button
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.background
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.interaction.collectIsPressedAsState
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.unit.sp
-import org.jellyfin.androidtv.ui.base.JellyfinTheme
-import org.jellyfin.androidtv.ui.base.ProvideTextStyle
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun ButtonBase(
-	onClick: () -> Unit,
-	modifier: Modifier = Modifier,
-	onLongClick: (() -> Unit)? = null,
-	enabled: Boolean = true,
-	shape: Shape = ButtonDefaults.Shape,
-	colors: ButtonColors = ButtonDefaults.colors(),
-	interactionSource: MutableInteractionSource? = null,
-	content: @Composable BoxScope.() -> Unit
-) {
-	@Suppress("NAME_SHADOWING")
-	val interactionSource = interactionSource ?: remember { MutableInteractionSource() }
-	val focused by interactionSource.collectIsFocusedAsState()
-	val pressed by interactionSource.collectIsPressedAsState()
-
-	val colors = when {
-		!enabled -> colors.disabledContainerColor to colors.disabledContentColor
-		pressed -> colors.focusedContainerColor to colors.focusedContentColor
-		focused -> colors.focusedContainerColor to colors.focusedContentColor
-		else -> colors.containerColor to colors.contentColor
-	}
-
-	ProvideTextStyle(value = JellyfinTheme.typography.default.copy(fontSize = 14.sp, color = colors.second)) {
-		Box(
-			modifier = modifier
-				.combinedClickable(
-					interactionSource = interactionSource,
-					indication = null,
-					enabled = enabled,
-					role = Role.Button,
-					onClick = onClick,
-					onLongClick = onLongClick,
-				)
-				.background(colors.first, shape)
-				.clip(shape),
-			content = content,
-		)
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/button/ButtonColors.kt

@@ -1,14 +0,0 @@
-package org.jellyfin.androidtv.ui.base.button
-
-import androidx.compose.runtime.Immutable
-import androidx.compose.ui.graphics.Color
-
-@Immutable
-data class ButtonColors(
-	val containerColor: Color,
-	val contentColor: Color,
-	val focusedContainerColor: Color,
-	val focusedContentColor: Color,
-	val disabledContainerColor: Color,
-	val disabledContentColor: Color,
-)

app/src/main/java/org/jellyfin/androidtv/ui/base/button/IconButton.kt

@@ -1,66 +0,0 @@
-package org.jellyfin.androidtv.ui.base.button
-
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.unit.dp
-import org.jellyfin.androidtv.ui.base.JellyfinTheme
-
-object IconButtonDefaults {
-	val Shape: Shape = ButtonDefaults.Shape
-	val ContentPadding: PaddingValues = PaddingValues(horizontal = 10.dp, vertical = 10.dp)
-
-	@ReadOnlyComposable
-	@Composable
-	fun colors(
-		containerColor: Color = JellyfinTheme.colorScheme.button,
-		contentColor: Color = JellyfinTheme.colorScheme.onButton,
-		focusedContainerColor: Color = JellyfinTheme.colorScheme.buttonFocused,
-		focusedContentColor: Color = JellyfinTheme.colorScheme.onButtonFocused,
-		disabledContainerColor: Color = JellyfinTheme.colorScheme.buttonDisabled,
-		disabledContentColor: Color = JellyfinTheme.colorScheme.onButtonDisabled,
-	) = ButtonDefaults.colors(
-		containerColor = containerColor,
-		contentColor = contentColor,
-		focusedContainerColor = focusedContainerColor,
-		focusedContentColor = focusedContentColor,
-		disabledContainerColor = disabledContainerColor,
-		disabledContentColor = disabledContentColor,
-	)
-}
-
-@Composable
-fun IconButton(
-	onClick: () -> Unit,
-	modifier: Modifier = Modifier,
-	onLongClick: (() -> Unit)? = null,
-	enabled: Boolean = true,
-	shape: Shape = IconButtonDefaults.Shape,
-	colors: ButtonColors = ButtonDefaults.colors(),
-	contentPadding: PaddingValues = IconButtonDefaults.ContentPadding,
-	interactionSource: MutableInteractionSource? = null,
-	content: @Composable BoxScope.() -> Unit
-) {
-	ButtonBase(
-		onClick = onClick,
-		modifier = modifier,
-		onLongClick = onLongClick,
-		enabled = enabled,
-		shape = shape,
-		colors = colors,
-		interactionSource = interactionSource,
-	) {
-		Box(
-			modifier = Modifier
-				.padding(contentPadding),
-			content = content,
-		)
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/button/ProgressButtonBase.kt

@@ -1,49 +0,0 @@
-package org.jellyfin.androidtv.ui.base.button
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.res.colorResource
-import org.jellyfin.androidtv.R
-
-@Composable
-fun ProgressButtonBase(
-	progress: Float,
-	onClick: () -> Unit,
-	modifier: Modifier = Modifier,
-	onLongClick: (() -> Unit)? = null,
-	enabled: Boolean = true,
-	shape: Shape = ButtonDefaults.Shape,
-	colors: ButtonColors = ButtonDefaults.colors(),
-	interactionSource: MutableInteractionSource? = null,
-	content: @Composable BoxScope.() -> Unit
-) {
-	val progressColor = colorResource(R.color.button_default_progress_background)
-
-	ButtonBase(
-		onClick = onClick,
-		modifier = modifier,
-		onLongClick = onLongClick,
-		enabled = enabled,
-		shape = shape,
-		colors = colors,
-		interactionSource = interactionSource,
-	) {
-		Box(Modifier.matchParentSize()) {
-			Box(
-				Modifier
-					.fillMaxHeight()
-					.fillMaxWidth(progress)
-					.background(progressColor)
-			)
-		}
-
-		content()
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/colorScheme.kt

@@ -1,82 +0,0 @@
-package org.jellyfin.androidtv.ui.base
-
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.compose.ui.graphics.Color
-import org.jellyfin.design.Tokens
-
-fun colorScheme(): ColorScheme = ColorScheme(
-	background = Tokens.Color.colorGrey975,
-	onBackground = Tokens.Color.colorBluegrey25,
-	button = Color(0xB3747474),
-	onButton = Color(0xFFDDDDDD),
-	buttonFocused = Color(0xE6CCCCCC),
-	onButtonFocused = Color(0xFF444444),
-	buttonDisabled = Color(0x33747474),
-	onButtonDisabled = Color(0xFF686868),
-	buttonActive = Color(0x4DCCCCCC),
-	onButtonActive = Color(0xFFDDDDDD),
-	input = Color(0xB3747474),
-	onInput = Color(0xE6CCCCCC),
-	inputFocused = Color(0xE6CCCCCC),
-	onInputFocused = Color(0xFFDDDDDD),
-	rangeControlBackground = Tokens.Color.colorBluegrey700,
-	rangeControlFill = Tokens.Color.colorCyan500,
-	rangeControlKnob = Tokens.Color.colorBluegrey100,
-	seekbarBuffer = Tokens.Color.colorBluegrey300,
-	recording = Tokens.Color.colorRed300,
-	onRecording = Tokens.Color.colorRed25,
-	badge = Tokens.Color.colorCyan500,
-	onBadge = Tokens.Color.colorBluegrey100,
-	listHeader = Tokens.Color.colorGrey50,
-	listOverline = Tokens.Color.colorGrey500,
-	listHeadline = Tokens.Color.colorGrey25,
-	listCaption = Tokens.Color.colorGrey200,
-	listButton = Color.Transparent,
-	listButtonFocused = Tokens.Color.colorBluegrey800,
-	surface = Tokens.Color.colorBluegrey900,
-	scrim = Tokens.Color.colorBlack.copy(alpha = 0.67f),
-)
-
-@Immutable
-data class ColorScheme(
-	val background: Color,
-	val onBackground: Color,
-
-	val button: Color,
-	val onButton: Color,
-	val buttonFocused: Color,
-	val onButtonFocused: Color,
-	val buttonDisabled: Color,
-	val onButtonDisabled: Color,
-	val buttonActive: Color,
-	val onButtonActive: Color,
-
-	val input: Color,
-	val onInput: Color,
-	val inputFocused: Color,
-	val onInputFocused: Color,
-
-	val rangeControlBackground: Color,
-	val rangeControlFill: Color,
-	val rangeControlKnob: Color,
-	val seekbarBuffer: Color,
-
-	val recording: Color,
-	val onRecording: Color,
-
-	val badge: Color,
-	val onBadge: Color,
-
-	val listHeader: Color,
-	val listOverline: Color,
-	val listHeadline: Color,
-	val listCaption: Color,
-	val listButton: Color,
-	val listButtonFocused: Color,
-
-	val surface: Color,
-	val scrim: Color,
-)
-
-val LocalColorScheme = staticCompositionLocalOf { colorScheme() }

app/src/main/java/org/jellyfin/androidtv/ui/base/dialog/DialogBase.kt

@@ -1,84 +0,0 @@
-package org.jellyfin.androidtv.ui.base.dialog
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.core.updateTransition
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.background
-import androidx.compose.foundation.focusGroup
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import org.jellyfin.androidtv.ui.base.JellyfinTheme
-import org.jellyfin.androidtv.ui.base.interactionTracker
-
-@Composable
-fun DialogBase(
-	visible: Boolean,
-	onDismissRequest: () -> Unit,
-	modifier: Modifier = Modifier,
-	scrimColor: Color = JellyfinTheme.colorScheme.scrim,
-	enterTransition: EnterTransition = fadeIn(tween(300)),
-	exitTransition: ExitTransition = fadeOut(tween(300)),
-	contentAlignment: Alignment = Alignment.Center,
-	content: @Composable BoxScope.() -> Unit,
-) {
-	val transition = updateTransition(visible)
-	val alpha by transition.animateFloat(
-		transitionSpec = { tween(1000) },
-		targetValueByState = { visible -> if (visible) 1f else 0f }
-	)
-
-	if (transition.currentState || transition.isRunning) {
-		val focusRequester = remember { FocusRequester() }
-		var contentVisible by remember { mutableStateOf(false) }
-
-		Dialog(
-			onDismissRequest = onDismissRequest,
-			properties = DialogProperties(
-				dismissOnBackPress = true,
-				dismissOnClickOutside = true,
-				usePlatformDefaultWidth = false,
-				decorFitsSystemWindows = false
-			),
-		) {
-			Box(
-				modifier = modifier
-					.fillMaxSize()
-					.background(scrimColor.copy(alpha = scrimColor.alpha * alpha))
-					.focusRequester(focusRequester)
-					.focusGroup()
-					.interactionTracker(),
-				contentAlignment = contentAlignment,
-			) {
-				transition.AnimatedVisibility(
-					visible = { it && contentVisible },
-					enter = enterTransition,
-					exit = exitTransition,
-				) {
-					content()
-					LaunchedEffect(focusRequester) { focusRequester.requestFocus() }
-				}
-			}
-		}
-
-		LaunchedEffect(contentVisible) { contentVisible = true }
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/form/Checkbox.kt

@@ -1,49 +0,0 @@
-package org.jellyfin.androidtv.ui.base.form
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.base.Icon
-import org.jellyfin.androidtv.ui.base.JellyfinTheme
-
-@Composable
-fun Checkbox(
-	checked: Boolean,
-	modifier: Modifier = Modifier,
-	shape: Shape = JellyfinTheme.shapes.extraSmall,
-	containerColor: Color = JellyfinTheme.colorScheme.button,
-	contentColor: Color = JellyfinTheme.colorScheme.onButton
-) {
-	Box(
-		modifier = modifier
-			.defaultMinSize(minWidth = 18.dp, minHeight = 18.dp)
-			.background(if (checked) containerColor else Color.Unspecified, shape)
-			.border(if (checked) 0.dp else 2.dp, containerColor, shape),
-		contentAlignment = Alignment.Center,
-	) {
-		AnimatedVisibility(
-			visible = checked,
-			modifier = Modifier
-				.matchParentSize()
-		) {
-			Icon(
-				painterResource(R.drawable.ic_check),
-				tint = contentColor,
-				contentDescription = null,
-				modifier = Modifier
-					.padding(3.dp)
-			)
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/form/ColorSwatch.kt

@@ -1,51 +0,0 @@
-package org.jellyfin.androidtv.ui.base.form
-
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun ColorSwatch(
-	color: Color,
-	modifier: Modifier = Modifier,
-	shape: Shape = CircleShape,
-) {
-	Box(
-		modifier = modifier
-			.defaultMinSize(minWidth = 18.dp, minHeight = 18.dp)
-			.clip(shape)
-	) {
-		Canvas(
-			modifier = Modifier
-				.matchParentSize()
-		) {
-			if (color.alpha < 1f) {
-				val squareSize = 6.dp.toPx()
-				repeat((size.height / squareSize).toInt()) { row ->
-					repeat((size.width / squareSize).toInt()) { col ->
-						val isLight = (row + col) % 2 == 0
-
-						drawRect(
-							color = if (isLight) Color.LightGray else Color.DarkGray,
-							topLeft = Offset(col * squareSize, row * squareSize),
-							size = Size(squareSize, squareSize),
-						)
-					}
-				}
-			}
-
-			drawRect(
-				color = color,
-			)
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/form/RadioButton.kt

@@ -1,50 +0,0 @@
-package org.jellyfin.androidtv.ui.base.form
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.base.Icon
-import org.jellyfin.androidtv.ui.base.JellyfinTheme
-
-@Composable
-fun RadioButton(
-	checked: Boolean,
-	modifier: Modifier = Modifier,
-	shape: Shape = CircleShape,
-	containerColor: Color = JellyfinTheme.colorScheme.button,
-	contentColor: Color = JellyfinTheme.colorScheme.onButton
-) {
-	Box(
-		modifier = modifier
-			.defaultMinSize(minWidth = 18.dp, minHeight = 18.dp)
-			.background(if (checked) containerColor else Color.Unspecified, shape)
-			.border(if (checked) 0.dp else 2.dp, containerColor, shape),
-		contentAlignment = Alignment.Center,
-	) {
-		AnimatedVisibility(
-			visible = checked,
-			modifier = Modifier
-				.matchParentSize()
-		) {
-			Icon(
-				painterResource(R.drawable.ic_check),
-				tint = contentColor,
-				contentDescription = null,
-				modifier = Modifier
-					.padding(3.dp)
-			)
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/form/RangeControl.kt

@@ -1,115 +0,0 @@
-package org.jellyfin.androidtv.ui.base.form
-
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.focusable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.layout.Box
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.geometry.CornerRadius
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.key.Key
-import androidx.compose.ui.input.key.KeyEventType
-import androidx.compose.ui.input.key.key
-import androidx.compose.ui.input.key.onKeyEvent
-import androidx.compose.ui.input.key.type
-import org.jellyfin.androidtv.ui.base.JellyfinTheme
-
-@Immutable
-data class RangeControlColors(
-	val backgroundColor: Color,
-	val fillColor: Color,
-	val knobColor: Color,
-)
-
-object RangeControlDefaults {
-	@ReadOnlyComposable
-	@Composable
-	fun colors(
-		backgroundColor: Color = JellyfinTheme.colorScheme.rangeControlBackground,
-		fillColor: Color = JellyfinTheme.colorScheme.rangeControlFill,
-		knobColor: Color = JellyfinTheme.colorScheme.rangeControlKnob,
-	) = RangeControlColors(
-		backgroundColor = backgroundColor,
-		fillColor = fillColor,
-		knobColor = knobColor,
-	)
-}
-
-@Composable
-fun RangeControl(
-	modifier: Modifier = Modifier,
-	interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-	min: Float = 0f,
-	max: Float = 1f,
-	value: Float = 0f,
-	stepForward: Float = 0.01f,
-	stepBackward: Float = stepForward,
-	onValueChange: ((vakye: Float) -> Unit)? = null,
-	enabled: Boolean = true,
-	colors: RangeControlColors = RangeControlDefaults.colors(),
-) {
-	val focused by interactionSource.collectIsFocusedAsState()
-	val knobSize by animateFloatAsState(if (focused) 1.75f else 1f)
-
-	Box(
-		modifier = modifier
-			.onKeyEvent {
-				if (!enabled) return@onKeyEvent false
-
-				val isForward = it.key == Key.DirectionRight
-				val isRewind = it.key == Key.DirectionLeft
-				val isScrubbing = isForward || isRewind
-				val isKeyDown = it.type == KeyEventType.KeyDown
-
-				val newValue = when {
-					isKeyDown && isForward -> (value + stepForward).coerceAtMost(max)
-					isKeyDown && isRewind -> (value - stepBackward).coerceAtLeast(min)
-					else -> value
-				}
-
-				if (value != newValue && onValueChange != null) onValueChange(newValue)
-
-				return@onKeyEvent isScrubbing
-			}
-			.focusable(interactionSource = interactionSource, enabled = enabled)
-			.drawWithContent {
-				val barCornerRadius = CornerRadius(size.minDimension, size.minDimension)
-
-				// Background bar
-				drawRoundRect(
-					color = colors.backgroundColor,
-					cornerRadius = barCornerRadius,
-				)
-
-				// Get percental value based on min/max options
-				val valuePercentage = (value - min) / (max - min)
-
-				// Value fill bar
-				if (valuePercentage > 0) {
-					drawRoundRect(
-						color = colors.fillColor,
-						size = size.copy(
-							width = valuePercentage * size.width,
-						),
-						cornerRadius = barCornerRadius,
-					)
-				}
-
-				// Progress knob
-				drawCircle(
-					color = colors.knobColor,
-					center = center.copy(
-						x = valuePercentage * size.width,
-					),
-					radius = size.minDimension * knobSize,
-				)
-			}
-	)
-}

app/src/main/java/org/jellyfin/androidtv/ui/base/interaction.kt

@@ -1,38 +0,0 @@
-package org.jellyfin.androidtv.ui.base
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.key.onPreviewKeyEvent
-
-typealias InteractionTracker = () -> Unit
-
-private val DefaultInteractionTracker: InteractionTracker = {}
-
-val LocalInteractionTracker = staticCompositionLocalOf<InteractionTracker> { DefaultInteractionTracker }
-
-@Composable
-fun ProvideLocalInteractionTracker(
-	interactionTracker: InteractionTracker,
-	content: @Composable () -> Unit
-) {
-	CompositionLocalProvider(
-		LocalInteractionTracker provides interactionTracker
-	) {
-		Box(
-			modifier = Modifier.interactionTracker(interactionTracker),
-		) {
-			content()
-		}
-	}
-}
-
-@Composable
-fun Modifier.interactionTracker(
-	interactionTracker: InteractionTracker = LocalInteractionTracker.current,
-): Modifier = onPreviewKeyEvent {
-	interactionTracker()
-	false
-}