Release 1.11.0-beta.4

.github/workflows/android-beta.yml

@@ -6,6 +6,9 @@ on:
       - beta
     paths:
       - 'app/**'
+      - 'build-logic/**'
+      - 'core/**'
+      - 'feature/**'
       - 'player/**'
       - 'baseline-profile/**'
       - 'gradle/**'
@@ -17,6 +20,9 @@ on:
       - beta
     paths:
       - 'app/**'
+      - 'build-logic/**'
+      - 'core/**'
+      - 'feature/**'
       - 'player/**'
       - 'baseline-profile/**'
       - 'gradle/**'
@@ -36,36 +42,31 @@ env:
   CI: true
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
   JAVA_TOOL_OPTIONS: -Djava.awt.headless=true
-  GRADLE_OPTS: -Dorg.gradle.workers.max=8 -Dorg.gradle.daemon.idletimeout=900000
-  ANDROID_HOME: /opt/android-sdk
-  ANDROID_SDK_ROOT: /opt/android-sdk
-  JAVA_HOME: /usr/lib/jvm/java-26-openjdk
-  GRADLE_USER_HOME: /var/tmp/typetype-android-gradle-user-home
   GITHUB_REPO: TypeType-Video/TypeType-Android
 
 jobs:
   release:
-    runs-on: [self-hosted, Linux, X64, ci-stack, android]
-    timeout-minutes: 35
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
     permissions:
       contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v7.0.1
 
+      - name: Set up Java
+        uses: actions/setup-java@v6.0.1
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v6.4.0
+
       - name: Install Android SDK platform
         run: |
-          platform="$ANDROID_HOME/platforms/android-37.0"
-          (
-            flock 9
-            if [ ! -f "$platform/android.jar" ]; then
-              rm -rf "$platform"
-              "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
-                --sdk_root="$ANDROID_HOME" \
-                "platforms;android-37.0"
-            fi
-            test -f "$platform/android.jar"
-          ) 9>"$ANDROID_HOME/.platform-install.lock"
+          "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install \
+            "platforms;android-37.0" "build-tools;36.0.0" > /dev/null
 
       - name: Validate beta release version
         env:
@@ -123,14 +124,12 @@ jobs:
           } > keystore.properties
 
       - name: Verify and build beta release
-        timeout-minutes: 25
+        timeout-minutes: 40
         run: |
-          ./gradlew --build-cache --stacktrace \
+          ./gradlew --stacktrace \
             :baseline-profile:assemble \
-            :player:testDebugUnitTest \
-            :app:testDebugUnitTest \
-            :player:lintDebug \
-            :app:lintDebug \
+            testDebugUnitTest \
+            lintDebug \
             :app:assembleDebug \
             :app:assembleRelease
 
@@ -140,8 +139,7 @@ jobs:
         with:
           name: typetype-beta-lint-report
           path: |
-            app/build/reports/lint-results-debug.html
-            player/build/reports/lint-results-debug.html
+            **/build/reports/lint-results-debug.html
           if-no-files-found: ignore
           retention-days: 14
 

.github/workflows/android.yml

@@ -37,67 +37,64 @@ env:
   CI: true
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
   JAVA_TOOL_OPTIONS: -Djava.awt.headless=true
-  GRADLE_OPTS: -Dorg.gradle.workers.max=8 -Dorg.gradle.daemon.idletimeout=900000
-  ANDROID_HOME: /opt/android-sdk
-  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:
     if: ${{ github.event_name != 'workflow_dispatch' || !inputs.publish_release || github.ref != 'refs/heads/main' }}
-    runs-on: [self-hosted, Linux, X64, ci-stack, android]
-    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
     steps:
       - name: Checkout
         uses: actions/checkout@v7.0.1
 
-      - name: Install Android SDK platform
+      - name: Check file length
         run: |
-          platform="$ANDROID_HOME/platforms/android-37.0"
-          (
-            flock 9
-            if [ ! -f "$platform/android.jar" ]; then
-              rm -rf "$platform"
-              "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
-                --sdk_root="$ANDROID_HOME" \
-                "platforms;android-37.0"
+          set -euo pipefail
+          status=0
+          while IFS= read -r file; do
+            limit=330
+            case "$file" in */src/test/*|*/src/androidTest/*) limit=350 ;; esac
+            lines="$(wc -l < "$file")"
+            if [ "$lines" -gt "$limit" ]; then
+              echo "::error file=$file::$lines lines, the limit is $limit"
+              status=1
             fi
-            test -f "$platform/android.jar"
-          ) 9>"$ANDROID_HOME/.platform-install.lock"
+          done < <(git ls-files '*.kt')
+          exit "$status"
+
+      - name: Set up Java
+        uses: actions/setup-java@v6.0.1
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v6.4.0
+
+      - name: Install Android SDK platform
+        run: |
+          "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install \
+            "platforms;android-37.0" "build-tools;36.0.0" > /dev/null
 
       - name: Verify Android project
-        timeout-minutes: 25
+        timeout-minutes: 40
         run: |
           set -euo pipefail
           tasks=(
             :baseline-profile:assemble
-            :player:testDebugUnitTest
-            :app:testDebugUnitTest
-            :player:lintDebug
-            :app:lintDebug
+            testDebugUnitTest
+            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[@]}"
+          ./gradlew --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
-            tv/build/outputs/apk/debug/*.apk
           if-no-files-found: error
           compression-level: 0
           retention-days: 14
@@ -108,35 +105,33 @@ jobs:
         with:
           name: lint-report
           path: |
-            app/build/reports/lint-results-debug.html
-            player/build/reports/lint-results-debug.html
-            tv/build/reports/lint-results-debug.html
+            **/build/reports/lint-results-debug.html
           if-no-files-found: ignore
           retention-days: 14
 
   release:
     if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.publish_release }}
-    runs-on: [self-hosted, Linux, X64, ci-stack, android]
-    timeout-minutes: 35
+    runs-on: ubuntu-latest
+    timeout-minutes: 50
     permissions:
       contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v7.0.1
 
+      - name: Set up Java
+        uses: actions/setup-java@v6.0.1
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v6.4.0
+
       - name: Install Android SDK platform
         run: |
-          platform="$ANDROID_HOME/platforms/android-37.0"
-          (
-            flock 9
-            if [ ! -f "$platform/android.jar" ]; then
-              rm -rf "$platform"
-              "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
-                --sdk_root="$ANDROID_HOME" \
-                "platforms;android-37.0"
-            fi
-            test -f "$platform/android.jar"
-          ) 9>"$ANDROID_HOME/.platform-install.lock"
+          "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install \
+            "platforms;android-37.0" "build-tools;36.0.0" > /dev/null
 
       - name: Prepare release metadata
         env:
@@ -173,38 +168,25 @@ jobs:
           } > keystore.properties
 
       - name: Verify Android project and build release
-        timeout-minutes: 25
+        timeout-minutes: 40
         run: |
           set -euo pipefail
           tasks=(
             :baseline-profile:assemble
-            :player:testDebugUnitTest
-            :app:testDebugUnitTest
-            :player:lintDebug
-            :app:lintDebug
+            testDebugUnitTest
+            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[@]}"
+          ./gradlew --stacktrace "${tasks[@]}"
 
       - name: Upload lint report
         if: ${{ always() }}
         uses: actions/upload-artifact@v7.0.1
         with:
           name: lint-report
           path: |
-            app/build/reports/lint-results-debug.html
-            player/build/reports/lint-results-debug.html
-            tv/build/reports/lint-results-debug.html
+            **/build/reports/lint-results-debug.html
           if-no-files-found: ignore
           retention-days: 14
 

CONTRIBUTING.md

@@ -33,8 +33,6 @@ 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
@@ -59,18 +57,25 @@ the contract advertised by the selected TypeType instance.
 
 ## Source layout
 
-| Path | Responsibility |
+| Module | Responsibility |
 | --- | --- |
-| `app/src/main/java/dev/typetype/android/core` | Shared UI and platform utilities |
-| `app/src/main/java/dev/typetype/android/data` | Network, database, cache, and repository implementations |
-| `app/src/main/java/dev/typetype/android/domain` | Models and application contracts |
-| `app/src/main/java/dev/typetype/android/feature` | Compose screens and feature state |
-| `app/src/main/java/dev/typetype/android/services` | Long-lived playback and Android services |
+| `app` | Activity, navigation, dependency wiring, app theme, and manifest |
+| `core:model` | Models, repository contracts, and small pure helpers |
+| `core:data` | Network, Room database, DataStore, and repository implementations |
+| `core:playback` | Playback service, SABR sessions, source and codec selection, recovery |
+| `core:notifications` | Push and local notifications |
+| `core:ui` | Shared Compose components, theme helpers, and navigation routes |
+| `core:resources` | Strings, drawables, and other shared resources |
+| `core:testing` | Helpers shared by device tests |
+| `feature:*` | One module per screen family: home, search, channel, library, subscriptions, player, Shorts, settings, setup, and more |
 | `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 |
+| `baseline-profile` | Baseline profile generation and macrobenchmarks |
+| `build-logic` | Convention plugins that hold the shared Android setup |
+
+Each module keeps its JVM tests in `src/test` and its device tests in
+`src/androidTest`. Features depend on `core` modules, not on each other, except
+where a screen embeds another one, such as Shorts using the player. Device tests
+that need the real playback service or the Hilt graph live in `app`.
 
 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,
@@ -117,22 +122,16 @@ Before opening a pull request, run the same core checks as CI:
 
 ```sh
 ./gradlew --no-daemon \
-  :player:testDebugUnitTest \
-  :app:testDebugUnitTest \
-  :player:lintDebug \
-  :app:lintDebug \
+  :baseline-profile:assemble \
+  testDebugUnitTest \
+  lintDebug \
   :app:assembleDebug \
   :app:assembleRelease
 ```
 
-For TV changes, also run:
-
-```sh
-./gradlew --no-daemon \
-  :tv:testDebugUnitTest \
-  :tv:lintDebug \
-  :tv:assembleDebug
-```
+Lint warnings fail the build, and CI rejects a Kotlin file over the length
+limit. To run one module's device tests on a connected device or emulator, use
+for example `./gradlew :feature:home:connectedDebugAndroidTest`.
 
 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

README.md

@@ -31,10 +31,6 @@ Play Services.
 TypeType Android uses the TypeType Server selected during setup for extraction,
 playback sessions, recommendations, synchronization, and downloads.
 
-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
 
 | Welcome | Add an instance | Home |
@@ -56,19 +52,6 @@ contracts as the mobile client.
   sleep timer.
 - Download supported videos and import existing data.
 
-## Android TV
-
-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