TypeType-Video · Priveetee · Aug 31, 2026 · Aug 28, 2026 · Aug 28, 2026 · Aug 28, 2026
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -42,6 +42,7 @@ env:
   ANDROID_SDK_ROOT: /opt/android-sdk
   JAVA_HOME: /usr/lib/jvm/java-26-openjdk
   GRADLE_USER_HOME: /var/tmp/typetype-android-gradle-user-home
+  TYPETYPE_SDK_PATH: .ci/TypeType-SDK
 
 jobs:
   verify:
@@ -69,20 +70,34 @@ jobs:
       - name: Verify Android project
         timeout-minutes: 25
         run: |
-          ./gradlew --build-cache --stacktrace \
-            :baseline-profile:assemble \
-            :player:testDebugUnitTest \
-            :app:testDebugUnitTest \
-            :player:lintDebug \
-            :app:lintDebug \
-            :app:assembleDebug \
+          set -euo pipefail
+          tasks=(
+            :baseline-profile:assemble
+            :player:testDebugUnitTest
+            :app:testDebugUnitTest
+            :player:lintDebug
+            :app:lintDebug
+            :app:assembleDebug
             :app:assembleRelease
+          )
+          if [[ -f "$TYPETYPE_SDK_PATH/settings.gradle.kts" ]]; then
+            tasks+=(
+              :tv:testDebugUnitTest
+              :tv:lintDebug
+              :tv:assembleDebug
+            )
+          else
+            echo "::notice::TV verification skipped because the private TypeType-SDK checkout is unavailable."
+          fi
+          ./gradlew --build-cache --stacktrace "${tasks[@]}"
 
       - name: Upload debug APK
         uses: actions/upload-artifact@v7.0.1
         with:
           name: typetype-debug-apk
-          path: app/build/outputs/apk/debug/*.apk
+          path: |
+            app/build/outputs/apk/debug/*.apk
+            tv/build/outputs/apk/debug/*.apk
           if-no-files-found: error
           compression-level: 0
           retention-days: 14
@@ -95,6 +110,7 @@ jobs:
           path: |
             app/build/reports/lint-results-debug.html
             player/build/reports/lint-results-debug.html
+            tv/build/reports/lint-results-debug.html
           if-no-files-found: ignore
           retention-days: 14
 
@@ -156,14 +172,26 @@ jobs:
       - name: Verify Android project and build release
         timeout-minutes: 25
         run: |
-          ./gradlew --build-cache --stacktrace \
-            :baseline-profile:assemble \
-            :player:testDebugUnitTest \
-            :app:testDebugUnitTest \
-            :player:lintDebug \
-            :app:lintDebug \
-            :app:assembleDebug \
+          set -euo pipefail
+          tasks=(
+            :baseline-profile:assemble
+            :player:testDebugUnitTest
+            :app:testDebugUnitTest
+            :player:lintDebug
+            :app:lintDebug
+            :app:assembleDebug
             :app:assembleRelease
+          )
+          if [[ -f "$TYPETYPE_SDK_PATH/settings.gradle.kts" ]]; then
+            tasks+=(
+              :tv:testDebugUnitTest
+              :tv:lintDebug
+              :tv:assembleDebug
+            )
+          else
+            echo "::notice::TV verification skipped because the private TypeType-SDK checkout is unavailable."
+          fi
+          ./gradlew --build-cache --stacktrace "${tasks[@]}"
 
       - name: Upload lint report
         if: ${{ always() }}
@@ -173,6 +201,7 @@ jobs:
           path: |
             app/build/reports/lint-results-debug.html
             player/build/reports/lint-results-debug.html
+            tv/build/reports/lint-results-debug.html
           if-no-files-found: ignore
           retention-days: 14
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -33,6 +33,8 @@ Gradle wrapper.
 ```sh
 git switch dev
 ./gradlew :app:assembleDebug
+# Android TV
+./gradlew :tv:assembleDebug
 ```
 
 On first launch, the app asks for a TypeType instance. Use your own test
@@ -67,6 +69,8 @@ the contract advertised by the selected TypeType instance.
 | `player` | TypeType playback integration for Media3 |
 | `app/src/test` | JVM unit and repository tests |
 | `app/src/androidTest` | Room, Compose, platform, and device tests |
+| `tv/src/main` | Native Android TV UI, navigation, focus, and playback |
+| `tv/src/test` | Android TV JVM unit tests |
 
 Most changes only touch one or two of these areas. As a rule of thumb,
 composables render state, repositories decide how data is loaded and cached,
@@ -121,6 +125,15 @@ Before opening a pull request, run the same core checks as CI:
   :app:assembleRelease
 ```
 
+For TV changes, also run:
+
+```sh
+./gradlew --no-daemon \
+  :tv:testDebugUnitTest \
+  :tv:lintDebug \
+  :tv:assembleDebug
+```
+
 Add the checks that make sense for your change. You are not expected to own
 every Android version or device; if something could not be tested, mention it
 in the pull request so another contributor can help. Useful checks include:

diff --git a/README.md b/README.md
@@ -21,73 +21,79 @@
 
 </div>
 
-TypeType Android is a native client for
+TypeType Android is the native client for
 [TypeType](https://github.com/TypeType-Video/TypeType), a self-hosted video
-platform. It provides browsing, account synchronization, downloads, and native
-playback on Android phones and tablets.
+platform. The app is in beta, supports Android 6.0 and newer, and does not
+require Google Play Services.
 
-The Android app is currently in beta and receives frequent updates.
+TypeType Android uses the TypeType Server selected during setup for extraction,
+playback sessions, recommendations, synchronization, and downloads.
 
-The app communicates exclusively with the TypeType instance selected during
-setup. Extraction, playback sessions, recommendations, synchronization, and
-server-side downloads remain server responsibilities.
+The Android TV client is part of this repository in the `tv` module. It is a
+separate native TV application that uses the same TypeType SDK and server
+contracts as the mobile client.
 
 ## Screenshots
 
-| Home and Continue Watching | Search | Subscriptions |
+| Welcome | Add an instance | Home |
 | --- | --- | --- |
-| ![TypeType home feed and Continue Watching on Android](assets/screenshots/android-home.png) | ![TypeType video search on Android](assets/screenshots/android-search.png) | ![TypeType subscriptions feed on Android](assets/screenshots/android-subscriptions.png) |
+| ![TypeType Android welcome screen](assets/screenshots/android-welcome.png) | ![TypeType Android add instance screen](assets/screenshots/android-add-instance.png) | ![TypeType Android home feed](assets/screenshots/android-home.png) |
 
-| Library and history | Native player | Comments |
+| Search | Native player | Settings |
 | --- | --- | --- |
-| ![TypeType library and history on Android](assets/screenshots/android-library.png) | ![TypeType native video player on Android](assets/screenshots/android-player.png) | ![TypeType video comments on Android](assets/screenshots/android-comments.png) |
-
-| Notifications | Profile | Settings |
-| --- | --- | --- |
-| ![TypeType notifications on Android](assets/screenshots/android-notifications.png) | ![TypeType profile and animated avatar support on Android](assets/screenshots/android-profile.png) | ![TypeType settings on Android](assets/screenshots/android-settings.png) |
+| ![TypeType Android search screen](assets/screenshots/android-search.png) | ![TypeType Android native video player](assets/screenshots/android-player.png) | ![TypeType Android settings screen](assets/screenshots/android-settings.png) |
 
 ## Features
 
-- Resume unfinished videos from Continue Watching.
-- Search videos, channels, playlists, music, and other supported content.
-- Browse subscriptions with labels for live, premiere, and special videos.
-- Access history, favorites, Watch Later, playlists, and notifications.
-- Use background audio, Picture in Picture, the mini-player, and audio-only
-  playback.
+- Browse and search videos, channels, playlists, music, and subscriptions.
+- Resume videos, manage history, favorites, Watch Later, playlists, and
+  notifications.
+- Play in the background, in Picture in Picture, or with the mini-player.
 - Choose quality, codec, audio track, captions, playback speed, and image mode.
-- Use chapters, SponsorBlock, the playback queue, comments, related videos, and
-  the sleep timer.
-- Download supported videos and retain cached pages during temporary network
-  interruptions.
-- Import existing data and manage multiple TypeType instances and accounts.
+- Use chapters, SponsorBlock, comments, related videos, the queue, and the
+  sleep timer.
+- Download supported videos and import existing data.
+
+## Android TV
 
-TypeType Android supports Android 6.0 and newer, and does not require Google
-Play Services.
+Build the TV client with the included Gradle wrapper:
+
+```sh
+./gradlew :tv:assembleDebug
+```
+
+The TV module targets Android TV devices from API 23 onward and keeps its TV
+navigation, focus behavior, layouts, and playback presentation independent from
+the mobile UI. Local builds automatically use a sibling `TypeType-SDK`
+checkout; set `TYPETYPE_SDK_PATH` when the SDK is stored elsewhere.
 
 ## Install
 
 ### F-Droid
 
-Use the official TypeType F-Droid repository to install the app and receive
-stable updates:
+TypeType Android is one application with two F-Droid channels:
+
+- **Stable** is the recommended channel for normal use.
+- **Beta** is for testing prerelease builds.
+
+Both channels use the same application package and signing certificate, so they
+update the same installation. Add only Stable for normal use, or add both
+repositories to receive Beta updates. Choose a channel from the
+[TypeType F-Droid setup page](https://typetype.video/fdroid/):
 
 1. Open the [TypeType F-Droid setup page](https://typetype.video/fdroid/) on
    your Android device, or scan its QR code.
-2. Tap **Open in F-Droid**, add the repository, then wait for the catalog to
-   refresh.
+2. Tap **Open in F-Droid**, add the repository, and refresh the catalog.
 3. Search for **TypeType** and install it.
 
 ### Signed APK
 
-1. Open the
+1. Download the signed APK from the
    [latest Release](https://github.com/TypeType-Video/TypeType-Android/releases/latest).
-2. Download the signed `TypeType-vX.Y.Z.apk`. A matching SHA-256 file is
-   available if you want to verify the download.
-3. Open the APK and allow installation from your browser or file manager when
-   Android asks.
-4. Launch TypeType, enter the address of your TypeType instance, then sign in
-   with a local account or OIDC. Guest access appears when the instance supports
-   it.
+2. Verify it with the matching SHA-256 file if desired.
+3. Open the APK and allow installation when Android asks.
+4. Enter your TypeType instance address and sign in, use OIDC, or continue as a
+   guest when supported.
 
 Installing a newer signed Release over an existing Release keeps the
 application data. If Android reports an incompatible signature, remove any
@@ -99,17 +105,6 @@ Debug build before installing the signed APK.
 > access to a compatible TypeType instance. If you want to host one, start with
 > the [self-hosting guide](https://typetype-video.github.io/Docs-TypeType/self-hosting/introduction).
 
-## Offline behavior and diagnostics
-
-The app keeps available local cache entries visible while refreshing and
-resumes progressive feeds after a temporary interruption. Playback, downloads,
-and account operations still depend on the selected instance and its upstream
-providers.
-
-When something fails, open **Settings > Diagnostics** to review a redacted,
-local request history before sharing it. Diagnostics do not include raw
-credentials, tokens, cookies, or private response bodies.
-
 ## Help and feedback
 
 - Read the [TypeType user guide](https://typetype-video.github.io/Docs-TypeType/guide/).
@@ -118,25 +113,17 @@ credentials, tokens, cookies, or private response bodies.
 - Report bugs and request features in the
   [TypeType Android issue tracker](https://github.com/TypeType-Video/TypeType-Android/issues).
 
-When reporting a playback or network problem, include the Android version, app
-version, TypeType instance version, video URL, the action that failed, and the
-redacted diagnostics export when available.
-
-## TypeType ecosystem
-
-- [TypeType](https://github.com/TypeType-Video/TypeType), stack installation,
-  releases, and coordination
-- [TypeType-Server](https://github.com/TypeType-Video/TypeType-Server), API,
-  extraction, playback sessions, and private user data
-- [TypeType-Frontend](https://github.com/TypeType-Video/TypeType-Frontend),
-  browser client
-- [Docs-TypeType](https://github.com/TypeType-Video/Docs-TypeType), user and
-  self-hosting documentation
+When reporting a problem, include the Android version, app version, TypeType
+Server version, the action that failed, and the redacted diagnostics export
+when available.
 
 ## Acknowledgements
 
-TypeType Android is an independent client. The following GPL v3 projects have
-provided useful technical and product references:
+We warmly thank the teams and contributors behind these projects. Their work,
+ideas, and hard-earned lessons have been valuable references while building
+TypeType Android, especially for Android compatibility, media playback, and
+user experience. TypeType Android remains an independent client and is not
+affiliated with these projects.
 
 - [PipePipe](https://github.com/InfinityLoop1308/PipePipe) and
   [PipePipeClient](https://github.com/InfinityLoop1308/PipePipeClient), for

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -26,8 +26,8 @@ android {
         applicationId = "dev.typetype.android"
         minSdk = 23
         targetSdk = 37
-        versionCode = 10704
-        versionName = "1.7.0-beta.5"
+        versionCode = 10705
+        versionName = "1.7.0-beta.6"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resValue("string", "app_name", "TypeType")
     }

diff --git a/app/src/androidTest/java/dev/typetype/android/core/ui/theme/TypeTypeThemeOrderTest.kt b/app/src/androidTest/java/dev/typetype/android/core/ui/theme/TypeTypeThemeOrderTest.kt
@@ -0,0 +1,59 @@
+package dev.typetype.android.core.ui.theme
+
+import androidx.compose.material3.ColorScheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
+import androidx.activity.ComponentActivity
+import androidx.compose.runtime.mutableStateOf
+import dev.typetype.android.domain.preferences.AccentColor
+import dev.typetype.android.domain.preferences.AppearanceMode
+import dev.typetype.android.domain.preferences.AppearancePersonality
+import dev.typetype.android.domain.preferences.AppearanceTheme
+import dev.typetype.android.domain.preferences.AppPreferences
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+
+class TypeTypeThemeOrderTest {
+    @get:Rule
+    val composeRule = createAndroidComposeRule<ComponentActivity>()
+    private val preferences = mutableStateOf(AppPreferences())
+    private var scheme: ColorScheme? = null
+
+    @Test
+    fun oledKeepsDynamicPaletteAndReplacesOnlySurfaces() {
+        preferences.value = AppPreferences(
+            accentColor = AccentColor.System,
+            appearancePersonality = AppearancePersonality.Classic,
+            appearanceMode = AppearanceMode.Dark,
+            appearanceTheme = AppearanceTheme.Dynamic,
+        )
+        composeRule.setContent {
+            TypeTypeTheme(preferences = preferences.value) {
+                scheme = MaterialTheme.colorScheme
+            }
+        }
+        val dynamic = requireNotNull(scheme)
+        val oled = colorSchemeFor(
+            preferences.value.copy(appearanceAmoled = true),
+        )
+        assertEquals(dynamic.primary, oled.primary)
+        assertEquals(dynamic.secondaryContainer, oled.secondaryContainer)
+        assertEquals(dynamic.tertiary, oled.tertiary)
+        assertEquals(dynamic.error, oled.error)
+        assertEquals(dynamic.surfaceVariant, oled.surfaceVariant)
+        assertEquals(dynamic.outline, oled.outline)
+        assertEquals(Color.Black, oled.background)
+        assertEquals(Color.Black, oled.surface)
+    }
+
+    private fun colorSchemeFor(preferences: AppPreferences): ColorScheme {
+        scheme = null
+        composeRule.runOnIdle {
+            this.preferences.value = preferences
+        }
+        composeRule.waitForIdle()
+        return requireNotNull(scheme)
+    }
+}