chore: release 0.1.1-beta.1

.github/workflows/ci.yml

@@ -0,0 +1,71 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - dev
+    paths-ignore:
+      - '**.md'
+      - 'assets/**'
+  pull_request:
+    branches:
+      - dev
+      - beta
+      - main
+    paths-ignore:
+      - '**.md'
+      - 'assets/**'
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ci-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  CI: true
+  ANDROID_PLATFORM: platforms;android-37.0
+  ANDROID_BUILD_TOOLS: build-tools;36.0.0
+
+jobs:
+  verify:
+    # Hosted runners: pull requests from forks run here, never on a machine of the project.
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    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 packages
+        run: yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install "$ANDROID_PLATFORM" "$ANDROID_BUILD_TOOLS" > /dev/null
+
+      - name: Test, lint and build
+        run: |
+          ./gradlew --stacktrace \
+            testDebugUnitTest \
+            :app:compileDebugAndroidTestKotlin \
+            lintDebug \
+            :app:assembleRelease
+
+      - name: Upload reports
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v7.0.1
+        with:
+          name: reports
+          path: |
+            **/build/reports/
+            **/build/test-results/
+          if-no-files-found: ignore
+          retention-days: 14

.github/workflows/release.yml

@@ -0,0 +1,161 @@
+name: Release
+
+# A push to beta publishes a prerelease, a push to main a stable release. The version comes from app/build.gradle.kts
+# and the text from release-notes/v<version>.md, which must be in the pushed commit.
+on:
+  push:
+    branches:
+      - beta
+      - main
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: release-${{ github.ref_name }}
+  cancel-in-progress: false
+
+env:
+  CI: true
+  APPLICATION_ID: video.typetype.tv
+  ANDROID_PLATFORM: platforms;android-37.0
+  ANDROID_BUILD_TOOLS: build-tools;36.0.0
+  BUILD_TOOLS_VERSION: 36.0.0
+
+jobs:
+  verify:
+    uses: ./.github/workflows/ci.yml
+
+  publish:
+    needs: verify
+    if: ${{ github.ref_name == 'beta' || github.ref_name == 'main' }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    # The signing key lives in this environment, which only the beta and main branches can use.
+    environment: release
+    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 packages
+        run: yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install "$ANDROID_PLATFORM" "$ANDROID_BUILD_TOOLS" > /dev/null
+
+      - name: Check the version
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+          version="$(sed -nE 's/^val appVersion = "([^"]+)"$/\1/p' app/build.gradle.kts)"
+          case "$GITHUB_REF_NAME" in
+            beta) pattern='^[0-9]+\.[0-9]+\.[0-9]+-beta\.[1-9][0-9]?$'; channel=beta ;;
+            main) pattern='^[0-9]+\.[0-9]+\.[0-9]+$'; channel=stable ;;
+          esac
+          if [[ ! "$version" =~ $pattern ]]; then
+            echo "::error::Version '$version' does not fit the $GITHUB_REF_NAME branch"
+            exit 1
+          fi
+          tag="v$version"
+          if [ ! -f "release-notes/$tag.md" ]; then
+            echo "::error::release-notes/$tag.md is missing"
+            exit 1
+          fi
+          if gh api "repos/$GITHUB_REPOSITORY/git/ref/tags/$tag" > /dev/null 2>&1; then
+            echo "::error::Tag $tag already exists: raise the version before publishing"
+            exit 1
+          fi
+          {
+            echo "RELEASE_VERSION=$version"
+            echo "RELEASE_TAG=$tag"
+            echo "RELEASE_CHANNEL=$channel"
+          } >> "$GITHUB_ENV"
+
+      - name: Build
+        run: ./gradlew --stacktrace :app:assembleRelease
+
+      - name: Sign
+        env:
+          KEYSTORE_BASE64: ${{ secrets.TV_KEYSTORE_BASE64 }}
+          KEYSTORE_PASSWORD: ${{ secrets.TV_KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.TV_KEY_ALIAS }}
+        run: |
+          set -euo pipefail
+          test -n "$KEYSTORE_BASE64" && test -n "$KEYSTORE_PASSWORD" && test -n "$KEY_ALIAS"
+          tools="$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION"
+          keystore="$RUNNER_TEMP/release.jks"
+          trap 'rm -f "$keystore"' EXIT
+          printf '%s' "$KEYSTORE_BASE64" | base64 --decode > "$keystore"
+          mkdir -p artifacts
+          "$tools/zipalign" -f -P 16 4 app/build/outputs/apk/release/app-release-unsigned.apk "$RUNNER_TEMP/aligned.apk"
+          "$tools/apksigner" sign --ks "$keystore" --ks-key-alias "$KEY_ALIAS" --v4-signing-enabled false \
+            --ks-pass env:KEYSTORE_PASSWORD --key-pass env:KEYSTORE_PASSWORD \
+            --out "artifacts/TypeType-TV-$RELEASE_TAG.apk" "$RUNNER_TEMP/aligned.apk"
+
+      - name: Check the APK
+        run: |
+          set -euo pipefail
+          tools="$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION"
+          apk="artifacts/TypeType-TV-$RELEASE_TAG.apk"
+          "$tools/zipalign" -c -P 16 4 "$apk"
+          "$tools/apksigner" verify --print-certs "$apk" | grep -E 'Signer #1 certificate (DN|SHA-256)'
+          badging="$("$tools/aapt2" dump badging "$apk" | head -n 1)"
+          echo "$badging"
+          package="$(sed -nE "s/^package: name='([^']+)'.*/\1/p" <<< "$badging")"
+          code="$(sed -nE "s/.*versionCode='([0-9]+)'.*/\1/p" <<< "$badging")"
+          name="$(sed -nE "s/.*versionName='([^']+)'.*/\1/p" <<< "$badging")"
+          test "$package" = "$APPLICATION_ID"
+          test "$name" = "$RELEASE_VERSION"
+          echo "RELEASE_CODE=$code" >> "$GITHUB_ENV"
+
+      - name: Write checksum and update manifest
+        run: |
+          set -euo pipefail
+          cd artifacts
+          apk="TypeType-TV-$RELEASE_TAG.apk"
+          sha256sum "$apk" > "$apk.sha256"
+          jq -n \
+            --arg channel "$RELEASE_CHANNEL" \
+            --arg packageName "$APPLICATION_ID" \
+            --arg versionName "$RELEASE_VERSION" \
+            --argjson versionCode "$RELEASE_CODE" \
+            --arg apkAsset "$apk" \
+            --arg sha256 "$(cut -d ' ' -f 1 "$apk.sha256")" \
+            '{schemaVersion: 1, channel: $channel, packageName: $packageName, versionName: $versionName,
+              versionCode: $versionCode, apkAsset: $apkAsset, sha256: $sha256}' > typetype-update.json
+          cat typetype-update.json
+
+      - name: Keep the files with the run
+        uses: actions/upload-artifact@v7.0.1
+        with:
+          name: typetype-tv-${{ env.RELEASE_TAG }}
+          path: artifacts/
+          if-no-files-found: error
+          compression-level: 0
+          retention-days: 30
+
+      - name: Publish the release
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+          if [ "$RELEASE_CHANNEL" = beta ]; then
+            flags=(--prerelease --latest=false)
+          else
+            flags=(--latest)
+          fi
+          gh release create "$RELEASE_TAG" artifacts/* \
+            --target "$GITHUB_SHA" \
+            --title "TypeType TV $RELEASE_VERSION" \
+            --notes-file "release-notes/$RELEASE_TAG.md" \
+            "${flags[@]}"

README.md

@@ -31,33 +31,38 @@ synchronization. It supports YouTube, Bilibili, and NicoNico.
 
 | Home | Video details | Player |
 | --- | --- | --- |
-| ![TypeType TV home screen](assets/screenshots/tv-home.png) | ![TypeType TV video details](assets/screenshots/tv-detail.png) | ![TypeType TV player](assets/screenshots/tv-player.png) |
+| ![TypeType TV home with a muted preview](assets/screenshots/tv-home.png) | ![TypeType TV video details](assets/screenshots/tv-detail.png) | ![TypeType TV player](assets/screenshots/tv-player.png) |
 
-| Comments | Search | Settings |
+| Live chat | More videos | Search |
 | --- | --- | --- |
-| ![TypeType TV comments panel](assets/screenshots/tv-comments.png) | ![TypeType TV search with the on-screen keyboard](assets/screenshots/tv-search.png) | ![TypeType TV playback settings](assets/screenshots/tv-settings.png) |
+| ![TypeType TV live stream with its chat](assets/screenshots/tv-live-chat.png) | ![TypeType TV related videos under the player](assets/screenshots/tv-related.png) | ![TypeType TV search with the on-screen keyboard](assets/screenshots/tv-search.png) |
 
 ## Features
 
-- Browse the home feed, search videos and channels, and open channels and playlists.
+- Browse the home feed, search videos, playlists and channels, and open channels and playlists.
+- Rest on a video for two seconds to see a muted preview behind the home screen and the video details.
 - Resume videos and find your history, favorites, and Watch Later in the library.
+- Play up to 4K with AVC, VP9, AV1 or HEVC, chosen from the decoders of your device; HDR on HDR screens.
 - Choose the quality, audio language, captions and their style, and the playback speed.
 - Use chapters, SponsorBlock, the description, comments and their replies, and the Up next queue.
-- Show scrolling comments on Bilibili and NicoNico videos.
-- Watch live streams, or keep only the audio.
+- Press Down twice in the player to browse more videos without leaving playback.
+- Watch YouTube live streams with their chat beside the picture, the live audience, and the quality of your choice.
+- Show scrolling comments on Bilibili and NicoNico videos, or keep only the audio.
 - Subscribe to channels and add videos to your playlists from the player.
 
 ## Build
 
 Requirements: JDK 17 and the Android SDK (`ANDROID_HOME` set).
 
 ```sh
-./gradlew :app:testDebugUnitTest :app:assembleDebug
+./gradlew testDebugUnitTest :app:assembleDebug
 ```
 
-The project has two modules:
+The project is split into modules:
 
-- `app`: the TV interface, built with Compose for remote-control focus, and the client for the TypeType Server API.
+- `app`: the TV application, its navigation and startup.
+- `core:*`: shared resources, the TypeType Server client, playback, the design system, and test fakes.
+- `feature:*`: one module per screen family (home, search, library, settings, collections, details, player, sign-in).
 - `player`: the Media3 source for TypeType SABR playback.
 
 ## Acknowledgements

app/build.gradle.kts

@@ -4,6 +4,22 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
 }
 
+// The release workflow reads this line: "x.y.z-beta.n" is published from the beta branch, "x.y.z" from main.
+val appVersion = "0.1.1-beta.1"
+
+// The version code follows from the name, so each release installs over the one before, and a beta sits under the
+// stable release that ends it: 0.3.0-beta.2 is 30002 and 0.3.0 is 30099.
+fun versionCodeOf(name: String): Int {
+    val match = requireNotNull(Regex("""(\d+)\.(\d+)\.(\d+)(?:-beta\.(\d+))?""").matchEntire(name)) {
+        "Version $name is neither x.y.z nor x.y.z-beta.n"
+    }
+    val (major, minor, patch, beta) = match.destructured
+    require(minor.toInt() < 100 && patch.toInt() < 100) { "Minor and patch of $name stay under 100" }
+    val step = if (beta.isEmpty()) 99 else beta.toInt()
+    require(beta.isEmpty() || step in 1..98) { "The beta number of $name is 1 to 98" }
+    return major.toInt() * 1_000_000 + minor.toInt() * 10_000 + patch.toInt() * 100 + step
+}
+
 android {
     namespace = "video.typetype.tv"
     compileSdk = 37
@@ -12,8 +28,8 @@ android {
         applicationId = "video.typetype.tv"
         minSdk = 23
         targetSdk = 37
-        versionCode = 1
-        versionName = "0.2.0"
+        versionCode = versionCodeOf(appVersion)
+        versionName = appVersion
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -41,10 +57,6 @@ android {
         unitTests.isReturnDefaultValues = true
     }
 
-    sourceSets {
-        getByName("test").kotlin.srcDir("src/sharedTest/java")
-        getByName("androidTest").kotlin.srcDir("src/sharedTest/java")
-    }
 }
 
 dependencies {
@@ -57,7 +69,18 @@ dependencies {
     implementation(libs.androidx.concurrent.futures)
     implementation(libs.androidx.lifecycle.runtime.compose)
 
-    implementation(project(":player"))
+    implementation(project(":core:resources"))
+    implementation(project(":core:data"))
+    implementation(project(":core:playback"))
+    implementation(project(":core:ui"))
+    implementation(project(":feature:auth"))
+    implementation(project(":feature:home"))
+    implementation(project(":feature:search"))
+    implementation(project(":feature:library"))
+    implementation(project(":feature:settings"))
+    implementation(project(":feature:collections"))
+    implementation(project(":feature:detail"))
+    implementation(project(":feature:player"))
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.androidx.media3.exoplayer.hls)
     implementation(libs.androidx.media3.datasource.okhttp)
@@ -77,6 +100,7 @@ dependencies {
     testImplementation(libs.okhttp.mockwebserver)
     testImplementation(libs.okhttp.tls)
 
+    androidTestImplementation(project(":core:testing"))
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.compose.ui.test.accessibility)