Compare commits

..

No commits in common. "main" and "v0.4.1" have entirely different histories.
main ... v0.4.1

68 changed files with 695 additions and 2300 deletions

View file

@ -35,11 +35,6 @@ jobs:
if test -f distribution/Kaleido.apk; then
(cd distribution && sha256sum -c Kaleido.apk.sha256)
.tools/sdk/build-tools/35.0.0/apksigner verify --verbose --print-certs distribution/Kaleido.apk
# The APK's own manifest must carry the advertised version (and, for a tag, version.properties').
case "${{ github.ref }}" in
refs/tags/v*) python3 scripts/verify_distribution.py --release ;;
*) python3 scripts/verify_distribution.py ;;
esac
fi
- name: Publish signed tag release
if: startsWith(github.ref, 'refs/tags/v')

View file

@ -4,14 +4,14 @@
- Ask clarifying questions before proceeding when more information is needed. Otherwise make reasonable decisions and complete the authorized work.
- This is a real native Android TV Plex client: Kotlin, Jetpack Compose, Media3/ExoPlayer. Preserve working Plex functionality; do not substitute mock content or prototype playback.
- The primary test device is the onn at **192.168.50.195:5555**, package **tv.kaleido.app**, activity **.MainActivity**. The user also authorized two weaker devices for performance testing: a Fire TV Stick 4K (Fire OS 8, 32-bit) at **192.168.50.146:5555** and a TCL Smart TV Pro (MT5896, slowest GPU) at **192.168.50.200:5555**. Scripts target the onn unless `KALEIDO_DEVICE` names another serial. Always specify the ADB serial. Do not modify any device's launcher, accessibility services (the onn runs Luma's Home-button service; Button Mapper was removed at the user's request on 2026-10-29; any service makes Compose do semantics work), settings, or other apps. The TCL's network ADB link drops intermittently; `device.py` reconnects and retries.
- The primary test device is the onn at **192.168.50.195:5555**, package **tv.kaleido.app**, activity **.MainActivity**. The user also authorized two weaker devices for performance testing: a Fire TV Stick 4K (Fire OS 8, 32-bit) at **192.168.50.146:5555** and a TCL Smart TV Pro (MT5896, slowest GPU) at **192.168.50.200:5555**. Scripts target the onn unless `KALEIDO_DEVICE` names another serial. Always specify the ADB serial. Do not modify any device's launcher, accessibility services (the onn runs two, which add per-frame semantics work), settings, or other apps. The TCL's network ADB link drops intermittently; `device.py` reconnects and retries.
- `.env` contains `PLEX_SERVER_URL` and `PLEX_TOKEN` for local testing. Never print, commit, or embed credentials in source, resources, APKs, or logs. Keep `.env`, signing keys, toolchains, and private evidence ignored.
- Use the existing encrypted session. `scripts/device.py seed` provisions an installed **debug** build only when needed; the app encrypts and deletes its bootstrap file. Never clear app data or sign out just to reset a test.
## UI and architecture
- **Home:** large cinematic hero with playback/information actions and integrated landscape Continue Watching. Entering the rows compacts it into a Silo-style preview of the focused card (its own image, top-right); Up/Back restores the hero.
- **Movies:** the same Silo-style preview follows focused posters; recent releases and movie recommendations lead. **TV:** episode-first layout with wider next-episode thumbnails, new seasons and new episodes. Keep these destinations' rows visibly distinct. The optional artwork colour wash is baked into the preview backdrop bitmap.
- **Home:** large cinematic hero with playback/information actions and integrated landscape Continue Watching. Do not replace it with the compact section preview.
- **Movies:** compact preview/backdrop follows focused posters; recent releases and movie recommendations lead. **TV:** episode-first layout with wider next-episode thumbnails, new seasons and new episodes. Keep these destinations visibly distinct.
- Both sections retain a dedicated, filtered/sorted **A–Z poster grid**. Primary tabs activate on focus. Use neutral near-black chrome, artwork-led color, restrained controls and stable card bounds. Inspect actual TV screenshots and D-pad behavior after UI changes.
- `KaleidoViewModel.kt`: navigation, async loading and section caches. `PlexApi.kt` / `Models.kt`: Plex transport and parsing. `FocusedBrowse.kt`, `BrowseBackdrop.kt`, `BrowseScreens.kt`, `Theme.kt`: browsing/focus/design. `Playback.kt`: controller, negotiation and progress. `PlayerControls.kt` / `PlaybackExtras.kt`: controls, options and post-play. `SecureSession.kt`: Android Keystore persistence. `AppUpdater.kt`: repository updates.
@ -35,17 +35,7 @@ Install `app/build/outputs/apk/release/app-release.apk` instead for performance/
## Testing suite
Use `& $KaleidoPython` before the Python commands below. **Never run competing device/UI tests in parallel.**
**Test in tiers; don't run every suite for every change.** Each device script cold-starts Kaleido, waits for playback and real timers, and dumps the UI per check, so a full pass takes 30+ minutes.
1. **Every change:** `.\Build.ps1 -Test` (compile, JVM unit tests, lint; about a minute). Put pure logic (ordering, parsing, fingerprints, countdown rules) in unit-testable functions with JVM tests instead of proving it on the TV.
2. **UI or device behaviour changed:** run only the one or two scripts for the area touched (map below), plus a screenshot of the changed screen. One script is usually 1–4 minutes.
3. **Before a release, or after broad navigation/playback/startup changes:** the full set: `verify_ui.py browse` and `player`, `repro_runtime.py controls episode postplay credits sections`, `verify_player_features.py`, `verify_settings.py`, then the release build with `repro_runtime.py browse` for frame pacing.
Area → checks: Home/Movies/TV rows, focus, details Back → `verify_ui.py browse` · player bar, menus, scrubbing → `verify_ui.py player` · previous/next episode, auto-skip, server picker, cross-device refresh → `verify_player_features.py <phase>` · post-play/autoplay/credits → `repro_runtime.py postplay` or `credits` · Settings rows/dialogs → `verify_settings.py` · details/cast → `verify_details_layout.py` / `verify_movie_details.py` · library A–Z/search → `verify_library_jump.py` · startup/tab loading → `repro_runtime.py sections` · scrolling smoothness → release + `repro_runtime.py browse`. Skip suites for untouched areas and say which were skipped.
Run only checks relevant to the change. Live playback tests change real Plex progress and can change playback preferences. Restore a useful final state, normally the release build on Home. After a functional debug batch, restore the signed release and its ART profile before returning the device to normal use; never judge performance from an unoptimized debug build.
Use `& $KaleidoPython` before the Python commands below. Run only checks relevant to the change; **never run competing device/UI tests in parallel**. Live playback tests change real Plex progress and can change playback preferences. Restore a useful final state, normally the release build on Home. After a functional debug batch, restore the signed release and its ART profile before returning the device to normal use; never judge performance from an unoptimized debug build.
| Command | Purpose / required build |
| --- | --- |
@ -55,8 +45,8 @@ Run only checks relevant to the change. Live playback tests change real Plex pro
| `scripts/repro_runtime.py browse` | Horizontal bounds and frame pacing; **optimized release with profile compilation** |
| `scripts/repro_runtime.py controls` | One-press Back, OK reveal, timed hide and exit; **debug** |
| `scripts/repro_runtime.py episode` | Next-episode replacement/crash regression; **debug** |
| `scripts/repro_runtime.py postplay` | Natural ending → Up Next countdown → next episode READY; **debug** |
| `scripts/repro_runtime.py credits` | Credits → Up Next (mini-player), season/related rows, any-press cancel, Back to video; **debug** |
| `scripts/repro_runtime.py postplay` | Natural ending → five-second countdown → next episode READY; **debug** |
| `scripts/repro_runtime.py credits` | Visible Skip credits, season/related rows and cancellable countdown; **debug** |
| `scripts/device.py screenshot <name>` | Capture to ignored `evidence/private/`; also supports `hierarchy`, `logs`, `launch`, `key` |
| `scripts/profile_browse.py` | Targeted atrace investigation when navigation performance regresses |
| `scripts/profile_transitions.py <label>` | Skipped frames per D-pad transition (tabs, hero, rows, Movies) from framestats; first cycle is the first pass after launch; profiled **release**; raw frames kept for `resummarize` |
@ -68,8 +58,7 @@ Run only checks relevant to the change. Live playback tests change real Plex pro
| `scripts/verify_movie_details.py` | Movie safe header, related movies and Back focus restoration; debug or release |
| `scripts/verify_settings.py` | Category navigation, preference-dialog cancellation and live update check; expects Original quality / 80% test preferences |
| `scripts/verify_library_jump.py` | Scoped Movie/TV categories, A–Z jumps beyond the first page, details/Back focus and exact Silo search |
| `scripts/verify_player_features.py [phase…]` | Phases `previous_episode`, `auto_skip` (Skipping intro fill, Down/Back cancel), `server_picker` (Back/Cancel), `refresh` (resume and open-app Continue Watching sync; moves and restores Silo 1×1 progress); **debug**; restores skip preferences |
| `scripts/verify_audio_preferences.py` | Theme persistence and actual playback audio; **debug**; restores prior audio preferences |
| `scripts/verify_audio_preferences.py` | Theme/boost persistence and actual boosted playback; **debug**; restores prior audio preferences |
Live Android integration tests (currently six) cover secure persistence, library APIs, episodes, PIN, preview JPEGs/new seasons and supported HEVC remux negotiation:
@ -86,17 +75,15 @@ These require the private test session. Playback test intents (`testTitleId`, `t
## Important regression traps
- Keep initialization independent of cancellable tab requests and apply section results atomically. Cancelling initialization during a startup tab switch previously left Movies/TV blank.
- Foreground library sync polls revisions every 15 seconds with a 60-second refresh fallback, and checks within a second of returning to the foreground. The revision includes a Continue Watching fingerprint (membership, order, watch count, progress in 5% steps) so watching on another device shows up without refreshing Home on every poll; pause it for playback/background and stage updates before applying them. Preserve stable hub/card focus IDs and current library filters/range. `LibrarySyncIntegrationTest` tests the real timer against an in-memory HTTP fixture without changing Plex or the encrypted session.
- Home, Movies and TV stay composed once shown; hidden ones are unplaced, have no semantics and must never request focus (gate effects on `active`). Catalog and rails prefetch through `FramePrefetch`/`CacheWindows`, which must remain a `CacheWindowLogic` or rows stop being kept around. With any accessibility service enabled, Compose walks every composed node after each layout change: keep offscreen rows and cards without semantics (`semanticsOnScreen`). See `docs/runtime-verification.md` (frame pacing).
- Foreground library sync polls revisions every 15 seconds with a 60-second refresh fallback; pause it for playback/background and stage updates before applying them. Preserve stable hub/card focus IDs and current library filters/range. `LibrarySyncIntegrationTest` tests the real timer against an in-memory HTTP fixture without changing Plex or the encrypted session.
- Preserve explicit D-pad row/column targets and fixed card geometry. Avoid expensive beyond-bounds focus searches, per-focus catalog recomposition and full-screen gradient overdraw. Contrast is baked into cached backdrop bitmaps off the main thread.
- Give every Media3 session a unique ID: next-episode creation can overlap the old controller's disposal. Plex HLS position is absolute; **do not add the requested resume offset again**.
- Handle remote Back explicitly before default focus handling. Wait for menu focus restoration in tests instead of sending blind rapid button sequences.
- A text field keeps the D-pad: route Down/IME actions out of Search's field explicitly. Give every `focusRestorer()` a fallback, or it overrides explicit focus targets. Per-card modifiers on browse rows must be `Modifier.Node`s, not `composed {}`, and must not animate per card.
- Playback has one quality preference (`StreamQuality`): **Original quality** (the default) tries the original file, then Plex HLS, then a 1080p conversion if needed; 4K/1080p/720p/480p ask Plex to convert. A nonempty audio-only track list for a declared video must trigger fallback. Earlier preferences migrate on first read. Debug `testMode` still forces a delivery mode. Augment Plex's existing HEVC target; competing targets previously forced unnecessary conversion. A server copy decision does not prove rendering. Preserve the selected Plex tracks and check actual delivered formats.
- **ADB screenshots can omit HEVC video on this onn while the actual TV displays it. The user confirmed this.** Do not force transcoding based solely on a blank capture. `scripts/check_video.py` has a pixel assertion that can falsely fail for this reason; use playback logs/rendered-frame evidence and physical TV confirmation as appropriate. Never infer universal HDR/codec support from one test.
- Preview thumbnails and intro/credit markers depend on server-generated data. Do not fabricate them. Automatic skips (Settings › Playback, 0 = button only) show "Skipping intro/credits" with a filling background rather than a number, count down only while playing, and are cancelled by any remote press (OK on the button skips now; Back only cancels).
- Theme tracks come from Plex metadata and inherit from the show for seasons/episodes. Stop music on video playback/background. Volume boost was removed because it degraded audio; keep passthrough and the normal audio path.
- A server-stopped session (Plex dashboard Stop) arrives as `terminationCode`/`terminationText` on the timeline response. Leave the player with the reason and never fall back or reconnect afterwards; timelines keep reporting `buffering` while a stream stalls so the stop is still noticed.
- Preview thumbnails and intro/credit markers depend on server-generated data. Do not fabricate them.
- Theme tracks come from Plex metadata and inherit from the show for seasons/episodes. Stop music on video playback/background. Volume boost processes decoded PCM; Off must preserve passthrough and the normal audio path.
### Performance testing

View file

@ -1,54 +1,5 @@
# Kaleido releases
## 0.8.1
- Fix a title page where Down from the buttons did nothing, leaving you stuck at the top. This happened when the Seasons, Cast or another row below had been scrolled away from its first card, for example by reopening a show from Continue Watching. Down now moves to a card in view.
## 0.8.0
- Replace the two countdowns at the end of an episode with one Up Next screen. When the credits start, the video shrinks into the top-left corner and keeps playing, beside the next episode's artwork, details, rating and synopsis, with the rest of the season and related shows below. Play next episode fills as it counts down, and pressing any button on the remote stops the countdown. Press Left and select the video, or press Back, to return to the credits.
- Update Continue Watching as soon as you leave the player, including an episode you have just started.
- Remove the label above the featured title on Home ("Recently released", "Suggested for you" and similar), as in Kaleido Desktop.
## 0.7.0
- Add a Previous episode button to the player, and redesign its controls: elapsed and remaining time at the ends of the timeline, previous episode, back 10 seconds, play, forward 30 seconds and next episode grouped in the centre, and the finish time beside Exit. Previous episode also steps back through a shuffle.
- Skip intros and credits automatically after a delay you choose in Settings › Playback (3, 5, 10 or 15 seconds, or show the button only). A pending skip reads "Skipping intro" with a filling background; pressing any button on the remote cancels it, and OK skips straight away. The earlier "Automatically" setting becomes a 5-second skip.
- Show what you watch on other devices promptly: Kaleido checks Continue Watching every 15 seconds while open and as soon as you return to it.
- Keep playback paused when you leave Kaleido while a stream is still starting, and only count down to the next episode while Kaleido is on screen.
- Keep the resume point when leaving a title before its stream has started, and keep progress reports on the server the title came from.
- Close Settings › Choose server with Back or the new Cancel button, and enter Home's rows from the Home tab when there is no featured title.
- Cancel slow network requests when they are no longer needed, and connect to the best server address as soon as it answers.
- Update a title's format badges when you pick another version, keep New Seasons when one show can't be loaded, and keep focus on Continue Watching when a card is replaced while a title page is open.
- Remove Volume boost, which degraded audio, and leave the player with the server's reason when a stream is stopped from the Plex dashboard.
## 0.6.2
- New startup animation, the same as Kaleido Desktop's: a kaleidoscope of shards turns and gathers into the Kaleido mark, then the view flies through its centre into Home.
## 0.6.1
- Make browsing noticeably smoother on Android TV hardware. Switching between Home, Movies and TV no longer rebuilds each section, returning to the hero or from a title page no longer redraws Home, and moving between rows prepares the next cards ahead of time instead of mid-scroll.
- Reduce the work done for accessibility services while browsing, which was the largest cost on devices running one (for example a Home-button remapper or TalkBack).
- Apply background library updates only after the remote has been still for a moment, so they no longer interrupt a move, and keep focus on a card when an update replaces it.
## 0.6.0
- Redesign Home after Silo. Moving into the rows compacts the hero into a preview of the focused card instead of scrolling it away: large title art, a rating badge, year, genre and runtime or time left, ratings, three lines of synopsis, cast and 4K/HDR/Atmos badges. Up or Back restores the hero.
- Show the focused card's own image in the top-right, scaled whole and fading into the page. Episodes show their own still instead of the show's artwork.
- Give Movies and TV the same preview above their rows.
- Fade between artwork, and fade and lift titles and descriptions between cards, instead of popping in. The hero's featured titles use the same transitions.
- Add Settings › Interface › Artwork colour wash (on by default), which tints the page with the focused artwork's colour.
- Redesign movie, show, season and episode pages to match: the same artwork and colour wash, title art, a facts line with rating and format badges, and a three-line synopsis. Season and episode pages follow the focused episode's still and details.
- Show title art, the rating badge and episode details in the player's controls.
## 0.5.0
- Show the selected version's source bitrate beside Original quality in the playback quality menu.
- Add a named Audio entry to Playback options alongside the speaker button. Preserve position, pause state and selected tracks when switching audio or rebuilding a Plex stream.
- Add Shuffle on TV show pages. Play episodes from all seasons in repeating shuffled cycles, starting each episode from the beginning and continuing even when ordinary autoplay is off. Seasons keep their usual Play action.
- Record sparse audio underrun and sink-error diagnostics for investigating intermittent dropouts. A short Infinity War check did not reproduce the reported stutter; a fix for that symptom is not yet confirmed.
## 0.4.1
- Make Categories about the genre: large centered labels over dim artwork with subdued natural color, a compact four-column grid and a restrained focus outline. Remove title captions and FILM/SERIES badges from category cards.

View file

@ -10,7 +10,7 @@ A Plex client for Android TV, designed for browsing from the couch. Kaleido puts
- **Home** brings together featured titles, Plex recommendations and Continue Watching. Resume a movie or get back to your current series without digging through your library.
- **Movies** starts with recent releases and recommendations. **TV Shows** leads with your next episodes, new seasons and newly added episodes.
- **Library** gives you an A–Z poster grid with watched-status and sorting controls; **Categories** browses by genre. If you have more than one movie or TV library, choose which one each section shows.
- **Library** gives you an A–Z poster grid with genre, watched-status and sorting controls. If you have more than one movie or TV library, choose which one each section shows.
- **Search** finds movies, shows, episodes and people across your libraries. Type with the remote or search by voice.
- **Title pages** include ratings, a synopsis, trailers and extras, and cast portraits with character names. Select an actor to see their available movies and shows. Series pages put seasons first. Season and episode pages show the episode you move to in the season row; select it, or Play, to watch.
- **Quick actions**: hold OK (or press Menu) on any title to play, start over, mark it watched, remove it from Continue Watching, or jump to its season or show.
@ -37,35 +37,27 @@ A manual server URL and token connection is also available. For future updates,
## Screenshots
Captured from Kaleido **0.6.0** running on Android TV with a live Plex library. Select a screenshot to view it at full resolution.
Captured from Kaleido **0.1.8** running on Android TV with a live Plex library. Select a screenshot to view it at full resolution.
**Home** — a cinematic feature with playback actions and integrated Continue Watching.
[![Kaleido Home with a cinematic featured title, playback actions and Continue Watching](docs/screenshots/home.webp)](docs/screenshots/home.webp)
Moving into the rows compacts the feature into a preview of the focused card, with its artwork, ratings, cast and formats.
[![Home rows with a compact preview of the focused Continue Watching card](docs/screenshots/home-rows.webp)](docs/screenshots/home-rows.webp)
[![Kaleido Home with cinematic featured artwork and a Continue Watching row](docs/screenshots/home.webp)](docs/screenshots/home.webp)
| Movie discovery | TV discovery |
| --- | --- |
| [![Movies with a preview of the focused poster, format badges and recently released titles](docs/screenshots/movies.webp)](docs/screenshots/movies.webp) | [![TV shows with a next-episode preview and wide episode thumbnails](docs/screenshots/tv.webp)](docs/screenshots/tv.webp) |
| [![Movies with focused backdrop artwork, audience ratings, and recently released posters](docs/screenshots/movies.webp)](docs/screenshots/movies.webp) | [![TV shows with next-episode thumbnails and newly added seasons](docs/screenshots/tv.webp)](docs/screenshots/tv.webp) |
| Movie information and cast | TV show information and seasons |
| --- | --- |
| [![Movie information with title art, ratings, format badges, actions and cast](docs/screenshots/details.webp)](docs/screenshots/details.webp) | [![TV show information with Watch next, Shuffle episodes and seven seasons](docs/screenshots/show.webp)](docs/screenshots/show.webp) |
| Season episodes | Cast and related shows |
| --- | --- |
| [![Season page previewing the focused episode above the episode row](docs/screenshots/season.webp)](docs/screenshots/season.webp) | [![Show information with actor portraits and related series from Plex](docs/screenshots/related.webp)](docs/screenshots/related.webp) |
| A–Z library | Categories |
| --- | --- |
| [![Movie library with a six-column poster grid, genre filters, sorting and alphabet jumps](docs/screenshots/library.webp)](docs/screenshots/library.webp) | [![TV categories shown as artwork tiles for each genre](docs/screenshots/categories.webp)](docs/screenshots/categories.webp) |
| [![Movie information with synopsis, ratings, watched controls and actor portraits](docs/screenshots/details.webp)](docs/screenshots/details.webp) | [![TV show information with a fitted poster, readable synopsis and Seasons first](docs/screenshots/show.webp)](docs/screenshots/show.webp) |
| Actor filmography | Settings |
| --- | --- |
| [![Actor page showing available movies across Plex libraries](docs/screenshots/actors.webp)](docs/screenshots/actors.webp) | [![Interface settings with navigation sounds, theme music and the artwork colour wash](docs/screenshots/settings.webp)](docs/screenshots/settings.webp) |
| [![Actor page showing available movies and television series across Plex libraries](docs/screenshots/actors.webp)](docs/screenshots/actors.webp) | [![Settings category rail with playback quality and watched preferences](docs/screenshots/settings.webp)](docs/screenshots/settings.webp) |
| A–Z library | Cast and related shows |
| --- | --- |
| [![Movie library with a six-column poster grid, genre filters, and sorting](docs/screenshots/library.webp)](docs/screenshots/library.webp) | [![Show information with actor portraits and related series from Plex](docs/screenshots/related.webp)](docs/screenshots/related.webp) |
## Build from source

View file

@ -30,14 +30,6 @@ class BrowsePolicyTest {
assertEquals(listOf("unknown1","unknown2","s1"),result.take(3).map{it.id})
assertTrue(groupRecentSeasons(emptyList()){error("Empty row")}.isEmpty())
}
@Test fun recentSeasonsSurviveOneUnavailableShow()=runBlocking {
val newest=title("s4","season").copy(parentId="gone",parentTitle="Missing",title="Season 4")
val older=title("s3","season").copy(parentId="gone",parentTitle="Missing",title="Season 3")
val other=title("s9","season").copy(parentId="show-c",parentTitle="Other",title="Season 9")
val result=groupRecentSeasons(listOf(newest,older,other)){throw PlexException("This item is no longer available.",404)}
assertEquals(listOf("s4","s9"),result.map{it.id})
assertEquals("Missing · Season 4",result.first().title)
}
@Test fun partiallyWatchedShowUsesEpisodeCountsEvenWithViewCount() {
val show=Title.parse(JSONObject("""{"type":"show","viewCount":12,"leafCount":30,"viewedLeafCount":10}"""))

View file

@ -1,56 +0,0 @@
package tv.kaleido.app
import android.content.Intent
import android.media.session.MediaSessionManager
import android.media.session.PlaybackState
import android.os.SystemClock
import androidx.lifecycle.ViewModelProvider
import androidx.test.platform.app.InstrumentationRegistry
import kotlinx.coroutines.runBlocking
import org.junit.Assert.*
import org.junit.Assume.assumeTrue
import org.junit.Test
/** Opt-in real episode endings and Compose autoplay; validation mode never writes Plex progress. */
class PlaybackChangesIntegrationTest {
@Test fun shuffleContinuesAfterTwoNaturalEndingsWithNormalAutoplayOff()=runBlocking {
assumeTrue(InstrumentationRegistry.getArguments().getString("playbackChanges")=="true")
val instrumentation=InstrumentationRegistry.getInstrumentation()
val app=instrumentation.targetContext.applicationContext as KaleidoApplication
val show=app.api.details("6115")
val episodes=app.api.allEpisodes(show.id)
assertTrue(episodes.map{it.parentId}.distinct().size>1)
val activity=instrumentation.startActivitySync(Intent(app,MainActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) as MainActivity
lateinit var vm:KaleidoViewModel
instrumentation.runOnMainSync{vm=ViewModelProvider(activity)[KaleidoViewModel::class.java]}
val oldCountdown=vm.autoplaySeconds
instrumentation.uiAutomation.adoptShellPermissionIdentity("android.permission.MEDIA_CONTENT_CONTROL")
try {
instrumentation.runOnMainSync{vm.chooseAutoplaySeconds(0);vm.playShuffled(show,validation=true)}
await{vm.playing!=null&&vm.shuffling}
val played=mutableSetOf<String>()
val manager=app.getSystemService(MediaSessionManager::class.java)
repeat(2) {
val current=vm.playing!!
assertTrue(episodes.any{it.id==current.id})
assertTrue("No repeat before exhausting the show",played.add(current.id))
assertTrue(vm.startFromZero)
await{manager.getActiveSessions(null).any{it.packageName==app.packageName&&it.playbackState?.state==PlaybackState.STATE_PLAYING}}
val controller=manager.getActiveSessions(null).first{it.packageName==app.packageName&&it.playbackState?.state==PlaybackState.STATE_PLAYING}
val duration=controller.metadata!!.getLong(android.media.MediaMetadata.METADATA_KEY_DURATION)
assertTrue(duration>5000)
controller.transportControls.seekTo(duration-4000)
await{vm.playing?.id!=current.id}
assertTrue(vm.shuffling)
}
assertFalse(played.contains(vm.playing!!.id))
} finally {
instrumentation.runOnMainSync{vm.chooseAutoplaySeconds(oldCountdown);vm.stopPlayback()}
instrumentation.uiAutomation.dropShellPermissionIdentity()
}
}
private fun await(check:()->Boolean) {
val deadline=SystemClock.elapsedRealtime()+60000
while(!check()){assertTrue("Playback transition timed out",SystemClock.elapsedRealtime()<deadline);SystemClock.sleep(200)}
}
}

View file

@ -14,6 +14,3 @@ HPLtv/kaleido/app/TitleActionsNode;->**(**)**
HPLtv/kaleido/app/TitleActionsElement;->**(**)**
HPLtv/kaleido/app/Title;->**(**)**
HPLtv/kaleido/app/Media;->**(**)**
HPLtv/kaleido/app/FramePrefetch;->**(**)**
HPLtv/kaleido/app/FramePrefetchKt;->**(**)**
HPLtv/kaleido/app/CacheWindows;->**(**)**

View file

@ -4,18 +4,10 @@ import android.graphics.Bitmap
import android.graphics.Canvas
import android.graphics.LinearGradient
import android.graphics.Paint
import android.graphics.PorterDuff
import android.graphics.PorterDuffXfermode
import android.graphics.Rect
import android.graphics.RectF
import android.graphics.Shader
import android.graphics.drawable.BitmapDrawable
import android.content.Context
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.FastOutSlowInEasing
import androidx.compose.foundation.layout.Box
import androidx.compose.ui.graphics.CompositingStrategy
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.fillMaxSize
@ -33,16 +25,10 @@ import coil.request.ImageRequest
import coil.size.Size
import coil.transform.Transformation
/**
* Bake contrast into the cached bitmap on Coil's worker thread, not two screen-sized GPU passes per frame.
* [header] artwork is scaled whole into the top-right of a screen-sized frame and fades into the page
* toward its left and bottom edges, so the frame still crossfades like any other backdrop. With [wash],
* the page beneath carries the artwork's own colour, as Silo does, at no per-frame cost.
*/
private class BrowseContrast(val cinematic:Boolean,val header:Boolean,val wash:Boolean):Transformation {
override val cacheKey="kaleido-browse-contrast-v2-$cinematic"+if(header)"-header-corner4-$wash"else ""
/** Bake contrast into the cached bitmap on Coil's worker thread, not two screen-sized GPU passes per frame. */
private class BrowseContrast(val cinematic:Boolean):Transformation {
override val cacheKey="kaleido-browse-contrast-v2-$cinematic"
override suspend fun transform(input:Bitmap,size:Size):Bitmap {
if(header)return headerFrame(input)
val output=input.copy(Bitmap.Config.ARGB_8888,true)
val canvas=Canvas(output)
val paint=Paint(Paint.ANTI_ALIAS_FLAG)
@ -52,96 +38,26 @@ private class BrowseContrast(val cinematic:Boolean,val header:Boolean,val wash:B
canvas.drawRect(0f,0f,output.width.toFloat(),output.height.toFloat(),paint)
return output
}
private fun headerFrame(input:Bitmap):Bitmap {
val output=Bitmap.createBitmap(960,540,Bitmap.Config.ARGB_8888)
val canvas=Canvas(output)
val width=output.width.toFloat();val height=output.height.toFloat()
canvas.drawColor(0xFF090909.toInt())
if(wash) {
// Richest behind the art (top-right), carried dimmer toward the rows (bottom-left).
val tint=ambientTint(input) and 0xFFFFFF
val paint=Paint()
paint.shader=LinearGradient(width,0f,0f,height,intArrayOf(0xFF shl 24 or tint,0x80 shl 24 or tint,0x2E shl 24 or tint),floatArrayOf(0f,.45f,1f),Shader.TileMode.CLAMP)
canvas.drawRect(0f,0f,width,height,paint)
}
// Whole pixels: a fractional edge left a faint seam beside the fade.
val art=RectF((width*(1f-HeaderArtWidth)).toInt().toFloat(),0f,width,(height*HeaderArtHeight).toInt().toFloat())
// The art gets its own layer, so its fading edges reveal the page (or wash) beneath.
val layer=canvas.saveLayer(art,null)
// Centre-crop only the small difference between the image's and the box's proportions.
val scale=maxOf(art.width()/input.width,art.height()/input.height)
val cropWidth=art.width()/scale;val cropHeight=art.height()/scale
val left=((input.width-cropWidth)/2f).toInt();val top=((input.height-cropHeight)/2f).toInt()
canvas.drawBitmap(input,Rect(left,top,left+cropWidth.toInt(),top+cropHeight.toInt()),art,Paint(Paint.FILTER_BITMAP_FLAG))
val mask=Paint().apply{xfermode=PorterDuffXfermode(PorterDuff.Mode.DST_IN)}
mask.shader=LinearGradient(art.left,0f,art.right,0f,intArrayOf(0,0x4D000000,0xFF000000.toInt()),floatArrayOf(0f,.2f,.5f),Shader.TileMode.CLAMP)
canvas.drawRect(art,mask)
mask.shader=LinearGradient(0f,art.top,0f,art.bottom,intArrayOf(0xFF000000.toInt(),0xFF000000.toInt(),0x4D000000,0),floatArrayOf(0f,.45f,.8f,1f),Shader.TileMode.CLAMP)
canvas.drawRect(art,mask)
canvas.restoreToCount(layer)
return output
}
}
/**
* The artwork's average colour at a fixed, low luminance (as Silo and tvOS do): bright art is dimmed
* and dark art lifted, giving a subtle, consistent tint over the near-black page.
*/
private fun ambientTint(input:Bitmap):Int {
val sample=Bitmap.createScaledBitmap(input,32,18,true)
val pixels=IntArray(sample.width*sample.height).also{sample.getPixels(it,0,sample.width,0,0,sample.width,sample.height)}
if(sample!==input)sample.recycle()
var r=0.0;var g=0.0;var b=0.0
for(pixel in pixels){r+=(pixel shr 16 and 0xFF);g+=(pixel shr 8 and 0xFF);b+=(pixel and 0xFF)}
r/=pixels.size*255.0;g/=pixels.size*255.0;b/=pixels.size*255.0
val luminance=.2126*r+.7152*g+.0722*b
val scale=when{luminance<=.001->0.0;luminance>.22->.22/luminance;else->maxOf(1.0,.22/maxOf(luminance,.05))}
fun channel(value:Double)=(value*scale*255).toInt().coerceIn(0,255)
return android.graphics.Color.rgb(channel(r),channel(g),channel(b))
}
/** The preview artwork box (Home, Movies, TV), as fractions of the screen; close to 16:9, so stills and art show whole. */
private const val HeaderArtWidth=.72f
private const val HeaderArtHeight=.78f
/** Old and new artwork overlap briefly instead of the new one popping in. */
internal const val ArtworkFadeMillis=320
internal fun browseBackdropRequest(context:Context,api:PlexApi,path:String,cinematic:Boolean,header:Boolean=false,wash:Boolean=false):ImageRequest? =
internal fun browseBackdropRequest(context:Context,api:PlexApi,path:String,cinematic:Boolean):ImageRequest? =
api.image(path,if(cinematic)1280 else 960,if(cinematic)720 else 540)?.let{url->
ImageRequest.Builder(context).data(url).apply{api.headers().forEach{(k,v)->addHeader(k,v)}}
.size(if(cinematic)1280 else 960,if(cinematic)720 else 540).allowHardware(false)
.transformations(BrowseContrast(cinematic,header&&!cinematic,wash)).crossfade(false).build()
.transformations(BrowseContrast(cinematic)).crossfade(false).build()
}
/** The new artwork fades in over the old one; only its layer alpha changes per frame. */
@Composable private fun FadingArtwork(bitmap:Bitmap?,modifier:Modifier,contentScale:ContentScale,alignment:Alignment) {
val progress=remember{Animatable(1f)}
var shown by remember{mutableStateOf<Bitmap?>(null)}
var under by remember{mutableStateOf<Bitmap?>(null)}
LaunchedEffect(bitmap) {
if(bitmap==null||bitmap===shown)return@LaunchedEffect
under=shown;shown=bitmap
progress.snapTo(0f);progress.animateTo(1f,tween(ArtworkFadeMillis,easing=FastOutSlowInEasing))
under=null
}
Box(modifier) {
under?.let{Image(remember(it){it.asImageBitmap()},null,contentScale=contentScale,alignment=alignment,modifier=Modifier.fillMaxSize())}
shown?.let{Image(remember(it){it.asImageBitmap()},null,contentScale=contentScale,alignment=alignment,modifier=Modifier.fillMaxSize().graphicsLayer{
compositingStrategy=CompositingStrategy.ModulateAlpha;alpha=progress.value
})}
}
}
@Composable internal fun BrowseBackdrop(api:PlexApi,path:String,modifier:Modifier,cinematic:Boolean=false,header:Boolean=false,wash:Boolean=false,animate:Boolean=false,alignment:Alignment=Alignment.Center,contentScale:ContentScale=ContentScale.Crop) {
@Composable internal fun BrowseBackdrop(api:PlexApi,path:String,modifier:Modifier,cinematic:Boolean=false,animate:Boolean=false,alignment:Alignment=Alignment.Center,contentScale:ContentScale=ContentScale.Crop) {
val context=LocalContext.current
var previous by remember{mutableStateOf<MemoryCache.Key?>(null)}
val request=remember(path,api.session?.server,cinematic,header,wash,animate){browseBackdropRequest(context,api,path,cinematic,header,wash)?.newBuilder()?.placeholderMemoryCacheKey(previous)?.build()}
val request=remember(path,api.session?.server,cinematic,animate){browseBackdropRequest(context,api,path,cinematic)?.newBuilder()?.placeholderMemoryCacheKey(previous)?.build()}
if(animate) {
// Animate cache hits too; Coil intentionally skips its own crossfade for memory-cache results.
val bitmap by produceState<Bitmap?>(null,request){
if(request!=null){val result=context.imageLoader.execute(request);if(result is SuccessResult){previous=result.memoryCacheKey;value=(result.drawable as? BitmapDrawable)?.bitmap}}
}
FadingArtwork(bitmap,modifier,contentScale,alignment)
Crossfade(bitmap,modifier=modifier,animationSpec=tween(220),label="heroArtwork"){loaded->
loaded?.let{Image(it.asImageBitmap(),null,contentScale=contentScale,alignment=alignment,modifier=Modifier.fillMaxSize())}
}
}else AsyncImage(request,contentDescription=null,modifier=modifier,contentScale=contentScale,alignment=alignment,onSuccess={previous=it.result.memoryCacheKey})
}

View file

@ -78,10 +78,10 @@ import androidx.compose.ui.text.input.TextFieldValue
if(navigation!=null&&it.type==KeyEventType.KeyDown&&it.key==Key.DirectionDown){
pendingTab[0]?.cancel()
val target=focusedTab[0]
if(vm.page.kind!=target){navigation.pendingEntry=target;vm.tab(target);vm.focusId=if(target=="home")"home-feature"else "discovery-entry"}else navigation.of(target).enter?.invoke()
if(vm.page.kind!=target){navigation.pendingEntry=target;vm.tab(target);vm.focusId=if(target=="home")"home-feature"else "discovery-entry"}else navigation.enter?.invoke()
true
}else false
}.focusProperties{if(navigation!=null)down=navigation.of(vm.page.kind).entry},horizontalArrangement=Arrangement.spacedBy(16.dp),verticalAlignment=Alignment.CenterVertically) {
}.focusProperties{if(navigation!=null)down=navigation.entry},horizontalArrangement=Arrangement.spacedBy(16.dp),verticalAlignment=Alignment.CenterVertically) {
listOf("home" to "Home","movies" to "Movies","tv" to "TV Shows").forEach{(kind,label)->
NavigationLabel(label,vm.page.kind==kind,modifier=if(navigation!=null&&vm.page.kind==kind)Modifier.focusRequester(navigation.top)else Modifier,initialFocus=vm.page.kind==kind&&initialFocus,onFocused={
focusedTab[0]=kind
@ -111,29 +111,14 @@ import androidx.compose.ui.text.input.TextFieldValue
// A reopened episode page resets its selection, but its saved scroll can still
// point elsewhere. Compose the entry card before the header sends focus Down.
LaunchedEffect(rowId){if(initialItem!=null)row.scrollToItem((initial-1).coerceAtLeast(0))}
val entryIndex=if(entryFocus!=null)rememberRowEntry(row,entry).value else -1
Column {
Box(Modifier.padding(horizontal=Cinema.gutter)){SectionHeading(title,subtitle)}
LazyRow(state=row,contentPadding=PaddingValues(start=Cinema.gutter,end=Cinema.gutter,top=5.dp,bottom=5.dp),horizontalArrangement=Arrangement.spacedBy(if(landscape)13.dp else 12.dp),modifier=Modifier.focusRestorer(fallback=entryFocus ?: FocusRequester.Default)) {
itemsIndexed(items,key={_,it->it.id}){index,item->MediaTile(vm,item,"$rowId:${item.id}",landscape,modifier=(if(index==entryIndex&&entryFocus!=null)Modifier.focusRequester(entryFocus)else Modifier).then(if(up!=null)Modifier.focusProperties{this.up=up}else Modifier),onMove={anticipateTileMove(vm,items,index,it,0)},episodeTitle=episodeTitles,current=item.id==selectedItem,onFocused=onFocused,onClick=onClick)}
itemsIndexed(items,key={_,it->it.id}){index,item->MediaTile(vm,item,"$rowId:${item.id}",landscape,modifier=(if(index==entry&&entryFocus!=null)Modifier.focusRequester(entryFocus)else Modifier).then(if(up!=null)Modifier.focusProperties{this.up=up}else Modifier),onMove={anticipateTileMove(vm,items,index,it,0)},episodeTitle=episodeTitles,current=item.id==selectedItem,onFocused=onFocused,onClick=onClick)}
}
}
}
/**
* The card a row is entered at from above: [preferred] while it is in view, otherwise the first
* card fully in view. A card scrolled out of a lazy row (e.g. a restored or scrolled Seasons row)
* is not composed, so an explicit focus move to its requester fails and strands focus above.
*/
internal fun rowEntryIndex(preferred:Int,visible:List<LazyListItemInfo>,viewportStart:Int):Int {
if(visible.isEmpty()||visible.any{it.index==preferred})return preferred
return (visible.firstOrNull{it.offset>=viewportStart} ?: visible.first()).index
}
/** [rowEntryIndex], updated only when a card enters or leaves the row's view. */
@Composable internal fun rememberRowEntry(row:LazyListState,preferred:Int):State<Int> =
remember(row,preferred){derivedStateOf{row.layoutInfo.let{rowEntryIndex(preferred,it.visibleItemsInfo,it.viewportStartOffset)}}}
internal fun anticipateTileMove(vm:KaleidoViewModel,items:List<Title>,index:Int,direction:Key,columns:Int) {
val target=when(direction){
Key.DirectionLeft->if(columns==0||index%columns>0)index-1 else -1
@ -168,11 +153,11 @@ internal fun anticipateTileMove(vm:KaleidoViewModel,items:List<Title>,index:Int,
}
@Composable fun LibraryScreen(vm:KaleidoViewModel,navigation:DiscoveryNavigation) {
// Discover is a retained DiscoveryScreen (see KaleidoApp); this is only the A–Z library.
if(!vm.allTitles)return
if(!vm.allTitles){DiscoveryScreen(vm,home=false,navigation=navigation);return}
val name=if(vm.page.kind=="movies")"Movies"else "TV Shows"
LaunchedEffect(vm.categories,vm.section?.id,vm.genres){vm.loadCategoryArtworks()}
var sortMenu by remember{mutableStateOf(false)}
var genreMenu by remember{mutableStateOf(false)}
var sectionMenu by remember{mutableStateOf(false)}
val discoverFocus=remember{FocusRequester()};val libraryFocus=remember{FocusRequester()};val categoriesFocus=remember{FocusRequester()}
val filterFocus=remember{FocusRequester()};val categoryEntryFocus=remember{FocusRequester()};val railFocus=remember{FocusRequester()};val sectionFocus=remember{FocusRequester()}
@ -221,7 +206,8 @@ internal fun anticipateTileMove(vm:KaleidoViewModel,items:List<Title>,index:Int,
Row(Modifier.fillMaxWidth().height(43.dp).padding(horizontal=Cinema.gutter),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(8.dp)) {
Text("${vm.total} titles",color=Muted,fontSize=11.sp,lineHeight=16.sp)
Spacer(Modifier.weight(1f))
TvButton(if(vm.unwatched)"Unwatched ✓"else "Unwatched",Modifier.focusRequester(filterFocus).focusProperties{left=categoriesFocus},selected=vm.unwatched){vm.filter(unwatchedValue=!vm.unwatched)}
TvButton((if(vm.genre.isBlank())"All genres"else vm.genres.firstOrNull{it.first==vm.genre}?.second ?: "Genre")+" ⌄",Modifier.focusRequester(filterFocus).focusProperties{left=categoriesFocus}){genreMenu=true}
TvButton(if(vm.unwatched)"Unwatched ✓"else "Unwatched",selected=vm.unwatched){vm.filter(unwatchedValue=!vm.unwatched)}
TvButton((sortLabels.firstOrNull{it.first==vm.sort}?.second ?: "Title: A–Z")+" ⌄",Modifier.focusProperties{right=FocusRequester.Cancel}){sortMenu=true}
}
val grid=rememberLazyGridState()
@ -262,7 +248,7 @@ internal fun anticipateTileMove(vm:KaleidoViewModel,items:List<Title>,index:Int,
val lastColumn=index%6==5||index==vm.library.lastIndex
MediaTile(vm,item,"library:${item.id}",fillWidth=true,modifier=Modifier.focusRequester(requester).then(if(lastColumn)Modifier.focusProperties{right=railFocus}else Modifier),onMove={anticipateTileMove(vm,vm.library,index,it,6)},onFocused={vm.onLibraryGridFocused()})
}
if(vm.library.isEmpty()&&!vm.busy)item(span={GridItemSpan(6)}){EmptyState("No matching titles","Try another category or watch filter.")}
if(vm.library.isEmpty()&&!vm.busy)item(span={GridItemSpan(6)}){EmptyState("No matching titles","Try another genre or watch filter.")}
if(vm.library.size<vm.total)item(span={GridItemSpan(6)}){TvButton(if(vm.busy)"Loading…"else "Load more titles"){vm.more()}}
}
LibraryJumpRail(enabledLetters,vm.libraryJumpLetter,railFocus,{scope.launch{runCatching{ returnFocusToGrid() }}},{vm.jumpToLibraryLetter(it)})
@ -270,6 +256,7 @@ internal fun anticipateTileMove(vm:KaleidoViewModel,items:List<Title>,index:Int,
}
}
if(sortMenu)ChoiceDialog("Sort by",sortLabels.map{it.second},sortLabels.indexOfFirst{it.first==vm.sort},{sortMenu=false}){vm.filter(sortValue=sortLabels[it].first);sortMenu=false}
if(genreMenu)ChoiceDialog("Genres",listOf("All genres")+vm.genres.map{it.second},vm.genres.indexOfFirst{it.first==vm.genre}+1,{genreMenu=false}){vm.filter(genreValue=if(it==0)""else vm.genres[it-1].first);genreMenu=false}
if(sectionMenu){val options=vm.sections.filter{it.type==vm.section?.type};ChoiceDialog("Libraries",options.map{it.title},options.indexOf(vm.section),{sectionMenu=false}){vm.chooseSection(options[it]);sectionMenu=false}}
}

View file

@ -1,58 +0,0 @@
package tv.kaleido.app;
import androidx.annotation.NonNull;
import androidx.annotation.OptIn;
import androidx.compose.foundation.ExperimentalFoundationApi;
import androidx.compose.foundation.lazy.LazyListCacheWindowScope;
import androidx.compose.foundation.lazy.LazyListLayoutInfo;
import androidx.compose.foundation.lazy.LazyListPrefetchScope;
import androidx.compose.foundation.lazy.LazyListPrefetchStrategy;
import androidx.compose.foundation.lazy.layout.CacheWindowLogic;
import androidx.compose.foundation.lazy.layout.LazyLayoutCacheWindow;
import androidx.compose.foundation.lazy.layout.NestedPrefetchScope;
import androidx.compose.foundation.lazy.layout.PrefetchScheduler;
/**
* Compose's cache-window strategy for lazy lists (LazyListCacheWindowStrategy, Compose 1.10),
* prefetching on {@link FramePrefetch} instead of Compose's scheduler. It must itself be a
* CacheWindowLogic: the list's measure policy only keeps items in the window composed after they
* scroll out when its strategy is one, so a delegating wrapper disposed every row leaving view.
* These classes are Kotlin-internal but public in bytecode; a Compose update that changes them
* fails this build instead of changing behaviour silently.
*/
@OptIn(markerClass = ExperimentalFoundationApi.class)
@SuppressWarnings("deprecation") // Compose marks parts of the prefetch API deprecated for Java callers.
final class CacheWindows extends CacheWindowLogic implements LazyListPrefetchStrategy {
private final LazyListCacheWindowScope scope = new LazyListCacheWindowScope();
CacheWindows(LazyLayoutCacheWindow window) {
super(window, true);
}
@NonNull
@Override
public PrefetchScheduler getPrefetchScheduler() {
return FramePrefetch.INSTANCE;
}
@Override
public void onScroll(@NonNull LazyListPrefetchScope prefetch, float delta, @NonNull LazyListLayoutInfo layoutInfo) {
scope.setLayoutInfo(layoutInfo);
scope.setPrefetchScope(prefetch);
onScroll(scope, delta);
}
@Override
public void onVisibleItemsUpdated(@NonNull LazyListPrefetchScope prefetch, @NonNull LazyListLayoutInfo layoutInfo) {
scope.setLayoutInfo(layoutInfo);
scope.setPrefetchScope(prefetch);
onVisibleItemsUpdated(scope);
}
@Override
public void onNestedPrefetch(@NonNull NestedPrefetchScope nested, int firstVisibleItemIndex) {
// Every card the row showed when last measured (Compose: precompose two); see premeasure.
int count = nested.getNestedPrefetchItemCount() == -1 ? 2 : nested.getNestedPrefetchItemCount();
for (int i = 0; i < count; i++) FramePrefetchKt.premeasure(nested, firstVisibleItemIndex + i);
}
}

View file

@ -9,7 +9,13 @@ import androidx.media3.exoplayer.audio.ForwardingAudioSink
/** Android rejects a center-only PCM mask; one-channel audio uses its standard mono output. */
@androidx.annotation.OptIn(UnstableApi::class)
internal class CompatibleAudioSink(sink:AudioSink):ForwardingAudioSink(sink) {
internal class CompatibleAudioSink(sink:AudioSink,private val decodedOnly:Boolean=false):ForwardingAudioSink(sink) {
override fun supportsFormat(format:Format):Boolean =
if(decodedOnly&&format.sampleMimeType!=MimeTypes.AUDIO_RAW)false else super.supportsFormat(format)
override fun getFormatSupport(format:Format):Int =
if(decodedOnly&&format.sampleMimeType!=MimeTypes.AUDIO_RAW)AudioSink.SINK_FORMAT_UNSUPPORTED else super.getFormatSupport(format)
override fun getFormatOffloadSupport(format:Format):androidx.media3.exoplayer.audio.AudioOffloadSupport =
if(decodedOnly)androidx.media3.exoplayer.audio.AudioOffloadSupport.DEFAULT_UNSUPPORTED else super.getFormatOffloadSupport(format)
@Suppress("DEPRECATION")
override fun configure(config:AudioSink.AudioSinkConfig) {
val format=compatiblePcmFormat(config.format)

View file

@ -40,16 +40,11 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
class DiscoveryNavigation {
val entry=FocusRequester()
val section=FocusRequester()
val top=FocusRequester()
var scrolled by mutableStateOf(false)
var pendingEntry by mutableStateOf<String?>(null)
private val destinations=mutableMapOf<String,DestinationNavigation>()
/** Home, Movies and TV stay composed while hidden, so each needs its own targets: a hidden one must never take focus. */
fun of(destination:String)=destinations.getOrPut(destination){DestinationNavigation()}
}
class DestinationNavigation {
val entry=FocusRequester()
val section=FocusRequester()
var enter:(()->Unit)?=null
}
/** Preserve server-supplied recommendations, but give each destination an editorial purpose. */

View file

@ -4,22 +4,15 @@ package tv.kaleido.app
import androidx.compose.foundation.*
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.*
import androidx.compose.foundation.lazy.layout.LazyLayoutCacheWindow
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.gestures.BringIntoViewSpec
import androidx.compose.foundation.gestures.LocalBringIntoViewSpec
import androidx.compose.foundation.gestures.animateScrollBy
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.FastOutSlowInEasing
import androidx.compose.animation.core.tween
import androidx.compose.animation.core.Animatable
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.graphics.CompositingStrategy
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.unit.DpSize
import coil.imageLoader
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.withTimeoutOrNull
import androidx.compose.material3.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.PlayArrow
@ -36,11 +29,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.key.*
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.semantics.*
import androidx.compose.ui.node.invalidateSemantics
import androidx.compose.ui.node.observeReads
import androidx.compose.ui.node.ObserverModifierNode
import androidx.compose.ui.node.SemanticsModifierNode
import androidx.compose.ui.node.ModifierNodeElement
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
@ -57,10 +45,7 @@ import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Shadow
import androidx.compose.material.icons.outlined.GridView
/** Movies, TV and Home's second row show posters; the rest landscape cards (wider TV episodes). */
private fun posterRow(hub:Hub,row:Int,destination:String)=hub.items.firstOrNull()?.type in listOf("movie","show","season")&&!hub.title.contains("Continue",true)&&(destination=="movies"||destination=="tv"||row==1)
/** A card's width plus the rail's spacing. */
private fun railPitch(poster:Boolean,tv:Boolean)=if(poster)130.dp else if(tv)274.dp else 224.dp
@Composable fun HomeScreen(vm:KaleidoViewModel,navigation:DiscoveryNavigation)=DiscoveryScreen(vm,true,navigation)
/** Column id of a row's trailing "View all" card. */
internal const val VIEW_ALL="view-all"
@ -77,46 +62,38 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
if(visible!=null)animateScrollBy(visible.offset.toFloat(),tween(220))else animateScrollToItem(index)
}
/**
* The preview never scrolls. Only the bounded catalog below it moves.
*
* Home, Movies and TV stay composed once shown: while [active] is false the screen is neither placed
* nor drawn (see KaleidoApp), and must not take focus. Switching tabs or returning from details then
* shows it again instead of disposing and composing whole sections (a 50–80 ms frame on the onn).
*/
@Composable fun DiscoveryScreen(vm:KaleidoViewModel,destination:String,navigation:DiscoveryNavigation,active:()->Boolean) {
val home=destination=="home"
val local=remember(destination){navigation.of(destination)}
val source=vm.discoveryHubs(destination)
/** The preview never scrolls. Only the bounded catalog below it moves. */
@Composable fun DiscoveryScreen(vm:KaleidoViewModel,home:Boolean,navigation:DiscoveryNavigation) {
val destination=if(home)"home"else vm.page.kind
val source=if(home)vm.homeHubs else vm.discoverHubs
val hubs=remember(source,destination){editorialHubs(source,destination)}
var previousHubs by remember(destination){mutableStateOf(hubs)}
val restore=remember(hubs){
val focused=Snapshot.withoutReadObservation{vm.focusId}
hubs.withIndex().firstNotNullOfOrNull{(row,h)->val column=if(focused=="${h.id}:$VIEW_ALL")h.items.size else h.items.indexOfFirst{"${h.id}:${it.id}"==focused};if(column>=0)Triple(h.id,row,column)else null}
}
val initialRow=restore?.second ?: 0
// Keep the hero/preview and two rows either side prepared across vertical moves (about two
// viewports). Prefetch only uses spare or idle frame time (FramePrefetch), so a wider window
// costs no frames; a one-viewport window composed rows mid-scroll when moving back up.
val list=rememberLazyListState(initialFirstVisibleItemIndex=initialRow,prefetchStrategy=remember{budgetedCacheWindow(ahead=2f,behind=2f)})
// The window only fills after the list has scrolled, and a change of rows resets it, so the
// next move composed rows mid-animation (a ~200 ms stall on the onn). Once the screen settles,
// nudge it so those rows compose in idle frames, then undo it.
LaunchedEffect(list,hubs){
if(hubs.isEmpty())return@LaunchedEffect
snapshotFlow{active()}.first{it}
val initialRow=restore?.let{it.second+if(home)1 else 0} ?: 0
// Keep the hero/preview and adjacent rows prepared across vertical moves.
// Without a behind window, every return discards and recomposes those cards.
val list=rememberLazyListState(initialFirstVisibleItemIndex=initialRow,
cacheWindow=remember{LazyLayoutCacheWindow(aheadFraction=1f,behindFraction=1f)})
// The window only fills ahead after the list has scrolled, so the first move down after
// a section appeared composed the next rows mid-animation (a ~200 ms stall on the onn).
// Once the screen settles, nudge it so those rows compose in idle frames, then undo it.
LaunchedEffect(list,hubs.isNotEmpty()){
if(hubs.isEmpty()||list.firstVisibleItemIndex!=0||list.firstVisibleItemScrollOffset!=0)return@LaunchedEffect
awaitSteadyFrames(4)
if(list.isScrollInProgress)return@LaunchedEffect
val moved=list.scrollBy(1f)
val at=list.firstVisibleItemIndex to list.firstVisibleItemScrollOffset
if(list.isScrollInProgress||list.firstVisibleItemScrollOffset!=0)return@LaunchedEffect
list.scrollBy(1f)
repeat(45){withFrameNanos{}}
if(moved!=0f&&!list.isScrollInProgress&&(list.firstVisibleItemIndex to list.firstVisibleItemScrollOffset)==at)list.scrollBy(-moved)
if(!list.isScrollInProgress&&list.firstVisibleItemIndex==0&&list.firstVisibleItemScrollOffset==1)list.scrollBy(-1f)
}
// Hub order and membership can change during a live refresh. Keep each rail's scroll
// state and each card's requester by stable Plex IDs so surviving rows/cards retain them.
val rowStateByHub=remember(destination){mutableMapOf<String,LazyListState>()}
val rowStates=remember(hubs){hubs.associate{hub->hub.id to rowStateByHub.getOrPut(hub.id){LazyListState(
firstVisibleItemIndex=if(restore?.first==hub.id)restore.third else 0,prefetchStrategy=budgetedCacheWindow(ahead=1f,behind=.5f))}}}
cacheWindow=LazyLayoutCacheWindow(aheadFraction=1f,behindFraction=.5f),
firstVisibleItemIndex=if(restore?.first==hub.id)restore.third else 0)}}}
val requesters=remember(destination){mutableMapOf<String,FocusRequester>()}
val columns=remember(destination){mutableMapOf<String,String>()}
val pendingColumns=remember(destination){mutableMapOf<String,String>()}
@ -125,39 +102,29 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
val scope=rememberCoroutineScope()
val density=LocalDensity.current
val hovered=remember{mutableStateOf<Title?>(null)}
val sectionEntry by remember{derivedStateOf{vm.focusId=="discovery-entry"&&active()}}
val sectionEntry by remember{derivedStateOf{vm.focusId=="discovery-entry"}}
val features=vm.homeFeatures
var featureIndex by rememberSaveable{mutableIntStateOf(0)}
val nextFeature=features.getOrNull(featureIndex % features.size.coerceAtLeast(1))
var selectedFeature by remember{mutableStateOf(nextFeature)}
val context=LocalContext.current
val heroFade=remember{Animatable(1f)}
LaunchedEffect(nextFeature){
val next=nextFeature?.item
if(home&&next!=null)vm.anticipate(next,cinematic=true)
// Hold the copy briefly until the new artwork is decoded, so both fade together.
if(home&&next!=null&&selectedFeature!=null&&selectedFeature?.item?.id!=next.id)
browseBackdropRequest(context,vm.api,next.art.ifBlank{next.thumb},true)?.let{withTimeoutOrNull(700){context.imageLoader.execute(it)}}
if(home)nextFeature?.item?.let{vm.anticipate(it,cinematic=true)}
if(home&&selectedFeature!=null&&nextFeature!=null&&selectedFeature?.item?.id!=nextFeature.item.id)heroFade.animateTo(0f,tween(100))
selectedFeature=nextFeature
heroFade.animateTo(1f,tween(180))
}
val feature=selectedFeature?.item
val activeFeature=rememberUpdatedState(feature)
// Home only: the large hero while it holds focus; a compact preview of the focused card otherwise.
// Read only inside effects, callbacks and layers: switching modes must not recompose the catalog.
val heroMode=remember{mutableStateOf(restore==null)}
var heroActive by heroMode
val compact=remember{Animatable(if(home&&restore==null)0f else 1f)}
LaunchedEffect(compact,home){snapshotFlow{home&&heroMode.value}.collectLatest{compact.animateTo(if(it)0f else 1f,tween(HeaderMillis,easing=FastOutSlowInEasing))}}
val firstCard=rememberUpdatedState(hubs.firstOrNull()?.items?.firstOrNull())
val preview=restingPreview(hovered,{firstCard.value}){!home||!heroMode.value}
fun anticipateCard(item:Title)=vm.anticipate(item,path=previewArt(item),header=true)
var heroActive by remember{mutableStateOf(restore==null)}
var rotating by remember{mutableStateOf(true)}
LaunchedEffect(home,features,rotating,featureIndex){
snapshotFlow{heroMode.value&&active()}.collectLatest{if(home&&it&&rotating&&features.size>1){delay(12000);featureIndex=(featureIndex+1)%features.size}}
LaunchedEffect(home,features,heroActive,rotating,featureIndex){
if(home&&heroActive&&rotating&&features.size>1){delay(12000);featureIndex=(featureIndex+1)%features.size}
}
val heroFocus=remember{FocusRequester()}
val staging=remember{CardStaging()}
LaunchedEffect(staging){delay(1000);staging.entering=false}
suspend fun focusHero(){repeat(4){withFrameNanos{};if(runCatching{heroFocus.requestFocus()}.getOrDefault(false))return}}
val rowOffset=if(home)1 else 0
suspend fun moveToRow(hubId:String,titleId:String)=coroutineScope {
val row=hubs.indexOfFirst{it.id==hubId}
val hub=hubs.getOrNull(row) ?: return@coroutineScope
@ -165,27 +132,22 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
if(column<0)return@coroutineScope
val state=rowStates[hub.id] ?: return@coroutineScope
val focusKey="$hubId:$titleId"
val visible=list.layoutInfo.visibleItemsInfo.any{it.index==row}&&state.layoutInfo.visibleItemsInfo.any{it.index==column}
val visible=list.layoutInfo.visibleItemsInfo.any{it.index==row+rowOffset}&&state.layoutInfo.visibleItemsInfo.any{it.index==column}
val focused=visible&&runCatching{requesters[focusKey]?.requestFocus()==true}.getOrDefault(false)
val scrolling=launch{list.animateBrowseTo(row)}
val scrolling=launch{list.animateBrowseTo(row+rowOffset)}
if(!state.layoutInfo.visibleItemsInfo.any{it.index==column})state.requestScrollToItem(column)
if(!focused) {
snapshotFlow{list.layoutInfo.visibleItemsInfo.any{it.index==row}&&state.layoutInfo.visibleItemsInfo.any{it.index==column}}.first{it}
// A card that replaced another (a live refresh) may compose a frame or two later; until it
// does, its requester is unattached and the request fails, which left nothing focused.
for(attempt in 0 until 8){withFrameNanos{};if(runCatching{requesters.getOrPut(focusKey){FocusRequester()}.requestFocus()}.getOrDefault(false))break}
snapshotFlow{list.layoutInfo.visibleItemsInfo.any{it.index==row+rowOffset}&&state.layoutInfo.visibleItemsInfo.any{it.index==column}}.first{it}
withFrameNanos{}
runCatching{requesters.getOrPut(focusKey){FocusRequester()}.requestFocus()}
}
scrolling.join()
}
/** The first card of the first row: where Down goes when Home has no hero to hold focus. */
suspend fun enterFirstRow(){hubs.firstOrNull{it.items.isNotEmpty()}?.let{hub->val item=hub.items.first();anticipateCard(item);moveToRow(hub.id,item.id)}}
suspend fun moveToHero()=coroutineScope {
heroActive=true
val scrolling=launch{list.animateBrowseTo(0)}
focusHero();scrolling.join()
snapshotFlow{list.layoutInfo.visibleItemsInfo.any{it.index==0}}.first{it}
withFrameNanos{};runCatching{heroFocus.requestFocus()};scrolling.join()
}
/** Whether focus is inside this screen; a card key in [KaleidoViewModel.focusId] alone doesn't mean it is. */
val screenFocus=remember{booleanArrayOf(false)}
LaunchedEffect(hubs) {
val old=previousHubs
if(old==hubs)return@LaunchedEffect
@ -208,21 +170,6 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
if(pendingColumns[hub.id]?.let{id->hub.items.any{it.id==id}}!=true)hub.items.firstOrNull()?.let{pendingColumns[hub.id]=it.id} ?: pendingColumns.remove(hub.id)
}
previousHubs=hubs
// A hidden screen moves no focus; it finds its card again when shown.
if(!active())return@LaunchedEffect
if(oldHub==null) {
// The card being restored (e.g. after details) was already gone from the previous rows,
// and this refresh cancelled that restoration. Finish it here instead of leaving focus
// on the top bar: the card itself if it is back, else the first card of its row.
val key=focus
val row=hubs.firstOrNull{key.startsWith("${it.id}:")&&it.items.isNotEmpty()}
if(row!=null&&!screenFocus[0]) {
val item=row.items.firstOrNull{"${row.id}:${it.id}"==key} ?: row.items.first()
columns[row.id]=item.id;pendingColumns[row.id]=item.id
navigationJob[0]=scope.launch{withFrameNanos{};moveToRow(row.id,item.id)}
}
return@LaunchedEffect
}
if(oldHub!=null&&oldTitle!=null) {
val sameHub=hubs.firstOrNull{it.id==oldHub.id}
@ -242,10 +189,10 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
hovered.value=null
if(home&&feature!=null) {
vm.focusId="home-feature";heroActive=true
navigationJob[0]=scope.launch{list.scrollToItem(0);focusHero()}
navigationJob[0]=scope.launch{list.scrollToItem(0);withFrameNanos{};runCatching{heroFocus.requestFocus()}}
}else if(!home) {
vm.focusId="discovery-entry"
navigationJob[0]=scope.launch{withFrameNanos{};runCatching{local.section.requestFocus()}}
navigationJob[0]=scope.launch{withFrameNanos{};runCatching{navigation.section.requestFocus()}}
}else {
vm.focusId=""
navigationJob[0]=scope.launch{withFrameNanos{};runCatching{navigation.top.requestFocus()}}
@ -253,29 +200,25 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
}
}
}
LaunchedEffect(home,features.isNotEmpty()){if(home&&active()&&vm.focusId=="home-feature"){heroActive=true;list.scrollToItem(0);focusHero()}}
DisposableEffect(local,list,hubs){
LaunchedEffect(home,features.isNotEmpty()){if(home&&vm.focusId=="home-feature"){list.scrollToItem(0);withFrameNanos{};runCatching{heroFocus.requestFocus()}}}
DisposableEffect(navigation,list,hubs){
navigation.scrolled=false
local.enter={
navigation.enter={
navigationJob[0]?.cancel()
// Discover is fixed above the catalog. Enter it immediately, without resetting
// or waiting for two lazy lists to lay out. The next Down explicitly enters row 0.
if(!home)runCatching{local.section.requestFocus()}
// Continue Watching and other rows can exist without an eligible featured title.
else if(activeFeature.value==null)navigationJob[0]=scope.launch{enterFirstRow()}
if(!home)runCatching{navigation.section.requestFocus()}
else {
if(heroActive)runCatching{heroFocus.requestFocus()}
navigationJob[0]=scope.launch{moveToHero()}
val visible=list.layoutInfo.visibleItemsInfo.any{it.index==0}
if(visible)runCatching{heroFocus.requestFocus()}
navigationJob[0]=scope.launch{if(visible)list.animateBrowseTo(0)else moveToHero()}
activeFeature.value?.let{vm.anticipate(it,cinematic=true)}
}
}
onDispose{local.enter=null}
onDispose{navigation.enter=null}
}
LaunchedEffect(navigation.pendingEntry,destination) {
if(navigation.pendingEntry!=destination)return@LaunchedEffect
// A retained screen is shown by the same change; enter it once it is placed again.
if(!active()){snapshotFlow{active()}.first{it};withFrameNanos{}}
navigation.pendingEntry=null;local.enter?.invoke()
if(navigation.pendingEntry==destination){navigation.pendingEntry=null;navigation.enter?.invoke()}
}
// Back from the catalog first returns to the hero (Home) or Discover; only then leaves.
var catalogFocus by remember{mutableStateOf(false)}
@ -284,96 +227,38 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
navigationJob[0]?.cancel()
if(home&&feature!=null){vm.anticipate(feature,cinematic=true);navigationJob[0]=scope.launch{moveToHero()}}
// Move focus out of the rows before they scroll away, or the removed card clears it.
else navigationJob[0]=scope.launch{runCatching{(if(home)navigation.top else local.section).requestFocus()};withFrameNanos{};list.scrollToItem(0)}
else navigationJob[0]=scope.launch{runCatching{(if(home)navigation.top else navigation.section).requestFocus()};withFrameNanos{};list.scrollToItem(0)}
}
// Focus the hero or card that started playback once the player closes.
val seenReturn=remember{intArrayOf(vm.playbackReturn)}
LaunchedEffect(vm.playbackReturn) {
if(vm.playbackReturn==seenReturn[0])return@LaunchedEffect
seenReturn[0]=vm.playbackReturn
if(!active())return@LaunchedEffect
withFrameNanos{}
val key=vm.focusId
runCatching{if(key=="home-feature")heroFocus.requestFocus()else requesters[key]?.requestFocus()}
}
// Hidden, the screen keeps its state but gives up focus: an unplaced card must not take key
// events. Shown again, it focuses what a freshly composed screen would.
val focusManager=LocalFocusManager.current
suspend fun reveal() {
withFrameNanos{}
val key=vm.focusId
if(key.isBlank()||key.startsWith("tab:")||key=="discovery-entry") {
// Entered from the top bar or Library: the screen opens at its start, as when first shown.
hovered.value=null;if(home)heroActive=true
if(list.firstVisibleItemIndex!=0||list.firstVisibleItemScrollOffset!=0)list.scrollToItem(0)
if(key=="discovery-entry"&&!home)runCatching{local.section.requestFocus()}
return
}
if(key=="home-feature"){if(home&&feature!=null)moveToHero()else if(home)enterFirstRow();return}
val card=hubs.firstNotNullOfOrNull{hub->hub.items.firstOrNull{"${hub.id}:${it.id}"==key}?.let{hub to it}}
if(card!=null){moveToRow(card.first.id,card.second.id);return}
if(requesters[key]?.let{runCatching{it.requestFocus()}.getOrDefault(false)}==true)return
// Its card left while hidden (e.g. finished from Continue Watching): that row's first card.
val row=hubs.firstOrNull{key.startsWith("${it.id}:")&&it.items.isNotEmpty()}
if(row!=null)moveToRow(row.id,row.items.first().id)
else if(home&&feature!=null)moveToHero()
else runCatching{(if(home)navigation.top else local.section).requestFocus()}
}
LaunchedEffect(Unit) {
var shown=active()
snapshotFlow{active()}.collect{now->
if(now==shown)return@collect
shown=now
navigationJob[0]?.cancel();navigationJob[0]=null
if(!now){if(screenFocus[0])focusManager.clearFocus(force=true)}
else if(navigation.pendingEntry!=destination)navigationJob[0]=scope.launch{reveal()}
}
}
var sectionMenu by remember{mutableStateOf(false)}
val sectionChoices=vm.sections.filter{it.type==vm.section?.type}
val sectionFocus=remember{FocusRequester()};val categoriesFocus=remember{FocusRequester()}
val title=when(destination){"movies"->"Movies";"tv"->"TV Shows";else->"Home"}
BoxWithConstraints(Modifier.fillMaxSize().onFocusChanged{screenFocus[0]=it.hasFocus}) {
BoxWithConstraints(Modifier.fillMaxSize()) {
val heroHeight=maxHeight*.80f-62.dp
if(home)HomeBackdrop(vm.api,preview,feature,heroMode,vm.colourWash)
else FocusedPreviewCanvas(vm,preview,hubs.firstOrNull()?.items?.firstOrNull(),vm.colourWash)
if(home) {
val lift=with(density){HeaderLift.toPx()}
// Leaving for the rows, the hero lifts away as the preview rises in; the reverse settles it back.
HeaderLayer({compact.value},{heroMode.value},true,lift,Modifier.padding(top=62.dp).fillMaxWidth().height(heroHeight)) {
feature?.let{item->Box(Modifier.fillMaxSize()) {
Column(Modifier.align(Alignment.BottomStart).padding(start=Cinema.gutter,bottom=35.dp).width(350.dp)) {
FadingCopy(selectedFeature,{it.item.id},lift,contentAlignment=Alignment.BottomStart){HeroCopy(vm,it)}
Row(Modifier.padding(top=16.dp).onPreviewKeyEvent{event->
if(event.type==KeyEventType.KeyDown&&event.key==Key.DirectionDown){hubs.firstOrNull()?.items?.firstOrNull()?.let{anticipateCard(it)};navigationJob[0]?.cancel();navigationJob[0]=scope.launch{hubs.firstOrNull()?.let{hub->hub.items.firstOrNull()?.let{moveToRow(hub.id,it.id)}}};true}else false
}.onFocusChanged{if(it.hasFocus){heroActive=true;hovered.value=null}},horizontalArrangement=Arrangement.spacedBy(9.dp),verticalAlignment=Alignment.CenterVertically) {
ActionButton(if(item.offset>0)"Resume"else "Play",Icons.Filled.PlayArrow,primary=true,modifier=Modifier.focusRequester(heroFocus).focusProperties{up=navigation.top}.onFocusChanged{if(it.isFocused){vm.focusId="home-feature";rotating=true}}){vm.play(item)}
IconControl(Icons.Outlined.Info,"More info",modifier=Modifier.focusProperties{up=navigation.top},onFocused={rotating=false}){vm.open(item)}
if(features.size>1)IconControl(Icons.Outlined.ChevronRight,"Next featured title",modifier=Modifier.focusProperties{up=navigation.top},onFocused={rotating=false}){featureIndex=(featureIndex+1)%features.size}
}
}
Row(Modifier.align(Alignment.BottomCenter).padding(bottom=8.dp),horizontalArrangement=Arrangement.spacedBy(5.dp)) {
features.forEachIndexed{i,_->Box(Modifier.size(if(i==featureIndex)12.dp else 3.dp,3.dp).background(Accent.copy(alpha=if(i==featureIndex).9f else .35f),RoundedCornerShape(2.dp)))}
}
}}
}
HeaderLayer({compact.value},{heroMode.value},false,lift,Modifier.padding(start=Cinema.gutter,top=78.dp).height(200.dp)) {
HomePreview(vm,preview)
}
}
if(home)HomeBackdrop(vm.api,hovered,feature,heroActive)
else FocusedPreviewCanvas(vm,hovered,hubs.firstOrNull()?.items?.firstOrNull(),destination)
Column(Modifier.fillMaxSize().padding(top=62.dp)) {
if(!home) {
Row(Modifier.fillMaxWidth().height(39.dp).padding(horizontal=Cinema.gutter),verticalAlignment=Alignment.CenterVertically) {
Text(title,color=Accent,fontSize=19.sp,fontWeight=FontWeight.SemiBold,modifier=Modifier.padding(end=20.dp))
if(!home) {
NavigationLabel("Discover",true,modifier=Modifier.focusRequester(local.section).focusProperties{up=navigation.top;down=local.entry}.onPreviewKeyEvent {
NavigationLabel("Discover",true,modifier=Modifier.focusRequester(navigation.section).focusProperties{up=navigation.top;down=navigation.entry}.onPreviewKeyEvent {
if(it.type==KeyEventType.KeyDown&&it.key==Key.DirectionDown){
hubs.firstOrNull()?.items?.firstOrNull()?.let{item->anticipateCard(item)}
hubs.firstOrNull()?.items?.firstOrNull()?.let{item->vm.anticipate(item)}
navigationJob[0]?.cancel();navigationJob[0]=scope.launch{hubs.firstOrNull()?.let{hub->hub.items.firstOrNull()?.let{moveToRow(hub.id,it.id)}}};true
}else false
},initialFocus=sectionEntry){}
NavigationLabel("Library",false,modifier=Modifier.focusProperties{up=navigation.top;down=local.entry;right=categoriesFocus}){vm.setAll(true)}
NavigationLabel("Categories",false,modifier=Modifier.focusRequester(categoriesFocus).focusProperties{up=navigation.top;down=local.entry;right=if(sectionChoices.size>1)sectionFocus else FocusRequester.Cancel}.onPreviewKeyEvent{
NavigationLabel("Library",false,modifier=Modifier.focusProperties{up=navigation.top;down=navigation.entry;right=categoriesFocus}){vm.setAll(true)}
NavigationLabel("Categories",false,modifier=Modifier.focusRequester(categoriesFocus).focusProperties{up=navigation.top;down=navigation.entry;right=if(sectionChoices.size>1)sectionFocus else FocusRequester.Cancel}.onPreviewKeyEvent{
if(it.type==KeyEventType.KeyDown&&it.key==Key.DirectionDown){
navigationJob[0]?.cancel();navigationJob[0]=scope.launch{hubs.firstOrNull()?.let{hub->hub.items.firstOrNull()?.let{moveToRow(hub.id,it.id)}}};true
}else false
@ -387,16 +272,41 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
}){sectionMenu=true}
}
}
Spacer(Modifier.fillMaxWidth().height(SectionPreviewSpace))
Spacer(Modifier.fillMaxWidth().height(if(destination=="movies")137.dp else 119.dp))
}
else Spacer(Modifier.fillMaxWidth().height(HomePreviewHeight))
// The rows sit below the hero, then slide up beneath the compact preview. A layer
// offset rather than a resized list: the catalog never re-measures during the move.
val heroDrop=with(density){(heroHeight+15.dp-HomePreviewHeight).toPx()}
CompositionLocalProvider(LocalBringIntoViewSpec provides BrowseScroll) {
LazyColumn(state=list,modifier=Modifier.fillMaxWidth().weight(1f).then(if(home)Modifier.graphicsLayer{translationY=heroDrop*(1f-compact.value)}else Modifier).onFocusChanged{catalogFocus=it.hasFocus},verticalArrangement=Arrangement.spacedBy(15.dp),contentPadding=PaddingValues(bottom=22.dp)) {
LazyColumn(state=list,modifier=Modifier.fillMaxWidth().weight(1f).onFocusChanged{catalogFocus=it.hasFocus},verticalArrangement=Arrangement.spacedBy(15.dp),contentPadding=PaddingValues(bottom=22.dp)) {
if(home)item(key="home-feature") {
Box(Modifier.fillMaxWidth().height(heroHeight)) {
feature?.let{item->
val metadata by produceState(item,item.id){value=item;value=vm.previewDetails(item)}
Column(Modifier.align(Alignment.BottomStart).padding(start=Cinema.gutter,bottom=35.dp).width(350.dp)) {
Column(Modifier.graphicsLayer{alpha=heroFade.value}) {
Eyebrow(selectedFeature?.reason.orEmpty())
Spacer(Modifier.height(9.dp))
TitleIdentity(vm.api,item,Modifier.width(264.dp).height(80.dp))
Row(Modifier.fillMaxWidth().padding(top=8.dp,bottom=8.dp),verticalAlignment=Alignment.CenterVertically) {
Text(listOf(item.year,item.genres.firstOrNull().orEmpty(),item.contentRating).filter{it.isNotBlank()}.joinToString(" · "),color=Cinema.secondary,fontSize=10.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.weight(1f,fill=false))
AudienceRatings(metadata,Modifier.padding(start=10.dp))
}
Text(item.summary,color=Cinema.secondary,fontSize=12.sp,lineHeight=18.sp,maxLines=3,overflow=TextOverflow.Ellipsis)
}
Row(Modifier.padding(top=16.dp).onPreviewKeyEvent{event->
if(event.type==KeyEventType.KeyDown&&event.key==Key.DirectionDown){hubs.firstOrNull()?.items?.firstOrNull()?.let{vm.anticipate(it,cinematic=true)};navigationJob[0]?.cancel();navigationJob[0]=scope.launch{hubs.firstOrNull()?.let{hub->hub.items.firstOrNull()?.let{moveToRow(hub.id,it.id)}}};true}else false
}.onFocusChanged{if(it.hasFocus){heroActive=true;hovered.value=null}},horizontalArrangement=Arrangement.spacedBy(9.dp),verticalAlignment=Alignment.CenterVertically) {
ActionButton(if(item.offset>0)"Resume"else "Play",Icons.Filled.PlayArrow,primary=true,modifier=Modifier.focusRequester(heroFocus).focusProperties{up=navigation.top}.onFocusChanged{if(it.isFocused){vm.focusId="home-feature";rotating=true}}){vm.play(item)}
IconControl(Icons.Outlined.Info,"More info",modifier=Modifier.focusProperties{up=navigation.top},onFocused={rotating=false}){vm.open(item)}
if(features.size>1)IconControl(Icons.Outlined.ChevronRight,"Next featured title",modifier=Modifier.focusProperties{up=navigation.top},onFocused={rotating=false}){featureIndex=(featureIndex+1)%features.size}
}
}
Row(Modifier.align(Alignment.BottomCenter).padding(bottom=8.dp),horizontalArrangement=Arrangement.spacedBy(5.dp)) {
features.forEachIndexed{i,_->Box(Modifier.size(if(i==featureIndex)12.dp else 3.dp,3.dp).background(Accent.copy(alpha=if(i==featureIndex).9f else .35f),RoundedCornerShape(2.dp)))}
}
}
}
}
itemsIndexed(hubs,key={_,h->h.id},contentType={_,h->if(h.items.firstOrNull()?.type=="episode")"episodes"else "titles"}) {row,hub->
val poster=posterRow(hub,row,destination)
val poster=hub.items.firstOrNull()?.type in listOf("movie","show","season")&&!hub.title.contains("Continue",true)&&(destination=="movies"||destination=="tv"||row==1)
val wideEpisode=destination=="tv"&&!poster
val continuing=isContinueHub(hub)
// A row with more titles than Plex returned ends with a "View all" card.
@ -421,12 +331,12 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
// catalog layout between those events. Bursts keep the latest
// logical column instead of dropping a move while awaiting layout.
withFrameNanos{}
if(!rapid)hub.items.getOrNull(target)?.let{anticipateCard(it)}
if(!rapid)hub.items.getOrNull(target)?.let{vm.anticipate(it,cinematic=home)}
val visible=state.layoutInfo.visibleItemsInfo.any{it.index==target}
val anchor=(target-1).coerceAtLeast(0)
if(visible&&!rapid) {
runCatching{requesters.getOrPut("${hub.id}:${idAt(target)}"){FocusRequester()}.requestFocus()}
val pitch=with(density){railPitch(poster,wideEpisode).toPx()}
val pitch=with(density){(if(poster)130.dp else if(wideEpisode)274.dp else 224.dp).toPx()}
val delta=(anchor-state.firstVisibleItemIndex)*pitch-state.firstVisibleItemScrollOffset
if(kotlin.math.abs(delta)>1)state.animateScrollBy(delta,tween(140))
}else{
@ -439,7 +349,7 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
// A held direction snaps to the latest anchor. Repeatedly
// cancelling pixel animations and decoding transient backdrops
// costs more than the focus move; predict only after it settles.
if(rapid){delay(70);hub.items.getOrNull(target)?.let{anticipateCard(it)}}
if(rapid){delay(70);hub.items.getOrNull(target)?.let{vm.anticipate(it,cinematic=home)}}
}
}
true
@ -447,7 +357,7 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
if(event.key==Key.DirectionUp&&row==0) {
if(home)feature?.let{vm.anticipate(it,cinematic=true)}
navigationJob[0]?.cancel()
navigationJob[0]=scope.launch{if(home&&feature!=null)moveToHero()else{withFrameNanos{};runCatching{(if(home)navigation.top else local.section).requestFocus()}}}
navigationJob[0]=scope.launch{if(home)moveToHero()else{withFrameNanos{};runCatching{navigation.section.requestFocus()}}}
}
else {
navigationJob[0]?.cancel()
@ -456,22 +366,21 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
val targetHub=hubs[target]
val selectedId=columns[targetHub.id]
val col=targetHub.items.indexOfFirst{it.id==selectedId}.takeIf{it>=0} ?: 0
anticipateCard(hubs[target].items[col])
vm.anticipate(hubs[target].items[col],cinematic=home)
navigationJob[0]=scope.launch{moveToRow(targetHub.id,targetHub.items[col].id)}
}
}
true
}else false
}
Column(Modifier.semanticsOnScreen{list.layoutInfo.visibleItemsInfo.any{it.index==row}}) {
Column {
Text(hub.title,color=Accent,fontSize=16.sp,lineHeight=21.sp,fontWeight=FontWeight.SemiBold,style=LocalTextStyle.current.copy(shadow=CaptionShadow),modifier=Modifier.padding(start=Cinema.gutter,bottom=5.dp))
LazyRow(state=rowStates[hub.id]!!,contentPadding=PaddingValues(start=Cinema.gutter,end=Cinema.gutter,top=3.dp,bottom=3.dp),horizontalArrangement=Arrangement.spacedBy(10.dp)) {
itemsIndexed(hub.items,key={_,t->t.id},contentType={_,_->poster}) {column,item->
val focusKey="${hub.id}:${item.id}"
val requester=requesters.getOrPut(focusKey){FocusRequester()}
val rail=rowStates[hub.id]!!
BrowseCard(vm,item,"${hub.id}:${item.id}",poster,wideEpisode,if(row==0&&column==0)local.entry else null,requester,staging,continuing,
rowKeys(column).semanticsOnScreen{rail.layoutInfo.visibleItemsInfo.any{it.index==column}},onHovered={columns[hub.id]=item.id;pendingColumns[hub.id]=item.id;hovered.value=it;heroActive=false})
BrowseCard(vm,item,"${hub.id}:${item.id}",poster,wideEpisode,if(row==0&&column==0)navigation.entry else null,requester,staging,continuing,
rowKeys(column),onHovered={columns[hub.id]=item.id;pendingColumns[hub.id]=item.id;hovered.value=it;heroActive=false})
}
if(viewAll)item(key=VIEW_ALL,contentType="viewAll") {
val focusKey="${hub.id}:$VIEW_ALL"
@ -492,195 +401,45 @@ private suspend fun LazyListState.animateBrowseTo(index:Int) {
if(sectionMenu)ChoiceDialog("Libraries",sectionChoices.map{it.title},sectionChoices.indexOf(vm.section),{sectionMenu=false}){vm.chooseSection(sectionChoices[it]);sectionMenu=false}
}
/** Home's compact header: the preview block Movies and TV show above their rows. */
/** Home's compact header (after Silo's): its height below the top bar, and its title art. */
private val HomePreviewHeight=228.dp
private val HomeLogo=DpSize(300.dp,64.dp)
/** Movies and TV use the same preview below their Discover/Library/Categories line, slightly smaller. */
private val SectionPreviewSpace=199.dp
private val SectionPreviewHeight=190.dp
private val SectionLogo=DpSize(280.dp,56.dp)
private const val HeaderMillis=380
private const val CopyMillis=380
internal val HeaderLift=12.dp
/** Focus must rest this long before the preview follows it, so a held direction doesn't replay fades. */
private const val PreviewRestMillis=110L
/** Previews show a card's own image: an episode's still, not its show's artwork. */
internal fun previewArt(item:Title)=if(item.type=="episode")item.still.ifBlank{item.thumb}.ifBlank{item.art}else item.art.ifBlank{item.thumb}
/**
* The card the preview shows: [hovered] once focus rests on it. The first card after the
* preview reappears shows at once. Inactive, it holds [idle] (the card Down enters), already
* composed under the hero, so entering the rows is only a fade.
*/
@Composable private fun restingPreview(hovered:State<Title?>,idle:()->Title?,active:()->Boolean):State<Title?> {
val rested=remember{mutableStateOf<Title?>(null)}
LaunchedEffect(hovered) {
snapshotFlow{if(active())hovered.value else idle()}.collectLatest{
if(it!=null&&rested.value!=null)delay(PreviewRestMillis)
rested.value=it
}
}
return rested
}
/**
* The hero ([hero]) or the compact preview, faded and lifted by [progress] in its own layer: one
* animation, no per-frame composition or layout. Both stay composed: the hidden one is a zero-alpha
* layer, which the renderer skips, without semantics. Composing the hero again on every return to it
* cost a frame there.
*/
@Composable private fun HeaderLayer(progress:()->Float,heroShown:()->Boolean,hero:Boolean,lift:Float,modifier:Modifier,content:@Composable ()->Unit) {
val shown by remember{derivedStateOf{!hero||heroShown()||progress()<1f}}
Box(modifier.then(if(shown)Modifier else Modifier.clearAndSetSemantics{}).graphicsLayer{
val c=progress()
compositingStrategy=CompositingStrategy.ModulateAlpha
if(hero){alpha=(1f-c*1.6f).coerceIn(0f,1f);translationY=-lift*c}
else{alpha=((c-.3f)/.7f).coerceIn(0f,1f);translationY=lift*(1f-c)}
}){content()}
}
/**
* Swaps [item] Silo-style: the outgoing copy lifts slightly as it fades; the next rises into
* place as it fades in. Two keyed layers driven by one animation, read only while drawing.
*/
@Composable internal fun <T:Any> FadingCopy(item:T?,id:(T)->String,lift:Float,modifier:Modifier=Modifier,contentAlignment:Alignment=Alignment.TopStart,content:@Composable (T)->Unit) {
val progress=remember{Animatable(1f)}
var shown by remember{mutableStateOf(item)}
var leaving by remember{mutableStateOf<T?>(null)}
LaunchedEffect(item?.let(id)) {
val previous=shown
shown=item
if(previous==null||item==null){leaving=null;progress.snapTo(1f);return@LaunchedEffect}
if(id(previous)==id(item))return@LaunchedEffect
leaving=previous
progress.snapTo(0f)
progress.animateTo(1f,tween(CopyMillis,easing=FastOutSlowInEasing))
leaving=null
}
// The same title with fresher details updates in place.
val current=if(item!=null&&shown?.let(id)==id(item))item else shown
Box(modifier,contentAlignment=contentAlignment) {
listOfNotNull(leaving,current).forEach{entry->
val outgoing=entry===leaving
key(id(entry)) {
Box(Modifier.graphicsLayer{
val t=progress.value
compositingStrategy=CompositingStrategy.ModulateAlpha
if(outgoing){alpha=(1f-t*2.5f).coerceAtLeast(0f);translationY=-lift*.66f*t}
else{alpha=((t-.2f)/.8f).coerceIn(0f,1f);translationY=lift*(1f-t)}
}){CompositionLocalProvider(LocalStagedCopy provides(!outgoing&&leaving!=null)){content(entry)}}
}
}
}
}
/** True for a [FadingCopy] entry that is fading in: it stays transparent for its first five or so frames. */
private val LocalStagedCopy=staticCompositionLocalOf{false}
/**
* How many of a copy's [total] parts to compose. An incoming copy adds one per frame while it is
* still transparent: composing and measuring all of a preview's text at once took 12 ms on the onn.
*/
@Composable private fun copyParts(total:Int):Int {
val staged=LocalStagedCopy.current
var parts by remember{mutableIntStateOf(if(staged)1 else total)}
if(parts<total)LaunchedEffect(Unit){while(parts<total){withFrameNanos{};parts++}}
return parts
}
/** Focus changes invalidate this small preview scope, never the catalog hierarchy. */
@Composable private fun HomeBackdrop(api:PlexApi,preview:State<Title?>,feature:Title?,heroMode:State<Boolean>,wash:Boolean) {
val target=if(heroMode.value)feature?.let{it.art.ifBlank{it.thumb} to true}else preview.value?.let{previewArt(it) to false}
// Keep the last artwork while the preview waits for its first resting card.
val last=remember{arrayOfNulls<Pair<String,Boolean>>(1)}
val shown=target ?: last[0] ?: feature?.let{it.art.ifBlank{it.thumb} to true}
last[0]=shown
shown?.let{(path,cinematic)->BrowseBackdrop(api,path,Modifier.fillMaxSize(),cinematic=cinematic,header=true,wash=wash,animate=true)}
@Composable private fun HomeBackdrop(api:PlexApi,hovered:State<Title?>,feature:Title?,heroActive:Boolean) {
var displayed by remember{mutableStateOf<Title?>(null)}
val current=if(heroActive)feature else hovered.value ?: feature
LaunchedEffect(current){if(!heroActive)delay(90);displayed=current}
(displayed ?: feature)?.let{BrowseBackdrop(api,it.art.ifBlank{it.thumb},Modifier.fillMaxSize(),cinematic=true,animate=heroActive)}
}
@Composable private fun FocusedPreviewCanvas(vm:KaleidoViewModel,preview:State<Title?>,fallback:Title?,wash:Boolean) {
val feature=preview.value ?: fallback
@Composable private fun FocusedPreviewCanvas(vm:KaleidoViewModel,hovered:State<Title?>,fallback:Title?,destination:String) {
var displayed by remember{mutableStateOf<Title?>(null)}
val current=hovered.value
LaunchedEffect(current){delay(120);displayed=current}
val feature=displayed ?: fallback
val metadata by produceState(feature,feature){value=feature;feature?.let{value=vm.previewDetails(it)}}
Box(Modifier.fillMaxSize()) {
feature?.let{BrowseBackdrop(vm.api,previewArt(it),Modifier.fillMaxSize(),header=true,wash=wash,animate=true)}
Box(Modifier.padding(start=Cinema.gutter,top=104.dp).height(SectionPreviewHeight)) {
PreviewBlock(vm,feature,SectionLogo)
}
}
}
@Composable private fun HomePreview(vm:KaleidoViewModel,preview:State<Title?>)=PreviewBlock(vm,preview.value,HomeLogo)
/** Bottom-anchored like Silo's: a shorter synopsis leaves room above the title, not a gap above the rows. */
@Composable private fun PreviewBlock(vm:KaleidoViewModel,item:Title?,logo:DpSize) {
FadingCopy(item,{it.id},with(LocalDensity.current){HeaderLift.toPx()},Modifier.fillMaxHeight(),Alignment.BottomStart){PreviewText(vm,it,logo)}
}
/** The focused card: large title art, the facts, three lines of synopsis, then cast and format. */
@Composable private fun PreviewText(vm:KaleidoViewModel,item:Title,logo:DpSize) {
var loaded by remember{mutableStateOf(false)}
val metadata by produceState(item,item){value=vm.previewDetails(item);loaded=true}
// Cast and formats need the full details. Their rows are reserved, and fade in when they arrive.
val details=remember{Animatable(0f)}
LaunchedEffect(loaded){if(loaded)details.animateTo(1f,tween(220))}
val formats=formatLabels(metadata.media.firstOrNull())
val runtime=when{item.duration<=0->"";item.offset>0->runtimeLabel(item.duration-item.offset)+" left";else->runtimeLabel(item.duration)}
Column(Modifier.width(420.dp).clearAndSetSemantics{contentDescription=listOf(item.displayTitle,metadata.rating,item.summary).filter{it.isNotBlank()}.joinToString(". ")}) {
val parts=copyParts(4)
TitleIdentity(vm.api,item,Modifier.size(logo))
if(parts>=2)Row(Modifier.fillMaxWidth().padding(top=10.dp,bottom=7.dp).height(17.dp),verticalAlignment=Alignment.CenterVertically) {
if(item.contentRating.isNotBlank())FormatBadge(item.contentRating,Modifier.padding(end=8.dp))
Text(listOf(if(item.type=="episode")"S${item.parentIndex} · E${item.index} ${item.title}"else item.year,item.genres.firstOrNull().orEmpty(),runtime).filter{it.isNotBlank()}.joinToString(" · "),fontSize=11.sp,lineHeight=15.sp,color=Cinema.secondary,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.weight(1f,fill=false))
AudienceRatings(metadata,Modifier.padding(start=10.dp))
}
if(parts>=3)Text(item.summary,color=Cinema.secondary,fontSize=12.sp,lineHeight=17.5.sp,maxLines=3,overflow=TextOverflow.Ellipsis)
if(parts>=4)Column(Modifier.graphicsLayer{alpha=details.value}) {
Text(metadata.cast.take(3).joinToString(", "),color=Muted,fontSize=10.5.sp,lineHeight=14.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.padding(top=6.dp).height(14.dp))
Row(Modifier.padding(top=8.dp).height(16.dp),horizontalArrangement=Arrangement.spacedBy(6.dp),verticalAlignment=Alignment.CenterVertically) {
formats.forEach{FormatBadge(it)}
feature?.let{item->
BrowseBackdrop(vm.api,item.art,Modifier.fillMaxSize())
Column(Modifier.padding(start=Cinema.gutter,top=106.dp).width(350.dp).clearAndSetSemantics{contentDescription=listOf(item.displayTitle,metadata?.rating.orEmpty(),item.summary).filter{it.isNotBlank()}.joinToString(". ")}) {
TitleIdentity(vm.api,item,Modifier.width(if(destination=="tv")230.dp else 260.dp).height(if(destination=="tv")43.dp else 53.dp))
Row(Modifier.fillMaxWidth().padding(top=7.dp,bottom=5.dp),verticalAlignment=Alignment.CenterVertically) {
Text(listOf(if(item.type=="episode")"S${item.parentIndex} · E${item.index} ${item.title}"else item.year,item.genres.firstOrNull().orEmpty(),item.contentRating).filter{it.isNotBlank()}.joinToString(" · "),fontSize=10.sp,lineHeight=14.sp,color=Cinema.secondary,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.weight(1f,fill=false))
AudienceRatings(metadata ?: item,Modifier.padding(start=10.dp))
}
Text(item.summary,color=Cinema.secondary,fontSize=11.5.sp,lineHeight=16.sp,maxLines=2,overflow=TextOverflow.Ellipsis)
}
}
}
}
/** Resolution, dynamic range and the best audio format, e.g. 4K · Dolby Vision · Atmos. */
internal fun formatLabels(media:Media?)=listOfNotNull(media?.resolutionLabel?.ifBlank{null},media?.dynamicRange?.ifBlank{null},media?.let{if(it.atmos)"Atmos"else it.channelLabel.ifBlank{null}})
/** A small outlined label: a content rating or a video/audio format. */
@Composable internal fun FormatBadge(label:String,modifier:Modifier=Modifier) {
Text(label.uppercase(),color=Color.White.copy(alpha=.9f),fontSize=8.5.sp,lineHeight=11.sp,fontWeight=FontWeight.SemiBold,letterSpacing=.5.sp,maxLines=1,
modifier=modifier.border(.5.dp,Color.White.copy(alpha=.3f),RoundedCornerShape(3.dp)).background(Color.White.copy(alpha=.06f),RoundedCornerShape(3.dp)).padding(horizontal=5.dp,vertical=1.5.dp))
}
internal fun runtimeLabel(ms:Long):String {val minutes=(ms/60000).coerceAtLeast(1);return if(minutes>=60)"${minutes/60}h ${minutes%60}m"else "${minutes}m"}
@Composable private fun HeroCopy(vm:KaleidoViewModel,feature:HomeFeature) {
val item=feature.item
val metadata by produceState(item,item.id){value=item;value=vm.previewDetails(item)}
Column {
val parts=copyParts(3)
TitleIdentity(vm.api,item,Modifier.width(264.dp).height(80.dp))
if(parts>=2)Row(Modifier.fillMaxWidth().padding(top=8.dp,bottom=8.dp),verticalAlignment=Alignment.CenterVertically) {
Text(listOf(item.year,item.genres.firstOrNull().orEmpty(),item.contentRating).filter{it.isNotBlank()}.joinToString(" · "),color=Cinema.secondary,fontSize=10.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.weight(1f,fill=false))
AudienceRatings(metadata,Modifier.padding(start=10.dp))
}
if(parts>=3)Text(item.summary,color=Cinema.secondary,fontSize=12.sp,lineHeight=18.sp,maxLines=3,overflow=TextOverflow.Ellipsis)
}
}
/**
* A newly shown section composed every visible card in one 100–200 ms frame. While it is
* entering, each card first lays out at its fixed size and fills in its artwork and titles a
* few cards per frame, under the page's fade-in. Later cards are composed whole: they come from
* the lazy lists' cache windows, which compose and measure them in idle time. Deferring their
* content instead moved that text layout into the next frames' synchronous layout, in the middle
* of the row scroll (about 1 ms per title on the onn).
* few cards per frame, under the page's fade-in. Later offscreen cards spread their
* artwork/text work over three frames too, keeping lazy-layout work short during input.
*/
private class CardStaging {
var entering=true
private var count=0
fun frames()=if(entering)count++/3 else -1
fun frames()=if(entering)count++/3 else count++%3
}
@Composable private fun BrowseCard(vm:KaleidoViewModel,item:Title,focusKey:String,poster:Boolean,wideEpisode:Boolean,entry:FocusRequester?,requester:FocusRequester,staging:CardStaging,continuing:Boolean,modifier:Modifier,onHovered:(Title)->Unit) {
@ -704,7 +463,7 @@ private class CardStaging {
}) {
Box(Modifier.fillMaxWidth().aspectRatio(if(poster)2f/3f else 16f/9f).clip(RoundedCornerShape(4.dp))) {
if(filled) {
CardArtwork(vm.api,image,Modifier.fillMaxSize(),if(poster)300 else 480,if(poster)450 else 270)
Artwork(vm.api,image,Modifier.fillMaxSize(),if(poster)300 else 480,if(poster)450 else 270,animate=false)
if(item.offset>0)Box(Modifier.align(Alignment.BottomCenter).padding(6.dp).fillMaxWidth().height(2.dp).background(Color.Black.copy(alpha=.65f))) {
Box(Modifier.fillMaxWidth(item.progress.coerceAtLeast(.01f)).fillMaxHeight().background(Accent))
}
@ -716,13 +475,7 @@ private class CardStaging {
// Placeholder height matches the titles' fixed heights, so card bounds never change.
if(!filled)Spacer(Modifier.height(if(poster)21.dp else 35.dp))
else {
// Both weights are laid out with the card (in prefetch); focus only swaps their layers.
// Changing the weight re-measured two titles in the first frame of every move.
Box(Modifier.padding(top=5.dp).height(16.dp)) {
val title=LocalTextStyle.current.copy(shadow=CaptionShadow)
Text(item.displayTitle,color=Cinema.secondary,fontSize=10.5.sp,lineHeight=14.sp,fontWeight=FontWeight.Normal,maxLines=1,overflow=TextOverflow.Ellipsis,style=title,modifier=Modifier.graphicsLayer{alpha=if(focused)0f else 1f})
Text(item.displayTitle,color=Accent,fontSize=10.5.sp,lineHeight=14.sp,fontWeight=FontWeight.SemiBold,maxLines=1,overflow=TextOverflow.Ellipsis,style=title,modifier=Modifier.graphicsLayer{alpha=if(focused)1f else 0f})
}
Text(item.displayTitle,color=if(focused)Accent else Cinema.secondary,fontSize=10.5.sp,lineHeight=14.sp,fontWeight=if(focused)FontWeight.SemiBold else FontWeight.Normal,maxLines=1,overflow=TextOverflow.Ellipsis,style=LocalTextStyle.current.copy(shadow=CaptionShadow),modifier=Modifier.padding(top=5.dp).height(16.dp))
if(!poster)Text(if(item.type=="episode")"S${item.parentIndex} · E${item.index} ${item.title}"else if(item.type=="season")item.subtitle else if(item.offset>0)"${((item.duration-item.offset)/60000).coerceAtLeast(0)} min left"else item.year,color=Cinema.secondary.copy(alpha=.85f),fontSize=9.sp,lineHeight=12.sp,maxLines=1,overflow=TextOverflow.Ellipsis,style=LocalTextStyle.current.copy(shadow=CaptionShadow),modifier=Modifier.height(14.dp))
}
}
@ -747,32 +500,3 @@ private class CardStaging {
Spacer(Modifier.height(if(poster)21.dp else 35.dp))
}
}
/**
* Semantics only while [onScreen]. With any accessibility service enabled, Compose walks and
* geometry-sorts every composed node, placed or not, after each layout change (every 100 ms while
* rows scroll): the rows and cards the lazy lists keep composed off screen made that the largest
* main-thread cost on the onn. Observed in the node, so entering or leaving view never recomposes.
*/
internal fun Modifier.semanticsOnScreen(onScreen:()->Boolean):Modifier=this then OnScreenSemanticsElement(onScreen)
private class OnScreenSemanticsElement(val onScreen:()->Boolean):ModifierNodeElement<OnScreenSemanticsNode>() {
override fun create()=OnScreenSemanticsNode(onScreen)
override fun update(node:OnScreenSemanticsNode){node.onScreen=onScreen;node.check()}
override fun equals(other:Any?)=other is OnScreenSemanticsElement&&other.onScreen===onScreen
override fun hashCode()=System.identityHashCode(onScreen)
}
private class OnScreenSemanticsNode(var onScreen:()->Boolean):Modifier.Node(),SemanticsModifierNode,ObserverModifierNode {
private var shown=true
override val shouldClearDescendantSemantics get()=!shown
override fun SemanticsPropertyReceiver.applySemantics(){}
override fun onAttach()=check()
override fun onObservedReadsChanged()=check()
fun check() {
if(!isAttached)return
var now=true
observeReads{now=onScreen()}
if(now!=shown){shown=now;invalidateSemantics()}
}
}

View file

@ -1,77 +0,0 @@
@file:OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class)
package tv.kaleido.app
import android.os.Handler
import android.os.Looper
import android.view.Choreographer
import androidx.compose.foundation.lazy.LazyListPrefetchStrategy
import androidx.compose.foundation.lazy.layout.LazyLayoutCacheWindow
import androidx.compose.foundation.lazy.layout.NestedPrefetchScope
import androidx.compose.ui.unit.Constraints
import androidx.compose.foundation.lazy.layout.PrefetchRequest
import androidx.compose.foundation.lazy.layout.PrefetchRequestScope
import androidx.compose.foundation.lazy.layout.PrefetchScheduler
/**
* Runs lazy-list prefetch in what is left of each frame. Compose's scheduler treats a frame that
* follows a late one as idle and gives its request unlimited time: on the onn it then composed a
* whole row of cards (35–45 ms) in the middle of the row scroll, dropping the frames it meant to
* save. Here a request that needs more than the frame has left waits for the next; only when
* nothing has been drawn for two frames (truly idle) may it take as long as it needs, since a
* whole row is more than one frame's work and must be ready before the next move.
*/
internal object FramePrefetch:PrefetchScheduler,Choreographer.FrameCallback,Runnable,PrefetchRequestScope {
/** The display's frame interval; MainActivity sets it from the actual refresh rate. */
var frameNanos=16_666_667L
/** Left for input and the frame's own late work. */
private const val MarginNanos=2_000_000L
private val requests=ArrayDeque<PrefetchRequest>()
private val handler=Handler(Looper.getMainLooper())
private var scheduled=false
private var deadline=0L
private var lastDraw=0L
private val stalls=java.util.IdentityHashMap<PrefetchRequest,Int>()
/** About two seconds of frames without progress before a request is dropped. */
private const val StallFrames=120
/** Called for every window draw (MainActivity's draw listener). */
fun drew(){lastDraw=System.nanoTime()}
override fun schedulePrefetch(prefetchRequest:PrefetchRequest) {
requests.addLast(prefetchRequest)
if(!scheduled){scheduled=true;Choreographer.getInstance().postFrameCallback(this)}
}
// Posted from the frame callback, this runs once the frame's layout and draw are done.
override fun doFrame(frameTimeNanos:Long) {
deadline=if(frameTimeNanos-lastDraw>2*frameNanos)Long.MAX_VALUE else frameTimeNanos+frameNanos-MarginNanos
handler.post(this)
}
override fun availableTimeNanos()=(deadline-System.nanoTime()).coerceAtLeast(0L)
override fun run() {
var skipped=0
while(requests.isNotEmpty()&&skipped<requests.size&&availableTimeNanos()>0) {
val request=requests.removeFirst()
val start=System.nanoTime()
// True means it has more work, but not enough time for its next step in this frame.
val more=with(request){execute()}
val worked=System.nanoTime()-start>200_000L
if(!more){stalls.remove(request);skipped=0;continue}
if(worked){stalls.remove(request);requests.addFirst(request);break}
// No progress: let the rest go first. A request for a list nobody lays out (a hidden
// screen's) never progresses, and must not hold up the visible screen's rows.
val misses=(stalls[request] ?: 0)+1
if(misses>=StallFrames)stalls.remove(request)else{stalls[request]=misses;requests.addLast(request)}
skipped++
}
if(requests.isNotEmpty())Choreographer.getInstance().postFrameCallback(this)else scheduled=false
}
}
/** Compose's cache window ([ahead] and [behind] in viewports), prefetching on [FramePrefetch]. */
internal fun budgetedCacheWindow(ahead:Float,behind:Float):LazyListPrefetchStrategy=
CacheWindows(LazyLayoutCacheWindow(aheadFraction=ahead,behindFraction=behind))
/**
* For [CacheWindows]: compose and measure a rail's card while the catalog prefetches its row.
* Only composing it left its text layout to the row's first frame on screen, mid-scroll.
*/
internal fun NestedPrefetchScope.premeasure(index:Int)=schedulePrecompositionAndPremeasure(index,Constraints())

View file

@ -1,6 +1,6 @@
package tv.kaleido.app
data class HomeFeature(val item:Title)
data class HomeFeature(val item:Title,val reason:String)
/** Interleave discovery categories; Continue Watching has its own rail. */
internal fun homeFeatures(recent:List<Title>,rated:List<Title>,hubs:List<Hub>,continuing:List<Title>,random:kotlin.random.Random=kotlin.random.Random.Default):List<HomeFeature> {
@ -9,10 +9,10 @@ internal fun homeFeatures(recent:List<Title>,rated:List<Title>,hubs:List<Hub>,co
item.id !in excluded&&!item.fullyWatched&&item.offset==0L
// Shuffle movies and shows together rather than always leading with the same movie section.
val buckets=listOf(
recent.filter{eligible(it)&&it.releaseDate.isNotBlank()}.sortedByDescending{it.releaseDate}.take(18).shuffled(random).map{HomeFeature(it)},
rated.filter{eligible(it)&&it.viewedLeafCount==0}.shuffled(random).map{HomeFeature(it)},
recent.filter{eligible(it)&&it.releaseDate.isNotBlank()}.sortedByDescending{it.releaseDate}.take(18).shuffled(random).map{HomeFeature(it,"Recently released")},
rated.filter{eligible(it)&&it.viewedLeafCount==0}.shuffled(random).map{HomeFeature(it,"Highly rated · Unwatched")},
hubs.filterNot{h->listOf("continue","ondeck","inprogress","recentlyviewed","recentlyadded","recentlyaired","recent").any{h.id.contains(it,true)}}
.flatMap{it.items}.filter(::eligible).distinctBy{it.id}.shuffled(random).map{HomeFeature(it)}
.flatMap{it.items}.filter(::eligible).distinctBy{it.id}.shuffled(random).map{HomeFeature(it,"Suggested for you")}
)
val seen=mutableSetOf<String>()
return buildList {

View file

@ -34,12 +34,6 @@ private fun categoryArtworkHint(section:Section,genre:String):String?=when {
section.type=="movie"&&genre.equals("Action",ignoreCase=true)->"Batman"
else->null
}
private const val SyncQuietMillis=2000L
/** The countdown an earlier "Automatically" skip setting becomes. */
internal const val AutoSkipDefaultSeconds=5
/** Returning to Kaleido checks the server almost at once, so watching elsewhere shows up promptly. */
private const val ResumeSyncDelayMillis=750L
private const val PlaybackReportWaitMillis=4_000L
class KaleidoViewModel(app: Application): AndroidViewModel(app) {
val application = app as KaleidoApplication
val api = application.api
@ -53,27 +47,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
var sections by mutableStateOf(emptyList<Section>()); private set
var homeHubs by mutableStateOf(emptyList<Hub>()); private set
var homeFeatures by mutableStateOf(emptyList<HomeFeature>()); private set
private var discoverHubsState by mutableStateOf(emptyList<Hub>())
var discoverHubs:List<Hub>
get()=discoverHubsState
private set(value){discoverHubsState=value;publishDiscovery(value)}
/**
* Rows per destination, for the Movies and TV screens that stay composed while hidden. A reload of
* the same library keeps its previous rows until the fresh ones arrive (equal rows keep their
* instances), so a retained screen neither empties nor recomposes its cards.
*/
var movieHubs by mutableStateOf(emptyList<Hub>()); private set
var showHubs by mutableStateOf(emptyList<Hub>()); private set
private val discoverySections=mutableMapOf<String,String?>()
fun discoveryHubs(destination:String)=when(destination){"home"->homeHubs;"movies"->movieHubs;else->showHubs}
private fun publishDiscovery(hubs:List<Hub>) {
val destination=when(section?.type){"movie"->"movies";"show"->"tv";else->pages.first().kind.takeIf{it in listOf("movies","tv")}} ?: return
val sectionId=section?.id
if(hubs.isEmpty()&&sectionId!=null&&discoverySections[destination]==sectionId)return
discoverySections[destination]=sectionId
if(destination=="movies")movieHubs=hubs else showHubs=hubs
}
private fun clearDiscovery(){discoverySections.clear();movieHubs=emptyList();showHubs=emptyList()}
var discoverHubs by mutableStateOf(emptyList<Hub>()); private set
var library by mutableStateOf(emptyList<Title>()); private set
var total by mutableStateOf(0); private set
var genres by mutableStateOf(emptyList<Pair<String,String>>()); private set
@ -102,8 +76,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
var playbackReturn by mutableIntStateOf(0); private set
private var retryAction:(()->Unit)?=null
private var previousTab="home"
/** Observable, so the version button, format badges and technical line all follow a new choice. */
private val mediaChoices=androidx.compose.runtime.mutableStateMapOf<String,Int>()
private val mediaChoices=mutableMapOf<String,Int>()
/** The episode a season or episode page shows, by page id. Focus in its season row chooses it. */
val episodeSelections=androidx.compose.runtime.mutableStateMapOf<String,String>()
var query by mutableStateOf(""); private set
@ -112,7 +85,6 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
var linkingAccount by mutableStateOf(false);private set
var accountToken = session?.accountToken.orEmpty()
var playing by mutableStateOf<Title?>(null); private set
var playbackInstance by mutableIntStateOf(0);private set
var startFromZero by mutableStateOf(false); private set
var focusId by mutableStateOf("")
var update by mutableStateOf<Release?>(null); private set
@ -126,9 +98,8 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
var remoteQuality by mutableStateOf(preferences.getString("remoteQuality",null)?.let{n->StreamQuality.entries.firstOrNull{it.name==n}} ?: StreamQuality.FullHD); private set
/** Seconds before the next episode starts; 0 turns autoplay off. */
var autoplaySeconds by mutableIntStateOf(preferences.getInt("autoplaySeconds",5)); private set
/** Seconds the Skip intro/credits button counts down before skipping by itself; 0 only shows the button. */
var autoSkipIntroSeconds by mutableIntStateOf(autoSkipSeconds("autoSkipIntro")); private set
var autoSkipCreditsSeconds by mutableIntStateOf(autoSkipSeconds("autoSkipCredits")); private set
var autoSkipIntro by mutableStateOf(preferences.getBoolean("autoSkipIntro",false)); private set
var autoSkipCredits by mutableStateOf(preferences.getBoolean("autoSkipCredits",false)); private set
var subtitleSize by mutableStateOf(preferences.getString("subtitleSize",null)?.let{n->SubtitleSize.entries.firstOrNull{it.name==n}} ?: SubtitleSize.Normal); private set
var subtitleStyle by mutableStateOf(preferences.getString("subtitleStyle",null)?.let{n->SubtitleStyle.entries.firstOrNull{it.name==n}} ?: SubtitleStyle.Box); private set
/** Debug test intents force a delivery mode (0 file, 1 direct stream, 2 convert); never set in release. */
@ -137,22 +108,17 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
var debugValidationFile:File?=null; private set
var watchedPercent by mutableStateOf(preferences.getInt("watchedPercent",80).coerceIn(50,100)); private set
var navigationSounds by mutableStateOf(preferences.getBoolean("navigationSounds",true)); private set
/** Tint the page behind browse previews with the focused artwork's colour. */
var colourWash by mutableStateOf(preferences.getBoolean("colourWash",true)); private set
var themeMusic by mutableStateOf(preferences.getBoolean("themeMusic",false)); private set
var themeVolume by mutableIntStateOf(preferences.getInt("themeVolume",30).coerceIn(10,100)); private set
var volumeBoostDb by mutableIntStateOf(preferences.getInt("volumeBoostDb",0).coerceIn(0,12)); private set
var episodeQueue by mutableStateOf(emptyList<Title>());private set
var relatedShows by mutableStateOf(emptyList<Title>());private set
var transitioningEpisode by mutableStateOf(false);private set
private var shuffleEpisodes by mutableStateOf<ShuffleEpisodes<Title>?>(null)
val shuffling get()=shuffleEpisodes!=null
private var episodeContextJob:Job?=null
private var episodeTransitionJob:Job?=null
private var loadJob: Job? = null
private var initializeJob:Job?=null
private var librarySyncJob:Job?=null
/** Uptime of the latest remote key, from the UI; library sync applies its snapshot only after a quiet spell. */
var lastInteraction=0L
private var foreground=false
private var loadGeneration=0
private var authJob: Job? = null
@ -174,8 +140,6 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
Thread({android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);task.run()},"KaleidoArtworkPrefetch").apply{isDaemon=true}
}.asCoroutineDispatcher()
init {
// Volume boost was removed; drop its stored level.
if(preferences.contains("volumeBoostDb"))preferences.edit().remove("volumeBoostDb").apply()
// Development provisioning is private app data, never an APK resource or build constant.
if(BuildConfig.DEBUG) {
val seed=File(app.filesDir,"bootstrap.json")
@ -243,25 +207,20 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
librarySyncJob?.cancel();librarySyncJob=null
if(!value)return
librarySyncJob=viewModelScope.launch {
// Kept across background spells: returning compares against what was last applied,
// so Continue Watching changes made on another device show up within a second.
var interval=ResumeSyncDelayMillis
var backoff=LibrarySync.POLL_MS
var observedSession=session
var sync=newLibrarySync()
var interval=LibrarySync.POLL_MS
while(isActive) {
delay(interval);interval=backoff
val sync=librarySync?.takeIf{librarySyncSession==session} ?: newLibrarySync().also{librarySync=it;librarySyncSession=session}
delay(interval)
if(session!=observedSession){observedSession=session;sync=newLibrarySync()}
if(session==null||playing!=null||busy||markingId!=null||initializeJob?.isActive==true)continue
try{sync.check();backoff=LibrarySync.POLL_MS}
try{sync.check();interval=LibrarySync.POLL_MS}
catch(e:CancellationException){throw e}
catch(_:Exception){backoff=(backoff*2).coerceAtMost(LibrarySync.FALLBACK_MS)}
interval=backoff
catch(_:Exception){interval=(interval*2).coerceAtMost(LibrarySync.FALLBACK_MS)}
}
}
}
private var librarySyncSession:Session?=null
private var librarySync:LibrarySync?=null
/** Library contents plus Continue Watching progress, which changes when anything is watched elsewhere. */
private fun newLibrarySync()=LibrarySync({api.libraryRevision()+"#"+api.continueWatchingRevision()},::syncLibrary,android.os.SystemClock::elapsedRealtime)
private fun newLibrarySync()=LibrarySync(api::libraryRevision,::syncLibrary,android.os.SystemClock::elapsedRealtime)
private suspend fun syncLibrary():Boolean {
val expectedSession=session ?: return false
val expectedPage=page;val generation=loadGeneration
@ -285,15 +244,11 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
val detailSnapshot=detail?.takeIf{expectedPage.kind in listOf("details","group")&&it.type in listOf("show","season","collection")}
val freshChildren=detailSnapshot?.let{api.children(it.id)}
// Applying rebuilds every changed row (Plex varies some hubs on each request), which dropped
// frames when it landed mid-move. Wait until the remote has been quiet, then validate.
while(android.os.SystemClock.uptimeMillis()-lastInteraction<SyncQuietMillis)delay(250)
// All loads above are staged. A tab/filter/session change must win over this snapshot.
if(!foreground||session!=expectedSession||page!=expectedPage||generation!=loadGeneration||
section!=expectedSection||sort!=expectedSort||genre!=expectedGenre||unwatched!=expectedUnwatched||categories!=expectedCategories||allTitles!=expectedAllTitles||
playing!=null||busy||markingId!=null)return false
sections=freshSections;homeHubs=freshHome.hubs;homeFeatures=freshHome.features
android.util.Log.i("KaleidoSync","APPLIED continue=${freshHome.hubs.firstOrNull{it.id=="continue"}?.items?.size ?: 0}")
sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear()
sectionStale=freshSection==null
if(freshSection!=null){section=active;discoverHubs=freshSection.hubs;genres=freshSection.genres;library=freshSection.library.items;total=freshSection.library.total}
@ -304,13 +259,13 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
suspend fun previewDetails(item:Title):Title {
return try{previews.details(item)}catch(e:CancellationException){throw e}catch(_:Exception){item}
}
fun anticipate(item:Title,cinematic:Boolean=false,backdrop:Boolean=true,path:String=item.art.ifBlank{item.thumb},header:Boolean=false) {
fun anticipate(item:Title,cinematic:Boolean=false,backdrop:Boolean=true) {
previews.anticipate(item)
val wash=header&&colourWash
val key=if(backdrop)"$cinematic:$header:$wash:$path"else ""
val path=item.art.ifBlank{item.thumb}
val key=if(backdrop)"$cinematic:$path"else ""
if(key!=predictedArtworkKey){
predictedArtwork?.dispose();predictedArtwork=null;predictedArtworkKey=key
if(backdrop)browseBackdropRequest(application,api,path,cinematic,header,wash)?.let{predictedArtwork=application.imageLoader.enqueue(it.newBuilder().dispatcher(artworkPrefetchDispatcher).build())}
if(backdrop)browseBackdropRequest(application,api,path,cinematic)?.let{predictedArtwork=application.imageLoader.enqueue(it.newBuilder().dispatcher(artworkPrefetchDispatcher).build())}
}
}
private fun cancelAnticipation(){previews.cancelPrediction();predictedArtwork?.dispose();predictedArtwork=null;predictedArtworkKey=""}
@ -338,36 +293,23 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
fun beginAccountLink(){linkingAccount=true;linkAccount()}
fun cancelAccountLink(){authJob?.cancel();pin=null;servers=emptyList();accountToken=session?.accountToken.orEmpty();linkingAccount=false}
/** Rating keys are only unique per server: drop per-title state when the server or account changes. */
private fun clearServerState(){
searchJob?.cancel();searchJob=null;query="";searchResults=SearchResults()
episodeContextJob?.cancel();episodeContextJob=null;episodeTransitionJob?.cancel();episodeTransitionJob=null
episodeQueue=emptyList();relatedShows=emptyList();shuffleEpisodes=null;transitioningEpisode=false
mediaChoices.clear();episodeSelections.clear()
}
fun chooseServer(server: Server) = launchLoad {
sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation();clearDiscovery();clearServerState()
sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation()
val s=api.connect(server,accountToken); application.secure.save(s);api.session=s;session=s;servers=emptyList();linkingAccount=false;pages=listOf(Page());sections=api.sections();homeHubs=loadHome()
}
fun manualConnect(address: String, token: String) = launchLoad {
sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation();clearDiscovery();clearServerState()
sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation()
require(address.startsWith("https://")||address.startsWith("http://")){"Enter a complete http:// or https:// server address."}
require(token.isNotBlank()){ "Enter an access token." }
val s=api.validate(Session("",token.trim(),address.trim().trimEnd('/'),"Plex",""))
authJob?.cancel();application.secure.save(s);api.session=s;session=s;linkingAccount=false;pages=listOf(Page());sections=api.sections();homeHubs=loadHome()
}
fun signOut(){loadJob?.cancel();initializeJob?.cancel();clearServerState();application.secure.clear();api.session=null;session=null;homeHubs=emptyList();discoverHubs=emptyList();clearDiscovery();sections=emptyList();library=emptyList();sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation();pages=listOf(Page());servers=emptyList();accountToken="";linkAccount()}
/** Back or Cancel from the server picker: keep the current server, or start over with a new sign-in code. */
fun dismissServerPicker(){
loadJob?.cancel();busy=false
if(session==null){servers=emptyList();linkAccount()}else cancelAccountLink()
}
fun signOut(){loadJob?.cancel();initializeJob?.cancel();application.secure.clear();api.session=null;session=null;homeHubs=emptyList();discoverHubs=emptyList();sections=emptyList();library=emptyList();sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation();pages=listOf(Page());servers=emptyList();accountToken="";linkAccount()}
fun switchServer()=launchLoad { require(accountToken.isNotBlank()){ "This connection uses a server token. Sign out to link a Plex account." };servers=api.servers(accountToken) }
fun tab(kind: String){
if(pages.size==1&&page.kind==kind)return
// Search and Settings return to the browsing tab they were opened from.
if(kind in listOf("search","settings")&&pages.first().kind in listOf("home","movies","tv"))previousTab=pages.first().kind
if(kind!="search"){searchJob?.cancel();searchJob=null}
cancelAnticipation();loadJob?.cancel();busy=false;focusId="";if(kind in listOf("movies","tv")){allTitles=false;categories=false;genre="";libraryJumpIndex=-1;libraryJumpLetter=null};pages=listOf(Page(kind));loadPage(true)
}
fun open(item: Title){detailsCache[item.id]=item;episodeSelections.remove(item.id);pages=pages+Page(if(item.type in listOf("collection","season")) "group" else "details",item.id,item.title,focusId);loadPage()}
@ -387,7 +329,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
/** The version (Plex Media) chosen for this title in this session; the first version by default. */
fun mediaIndex(item:Title)=(mediaChoices[item.id] ?: 0).coerceIn(0,(item.media.size-1).coerceAtLeast(0))
fun chooseMedia(item:Title,index:Int){mediaChoices[item.id]=index}
fun chooseMedia(item:Title,index:Int){mediaChoices[item.id]=index;detail=detail?.let{if(it.id==item.id)it.copy()else it}}
fun openActor(actor:CastMember){
if(actor.id.isBlank())return
pages=pages+Page("actor",actor.id,actor.name,focusId,actor);focusId="";loadPage()
@ -461,17 +403,14 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
val cached=sectionCache[s.id]
if(cached!=null){discoverHubs=cached.hubs;genres=cached.genres;library=cached.library.items;total=cached.library.total;busy=false;return}
discoverHubs=emptyList();library=emptyList();total=0;genres=emptyList()
launchLoad({loadSection(s)}) {
val content=loadSectionContent(s).also{sectionCache[s.id]=it}
if(section?.id==s.id){discoverHubs=content.hubs;genres=content.genres;library=content.library.items;total=content.library.total}
}
}
private suspend fun loadSectionContent(s:Section):SectionContent=coroutineScope {
val g=async{api.genres(s.id)};val h=async{api.hubs(s.id)};val l=async{api.library(s.id,type=plexLibraryType(s.type))}
val seasons:kotlinx.coroutines.Deferred<List<Title>>?=if(s.type=="show")async{runCatching{api.recentSeasons(s.id)}.getOrDefault(emptyList())}else null
val raw=h.await();val genreList=g.await();val p=l.await();val newSeasons=seasons?.await().orEmpty()
val rows=(if(raw.isEmpty()&&p.items.isNotEmpty())listOf(Hub("library-${s.id}","From your library",p.items.take(18)))else raw)+if(newSeasons.isNotEmpty())listOf(Hub("tv.newseasons.${s.id}","New seasons",newSeasons))else emptyList()
SectionContent(rows,genreList,p)
launchLoad({loadSection(s)}) {coroutineScope {
val g=async{api.genres(s.id)};val h=async{api.hubs(s.id)};val l=async{api.library(s.id,type=plexLibraryType(s.type))}
val seasons:kotlinx.coroutines.Deferred<List<Title>>?=if(s.type=="show")async{runCatching{api.recentSeasons(s.id)}.getOrDefault(emptyList())}else null
val raw=h.await();val genreList=g.await();val p=l.await();val newSeasons=seasons?.await().orEmpty()
val rows=(if(raw.isEmpty()&&p.items.isNotEmpty())listOf(Hub("library-${s.id}","From your library",p.items.take(18)))else raw)+if(newSeasons.isNotEmpty())listOf(Hub("tv.newseasons.${s.id}","New seasons",newSeasons))else emptyList()
sectionCache[s.id]=SectionContent(rows,genreList,p)
if(section?.id==s.id){discoverHubs=rows;genres=genreList;library=p.items;total=p.total}
}}
}
fun chooseSection(s: Section){
if(s.id==section?.id)return
@ -480,11 +419,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
cancelAnticipation();focusId=if(allTitles)"library-entry"else "discovery-entry";loadSection(s)
if(keepCategories){allTitles=true;categories=true;focusId="categories-entry"}
}
fun setAll(value: Boolean){
// Genre filtering belongs to Categories; the Library grid always lists the whole section.
val hadGenre=genre.isNotBlank();focusId=if(value)"library-entry"else "discovery-entry";allTitles=value;categories=false;genre="";libraryJumpIndex=-1;libraryJumpLetter=null
if(hadGenre)refreshLibrary()
}
fun setAll(value: Boolean){focusId=if(value)"library-entry"else "discovery-entry";allTitles=value;categories=false;libraryJumpIndex=-1;libraryJumpLetter=null}
fun openCategories(){val hadGenre=genre.isNotBlank();allTitles=true;categories=true;genre="";focusId="categories-entry";libraryJumpIndex=-1;libraryJumpLetter=null;if(hadGenre)refreshLibrary()}
fun loadCategoryArtworks() {
val selectedSection=section ?: return
@ -570,7 +505,7 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
}
fun selectCategory(value:String){if(value.isBlank())return;categories=true;allTitles=true;genre=value;sort="titleSort:asc";focusId="category-grid";libraryJumpIndex=-1;libraryJumpLetter=null;refreshLibrary()}
fun filter(sortValue: String=sort,unwatchedValue: Boolean=unwatched){sort=sortValue;unwatched=unwatchedValue;libraryJumpIndex=-1;libraryJumpLetter=null;refreshLibrary()}
fun filter(sortValue: String=sort,genreValue: String=genre,unwatchedValue: Boolean=unwatched){sort=sortValue;genre=genreValue;unwatched=unwatchedValue;libraryJumpIndex=-1;libraryJumpLetter=null;refreshLibrary()}
private fun refreshLibrary() {
val selectedSection=section ?: return
val requestedSort=sort;val requestedGenre=genre;val requestedUnwatched=unwatched
@ -658,26 +593,12 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
sectionCache.clear();characterOffsetCache.clear()
}
fun play(item: Title,fromStart: Boolean=false):Unit=launchLoad({play(item,fromStart)}) {
shuffleEpisodes=null
debugMode=null;debugValidation=false;debugValidationFile=null
val playable=if(item.type=="show" || item.type=="season") {
val episodes=api.allEpisodes(item.id);episodes.firstOrNull {it.offset>0&&!it.watched} ?: episodes.firstOrNull {!it.watched} ?: episodes.firstOrNull() ?: throw PlexException("No playable episodes are available.")
} else item
val d=api.details(playable.id);require(d.media.firstOrNull()?.parts?.isNotEmpty()==true){"No playable media file is available."};startFromZero=fromStart;playing=d
}
/** Starts a show-wide shuffle bag. Watched state and resume offsets do not affect eligibility. */
fun playShuffled(show:Title,validation:Boolean=false):Unit=launchLoad({playShuffled(show,validation)}) {
require(show.type=="show") { "Shuffle is available from a TV show page." }
debugMode=null;debugValidation=BuildConfig.DEBUG&&validation;debugValidationFile=null
val episodes=api.allEpisodes(show.id).filter{it.type=="episode"}.distinctBy{it.id}
val order=ShuffleEpisodes(episodes,Title::id)
val first=order.first ?: throw PlexException("No playable episodes are available.")
val metadata=api.details(first.id)
require(metadata.media.firstOrNull()?.parts?.isNotEmpty()==true){"No playable media file is available."}
shuffleEpisodes=order
startFromZero=true
playing=metadata
}
fun loadEpisodeContext(item:Title) {
if(item.type!="episode")return
if(episodeQueue.any{it.id==item.id})return
@ -691,71 +612,25 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
}
}
/** The episode before [item]: the previous one in the show, or the previous shuffle pick. */
fun precedingEpisode(item:Title):Title? {
val shuffle=shuffleEpisodes
if(shuffle!=null)return shuffle.preceding(item.id)
val i=episodeQueue.indexOfFirst{it.id==item.id};return if(i>0)episodeQueue[i-1]else null
}
/** False only once the episode list has loaded and [item] is the show's first episode (or the shuffle's first pick). */
fun mayHavePrecedingEpisode(item:Title):Boolean {
val shuffle=shuffleEpisodes
if(shuffle!=null)return shuffle.preceding(item.id)!=null
val i=episodeQueue.indexOfFirst{it.id==item.id};return i!=0
}
fun followingEpisode(item:Title):Title? {
val shuffle=shuffleEpisodes
if(shuffle!=null)return shuffle.following(item.id)
val i=episodeQueue.indexOfFirst{it.id==item.id};return if(i>=0)episodeQueue.getOrNull(i+1)else null
}
fun previousEpisode(item: Title) {
if(episodeTransitionJob?.isActive==true)return
episodeTransitionJob=viewModelScope.launch {
transitioningEpisode=true
try {
val shuffle=shuffleEpisodes
val previous=if(shuffle!=null)shuffle.preceding(item.id) else {
val episodes=if(episodeQueue.any{it.id==item.id})episodeQueue else api.allEpisodes(item.grandparentId).sortedWith(compareBy<Title>{it.parentIndex}.thenBy{it.index})
val i=episodes.indexOfFirst{it.id==item.id};if(i>0)episodes[i-1]else null
} ?: return@launch
val metadata=api.details(previous.id)
if(playing?.id==item.id){if(shuffle!=null)shuffle.retreat(item.id,previous.id);startFromZero=true;playbackInstance++;playing=metadata}
}catch(e:CancellationException){throw e}catch(e:Exception){fail(e.message ?: "The previous episode could not be loaded."){previousEpisode(item)}}finally{transitioningEpisode=false}
}
}
fun followingEpisode(item:Title):Title? {val i=episodeQueue.indexOfFirst{it.id==item.id};return if(i>=0)episodeQueue.getOrNull(i+1)else null}
fun nextEpisode(item: Title) {
if(episodeTransitionJob?.isActive==true)return
episodeTransitionJob=viewModelScope.launch {
transitioningEpisode=true
try {
val shuffle=shuffleEpisodes
val next=if(shuffle!=null)shuffle.following(item.id) else {
val episodes=if(episodeQueue.any{it.id==item.id})episodeQueue else api.allEpisodes(item.grandparentId).sortedWith(compareBy<Title>{it.parentIndex}.thenBy{it.index})
val i=episodes.indexOfFirst{it.id==item.id};if(i>=0)episodes.getOrNull(i+1)else null
}
if(next!=null){val metadata=api.details(next.id);if(playing?.id==item.id){if(shuffle!=null)shuffle.advance(item.id,next.id);startFromZero=true;playbackInstance++;playing=metadata}}
val episodes=if(episodeQueue.any{it.id==item.id})episodeQueue else api.allEpisodes(item.grandparentId).sortedWith(compareBy<Title>{it.parentIndex}.thenBy{it.index})
val i=episodes.indexOfFirst{it.id==item.id};val next=if(i>=0)episodes.getOrNull(i+1)else null
if(next!=null){val metadata=api.details(next.id);if(playing?.id==item.id){startFromZero=true;playing=metadata}}
else if(playing?.id==item.id)stopPlayback()
}catch(e:CancellationException){throw e}catch(e:Exception){fail(e.message ?: "The next episode could not be loaded."){nextEpisode(item)}}finally{transitioningEpisode=false}
}
}
/** The server ended this session: leave the player and explain, offering to resume from the saved position. */
fun playbackStoppedByServer(item:Title,message:String){
if(playing?.id!=item.id)return
stopPlayback();fail(message){play(item)}
}
/** Each player's timeline reporter, until it has sent its final position. */
private val playbackReports=java.util.concurrent.CopyOnWriteArraySet<Job>()
internal fun trackPlaybackReports(job:Job){playbackReports+=job;job.invokeOnCompletion{playbackReports-=job}}
fun stopPlayback(){
val finished=playing
shuffleEpisodes=null
if(finished!=null)playbackReturn++;playing=null;sectionCache.clear();characterOffsetCache.clear();detailsCache.clear();previews.clear();cancelAnticipation()
// A season or episode page shows the last episode played, with fresh progress in its row.
detail?.let{if(finished?.type=="episode"&&it.type in listOf("season","episode"))episodeSelections[it.id]=finished.id}
launchLoad {
// The player closes after this frame and only then reports where it stopped. Reloading
// before Plex has that report showed the previous Continue Watching.
kotlinx.coroutines.withTimeoutOrNull(PlaybackReportWaitMillis){playbackReports.toList().forEach{it.join()}}
homeHubs=loadHome()
detail?.let {
if(it.type in listOf("movie","episode"))detail=api.details(it.id)
@ -764,8 +639,6 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
}
}
}
// Earlier versions stored an on/off switch that skipped at once; on becomes a short, cancellable countdown.
private fun autoSkipSeconds(name:String)=preferences.getInt("${name}Seconds",if(preferences.getBoolean(name,false))AutoSkipDefaultSeconds else 0).coerceIn(0,60)
// Earlier versions stored a mode (Original/Direct stream/Transcode) and a separate transcode quality.
private fun savedStreamQuality()=preferences.getString("streamQuality",null)?.let{name->StreamQuality.entries.firstOrNull{it.name==name}}
?: if(preferences.getInt("playbackModeV2",1)==2)(if(preferences.getInt("quality",20000)>20000)StreamQuality.UltraHD else StreamQuality.FullHD)else StreamQuality.Original
@ -774,15 +647,15 @@ class KaleidoViewModel(app: Application): AndroidViewModel(app) {
/** The player's quality menu changes the preference for the connection in use. */
fun chooseActiveQuality(value: StreamQuality)=if(localConnection)chooseStreamQuality(value)else chooseRemoteQuality(value)
fun chooseAutoplaySeconds(value:Int){autoplaySeconds=value.coerceAtLeast(0);preferences.edit().putInt("autoplaySeconds",autoplaySeconds).apply()}
fun chooseAutoSkipIntro(seconds:Int){autoSkipIntroSeconds=seconds.coerceIn(0,60);preferences.edit().putInt("autoSkipIntroSeconds",autoSkipIntroSeconds).remove("autoSkipIntro").apply()}
fun chooseAutoSkipCredits(seconds:Int){autoSkipCreditsSeconds=seconds.coerceIn(0,60);preferences.edit().putInt("autoSkipCreditsSeconds",autoSkipCreditsSeconds).remove("autoSkipCredits").apply()}
fun chooseAutoSkipIntro(value:Boolean){autoSkipIntro=value;preferences.edit().putBoolean("autoSkipIntro",value).apply()}
fun chooseAutoSkipCredits(value:Boolean){autoSkipCredits=value;preferences.edit().putBoolean("autoSkipCredits",value).apply()}
fun chooseSubtitleSize(value:SubtitleSize){subtitleSize=value;preferences.edit().putString("subtitleSize",value.name).apply()}
fun chooseSubtitleStyle(value:SubtitleStyle){subtitleStyle=value;preferences.edit().putString("subtitleStyle",value.name).apply()}
fun chooseWatchedPercent(value:Int){watchedPercent=value.coerceIn(50,100);preferences.edit().putInt("watchedPercent",watchedPercent).apply()}
fun chooseNavigationSounds(value:Boolean){navigationSounds=value;preferences.edit().putBoolean("navigationSounds",value).apply()}
fun chooseColourWash(value:Boolean){colourWash=value;preferences.edit().putBoolean("colourWash",value).apply()}
fun chooseThemeMusic(value:Boolean){themeMusic=value;preferences.edit().putBoolean("themeMusic",value).apply()}
fun chooseThemeVolume(value:Int){themeVolume=value.coerceIn(10,100);preferences.edit().putInt("themeVolume",themeVolume).apply()}
fun chooseVolumeBoostDb(value:Int){volumeBoostDb=value.coerceIn(0,12);preferences.edit().putInt("volumeBoostDb",volumeBoostDb).apply()}
fun checkUpdate(manual: Boolean=true){viewModelScope.launch {
if(downloading||!manual&&System.currentTimeMillis()-preferences.getLong("lastUpdateCheck",0)<6*3600_000L)return@launch
updateStatus="Checking for updates…"

View file

@ -36,10 +36,7 @@ class MainActivity: ComponentActivity() {
super.onCreate(savedInstanceState)
WindowCompat.setDecorFitsSystemWindows(window,false)
WindowInsetsControllerCompat(window,window.decorView).apply{hide(WindowInsetsCompat.Type.systemBars());systemBarsBehavior=WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE}
@Suppress("DEPRECATION")
FramePrefetch.frameNanos=(1_000_000_000/windowManager.defaultDisplay.refreshRate.coerceAtLeast(24f)).toLong()
setContent { KaleidoApp(model,::installApk) }
window.decorView.viewTreeObserver.addOnDrawListener{FramePrefetch.drew()}
// Compose paints Ink over the whole window; the theme background only covers launch.
window.setBackgroundDrawable(null)
debugPlayback(intent)

View file

@ -1,14 +1,13 @@
package tv.kaleido.app
import androidx.compose.runtime.Immutable
import org.json.JSONArray
import org.json.JSONObject
fun JSONArray?.objects(): List<JSONObject> = if (this == null) emptyList() else (0 until length()).mapNotNull { optJSONObject(it) }
data class Section(val id: String, val title: String, val type: String)
@Immutable data class Stream(val id: String, val type: Int, val codec: String, val language: String, val title: String, val selected: Boolean, val key: String, val channels: Int, val index: Int)
@Immutable data class Part(val id: String, val key: String, val streams: List<Stream>,val indexes:String="",val duration:Long=0,val size:Long=0)
@Immutable data class Media(val id: String, val container: String, val videoCodec: String, val audioCodec: String, val resolution: String, val width: Int, val height: Int, val bitrate: Int, val parts: List<Part>,
data class Stream(val id: String, val type: Int, val codec: String, val language: String, val title: String, val selected: Boolean, val key: String, val channels: Int, val index: Int)
data class Part(val id: String, val key: String, val streams: List<Stream>,val indexes:String="",val duration:Long=0,val size:Long=0)
data class Media(val id: String, val container: String, val videoCodec: String, val audioCodec: String, val resolution: String, val width: Int, val height: Int, val bitrate: Int, val parts: List<Part>,
val dynamicRange:String="",val audioChannels:Int=0) {
val resolutionLabel get()=when(resolution.lowercase()){"4k"->"4K";"sd"->"SD";""->"";else->if(resolution.all(Char::isDigit))"${resolution}p"else resolution.uppercase()}
val channelLabel get()=when(audioChannels){0->"";1->"Mono";2->"Stereo";6->"5.1";8->"7.1";else->"$audioChannels ch"}
@ -19,19 +18,16 @@ data class Section(val id: String, val title: String, val type: String)
listOf(audioCodec.uppercase(),channelLabel,if(atmos)"Atmos"else "").filter{it.isNotBlank()}.joinToString(" "),
if(bitrate>0)"${(bitrate+500)/1000} Mbps"else "",if(includeSize&&size>0)fileSize(size)else "",if(parts.size>1)"${parts.size} parts"else "")
.filter{it.isNotBlank()}.joinToString(" · ")
/** What the format badges leave out: codecs, audio layout and bitrate, e.g. "AV1 · EAC3 5.1 · 10 Mbps". */
val technical get()=listOf(videoCodec.uppercase(),listOf(audioCodec.uppercase(),channelLabel).filter{it.isNotBlank()}.joinToString(" "),
if(bitrate>0)"${(bitrate+500)/1000} Mbps"else "",if(parts.size>1)"${parts.size} parts"else "").filter{it.isNotBlank()}.joinToString(" · ")
}
internal fun fileSize(bytes:Long):String = if(bytes>=1_000_000_000L)String.format(java.util.Locale.US,"%.1f GB",bytes/1e9)else "${bytes/1_000_000} MB"
@Immutable data class Marker(val type: String, val start: Long, val end: Long)
@Immutable data class Chapter(val index:Int,val title:String,val start:Long,val end:Long,val thumb:String)
@Immutable data class CastMember(val id:String,val name:String,val role:String,val thumb:String) {
data class Marker(val type: String, val start: Long, val end: Long)
data class Chapter(val index:Int,val title:String,val start:Long,val end:Long,val thumb:String)
data class CastMember(val id:String,val name:String,val role:String,val thumb:String) {
companion object {
fun parse(j:JSONObject)=CastMember(j.optString("id").ifBlank{j.optString("filter").removePrefix("actor=")}.takeIf{it.all(Char::isDigit)}.orEmpty(),j.optString("tag"),j.optString("role"),j.optString("thumb"))
}
}
@Immutable data class Title(
data class Title(
val id: String, val key: String, val type: String, val title: String, val summary: String,
val thumb: String, val art: String, val year: String, val duration: Long, val offset: Long,
val watched: Boolean, val rating: String, val contentRating: String, val parentTitle: String,
@ -103,7 +99,7 @@ internal fun fileSize(bytes:Long):String = if(bytes>=1_000_000_000L)String.forma
}
/** Plex normalizes external ratings to 0–10. Never substitute the critic `rating` field. */
@Immutable data class AudienceScore(val source:String,val value:Double) {
data class AudienceScore(val source:String,val value:Double) {
val displayValue get() = if(source=="Rotten Tomatoes")"${kotlin.math.round(value*10).toInt()}%"else "${String.format(java.util.Locale.US,"%.1f",value)}/10"
val label get() = "$source ${if(source=="Rotten Tomatoes")"audience "else ""}$displayValue"
companion object {
@ -130,9 +126,9 @@ internal fun fileSize(bytes:Long):String = if(bytes>=1_000_000_000L)String.forma
internal fun reachedWatchedThreshold(position:Long,duration:Long,percent:Int):Boolean =
duration>0&&position.toDouble()/duration>=percent.coerceIn(50,100)/100.0
/** [key] and [more] come from Plex: a row with more titles than shown can open its full list. */
@Immutable data class Hub(val id: String, val title: String, val items: List<Title>,val key:String="",val more:Boolean=false)
@Immutable data class LibraryPage(val items: List<Title>,val total: Int)
@Immutable data class SearchResults(val titles:List<Title> = emptyList(),val people:List<CastMember> = emptyList())
data class Hub(val id: String, val title: String, val items: List<Title>,val key:String="",val more:Boolean=false)
data class LibraryPage(val items: List<Title>,val total: Int)
data class SearchResults(val titles:List<Title> = emptyList(),val people:List<CastMember> = emptyList())
data class Server(val id: String, val name: String, val token: String, val connections: List<String>)
data class Session(val accountToken: String, val serverToken: String, val server: String, val serverName: String, val machineId: String)
data class Pin(val id: String,val code: String)

View file

@ -48,17 +48,16 @@ data class TimelineReport(val position: Long,val state: String,val duration: Lon
class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
private val app=vm.application
val api=vm.api
/** The server this title belongs to. Progress reports finish after close and must not follow a server change. */
private val server=api.session
val scope=CoroutineScope(SupervisorJob()+Dispatchers.Main.immediate)
val selector=DefaultTrackSelector(app)
private val sourceFactory=DefaultMediaSourceFactory(DefaultDataSource.Factory(app,OkHttpDataSource.Factory(api.http).setDefaultRequestProperties(api.headers().filterKeys{it!="Accept"})))
private val renderers=object:DefaultRenderersFactory(app) {
override fun buildAudioSink(context:android.content.Context,enableFloatOutput:Boolean,enableAudioOutputPlaybackParams:Boolean):androidx.media3.exoplayer.audio.AudioSink =
CompatibleAudioSink(androidx.media3.exoplayer.audio.DefaultAudioSink.Builder(context)
.setEnableFloatOutput(enableFloatOutput)
.setAudioProcessors(if(vm.volumeBoostDb>0)arrayOf(VolumeBoostProcessor(vm.volumeBoostDb){Log.i("KaleidoPlayback","BOOST processing PCM db=${vm.volumeBoostDb}")})else emptyArray())
.setEnableFloatOutput(enableFloatOutput&&vm.volumeBoostDb==0)
.setEnableAudioOutputPlaybackParameters(enableAudioOutputPlaybackParams)
.build())
.build(),decodedOnly=vm.volumeBoostDb>0)
}.setEnableDecoderFallback(true).forceDisableMediaCodecAsynchronousQueueing()
val player=ExoPlayer.Builder(app,renderers).setTrackSelector(selector).setMediaSourceFactory(sourceFactory).build().apply {
setAudioAttributes(AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).setContentType(C.AUDIO_CONTENT_TYPE_MOVIE).build(),true)
@ -82,9 +81,8 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
mode==2->"Converting · "+quality.conversion.label
serverConverting->if(serverAudioConverting)"Converted video and audio"else "Converted video"
serverAudioConverting->"Original video · Converted audio"
else->qualityOptionLabel(StreamQuality.Original)
else->StreamQuality.Original.label
}
fun qualityOptionLabel(value:StreamQuality)=value.forMedia(media)
var loading by mutableStateOf(true);private set
var error by mutableStateOf<String?>(null);private set
var position by mutableLongStateOf(if(vm.startFromZero)0 else item.offset);private set
@ -100,46 +98,30 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
val part get()=parts[partIndex.coerceIn(0,parts.lastIndex)]
private val partOffset get()=partStart(parts,partIndex)
var activeSubtitle by mutableStateOf(parts.first().streams.firstOrNull{it.type==3&&it.selected}?.id ?: "0");private set
var activeAudio by mutableStateOf((parts.first().streams.firstOrNull{it.type==2&&it.selected} ?: parts.first().streams.firstOrNull{it.type==2})?.id.orEmpty());private set
var activeAudio by mutableStateOf(parts.first().streams.firstOrNull{it.type==2&&it.selected}?.id.orEmpty());private set
private var streamSession=UUID.randomUUID().toString()
private var streamStart=0L
private var preparing=false
private var closed=false
/** False while the app is stopped (Home, another app): a pending preparation must not start playing. */
private var foreground=true
private val prepareMutex=Mutex()
private val streamSelectionMutex=Mutex()
private var fallbackPending=false
private var nativeSelectionApplied=false
private val reports=Channel<TimelineReport>(Channel.UNLIMITED)
// Trailers and other extras are not library progress.
private val synced=!validation&&item.type!="clip"
/** Set once the server ends this session (dashboard Stop); nothing may reconnect or fall back after it. */
private var serverStopped=false
private val reportJob=app.scope.launch {
val watched=WatchedProgress{api.watched(item,true,server);withContext(Dispatchers.Main){if(api.session==server)vm.refreshWatched(item)}}
val watched=WatchedProgress{api.watched(item,true);withContext(Dispatchers.Main){vm.refreshWatched(item)}}
// Trailers and other extras are not library progress.
val synced=!validation&&item.type!="clip"
for(r in reports) {
if(synced) {
runCatching {api.timeline(item,r.position,r.state,r.duration,streamSession,server)}.onFailure {Log.w("KaleidoPlayback","Timeline sync unavailable")}
.getOrNull()?.let{if(!r.final)withContext(Dispatchers.Main){stoppedByServer(it)}}
runCatching {api.timeline(item,r.position,r.state,r.duration,streamSession)}.onFailure {Log.w("KaleidoPlayback","Timeline sync unavailable")}
runCatching{watched.report(r.position,r.duration,vm.watchedPercent)}
.onFailure{Log.w("KaleidoPlayback","Watched status sync unavailable")}
}
if(r.final){if(mode>0)runCatching{api.stopTranscode(streamSession,server)};break}
if(r.final){if(mode>0)runCatching{api.stopTranscode(streamSession)};break}
}
}
init {
vm.trackPlaybackReports(reportJob)
audit?.let{player.addAnalyticsListener(it)}
// Sparse diagnostics also survive in release logcat when an intermittent dropout occurs.
player.addAnalyticsListener(object:androidx.media3.exoplayer.analytics.AnalyticsListener {
override fun onAudioUnderrun(t:androidx.media3.exoplayer.analytics.AnalyticsListener.EventTime,size:Int,duration:Long,elapsed:Long) {
Log.w("KaleidoAudio","UNDERRUN item=${item.id} position=${t.eventPlaybackPositionMs} bufferMs=$duration sinceFeedMs=$elapsed mode=$mode")
}
override fun onAudioSinkError(t:androidx.media3.exoplayer.analytics.AnalyticsListener.EventTime,e:Exception) {
Log.w("KaleidoAudio","SINK_ERROR item=${item.id} position=${t.eventPlaybackPositionMs} kind=${e.javaClass.simpleName}")
}
})
player.addListener(object: Player.Listener {
override fun onPlaybackStateChanged(state: Int) {
loading=state==Player.STATE_BUFFERING
@ -156,9 +138,6 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
override fun onIsPlayingChanged(value: Boolean){isPlaying=value;if(!preparing&&!closed)report(if(value)"playing"else "paused")}
override fun onTracksChanged(value: Tracks){
tracks=value
audit?.event("selectedTracks",org.json.JSONObject().put("audio",org.json.JSONArray(value.groups.filter{it.type==C.TRACK_TYPE_AUDIO}.flatMap{g->
(0 until g.length).filter{g.isTrackSelected(it)}.map{index->g.getTrackFormat(index).let{f->org.json.JSONObject().put("id",f.id).put("mime",f.sampleMimeType).put("channels",f.channelCount)}}
})))
Log.i("KaleidoPlayback","TRACKS audio=${value.groups.count{it.type==C.TRACK_TYPE_AUDIO}} text=${value.groups.count{it.type==C.TRACK_TYPE_TEXT}}")
// Some extractors expose only audio for an unsupported video codec (e.g. VC-1).
if(value.groups.isNotEmpty()&&media.videoCodec.isNotBlank()&&
@ -173,39 +152,23 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
}
override fun onPlayerError(e: PlaybackException) {
Log.w("KaleidoPlayback","ERROR code=${e.errorCodeName} mode=$mode")
if(serverStopped)return
if(mode<2&&localValidationFile==null)fallback(e.errorCodeName)
else scope.launch{if(!checkServerStopped(position)){loading=false;error="Playback failed (${e.errorCodeName}). Check the server transcoder, network connection, and media availability."}}
if(mode<2&&localValidationFile==null)fallback(e.errorCodeName)else{loading=false;error="Playback failed (${e.errorCodeName}). Check the server transcoder, network connection, and media availability."}
}
})
scope.launch {prepare(mode,position)}
if(audit!=null)scope.launch{while(isActive){delay(1000);audit.sample(mode)}}
scope.launch {var ticks=0;while(isActive){delay(250);if(!preparing){position=currentPosition();bufferedPosition=(partOffset+player.bufferedPosition).coerceIn(0,duration);val d=player.duration;if(d>0&&parts.size==1)duration=if(mode>0)item.duration else d};if(++ticks%40==0&&!ended)report(if(preparing||loading)"buffering"else if(isPlaying)"playing"else "paused")}}
scope.launch {var ticks=0;while(isActive){delay(250);if(!preparing){position=currentPosition();bufferedPosition=(partOffset+player.bufferedPosition).coerceIn(0,duration);val d=player.duration;if(d>0&&parts.size==1)duration=if(mode>0)item.duration else d};if(++ticks%40==0&&!preparing&&!ended)report(if(isPlaying)"playing"else "paused")}}
}
/** Position on the title's timeline, across parts. */
private fun currentPosition() = (partOffset+player.currentPosition).coerceIn(0,duration.coerceAtLeast(0))
private fun report(state: String,final: Boolean=false){reports.trySend(TimelineReport(position,state,duration,final))}
private fun stoppedByServer(termination:PlaybackTermination) {
if(closed||serverStopped)return
serverStopped=true
Log.i("KaleidoPlayback","TERMINATED item=${item.id} code=${termination.code} mode=$mode")
seekJob?.cancel();player.stop();loading=false
vm.playbackStoppedByServer(item,termination.message)
}
/** A failed stream may be one the server stopped: ask Plex before reconnecting, so a stopped session stays stopped. */
private suspend fun checkServerStopped(offset:Long):Boolean {
if(serverStopped)return true
if(!synced)return false
val termination=withTimeoutOrNull(3000){runCatching{api.timeline(item,offset,"buffering",duration,streamSession,server)}.getOrNull()} ?: return false
stoppedByServer(termination);return true
}
private fun fallback(reason:String) {
if(closed||serverStopped||mode>=2||localValidationFile!=null||fallbackPending)return
if(closed||mode>=2||localValidationFile!=null||fallbackPending)return
fallbackPending=true
val session=streamSession;val offset=if(preparing)position else currentPosition();val resume=player.playWhenReady
scope.launch {
try {prepareMutex.withLock {
if(!closed&&session==streamSession&&!checkServerStopped(offset)) {
if(!closed&&session==streamSession) {
audit?.event("fallback",org.json.JSONObject().put("reason",reason).put("fromMode",mode).put("offset",offset))
prepareInternal(mode+1,offset,resume)
}
@ -214,14 +177,13 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
}
suspend fun prepare(newMode: Int,offset: Long,resume:Boolean=true) = prepareMutex.withLock{prepareInternal(newMode,offset,resume)}
private suspend fun prepareInternal(newMode: Int,offset: Long,resume:Boolean) {
if(closed||serverStopped)return
if(closed)return
preparing=true;loading=true;error=null;ended=false;nativeSelectionApplied=false
serverConverting=false;serverAudioConverting=false
// Empty track events from stop must not be mistaken for a missing video track.
player.stop()
selector.parameters=selector.buildUponParameters().clearOverrides().build()
try {
if(mode>0)runCatching{api.stopTranscode(streamSession,server)}
if(mode>0)runCatching{api.stopTranscode(streamSession)}
mode=newMode;streamSession=UUID.randomUUID().toString();streamStart=offset
partIndex=partFor(parts,offset)
val partOffsetMs=(offset-partOffset).coerceAtLeast(0)
@ -235,10 +197,7 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
MediaItem.SubtitleConfiguration.Builder(android.net.Uri.parse(api.url(s.key))).setId(s.id).setLabel(s.title).setLanguage(s.language).setMimeType(when(s.codec){"srt"->MimeTypes.APPLICATION_SUBRIP;"ass","ssa"->MimeTypes.TEXT_SSA;else->MimeTypes.TEXT_VTT}).setSelectionFlags(if(s.id==currentStream(activeSubtitle)?.id)C.SELECTION_FLAG_DEFAULT else 0).build()
})
} else {
val p=api.transcodeParams(item,streamSession,mode,partOffsetMs,quality.conversion,mediaIndex,partIndex,local,vm.subtitleSize.plexPercent).toMutableMap().apply {
currentStream(activeAudio)?.let{put("audioStreamID",it.id)}
put("subtitleStreamID",currentStream(activeSubtitle)?.id ?: "0")
}
val p=api.transcodeParams(item,streamSession,mode,partOffsetMs,quality.conversion,mediaIndex,partIndex,local,vm.subtitleSize.plexPercent)
val decision=api.container("/video/:/transcode/universal/decision",p)
val streams=decision.optJSONArray("Metadata").objects().flatMap{it.optJSONArray("Media").objects()}
.flatMap{it.optJSONArray("Part").objects()}.flatMap{it.optJSONArray("Stream").objects()}
@ -255,7 +214,7 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
}
// Plex HLS exposes the part's original timeline, including a seek-start offset:
// never add the requested offset again.
player.setMediaItem(builder.build(),partOffsetMs);player.prepare();player.playWhenReady=resume&&foreground;player.setPlaybackSpeed(playbackRate)
player.setMediaItem(builder.build(),partOffsetMs);player.prepare();player.playWhenReady=resume;player.setPlaybackSpeed(playbackRate)
Log.i("KaleidoPlayback","PREPARE item=${item.id} mode=$mode offset=$offset part=${partIndex+1}/${parts.size} media=${mediaIndex+1}/${item.media.size} local=$local")
}catch(e:CancellationException){throw e}catch(e:Exception){
audit?.event("prepareFailure",org.json.JSONObject().put("mode",newMode).put("kind",e.javaClass.simpleName).put("httpStatus",(e as? PlexException)?.status))
@ -276,10 +235,7 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
/** Moves the pending seek target; repeated presses accumulate into one seek after [settle] ms. */
fun scrubBy(delta:Long,settle:Long=650){scrubPosition=((scrubPosition ?: position)+delta).coerceIn(0,duration);seekJob?.cancel();seekJob=scope.launch{delay(settle);commitScrub()}}
fun commitScrub(){val target=scrubPosition ?: return;scrubPosition=null;seekTo(target)}
fun pause(){player.pause();if(!preparing)position=currentPosition();report("paused")}
/** The app left the foreground: pause, and keep any preparation still in flight paused. */
fun enterBackground(){foreground=false;pause()}
fun enterForeground(){foreground=true}
fun pause(){player.pause();position=currentPosition();report("paused")}
fun select(type:Int,groupIndex:Int,trackIndex:Int) {
val group=tracks.groups[groupIndex];selector.parameters=selector.buildUponParameters().setTrackTypeDisabled(type,false).setOverrideForType(TrackSelectionOverride(group.mediaTrackGroup,listOf(trackIndex))).build()
}
@ -311,27 +267,18 @@ class PlaybackController(private val vm: KaleidoViewModel,val item: Title) {
}
fun selectServerStream(stream:Stream?,type:Int) {
scope.launch {
streamSelectionMutex.withLock {
try {prepareMutex.withLock selection@{
if(closed)return@selection
try {
val part=part
val selected=stream?.let{currentStream(it.id)}
val id=selected?.id ?: "0"
if(type==C.TRACK_TYPE_AUDIO&&selected==null)return@selection
if(type==C.TRACK_TYPE_TEXT){api.selectStreams(part,subtitle=id);activeSubtitle=id}
else{api.selectStreams(part,audio=id);activeAudio=id}
val offset=currentPosition();val resume=player.playWhenReady
audit?.event("streamSelected",org.json.JSONObject().put("type",type).put("streamId",id).put("offset",offset).put("resume",resume))
if(mode>0){prepareInternal(mode,offset,resume);return@selection}
if(type==C.TRACK_TYPE_TEXT){activeSubtitle=stream?.id ?: "0";api.selectStreams(part,subtitle=activeSubtitle)}else{activeAudio=stream?.id.orEmpty();api.selectStreams(part,audio=activeAudio)}
if(mode>0){prepare(mode,position,player.playWhenReady);return@launch}
if(stream==null){selector.parameters=selector.buildUponParameters().setTrackTypeDisabled(type,true).build();return@launch}
val match=selected?.let{nativeTrack(type,it)}
val match=nativeTrack(type,stream)
if(match!=null&&tracks.groups[match.first].isTrackSupported(match.second,true))select(type,match.first,match.second)
else prepareInternal(if(type==C.TRACK_TYPE_AUDIO)1 else 2,offset,resume)
}}catch(e:CancellationException){throw e}catch(e:Exception){error="Could not change the selected track. Please try again."}
}
else prepare(2,position) // Image subtitles and unsupported embedded tracks are burned by Plex.
}catch(e:CancellationException){throw e}catch(e:Exception){error=e.message ?: "Could not change the selected track."}
}
}
fun close(){if(closed)return;if(!preparing)position=currentPosition();closed=true;scope.cancel();audit?.finish(mode);report("stopped",true);reports.close();mediaSession.release();player.release()}
fun close(){if(closed)return;position=currentPosition();closed=true;scope.cancel();audit?.finish(mode);report("stopped",true);reports.close();mediaSession.release();player.release()}
}
/** The single playback quality preference: the original stream, then conversions from highest to lowest resolution. */
enum class StreamQuality(val label:String,val width:Int,val height:Int,val kbps:Int) {
@ -342,8 +289,6 @@ enum class StreamQuality(val label:String,val width:Int,val height:Int,val kbps:
SD("480p · 3 Mbps",720,480,3000);
/** Target used when Plex must convert; Original falls back to 1080p if direct streaming fails. */
val conversion get()=if(this==Original)FullHD else this
fun forMedia(media:Media):String = if(this!=Original)label else "$label · "+
if(media.bitrate>0)String.format(java.util.Locale.US,"%.1f Mbps",media.bitrate/1000.0)else "Bitrate unavailable"
}
fun clockTime(ms:Long):String {val s=(ms.coerceAtLeast(0)/1000);return if(s>=3600)"%d:%02d:%02d".format(s/3600,s/60%60,s%60)else "%d:%02d".format(s/60,s%60)}
/** Subtitle text size; [plexPercent] sizes subtitles Plex burns into converted video. */

View file

@ -19,178 +19,71 @@ 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 androidx.lifecycle.Lifecycle
import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.compose.currentStateAsState
import kotlinx.coroutines.delay
import androidx.compose.material3.Icon
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusProperties
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
@Composable internal fun PlaybackOptions(vm:KaleidoViewModel,controller:PlaybackController,item:Title,menu:Int,open:(Int)->Unit,close:()->Unit) {
val speeds=listOf(.5f,.75f,1f,1.25f,1.5f,2f)
// Audio is also named here so it is discoverable without recognizing the speaker icon.
val entries=listOfNotNull(10 to "Audio · ${controller.currentStream(controller.activeAudio)?.title ?: "Choose track"}",
4 to "Quality · ${controller.qualityOptionLabel(vm.activeQuality)}"+if(vm.localConnection)""else " (remote)",5 to "Speed · ${speedLabel(controller.playbackRate)}",
// Audio and Subtitles have their own buttons; this menu holds the remaining options.
val entries=listOfNotNull(4 to "Quality · ${vm.activeQuality.label}"+if(vm.localConnection)""else " (remote)",5 to "Speed · ${speedLabel(controller.playbackRate)}",
if(item.chapters.isNotEmpty())7 to "Chapters" else null,8 to "Subtitle size · ${vm.subtitleSize.label}",9 to "Subtitle style · ${vm.subtitleStyle.label}")
// A submenu returns focus to the option that opened it.
var returnTo by remember{mutableIntStateOf(0)}
val dismiss={if(menu==3)close()else open(3)}
when(menu) {
3->TrackPanel("Playback options",entries.map{it.second},-1,dismiss,focusIndex=entries.indexOfFirst{it.first==returnTo}.coerceAtLeast(0)){index->returnTo=entries[index].first;open(entries[index].first)}
4->TrackPanel(if(vm.localConnection)"Playback quality"else "Remote playback quality",StreamQuality.entries.map(controller::qualityOptionLabel),vm.activeQuality.ordinal,dismiss){controller.changeQuality(StreamQuality.entries[it]);close()}
4->TrackPanel(if(vm.localConnection)"Playback quality"else "Remote playback quality",StreamQuality.entries.map{it.label},vm.activeQuality.ordinal,dismiss){controller.changeQuality(StreamQuality.entries[it]);close()}
5->TrackPanel("Playback speed",speeds.map(::speedLabel),speeds.indexOf(controller.playbackRate),dismiss){controller.changeSpeed(speeds[it]);close()}
7->TrackPanel("Chapters",item.chapters.map{"${it.title} · ${clockTime(it.start)}"},item.chapters.indexOfLast{it.start<=controller.position},dismiss){controller.seekTo(item.chapters[it].start);close()}
8->TrackPanel("Subtitle size",SubtitleSize.entries.map{it.label},vm.subtitleSize.ordinal,dismiss){vm.chooseSubtitleSize(SubtitleSize.entries[it]);close()}
9->TrackPanel("Subtitle style",SubtitleStyle.entries.map{it.label},vm.subtitleStyle.ordinal,dismiss){vm.chooseSubtitleStyle(SubtitleStyle.entries[it]);close()}
10->AudioTrackPanel(controller,dismiss,close)
}
}
internal fun speedLabel(speed:Float)=if(speed==1f)"Normal" else "${speed.toString().removeSuffix(".0")}×"
/** Where the playing video shrinks to while Up Next is open, on the 960 × 540 dp canvas. */
internal object UpNextFrame {
val x=44.dp;val y=34.dp;val width=352.dp;val height=198.dp
}
/**
* Up Next's page beneath the player's surface: the next episode's artwork, top-right, fading into
* the page, and a black frame under the mini-player for letterboxed video. Drawn before the
* PlayerView, whose SurfaceView shows through only where nothing is drawn above it.
*/
@Composable internal fun UpNextBackdrop(vm:KaleidoViewModel,item:Title,modifier:Modifier) {
val upcoming=vm.followingEpisode(item)
val path=upcoming?.let{it.still.ifBlank{it.thumb}.ifBlank{it.art}} ?: item.art.ifBlank{item.thumb}
Box(modifier.fillMaxSize().background(Ink)) {
Box(Modifier.align(Alignment.TopEnd).width(640.dp).aspectRatio(16f/9f)) {
if(path.isNotBlank())Artwork(vm.api,path,Modifier.fillMaxSize(),960,540,animate=false)
Box(Modifier.fillMaxSize().background(Brush.horizontalGradient(0f to Ink,.42f to Ink.copy(alpha=.72f),1f to Color.Transparent)))
Box(Modifier.fillMaxSize().background(Brush.verticalGradient(.35f to Color.Transparent,1f to Ink)))
}
Box(Modifier.offset(UpNextFrame.x,UpNextFrame.y).size(UpNextFrame.width,UpNextFrame.height).background(Color.Black))
}
}
/**
* Up Next, over the shrunken player: the next episode with one countdown, the season and related shows.
* Any remote press stops the countdown. Left from Play next (or Back) returns to the playing video.
*/
@Composable internal fun PostPlayScreen(vm:KaleidoViewModel,item:Title,controller:PlaybackController,watchVideo:()->Unit,next:()->Unit) {
@Composable internal fun PostPlayScreen(vm:KaleidoViewModel,item:Title,dismiss:()->Unit,next:()->Unit) {
val upcoming=vm.followingEpisode(item)
// Settings › Playback sets the countdown; 0 turns autoplay off.
val countdown=if(vm.shuffling&&vm.autoplaySeconds==0)5 else vm.autoplaySeconds
var cancelled by remember{mutableStateOf(false)}
val counting=upcoming!=null&&countdown>0&&!cancelled
var elapsed by remember{mutableLongStateOf(0)}
// The countdown runs only while Kaleido is on screen; leaving it restarts on return.
val lifecycle by LocalLifecycleOwner.current.lifecycle.currentStateAsState()
val onScreen=lifecycle.isAtLeast(Lifecycle.State.STARTED)
LaunchedEffect(counting,upcoming?.id,onScreen) {
if(!counting||!onScreen||upcoming==null)return@LaunchedEffect
val total=countdown*1000L;elapsed=0
android.util.Log.i("KaleidoPlayback","AUTOPLAY countdown item=${item.id} next=${upcoming.id}")
while(elapsed<total){delay(50);elapsed+=50}
android.util.Log.i("KaleidoPlayback","AUTOPLAY starting next=${upcoming.id}");next()
val countdown=vm.autoplaySeconds
var autoplay by remember{mutableStateOf(countdown>0)}
var seconds by remember{mutableIntStateOf(countdown)}
LaunchedEffect(autoplay,upcoming?.id) {
if(autoplay&&upcoming!=null&&countdown>0){seconds=countdown;android.util.Log.i("KaleidoPlayback","AUTOPLAY countdown item=${item.id} next=${upcoming.id}");repeat(countdown){delay(1000);seconds--};android.util.Log.i("KaleidoPlayback","AUTOPLAY starting next=${upcoming.id}");next()}
}
val playFocus=remember{FocusRequester()}
val videoFocus=remember{FocusRequester()}
LaunchedEffect(Unit){withFrameNanos{};runCatching{(if(upcoming!=null)playFocus else videoFocus).requestFocus()}}
val season=vm.episodeQueue.filter{it.parentId==item.parentId}
Box(Modifier.fillMaxSize().onPreviewKeyEvent{
if(it.type==KeyEventType.KeyDown&&counting){cancelled=true;android.util.Log.i("KaleidoPlayback","AUTOPLAY cancelled item=${item.id}")}
false
}) {
// The video itself is the PlayerView beneath; this is its focus target and outline.
var videoFocused by remember{mutableStateOf(false)}
Box(Modifier.offset(UpNextFrame.x-4.dp,UpNextFrame.y-4.dp).size(UpNextFrame.width+8.dp,UpNextFrame.height+8.dp)
.focusRequester(videoFocus).focusProperties{right=if(upcoming!=null)playFocus else FocusRequester.Default}
.navigationSound().onFocusChanged{videoFocused=it.isFocused}
.border(if(videoFocused)2.dp else 1.dp,Color.White.copy(alpha=if(videoFocused)1f else .16f),RoundedCornerShape(8.dp))
.semantics{contentDescription="Return to "+item.displayTitle}.clickable(onClick=watchVideo))
NowPlaying(item,controller,videoFocused,Modifier.offset(UpNextFrame.x,UpNextFrame.y+UpNextFrame.height+10.dp).width(UpNextFrame.width))
Column(Modifier.padding(start=UpNextFrame.x+UpNextFrame.width+36.dp,top=36.dp,end=Cinema.gutter)) {
Eyebrow(if(upcoming==null)"More to watch"else if(vm.shuffling)"Up next · Shuffle"else "Up next")
Spacer(Modifier.height(8.dp))
// The playing episode carries its show's title art; listed episodes may not.
TitleIdentity(vm.api,item,Modifier.size(240.dp,44.dp))
if(upcoming!=null) {
val metadata by produceState(upcoming,upcoming.id){value=upcoming;value=vm.previewDetails(upcoming)}
Text(upcoming.title,color=Accent,fontSize=21.sp,lineHeight=26.sp,fontWeight=FontWeight.SemiBold,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.padding(top=6.dp))
Row(Modifier.padding(top=6.dp).height(17.dp),verticalAlignment=Alignment.CenterVertically) {
if(metadata.contentRating.isNotBlank())FormatBadge(metadata.contentRating,Modifier.padding(end=8.dp))
Text(listOf("S${upcoming.parentIndex} · E${upcoming.index}",if(upcoming.duration>0)runtimeLabel(upcoming.duration)else "").filter{it.isNotBlank()}.joinToString(" · "),color=Cinema.secondary,fontSize=11.sp,lineHeight=15.sp,maxLines=1)
AudienceRatings(metadata,Modifier.padding(start=10.dp))
}
if(metadata.summary.isNotBlank())Text(metadata.summary,color=Cinema.secondary,fontSize=12.sp,lineHeight=18.sp,maxLines=3,overflow=TextOverflow.Ellipsis,modifier=Modifier.padding(top=8.dp))
UpNextButton(if(vm.transitioningEpisode)"Loading…"else "Play next episode",if(counting)({(elapsed.toFloat()/(countdown*1000)).coerceIn(0f,1f)})else null,
Modifier.padding(top=14.dp).focusRequester(playFocus).focusProperties{left=videoFocus}.onFocusChanged{if(it.isFocused&&BuildConfig.DEBUG)android.util.Log.i("KaleidoPlayback","POSTPLAY focus=play")}) {
cancelled=true;next()
LazyColumn(Modifier.fillMaxSize().background(Color.Black.copy(alpha=.93f)),contentPadding=PaddingValues(horizontal=Cinema.gutter,vertical=29.dp),verticalArrangement=Arrangement.spacedBy(15.dp)) {
item {
Text(if(upcoming!=null)"Up next"else "More to watch",color=Accent,fontSize=25.sp,fontWeight=FontWeight.SemiBold)
Row(Modifier.padding(top=13.dp),horizontalArrangement=Arrangement.spacedBy(20.dp),verticalAlignment=Alignment.CenterVertically) {
if(upcoming!=null)Artwork(vm.api,upcoming.still.ifBlank{upcoming.thumb},Modifier.width(205.dp).aspectRatio(16f/9f).clip(RoundedCornerShape(5.dp)),480,270,animate=false)
Column(Modifier.weight(1f)) {
Text(upcoming?.displayTitle ?: item.displayTitle,color=Accent,fontSize=21.sp,fontWeight=FontWeight.SemiBold)
Text(upcoming?.let{"S${it.parentIndex} · E${it.index} ${it.title}"} ?: "You've reached the end of this series.",color=Cinema.secondary,fontSize=12.sp,modifier=Modifier.padding(top=5.dp,bottom=15.dp))
Row(horizontalArrangement=Arrangement.spacedBy(10.dp),verticalAlignment=Alignment.CenterVertically) {
if(upcoming!=null)ActionButton(if(vm.transitioningEpisode)"Loading…"else if(autoplay)"Play in $seconds"else "Play now",Icons.Filled.PlayArrow,modifier=Modifier.onFocusChanged{if(it.isFocused&&BuildConfig.DEBUG)android.util.Log.i("KaleidoPlayback","POSTPLAY focus=play")},primary=true,initialFocus=true){autoplay=false;next()}
if(upcoming!=null&&countdown>0)TvButton(if(autoplay)"Cancel autoplay"else "Autoplay off"){autoplay=!autoplay;android.util.Log.i("KaleidoPlayback","AUTOPLAY ${if(autoplay)"enabled"else "cancelled"} item=${item.id}")}
TvButton("Back to video"){autoplay=false;dismiss()}
}
}
}
else Text("You've reached the end of this series.",color=Cinema.secondary,fontSize=12.sp,lineHeight=18.sp,modifier=Modifier.padding(top=8.dp))
}
LazyColumn(Modifier.fillMaxWidth().padding(top=292.dp),contentPadding=PaddingValues(start=Cinema.gutter,end=Cinema.gutter,bottom=24.dp),verticalArrangement=Arrangement.spacedBy(14.dp)) {
val up=if(upcoming!=null)playFocus else videoFocus
if(season.isNotEmpty())item {
val current=season.indexOfFirst{it.id==item.id}
PostPlayRail(vm,if(item.parentIndex>0)"Season ${item.parentIndex}"else "Episodes",season,up,(current-1).coerceAtLeast(0),{when(it.id){item.id->"Now playing";upcoming?.id->"Up next";else->if(it.duration>0)runtimeLabel(it.duration)else ""}}){vm.play(it,true)}
}
if(vm.relatedShows.isNotEmpty())item {PostPlayRail(vm,"Related shows",vm.relatedShows,if(season.isEmpty())up else null,0,{it.year}){vm.stopPlayback();vm.open(it)}}
}
if(season.isNotEmpty())item {PostPlayRail(vm,"Episodes in this season",season){autoplay=false;vm.play(it,true)}}
if(vm.relatedShows.isNotEmpty())item {PostPlayRail(vm,"Related shows",vm.relatedShows){autoplay=false;vm.stopPlayback();vm.open(it)}}
}
}
/** Where the playing episode is, under the mini-player. Its own scope: position ticks recompose only this. */
@Composable private fun NowPlaying(item:Title,controller:PlaybackController,focused:Boolean,modifier:Modifier) {
Column(modifier) {
Row(verticalAlignment=Alignment.CenterVertically) {
Text((if(item.type=="episode")"S${item.parentIndex} · E${item.index} "else "")+item.title,color=if(focused)Accent else Cinema.secondary,fontSize=11.sp,lineHeight=15.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.weight(1f))
Text("−"+clockTime(controller.duration-controller.position),color=Cinema.quiet,fontSize=10.sp,lineHeight=14.sp,maxLines=1,modifier=Modifier.padding(start=10.dp))
}
val progress=if(controller.duration>0)(controller.position.toFloat()/controller.duration).coerceIn(0f,1f)else 0f
Box(Modifier.padding(top=6.dp).fillMaxWidth().height(3.dp).clip(RoundedCornerShape(2.dp)).background(Color.White.copy(alpha=.22f))) {
Box(Modifier.fillMaxHeight().fillMaxWidth(progress).background(Accent))
}
}
}
/** Play next episode. While autoplay counts down ([progress] non-null) a lighter fill sweeps across it, without numbers. */
@Composable private fun UpNextButton(label:String,progress:(()->Float)?,modifier:Modifier,onClick:()->Unit) {
var focused by remember{mutableStateOf(false)}
val shape=RoundedCornerShape(5.dp)
val foreground=if(focused)Ink else Accent
Row(modifier.height(34.dp).navigationSound().onFocusChanged{focused=it.isFocused}.clip(shape)
.drawBehind{
val fill=progress?.invoke()
drawRect(if(focused)(if(fill!=null)Color(0xFFBDBDBD)else Accent)else Color.White.copy(alpha=.16f))
if(fill!=null)drawRect(if(focused)Accent else Color.White.copy(alpha=.18f),size=androidx.compose.ui.geometry.Size(size.width*fill,size.height))
}
.semantics{contentDescription=label}.clickable(onClick=onClick).padding(horizontal=14.dp),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(7.dp)) {
Icon(Icons.Filled.PlayArrow,null,tint=foreground,modifier=Modifier.size(17.dp))
Text(label,color=foreground,fontSize=12.sp,lineHeight=16.sp,fontWeight=FontWeight.SemiBold)
}
}
@Composable private fun PostPlayRail(vm:KaleidoViewModel,label:String,titles:List<Title>,up:FocusRequester?,start:Int,caption:(Title)->String,choose:(Title)->Unit) {
@Composable private fun PostPlayRail(vm:KaleidoViewModel,label:String,titles:List<Title>,choose:(Title)->Unit) {
Column {
Text(label,color=Accent,fontSize=16.sp,lineHeight=21.sp,fontWeight=FontWeight.SemiBold,modifier=Modifier.padding(bottom=8.dp))
LazyRow(state=rememberLazyListState(start),horizontalArrangement=Arrangement.spacedBy(12.dp)) {
Text(label,color=Accent,fontSize=16.sp,fontWeight=FontWeight.SemiBold,modifier=Modifier.padding(bottom=8.dp))
LazyRow(horizontalArrangement=Arrangement.spacedBy(12.dp)) {
items(titles,key={it.id}){title->
var focused by remember{mutableStateOf(false)}
Column(Modifier.width(188.dp).then(if(up!=null)Modifier.focusProperties{this.up=up}else Modifier).navigationSound().onFocusChanged{focused=it.isFocused}.semantics{contentDescription=title.displayTitle+" "+title.subtitle}.clickable{choose(title)}) {
Box(Modifier.fillMaxWidth().aspectRatio(16f/9f).clip(RoundedCornerShape(6.dp))) {
Column(Modifier.width(167.dp).navigationSound().onFocusChanged{focused=it.isFocused}.semantics{contentDescription=title.displayTitle+" "+title.subtitle}.clickable{choose(title)}) {
Box(Modifier.fillMaxWidth().aspectRatio(16f/9f).clip(RoundedCornerShape(4.dp))) {
Artwork(vm.api,if(title.type=="episode")title.still.ifBlank{title.thumb}else title.art.ifBlank{title.thumb},Modifier.fillMaxSize(),384,216,animate=false)
if(focused)Box(Modifier.fillMaxSize().border(2.dp,Accent,RoundedCornerShape(6.dp)))
if(focused)Box(Modifier.fillMaxSize().border(2.dp,Accent,RoundedCornerShape(4.dp)))
}
Text(if(title.type=="episode")"${title.index}. ${title.title}"else title.title,color=if(focused)Accent else Cinema.secondary,fontSize=11.sp,lineHeight=15.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.padding(top=5.dp))
Text(caption(title),color=Cinema.quiet,fontSize=10.sp,lineHeight=14.sp,maxLines=1)
Text(if(title.type=="episode")"${title.index}. ${title.title}"else title.title,color=if(focused)Accent else Cinema.secondary,fontSize=10.sp,lineHeight=14.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.padding(top=4.dp))
}
}
}

View file

@ -28,14 +28,11 @@ import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.focus.*
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.layout.layout
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.input.key.*
import androidx.compose.ui.platform.LocalDensity
@ -100,61 +97,32 @@ import kotlinx.coroutines.delay
// Derived: the player only recomposes when a marker starts or ends, not on every position tick.
val marker by remember{derivedStateOf{item.markers.firstOrNull{controller.position>=it.start&&controller.position<it.end&&it.type in listOf("intro","credits")}}}
fun skip(marker:Marker){
// Episodes go to Up Next, where the credits keep playing in the corner.
if(marker.type=="credits"&&item.type=="episode"){android.util.Log.i("KaleidoPlayback","POSTPLAY item=${item.id} reason=skip-credits");postPlay=true}
if(marker.type=="credits"&&item.type=="episode"){controller.pause();android.util.Log.i("KaleidoPlayback","POSTPLAY item=${item.id} reason=skip-credits");postPlay=true}
else controller.seekTo(marker.end)
}
// Each marker counts down to an automatic skip once, so seeking back into it plays it.
// The countdown runs only while playing; any remote press cancels it (OK on the button skips now).
// Each marker is skipped automatically once, so seeking back into it plays it.
val autoSkipped=remember{mutableSetOf<Marker>()}
var autoSkip by remember{mutableStateOf<Marker?>(null)}
var autoSkipTotal by remember{mutableLongStateOf(0)}
var autoSkipRemaining by remember{mutableLongStateOf(0)}
fun cancelAutoSkip(){val m=autoSkip ?: return;autoSkipped+=m;autoSkip=null;android.util.Log.i("KaleidoPlayback","AUTOSKIP cancelled ${m.type} item=${item.id}")}
LaunchedEffect(marker,controller.loading,postPlay) {
val m=marker
if(m==null||controller.loading||postPlay||m in autoSkipped){if(m==null||postPlay)autoSkip=null;return@LaunchedEffect}
val seconds=when(m.type){"intro"->vm.autoSkipIntroSeconds;"credits"->vm.autoSkipCreditsSeconds;else->0}
if(seconds<=0)return@LaunchedEffect
// Up Next has the one countdown (to the next episode), so automatic credits open it at once.
if(m.type=="credits"&&item.type=="episode"){autoSkipped+=m;android.util.Log.i("KaleidoPlayback","POSTPLAY item=${item.id} reason=credits");postPlay=true;return@LaunchedEffect}
if(autoSkip!=m){autoSkip=m;autoSkipTotal=seconds*1000L;autoSkipRemaining=autoSkipTotal;android.util.Log.i("KaleidoPlayback","AUTOSKIP countdown ${m.type} seconds=$seconds item=${item.id}")}
while(autoSkipRemaining>0){delay(50);if(autoSkip!=m)return@LaunchedEffect;if(controller.isPlaying)autoSkipRemaining-=50}
if(autoSkip!=m)return@LaunchedEffect
autoSkipped+=m;autoSkip=null;android.util.Log.i("KaleidoPlayback","AUTOSKIP ${m.type} item=${item.id}");skip(m)
LaunchedEffect(marker,controller.loading) {
val m=marker ?: return@LaunchedEffect
if(controller.loading||postPlay||m in autoSkipped)return@LaunchedEffect
if(m.type=="intro"&&vm.autoSkipIntro||m.type=="credits"&&vm.autoSkipCredits){autoSkipped+=m;android.util.Log.i("KaleidoPlayback","AUTOSKIP ${m.type} item=${item.id}");skip(m)}
}
DisposableEffect(controller) {
activity.window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
val observer=LifecycleEventObserver{_,event->when(event){Lifecycle.Event.ON_STOP->controller.enterBackground();Lifecycle.Event.ON_START->controller.enterForeground();else->{}}}
val observer=LifecycleEventObserver{_,event->if(event==Lifecycle.Event.ON_STOP)controller.pause()}
owner.lifecycle.addObserver(observer)
// Created while already stopped (e.g. a next episode loading behind Home): start paused.
if(!owner.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED))controller.enterBackground()
onDispose{owner.lifecycle.removeObserver(observer);activity.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);controller.close()}
}
// Up Next owns focus while open: hiding the controls behind it must not take focus back.
LaunchedEffect(controls,interaction,controller.isPlaying,trackMenu,postPlay) {
if(controls&&controller.isPlaying&&trackMenu==0&&!postPlay){delay(5000);controls=false}
LaunchedEffect(controls,interaction,controller.isPlaying,trackMenu) {
if(controls&&controller.isPlaying&&trackMenu==0){delay(5000);controls=false}
}
LaunchedEffect(controls) {if(!controls&&!postPlay){timelineReveal=false;delay(210);if(!postPlay)runCatching{rootFocus.requestFocus()}}}
LaunchedEffect(controls) {if(!controls){timelineReveal=false;delay(210);runCatching{rootFocus.requestFocus()}}}
LaunchedEffect(seekFocus,controls) {if(seekFocus&&controls){delay(220);runCatching{timelineFocus.requestFocus()};timelineReveal=true;seekFocus=false}}
LaunchedEffect(restoreMenuFocus,trackMenu) {if(restoreMenuFocus!=0&&trackMenu==0){delay(16);runCatching{(when(restoreMenuFocus){1->audioFocus;2->subtitleFocus;else->optionsFocus}).requestFocus()};restoreMenuFocus=0}}
// Leaving Up Next returns to the full-screen video without revealing the controls.
var refocusRoot by remember{mutableIntStateOf(0)}
LaunchedEffect(refocusRoot){if(refocusRoot>0){withFrameNanos{};runCatching{rootFocus.requestFocus()}}}
fun leaveUpNext(){postPlay=false;controls=false;refocusRoot++;android.util.Log.i("KaleidoPlayback","POSTPLAY closed item=${item.id}")}
// The video shrinks into Up Next's corner and grows back; only its layout reads the animation.
val upNext=androidx.compose.animation.core.animateFloatAsState(if(postPlay)1f else 0f,tween(320),label="upNext")
fun goBack(){if(postPlay)leaveUpNext() else if(trackMenu!=0)closeTracks()else if(controls)controls=false else vm.stopPlayback()}
fun goBack(){if(postPlay)postPlay=false else if(trackMenu!=0)closeTracks()else if(controls)controls=false else vm.stopPlayback()}
BackHandler(onBack=::goBack)
val visible=controls&&!postPlay
Box(Modifier.fillMaxSize().background(Color.Black).focusRequester(rootFocus).onPreviewKeyEvent{event->
// A pending automatic skip yields to the remote. Back only cancels it; OK on a hidden
// player still takes the Skip button, which skips now.
val okHidden=!visible&&event.nativeKeyEvent.keyCode in listOf(android.view.KeyEvent.KEYCODE_DPAD_CENTER,android.view.KeyEvent.KEYCODE_ENTER)
if(autoSkip!=null&&event.type==KeyEventType.KeyDown&&!okHidden&&!postPlay){
cancelAutoSkip()
if(event.key==Key.Back)return@onPreviewKeyEvent true
}
if(event.key==Key.Back){if(event.type==KeyEventType.KeyDown)goBack();true}
else if(event.type!=KeyEventType.KeyDown||postPlay)false else {
interacted()
@ -165,7 +133,7 @@ import kotlinx.coroutines.delay
android.view.KeyEvent.KEYCODE_MEDIA_FAST_FORWARD->{controller.seekTo(controller.position+30000);controls=true;seekFocus=true;true}
android.view.KeyEvent.KEYCODE_MEDIA_REWIND->{controller.seekTo(controller.position-10000);controls=true;seekFocus=true;true}
// With the controls hidden, OK takes a visible Skip intro/credits; otherwise it reveals them.
android.view.KeyEvent.KEYCODE_DPAD_CENTER,android.view.KeyEvent.KEYCODE_ENTER->{if(!visible){marker?.let{autoSkip=null;autoSkipped+=it;skip(it)} ?: run{controls=true};true}else false}
android.view.KeyEvent.KEYCODE_DPAD_CENTER,android.view.KeyEvent.KEYCODE_ENTER->{if(!visible){marker?.let(::skip) ?: run{controls=true};true}else false}
android.view.KeyEvent.KEYCODE_DPAD_LEFT,android.view.KeyEvent.KEYCODE_DPAD_RIGHT->{
val delta=if(event.nativeKeyEvent.keyCode==android.view.KeyEvent.KEYCODE_DPAD_LEFT)-10000L else 10000L
when {
@ -181,7 +149,6 @@ import kotlinx.coroutines.delay
}
}
}.focusable()) {
if(postPlay)UpNextBackdrop(vm,item,Modifier.graphicsLayer{alpha=upNext.value})
AndroidView(factory={context->PlayerView(context).apply {
setEnableComposeSurfaceSyncWorkaround(true)
player=controller.player
@ -190,71 +157,43 @@ import kotlinx.coroutines.delay
descendantFocusability=ViewGroup.FOCUS_BLOCK_DESCENDANTS
setShowBuffering(PlayerView.SHOW_BUFFERING_NEVER)
setKeepContentOnPlayerReset(true)
}},update={view->view.subtitleView?.let{applySubtitleStyle(it,vm.subtitleSize,vm.subtitleStyle)}},modifier=Modifier.fillMaxSize().layout{measurable,constraints->
val f=upNext.value
fun lerp(a:Int,b:Int)=(a+(b-a)*f).toInt()
val width=lerp(constraints.maxWidth,UpNextFrame.width.roundToPx());val height=lerp(constraints.maxHeight,UpNextFrame.height.roundToPx())
val placeable=measurable.measure(androidx.compose.ui.unit.Constraints.fixed(width,height))
layout(constraints.maxWidth,constraints.maxHeight){placeable.place(lerp(0,UpNextFrame.x.roundToPx()),lerp(0,UpNextFrame.y.roundToPx()))}
},onRelease={it.player=null})
if(controller.loading&&!postPlay)CircularProgressIndicator(color=Accent,strokeWidth=2.dp,modifier=Modifier.align(Alignment.Center).size(30.dp))
}},update={view->view.subtitleView?.let{applySubtitleStyle(it,vm.subtitleSize,vm.subtitleStyle)}},modifier=Modifier.fillMaxSize(),onRelease={it.player=null})
if(controller.loading)CircularProgressIndicator(color=Accent,strokeWidth=2.dp,modifier=Modifier.align(Alignment.Center).size(30.dp))
QuickSkipFeedback(skipSeconds,skipPulse,!visible&&!postPlay,Modifier.align(if(skipForward)Alignment.CenterEnd else Alignment.CenterStart).padding(horizontal=32.dp))
AnimatedVisibility(visible=visible,enter=fadeIn(tween(190))+slideInVertically(tween(190)){it/8},exit=fadeOut(tween(190))+slideOutVertically(tween(190)){it/10},modifier=Modifier.align(Alignment.BottomCenter)) {
Column(Modifier.fillMaxWidth().background(Brush.verticalGradient(0f to Color.Transparent,.35f to Color.Black.copy(alpha=.5f),1f to Color.Black.copy(alpha=.85f))).padding(start=Cinema.gutter,end=Cinema.gutter,top=48.dp,bottom=16.dp)) {
// The title art and facts the browse previews and details use, at playback scale.
Row(Modifier.fillMaxWidth().padding(bottom=10.dp),verticalAlignment=Alignment.Bottom) {
Column(Modifier.weight(1f)) {
TitleIdentity(vm.api,item,Modifier.size(240.dp,44.dp))
Row(Modifier.padding(top=8.dp).height(17.dp),verticalAlignment=Alignment.CenterVertically) {
if(item.contentRating.isNotBlank())FormatBadge(item.contentRating,Modifier.padding(end=8.dp))
Text((if(item.type=="episode")listOf("S${item.parentIndex} · E${item.index}",item.title)else listOf(item.year,item.genres.firstOrNull().orEmpty())).filter{it.isNotBlank()}.joinToString(" · "),
color=Cinema.secondary,fontSize=11.sp,lineHeight=15.sp,maxLines=1,overflow=TextOverflow.Ellipsis)
}
}
Column(Modifier.fillMaxWidth().background(Brush.verticalGradient(0f to Color.Transparent,.42f to Color.Black.copy(alpha=.46f),1f to Color.Black.copy(alpha=.79f))).padding(start=Cinema.gutter,end=Cinema.gutter,top=31.dp,bottom=16.dp)) {
Row(Modifier.fillMaxWidth().padding(bottom=7.dp),verticalAlignment=Alignment.Bottom) {
Text(item.displayTitle,color=Accent,fontSize=18.sp,lineHeight=23.sp,fontWeight=FontWeight.SemiBold,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.weight(1f))
Spacer(Modifier.width(18.dp))
Text(controller.qualityLabel,color=Color.White.copy(alpha=.6f),fontSize=10.sp,lineHeight=14.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.widthIn(max=360.dp))
Text(if(item.type=="episode")"S${item.parentIndex} · E${item.index} ${item.title}"else controller.qualityLabel,color=Color.White.copy(alpha=.72f),fontSize=12.sp,lineHeight=16.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.widthIn(max=420.dp))
}
// Elapsed and remaining time sit at the timeline's ends and follow a pending scrub.
val shownPosition=controller.scrubPosition ?: controller.position
Row(Modifier.fillMaxWidth(),verticalAlignment=Alignment.CenterVertically) {
Text(clockTime(shownPosition),color=Color.White.copy(alpha=.82f),fontSize=10.sp,lineHeight=14.sp,maxLines=1,modifier=Modifier.width(58.dp))
SeekTimeline(controller,item,Modifier.weight(1f).focusRequester(timelineFocus).focusProperties{down=playFocus},::interacted)
Text("−"+clockTime(controller.duration-shownPosition),color=Color.White.copy(alpha=.62f),fontSize=10.sp,lineHeight=14.sp,maxLines=1,textAlign=TextAlign.End,modifier=Modifier.width(58.dp))
}
Box(Modifier.fillMaxWidth().padding(top=6.dp).height(48.dp)) {
Row(Modifier.align(Alignment.CenterStart),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(10.dp)) {
IconControl(Icons.AutoMirrored.Outlined.ArrowBack,"Exit playback",size=32.dp,iconSize=19.dp,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){vm.stopPlayback()}
Text("Ends "+endsAt(controller),color=Color.White.copy(alpha=.58f),fontSize=10.sp,lineHeight=14.sp,maxLines=1)
SeekTimeline(controller,item,Modifier.fillMaxWidth().focusRequester(timelineFocus).focusProperties{down=playFocus},::interacted)
Box(Modifier.fillMaxWidth().height(40.dp)) {
Row(Modifier.align(Alignment.CenterStart),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(7.dp)) {
IconControl(Icons.AutoMirrored.Outlined.ArrowBack,"Exit playback",size=30.dp,iconSize=18.dp,onFocused=::interacted){vm.stopPlayback()}
Text(clockTime(controller.position),color=Color.White.copy(alpha=.78f),fontSize=10.sp,lineHeight=14.sp)
}
// Transport: episodes step between neighbours around the seek and play controls.
// An absent previous episode keeps its space, so Play stays centred.
Row(Modifier.align(Alignment.Center),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(14.dp)) {
val up=Modifier.focusProperties{up=timelineFocus}
if(item.type=="episode") {
if(vm.mayHavePrecedingEpisode(item))IconControl(Icons.Outlined.SkipPrevious,"Previous episode",size=34.dp,iconSize=22.dp,modifier=up,onFocused=::interacted){vm.previousEpisode(item);interacted()}
else Spacer(Modifier.size(34.dp))
}
IconControl(Icons.Outlined.Replay10,"Back 10 seconds",size=34.dp,iconSize=22.dp,modifier=up,onFocused=::interacted){controller.seekTo(controller.position-10000);interacted()}
IconControl(if(controller.isPlaying)Icons.Filled.Pause else Icons.Filled.PlayArrow,if(controller.isPlaying)"Pause"else "Play",size=46.dp,iconSize=30.dp,requester=playFocus,selected=true,initialFocus=controls&&!seekFocus&&!timelineReveal,modifier=up,onFocused=::interacted){controller.toggle();controls=true;interacted()}
IconControl(Icons.Outlined.Forward30,"Forward 30 seconds",size=34.dp,iconSize=22.dp,modifier=up,onFocused=::interacted){controller.seekTo(controller.position+30000);interacted()}
if(item.type=="episode")IconControl(Icons.Outlined.SkipNext,"Next episode",size=34.dp,iconSize=22.dp,modifier=up,onFocused=::interacted){vm.nextEpisode(item);interacted()}
Row(Modifier.align(Alignment.Center),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(16.dp)) {
IconControl(Icons.Outlined.Replay10,"Back 10 seconds",size=32.dp,iconSize=22.dp,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){controller.seekTo(controller.position-10000);interacted()}
IconControl(if(controller.isPlaying)Icons.Filled.Pause else Icons.Filled.PlayArrow,if(controller.isPlaying)"Pause"else "Play",size=38.dp,iconSize=28.dp,requester=playFocus,initialFocus=controls&&!seekFocus&&!timelineReveal,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){controller.toggle();controls=true;interacted()}
IconControl(Icons.Outlined.Forward30,"Forward 30 seconds",size=32.dp,iconSize=22.dp,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){controller.seekTo(controller.position+30000);interacted()}
}
Row(Modifier.align(Alignment.CenterEnd),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(10.dp)) {
IconControl(Icons.AutoMirrored.Outlined.VolumeUp,"Audio tracks",size=32.dp,iconSize=20.dp,requester=audioFocus,selected=trackMenu==1,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=1;interacted()}
IconControl(Icons.Outlined.Subtitles,"Subtitles",size=32.dp,iconSize=20.dp,requester=subtitleFocus,selected=trackMenu==2,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=2;interacted()}
IconControl(Icons.Outlined.Settings,"Playback options",size=32.dp,iconSize=20.dp,requester=optionsFocus,selected=trackMenu>=3,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=3;interacted()}
Text("−"+clockTime(controller.duration-controller.position)+" · Ends "+endsAt(controller),color=Color.White.copy(alpha=.58f),fontSize=10.sp,lineHeight=14.sp,modifier=Modifier.padding(end=8.dp))
if(item.type=="episode")IconControl(Icons.Outlined.SkipNext,"Next episode",size=30.dp,iconSize=21.dp,onFocused=::interacted){vm.nextEpisode(item)}
IconControl(Icons.AutoMirrored.Outlined.VolumeUp,"Audio tracks",size=30.dp,iconSize=21.dp,requester=audioFocus,selected=trackMenu==1,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=1;interacted()}
IconControl(Icons.Outlined.Subtitles,"Subtitles",size=30.dp,iconSize=21.dp,requester=subtitleFocus,selected=trackMenu==2,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=2;interacted()}
IconControl(Icons.Outlined.Settings,"Playback options",size=30.dp,iconSize=21.dp,requester=optionsFocus,selected=trackMenu>=3,modifier=Modifier.focusProperties{up=timelineFocus},onFocused=::interacted){trackMenu=3;interacted()}
}
}
}
}
marker?.let{marker->if(!postPlay)Box(Modifier.align(Alignment.BottomEnd).padding(end=Cinema.gutter,bottom=if(visible)146.dp else 45.dp)) {
val counting=autoSkip==marker&&autoSkipTotal>0
SkipMarkerButton(marker.type=="intro",if(counting)1f-(autoSkipRemaining.toFloat()/autoSkipTotal).coerceIn(0f,1f)else null){autoSkip=null;autoSkipped+=marker;skip(marker);interacted()}
marker?.let{marker->if(!postPlay)Box(Modifier.align(Alignment.BottomEnd).padding(end=Cinema.gutter,bottom=if(visible)130.dp else 45.dp)) {
ActionButton(if(marker.type=="intro")"Skip intro"else "Skip credits",Icons.Outlined.ChevronRight,modifier=Modifier.background(Color.Black.copy(alpha=.9f),RoundedCornerShape(5.dp)).border(1.dp,Color.White.copy(alpha=.75f),RoundedCornerShape(5.dp))){skip(marker);interacted()}
}}
if(postPlay)PostPlayScreen(vm,item,controller,::leaveUpNext){vm.nextEpisode(item)}
if(postPlay)PostPlayScreen(vm,item,{postPlay=false;controls=true},{vm.nextEpisode(item)})
controller.error?.let{ErrorDialog(it,{vm.stopPlayback()},{controller.retry()})}
if(trackMenu==1)AudioTrackPanel(controller,::closeTracks,::closeTracks)
if(trackMenu==2) {
if(trackMenu in 1..2) {
val type=if(trackMenu==1)C.TRACK_TYPE_AUDIO else C.TRACK_TYPE_TEXT
val streams=controller.part.streams.filter{it.type==(if(trackMenu==1)2 else 3)}
val options=(if(trackMenu==2)listOf("Off")else emptyList())+streams.map{it.title}
@ -270,38 +209,6 @@ import kotlinx.coroutines.delay
}
}
/**
* Skip intro/credits. While an automatic skip is pending ([progress] non-null) it reads
* "Skipping intro" and a lighter fill sweeps across it until the skip happens, without numbers.
*/
@Composable private fun SkipMarkerButton(intro:Boolean,progress:Float?,onClick:()->Unit) {
var focused by remember{mutableStateOf(false)}
val shape=RoundedCornerShape(6.dp)
val label=if(progress!=null)(if(intro)"Skipping intro"else "Skipping credits")else if(intro)"Skip intro"else "Skip credits"
val foreground=if(focused)Ink else Accent
Row(Modifier.height(36.dp).navigationSound().onFocusChanged{focused=it.isFocused}.clip(shape)
.drawBehind{
drawRect(if(focused)Accent else Color(0xE6181818))
if(progress!=null&&!focused)drawRect(Color.White.copy(alpha=.2f),size=androidx.compose.ui.geometry.Size(size.width*progress,size.height))
}
.border(1.dp,Color.White.copy(alpha=if(focused)0f else .55f),shape).semantics{contentDescription=label}
.clickable(onClick=onClick).padding(horizontal=16.dp),verticalAlignment=Alignment.CenterVertically,horizontalArrangement=Arrangement.spacedBy(10.dp)) {
Text(label,color=foreground,fontSize=12.sp,lineHeight=16.sp,fontWeight=FontWeight.SemiBold)
Icon(Icons.Filled.SkipNext,null,tint=foreground,modifier=Modifier.size(17.dp))
}
}
/** The same track selector is reachable from the speaker and from Playback options. */
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
@Composable internal fun AudioTrackPanel(controller:PlaybackController,dismiss:()->Unit,close:()->Unit) {
val streams=controller.part.streams.filter{it.type==2}
val active=controller.currentStream(controller.activeAudio)
TrackPanel("Audio tracks",streams.map{it.title},streams.indexOfFirst{it.id==active?.id},dismiss){index->
streams.getOrNull(index)?.let{controller.selectServerStream(it,C.TRACK_TYPE_AUDIO)}
close()
}
}
/** A short, non-focusable cue leaves the picture and remote focus undisturbed. */
@Composable private fun QuickSkipFeedback(seconds:Int,pulse:Int,allowed:Boolean,modifier:Modifier) {
// Keep the final label while the cue fades out.

View file

@ -1,13 +1,10 @@
package tv.kaleido.app
import kotlinx.coroutines.CoroutineStart
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.awaitCancellation
import kotlinx.coroutines.withContext
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch
import okhttp3.FormBody
import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.OkHttpClient
@ -18,10 +15,6 @@ import java.io.IOException
import java.util.concurrent.TimeUnit
class PlexException(message: String, val status: Int = 0): IOException(message)
/** Plex's timeline answer after the server ends a playback session. */
data class PlaybackTermination(val code: Int, val reason: String) {
val message get() = listOf("The server stopped this stream.", reason.trim()).filter { it.isNotBlank() }.joinToString("\n\n")
}
class PlexApi(val clientId: String) {
val http = OkHttpClient.Builder().connectTimeout(10,TimeUnit.SECONDS).readTimeout(30,TimeUnit.SECONDS).addNetworkInterceptor { chain ->
val original=chain.call().request().url;val current=chain.request().url
@ -34,24 +27,16 @@ class PlexApi(val clientId: String) {
put("X-Plex-Client-Identifier",clientId);put("X-Plex-Platform","Android");put("X-Plex-Device","Android TV");put("X-Plex-Device-Name","Kaleido TV")
if(!token.isNullOrBlank()) put("X-Plex-Token",token)
}
suspend fun request(url: String, token: String? = session?.serverToken, method: String = "GET", form: Map<String,String> = emptyMap()): String = coroutineScope {
suspend fun request(url: String, token: String? = session?.serverToken, method: String = "GET", form: Map<String,String> = emptyMap()): String = withContext(Dispatchers.IO) {
val req=Request.Builder().url(url).apply { headers(token).forEach { (k,v) -> header(k,v) }; if(method!="GET") method(method,FormBody.Builder().apply { form.forEach { (k,v)->add(k,v) } }.build()) }.build()
val call=http.newCall(req)
// execute() blocks until the server answers; a cancelled caller (a timeout, a replaced load) aborts the call.
val abort=launch(start=CoroutineStart.UNDISPATCHED){try{awaitCancellation()}finally{call.cancel()}}
try {
withContext(Dispatchers.IO) {
call.execute().use { r -> if(!r.isSuccessful) throw PlexException(when(r.code){401,403->"Plex rejected this session. Sign in again or check server access.";404->"This item is no longer available.";else->"Plex could not complete the request (${r.code})."},r.code); r.body?.string() ?: "{}" }
}
} finally { abort.cancel() }
http.newCall(req).execute().use { r -> if(!r.isSuccessful) throw PlexException(when(r.code){401,403->"Plex rejected this session. Sign in again or check server access.";404->"This item is no longer available.";else->"Plex could not complete the request (${r.code})."},r.code); r.body?.string() ?: "{}" }
}
/** [server] pins a request to one server; by default it follows the current session. */
fun url(path: String, params: Map<String,String> = emptyMap(), server: Session? = session): String {
val s=server ?: throw PlexException("Choose a Plex server first.")
fun url(path: String, params: Map<String,String> = emptyMap()): String {
val s=session ?: throw PlexException("Choose a Plex server first.")
require(!path.startsWith("http")) { "Expected a server-relative Plex path" }
return (s.server.trimEnd('/')+"/"+path.trimStart('/')).toHttpUrl().newBuilder().apply { params.forEach { (k,v)->addQueryParameter(k,v) } }.build().toString()
}
suspend fun container(path: String, params: Map<String,String> = emptyMap(), server: Session? = session): JSONObject = withContext(Dispatchers.Default){JSONObject(request(url(path,params,server),server?.serverToken).ifBlank{"{}"}).optJSONObject("MediaContainer") ?: JSONObject()}
suspend fun container(path: String, params: Map<String,String> = emptyMap()): JSONObject = withContext(Dispatchers.Default){JSONObject(request(url(path,params)).ifBlank{"{}"}).optJSONObject("MediaContainer") ?: JSONObject()}
suspend fun validate(s: Session): Session {
val j=JSONObject(request(s.server.trimEnd('/')+"/",s.serverToken)).getJSONObject("MediaContainer")
if(j.optString("machineIdentifier").isBlank()) throw PlexException("This address is not a Plex Media Server.")
@ -70,12 +55,9 @@ class PlexApi(val clientId: String) {
// Try TLS connections first; local HTTP remains available for servers without TLS.
var last: Throwable? = null
for (group in server.connections.partition { it.startsWith("https://") }.toList()) {
// Probe together, but accept in preference order (local first, relay last): the best
// answering address wins without waiting for slower, less preferred probes to time out.
val attempts=group.map { address -> async { runCatching { validate(Session(account,server.token,address,server.name,server.id)) } } }
try {
for (attempt in attempts) attempt.await().onSuccess { return@coroutineScope it }.onFailure { last=it }
} finally { attempts.forEach { it.cancel() } }
val results=group.map { address -> async { runCatching { validate(Session(account,server.token,address,server.name,server.id)) } } }.awaitAll()
results.firstOrNull { it.isSuccess }?.getOrNull()?.let { return@coroutineScope it }
last=results.lastOrNull()?.exceptionOrNull() ?: last
}
throw PlexException("Cannot reach ${server.name}. Check that the server is online and reachable from this TV.")
}
@ -87,12 +69,6 @@ class PlexApi(val clientId: String) {
suspend fun hubs(section: String? = null): List<Hub> = withContext(Dispatchers.Default){container(if(section==null) "/hubs" else "/hubs/sections/$section", mapOf("count" to "18","includeExternalMetadata" to "1")).optJSONArray("Hub").objects().map { Hub(it.optString("hubIdentifier",it.optString("key",it.optString("title"))),it.optString("title"),it.optJSONArray("Metadata").objects().map(Title::parse),it.optString("key"),it.opt("more").let{v->v==true||v==1||v=="1"||v=="true"}) }.filter { it.items.isNotEmpty() && it.items.first().type in listOf("movie","show","episode","season","collection") }}
/** A hub's complete list, for "View all". Plex keys may already carry query parameters. */
suspend fun hubItems(key:String):List<Title> = withContext(Dispatchers.Default){container(key,mapOf("X-Plex-Container-Start" to "0","X-Plex-Container-Size" to "500","includeExternalMetadata" to "1")).optJSONArray("Metadata").objects().map(Title::parse)}
/**
* Continue Watching as a fingerprint. Watching on another device changes it without changing the
* library revision above: new, finished or reordered titles at once, progress in 5% steps (so
* a title playing elsewhere doesn't rebuild Home on every poll).
*/
suspend fun continueWatchingRevision():String = continueWatchingFingerprint(container("/library/onDeck",mapOf("X-Plex-Container-Size" to "30")).optJSONArray("Metadata").objects())
suspend fun onDeck(): List<Title> = container("/library/onDeck",mapOf("X-Plex-Container-Size" to "30")).optJSONArray("Metadata").objects().map(Title::parse)
suspend fun recentSeasons(section:String):List<Title> = withContext(Dispatchers.Default){
// Fetch beyond the display limit so one large series import doesn't fill the row.
@ -151,11 +127,9 @@ class PlexApi(val clientId: String) {
}
/** Removes an in-progress title from Continue Watching without changing its watched state. */
suspend fun removeFromContinueWatching(item:Title){request(url("/actions/removeFromContinueWatching",mapOf("ratingKey" to item.id)),method="PUT")}
suspend fun watched(item: Title, watched: Boolean, server: Session? = session) { container(if(watched) "/:/scrobble" else "/:/unscrobble",mapOf("key" to item.id,"identifier" to "com.plexapp.plugins.library"),server) }
/** Reports progress; a stream the server stopped (Plex dashboard "Stop", or shutdown) comes back as a termination. */
suspend fun timeline(item: Title, position: Long, state: String, duration: Long, sessionId: String, server: Session? = session): PlaybackTermination? {
val c=container("/:/timeline",mapOf("ratingKey" to item.id,"key" to item.key,"state" to state,"time" to position.coerceAtLeast(0).toString(),"duration" to duration.coerceAtLeast(0).toString(),"identifier" to "com.plexapp.plugins.library","session" to sessionId),server)
return if(c.has("terminationCode"))PlaybackTermination(c.optInt("terminationCode",-1),c.optString("terminationText"))else null
suspend fun watched(item: Title, watched: Boolean) { container(if(watched) "/:/scrobble" else "/:/unscrobble",mapOf("key" to item.id,"identifier" to "com.plexapp.plugins.library")) }
suspend fun timeline(item: Title, position: Long, state: String, duration: Long, sessionId: String) {
container("/:/timeline",mapOf("ratingKey" to item.id,"key" to item.key,"state" to state,"time" to position.coerceAtLeast(0).toString(),"duration" to duration.coerceAtLeast(0).toString(),"identifier" to "com.plexapp.plugins.library","session" to sessionId))
}
suspend fun selectStreams(part: Part, audio: String? = null, subtitle: String? = null) {
request(url("/library/parts/${part.id}",buildMap { put("allParts","1");audio?.let {put("audioStreamID",it)};subtitle?.let {put("subtitleStreamID",it)} }),method="PUT")
@ -173,7 +147,7 @@ class PlexApi(val clientId: String) {
val hevcAvailable=android.media.MediaCodecList(android.media.MediaCodecList.REGULAR_CODECS).codecInfos.any{!it.isEncoder&&it.supportedTypes.any{type->type.equals("video/hevc",true)}}
put("X-Plex-Client-Profile-Extra",if(mode==1&&hevcAvailable)"append-transcode-target-codec(type=videoProfile&context=streaming&protocol=hls&videoCodec=hevc)"else "")
}
suspend fun stopTranscode(sessionId: String, server: Session? = session) { container("/video/:/transcode/universal/stop",mapOf("session" to sessionId),server) }
suspend fun stopTranscode(sessionId: String) { container("/video/:/transcode/universal/stop",mapOf("session" to sessionId)) }
}
/** Index of the part containing [time] on the title's combined timeline. */
@ -183,8 +157,3 @@ internal fun partFor(parts:List<Part>,time:Long):Int {
return 0
}
internal fun partStart(parts:List<Part>,index:Int):Long = parts.take(index.coerceAtLeast(0)).sumOf{it.duration.coerceAtLeast(0)}
internal fun continueWatchingFingerprint(items:List<JSONObject>):String = items.joinToString("|"){j->
val duration=j.optLong("duration");val offset=j.optLong("viewOffset")
val step=if(duration>0)(offset*20/duration).toString()else (offset/120_000).toString()
"${j.optString("ratingKey")}:${j.optString("viewCount")}:$step"
}

View file

@ -1,19 +1,14 @@
package tv.kaleido.app
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
/**
* Preserve newest-first order. A multi-season addition opens the real show's season list; if that
* show can't be loaded, its newest season stands in rather than discarding the whole row.
*/
/** Preserve newest-first order. A multi-season addition opens the real show's season list. */
internal suspend fun groupRecentSeasons(seasons:List<Title>,loadShow:suspend (String)->Title):List<Title> = coroutineScope {
seasons.distinctBy{it.id}.groupBy{it.parentId.ifBlank{"season:${it.id}"}}.values.take(18).map { group->async {
val season=group.first()
val single=season.copy(title=listOf(season.parentTitle,season.title).filter{it.isNotBlank()}.joinToString(" · "))
if(group.size>1&&season.parentId.isNotBlank())try{loadShow(season.parentId)}catch(e:CancellationException){throw e}catch(_:Exception){single}
else single
if(group.size>1&&season.parentId.isNotBlank())loadShow(season.parentId)
else season.copy(title=listOf(season.parentTitle,season.title).filter{it.isNotBlank()}.joinToString(" · "))
}}.awaitAll()
}

View file

@ -26,8 +26,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.CompositingStrategy
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.layout.Layout
import androidx.compose.ui.semantics.clearAndSetSemantics
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.PasswordVisualTransformation
@ -36,13 +34,6 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.window.Dialog
import coil.compose.AsyncImage
import coil.imageLoader
import android.graphics.drawable.BitmapDrawable
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.graphics.FilterQuality
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.IntSize
import coil.request.ImageRequest
import coil.size.Precision
import androidx.compose.foundation.gestures.BringIntoViewSpec
@ -65,34 +56,12 @@ import java.io.File
val model=remember(path,api.session?.server,width,height,animate){api.image(path,width,height)?.let {u -> ImageRequest.Builder(context).data(u).apply {api.headers().forEach{(k,v)->addHeader(k,v)}}.size(width,height).precision(Precision.INEXACT).crossfade(if(animate)180 else 0).build()}}
AsyncImage(model=model,contentDescription=null,contentScale=contentScale,colorFilter=colorFilter,modifier=modifier.background(Panel))
}
/**
* A browse card's artwork, without Coil's painter machinery (a painter, a snapshot flow and a
* request run per card cost about 2.5 ms of each card's composition on the onn). A memory-cache
* hit is drawn straight away; otherwise the image loads, then draws without recomposing. Like
* [Artwork] with ContentScale.Crop and no crossfade.
*/
@Composable fun CardArtwork(api:PlexApi,path:String,modifier:Modifier,width:Int,height:Int) {
val context=LocalContext.current
val loader=context.imageLoader
val request=remember(path,api.session?.server,width,height){api.image(path,width,height)?.let{u->ImageRequest.Builder(context).data(u).memoryCacheKey("card:$u")
.apply{api.headers().forEach{(k,v)->addHeader(k,v)}}.size(width,height).precision(Precision.INEXACT).build()}}
val image=remember(request){mutableStateOf(request?.memoryCacheKey?.let{loader.memoryCache?.get(it)?.bitmap?.asImageBitmap()})}
if(image.value==null&&request!=null)LaunchedEffect(request){(loader.execute(request).drawable as? BitmapDrawable)?.bitmap?.let{image.value=it.asImageBitmap()}}
Box(modifier.background(Panel).drawBehind{
val bitmap=image.value ?: return@drawBehind
// Centre crop: scale to cover the card, trim the overflow.
val scale=maxOf(size.width/bitmap.width,size.height/bitmap.height)
val srcWidth=(size.width/scale).toInt().coerceIn(1,bitmap.width);val srcHeight=(size.height/scale).toInt().coerceIn(1,bitmap.height)
drawImage(bitmap,IntOffset((bitmap.width-srcWidth)/2,(bitmap.height-srcHeight)/2),IntSize(srcWidth,srcHeight),dstSize=IntSize(size.width.toInt(),size.height.toInt()),filterQuality=FilterQuality.Low)
})
}
@Composable fun KaleidoApp(vm: KaleidoViewModel,install: (File)->Unit) {
KaleidoTheme {
ThemeMusic(vm)
val stateHolder=rememberSaveableStateHolder()
val discoveryFocus=remember{DiscoveryNavigation()}
val immersive=isDiscovery(vm)
val discoveries=remember{LinkedHashSet<String>()}
val immersive=vm.page.kind=="home"||(vm.page.kind in listOf("movies","tv")&&!vm.allTitles)
val screenKey=vm.page.kind+":"+vm.page.id+if(vm.page.kind in listOf("movies","tv")) ":${vm.allTitles}:${vm.categories}:${vm.genre}"else ""
val entrance=remember{Animatable(1f)}
val density=LocalDensity.current
@ -118,12 +87,11 @@ import java.io.File
splashExit.animateTo(1f,tween(StartupExitMillis,easing=LinearEasing));startup=false
}
}
// The server picker covers every page, so Back closes it before navigating underneath.
BackHandler(enabled=vm.servers.isNotEmpty()||vm.linkingAccount||vm.playing!=null||vm.pages.size>1||vm.page.kind!="home"){
if(vm.servers.isNotEmpty())vm.dismissServerPicker()else if(vm.linkingAccount)vm.cancelAccountLink()else vm.back()
BackHandler(enabled=vm.linkingAccount||vm.playing!=null||vm.pages.size>1||vm.page.kind!="home"){
if(vm.linkingAccount)vm.cancelAccountLink()else vm.back()
}
NavigationSounds(vm.navigationSounds&&!startup) {
Box(Modifier.fillMaxSize().background(Ink).onPreviewKeyEvent{vm.lastInteraction=android.os.SystemClock.uptimeMillis();startup}) {
Box(Modifier.fillMaxSize().background(Ink).onPreviewKeyEvent{startup}) {
// The app settles into place behind the splash as its aperture opens.
Box(Modifier.fillMaxSize().then(if(startup)Modifier.graphicsLayer{val s=startupArrivalScale(splashExit.value);scaleX=s;scaleY=s}else Modifier)) {
if(vm.servers.isNotEmpty()) ServerPicker(vm) else if(vm.session==null||vm.linkingAccount) SignIn(vm) else {
@ -134,35 +102,16 @@ import java.io.File
translationX=with(density){28.dp.toPx()}*direction*(1f-entrance.value)
}) {
if(!immersive&&vm.page.kind !in listOf("details","group","actor","hub")) TopBar(vm)
// Home, Movies and TV stay composed once shown; only the one on screen is measured,
// placed and drawn. Unplaced, the others take no focus and draw nothing, and
// showing one again costs no composition. Other pages compose as before.
if(immersive)discoveries+=vm.page.kind
val shown=if(immersive)discoveries.indexOf(vm.page.kind)else -1
Layout({
discoveries.forEach{destination->key(destination){
// Unplaced screens are still walked whenever accessibility rebuilds its tree
// (every 100 ms while anything moves, with the onn's services); clearing
// their semantics stops that walk at the root.
Box(if(isDiscovery(vm)&&vm.page.kind==destination)Modifier else Modifier.clearAndSetSemantics{}) {
stateHolder.SaveableStateProvider("discovery:$destination") {
DiscoveryScreen(vm,destination,discoveryFocus){isDiscovery(vm)&&vm.page.kind==destination}
}
}
}}
if(!immersive)Box{stateHolder.SaveableStateProvider(screenKey) {
when(vm.page.kind){
"movies","tv"->LibraryScreen(vm,discoveryFocus)
"details","group"->DetailsScreen(vm)
"actor"->ActorScreen(vm)
"hub"->HubScreen(vm)
"search"->SearchScreen(vm)
"settings"->CohesiveSettingsScreen(vm,install)
}
}}
},Modifier.fillMaxSize()){measurables,constraints->
val page=(if(shown>=0)measurables.getOrNull(shown)else measurables.lastOrNull())?.measure(constraints)
layout(constraints.maxWidth,constraints.maxHeight){page?.place(0,0)}
stateHolder.SaveableStateProvider(screenKey) {
when(vm.page.kind){
"home"->HomeScreen(vm,discoveryFocus)
"movies","tv"->LibraryScreen(vm,discoveryFocus)
"details","group"->DetailsScreen(vm)
"actor"->ActorScreen(vm)
"hub"->HubScreen(vm)
"search"->SearchScreen(vm)
"settings"->CohesiveSettingsScreen(vm,install)
}
}
}
if(immersive)TopBar(vm,discoveryFocus)
@ -171,14 +120,12 @@ import java.io.File
if(vm.busy) LinearProgressIndicator(Modifier.fillMaxWidth().height(2.dp).align(Alignment.TopCenter),color=Accent,trackColor=Color.Transparent)
if(vm.error!=null) ErrorDialog(vm.error!!,{vm.dismissError()},{vm.retry()})
vm.contextItem?.let{item->if(vm.playing==null)TitleActions(vm,item)}
vm.playing?.let {item-> androidx.compose.runtime.key(item.id,vm.playbackInstance) {PlaybackScreen(vm,item)} }
vm.playing?.let {item-> androidx.compose.runtime.key(item.id) {PlaybackScreen(vm,item)} }
if(startup)StartupSplash({splashExit.value},{!vm.busy}){brandReady=true}
}
}
}
}
/** Home, or Movies/TV showing Discover rather than the A–Z library: the full-screen browse destinations. */
internal fun isDiscovery(vm:KaleidoViewModel)=vm.page.kind=="home"||(vm.page.kind in listOf("movies","tv")&&!vm.allTitles)
val sortLabels=listOf("titleSort:asc" to "Title: A–Z","titleSort:desc" to "Title: Z–A","addedAt:desc" to "Recently added","year:desc" to "Newest release","year:asc" to "Oldest release","audienceRating:desc" to "Audience rating","duration:asc" to "Shortest first")
@Composable fun SignIn(vm: KaleidoViewModel) {
var manual by rememberSaveable{mutableStateOf(false)}
@ -198,7 +145,7 @@ val sortLabels=listOf("titleSort:asc" to "Title: A–Z","titleSort:desc" to "Tit
Spacer(Modifier.height(14.dp));OutlinedTextField(address,{address=it},label={Text("Server URL")},singleLine=true,modifier=Modifier.fillMaxWidth());Spacer(Modifier.height(10.dp));OutlinedTextField(token,{token=it},label={Text("Access token")},singleLine=true,visualTransformation=PasswordVisualTransformation(),modifier=Modifier.fillMaxWidth());Spacer(Modifier.height(18.dp));TvButton("Connect",primary=true,onClick={vm.manualConnect(address,token)});Spacer(Modifier.height(10.dp));TvButton("Use Plex account",onClick=back)
}
@Composable fun ServerPicker(vm: KaleidoViewModel) {
Column(Modifier.fillMaxSize().padding(60.dp),verticalArrangement=Arrangement.spacedBy(18.dp)){Brand();Spacer(Modifier.height(20.dp));Text("Choose your Plex server",color=Color.White,fontSize=32.sp,fontWeight=FontWeight.Bold);vm.servers.forEachIndexed{i,s->TvButton(s.name,initialFocus=i==0,onClick={vm.chooseServer(s)})};if(vm.session!=null){Spacer(Modifier.height(6.dp));TvButton("Cancel",onClick={vm.dismissServerPicker()})}}
Column(Modifier.fillMaxSize().padding(60.dp),verticalArrangement=Arrangement.spacedBy(18.dp)){Brand();Spacer(Modifier.height(20.dp));Text("Choose your Plex server",color=Color.White,fontSize=32.sp,fontWeight=FontWeight.Bold);vm.servers.forEachIndexed{i,s->TvButton(s.name,initialFocus=i==0,onClick={vm.chooseServer(s)})}}
}
@Composable fun EmptyState(title: String,message: String){Column(Modifier.padding(52.dp),verticalArrangement=Arrangement.spacedBy(12.dp)){Text(title,color=Color.White,fontSize=26.sp,fontWeight=FontWeight.Bold);Text(message,color=Muted,fontSize=14.sp)}}
@Composable fun ErrorDialog(message: String,dismiss: ()->Unit,retry: ()->Unit) {Dialog(onDismissRequest=dismiss){Column(Modifier.width(390.dp).clip(RoundedCornerShape(12.dp)).background(Panel).padding(23.dp)){Text("Something needs attention",color=Accent,fontSize=20.sp,lineHeight=26.sp,fontWeight=FontWeight.SemiBold);Text(message,color=Muted,fontSize=12.sp,lineHeight=19.sp,modifier=Modifier.padding(vertical=17.dp));Row(horizontalArrangement=Arrangement.spacedBy(9.dp)){TvButton("Try again",primary=true,initialFocus=true,onClick=retry);TvButton("Dismiss",onClick=dismiss)}}}}

View file

@ -44,19 +44,18 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
var watchedDialog by remember { mutableStateOf(false) }
var remoteDialog by remember { mutableStateOf(false) }
var autoplayDialog by remember { mutableStateOf(false) }
var introDialog by remember { mutableStateOf(false) }
var creditsDialog by remember { mutableStateOf(false) }
var subtitleSizeDialog by remember { mutableStateOf(false) }
var subtitleStyleDialog by remember { mutableStateOf(false) }
var themeVolumeDialog by remember { mutableStateOf(false) }
var volumeBoostDialog by remember { mutableStateOf(false) }
val remoteFocus = remember { FocusRequester() }
val autoplayFocus = remember { FocusRequester() }
val introFocus = remember { FocusRequester() }
val creditsFocus = remember { FocusRequester() }
val subtitleStyleFocus = remember { FocusRequester() }
val themeMusicFocus = remember { FocusRequester() }
val colourWashFocus = remember { FocusRequester() }
val themeVolumeFocus = remember { FocusRequester() }
val volumeBoostFocus = remember { FocusRequester() }
val categoryFocus = remember { List(categories.size) { FocusRequester() } }
val entryFocus = remember { List(categories.size) { FocusRequester() } }
@ -74,8 +73,8 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
delay(140)
runCatching { entryFocus[selectedCategory].requestFocus() }
}
val anyDialogOpen = confirmSignOut || qualityDialog || watchedDialog || remoteDialog || autoplayDialog || introDialog || creditsDialog ||
subtitleSizeDialog || subtitleStyleDialog || themeVolumeDialog
val anyDialogOpen = confirmSignOut || qualityDialog || watchedDialog || remoteDialog || autoplayDialog ||
subtitleSizeDialog || subtitleStyleDialog || themeVolumeDialog || volumeBoostDialog
LaunchedEffect(anyDialogOpen, dialogRestoreFocus) {
if (!anyDialogOpen) {
dialogRestoreFocus?.let { requester ->
@ -236,7 +235,7 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
)
SettingsValueRow(
title = "Autoplay next episode",
description = "Up Next counts down to the next episode. Any remote press stops it.",
description = "Count down to the next episode when one ends.",
value = autoplayLabel(vm.autoplaySeconds),
requester = autoplayFocus,
leftTarget = categoryFocus[1],
@ -244,19 +243,27 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
)
SettingsValueRow(
title = "Skip intros",
description = "Uses intro markers from your Plex server. Any remote press cancels an automatic skip.",
value = autoSkipLabel(vm.autoSkipIntroSeconds),
description = "Uses intro markers from your Plex server.",
value = if (vm.autoSkipIntro) "Automatically" else "Show button",
requester = introFocus,
leftTarget = categoryFocus[1],
onClick = { dialogRestoreFocus = introFocus; introDialog = true }
onClick = { vm.chooseAutoSkipIntro(!vm.autoSkipIntro) }
)
SettingsValueRow(
title = "Skip credits",
description = "Automatic: episodes open Up Next as the credits start; movies skip past them after the delay.",
value = autoSkipLabel(vm.autoSkipCreditsSeconds),
description = "Episodes go straight to Up Next; movies skip past the credits.",
value = if (vm.autoSkipCredits) "Automatically" else "Show button",
requester = creditsFocus,
leftTarget = categoryFocus[1],
onClick = { dialogRestoreFocus = creditsFocus; creditsDialog = true }
onClick = { vm.chooseAutoSkipCredits(!vm.autoSkipCredits) }
)
SettingsValueRow(
title = "Volume boost",
description = "Raise quiet titles. Higher boosts can distort loud peaks. Uses decoded audio instead of passthrough.",
value = volumeBoostLabel(vm.volumeBoostDb),
requester = volumeBoostFocus,
leftTarget = categoryFocus[1],
onClick = { dialogRestoreFocus = volumeBoostFocus; volumeBoostDialog = true }
)
Text(
"Completed titles keep their Plex watched status.",
@ -289,7 +296,7 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
}
3 -> {
SettingsSectionDescription("Choose how Kaleido looks and sounds while you browse.")
SettingsSectionDescription("Choose the sounds Kaleido plays while you browse.")
SettingsValueRow(
title = "Navigation sounds",
description = "Play the TV's system tap when focus moves. Follows the TV sound-effects setting.",
@ -314,14 +321,6 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
leftTarget = categoryFocus[3],
onClick = { dialogRestoreFocus = themeVolumeFocus; themeVolumeDialog = true }
)
SettingsValueRow(
title = "Artwork colour wash",
description = "Tint the page behind Home, Movies and TV previews with the focused artwork's colour.",
value = if (vm.colourWash) "On" else "Off",
requester = colourWashFocus,
leftTarget = categoryFocus[3],
onClick = { vm.chooseColourWash(!vm.colourWash) }
)
}
else -> {
@ -407,18 +406,6 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
remoteDialog = false
}
}
if (introDialog) {
ChoiceDialog("Skip intros", AutoSkipChoices.map(::autoSkipLabel), AutoSkipChoices.indexOf(vm.autoSkipIntroSeconds).coerceAtLeast(0), { introDialog = false }) {
vm.chooseAutoSkipIntro(AutoSkipChoices[it])
introDialog = false
}
}
if (creditsDialog) {
ChoiceDialog("Skip credits", AutoSkipChoices.map(::autoSkipLabel), AutoSkipChoices.indexOf(vm.autoSkipCreditsSeconds).coerceAtLeast(0), { creditsDialog = false }) {
vm.chooseAutoSkipCredits(AutoSkipChoices[it])
creditsDialog = false
}
}
if (autoplayDialog) {
val choices = listOf(0, 5, 10, 15, 30)
ChoiceDialog("Autoplay next episode", choices.map(::autoplayLabel), choices.indexOf(vm.autoplaySeconds), { autoplayDialog = false }) {
@ -451,12 +438,17 @@ fun CohesiveSettingsScreen(vm: KaleidoViewModel, install: (File) -> Unit) {
themeVolumeDialog = false
}
}
if (volumeBoostDialog) {
val choices = listOf(0, 3, 6, 9, 12)
ChoiceDialog("Volume boost", choices.map(::volumeBoostLabel), choices.indexOf(vm.volumeBoostDb).coerceAtLeast(0), { volumeBoostDialog = false }) {
vm.chooseVolumeBoostDb(choices[it])
volumeBoostDialog = false
}
}
}
private fun autoplayLabel(seconds: Int) = if (seconds <= 0) "Off" else "After $seconds seconds"
/** 0 only shows the Skip button; otherwise the button counts down this long before skipping. */
private val AutoSkipChoices = listOf(0, 3, 5, 10, 15)
private fun autoSkipLabel(seconds: Int) = if (seconds <= 0) "Show button" else "Automatically after $seconds s"
private fun volumeBoostLabel(db: Int) = if (db == 0) "Off (+0 dB)" else "+$db dB"
/** A sample line in the chosen subtitle look, rendered by the player's own subtitle view. */
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)

View file

@ -1,62 +0,0 @@
package tv.kaleido.app
import kotlin.random.Random
/** A repeating shuffle bag that never repeats the previous episode at a cycle boundary. */
internal class ShuffleEpisodes<T>(
episodes: List<T>,
private val id: (T) -> String,
private val random: Random = Random.Default,
) {
private val episodes = episodes.distinctBy(id)
private var order = this.episodes.shuffled(random)
private var currentIndex = 0
private var nextCycle: List<T>? = null
val first: T? get() = order.firstOrNull()
/** Returns the item after [currentId], preparing the next bag when needed. */
fun following(currentId: String): T? {
if (order.getOrNull(currentIndex)?.let(id) != currentId) return null
if (currentIndex < order.lastIndex) return order[currentIndex + 1]
return nextCycle?.firstOrNull() ?: makeNextCycle(order[currentIndex]).also { nextCycle = it }.firstOrNull()
}
/** The item played before [currentId] in this bag, or null at the bag's start. */
fun preceding(currentId: String): T? {
if (order.getOrNull(currentIndex)?.let(id) != currentId) return null
return order.getOrNull(currentIndex - 1)
}
/** Steps back only when [previousId] is the item returned by [preceding]. */
fun retreat(currentId: String, previousId: String): Boolean {
if (preceding(currentId)?.let(id) != previousId) return false
currentIndex--
return true
}
/** Advances only when [nextId] is the next item returned by [following]. */
fun advance(currentId: String, nextId: String): Boolean {
if (following(currentId)?.let(id) != nextId) return false
if (currentIndex == order.lastIndex) {
order = nextCycle ?: makeNextCycle(order[currentIndex])
nextCycle = null
currentIndex = 0
} else {
currentIndex++
}
return order.getOrNull(currentIndex)?.let(id) == nextId
}
private fun makeNextCycle(previous: T): List<T> {
val shuffled = episodes.shuffled(random)
if (shuffled.size < 2 || id(shuffled.first()) != id(previous)) return shuffled
val firstDifferent = shuffled.indexOfFirst { id(it) != id(previous) }
if (firstDifferent < 1) return shuffled
return shuffled.toMutableList().also { bag ->
val first = bag[0]
bag[0] = bag[firstDifferent]
bag[firstDifferent] = first
}
}
}

View file

@ -16,24 +16,30 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.PathFillType
import androidx.compose.ui.graphics.drawscope.Stroke
import androidx.compose.ui.graphics.drawscope.clipPath
import androidx.compose.ui.graphics.drawscope.clipRect
import androidx.compose.ui.graphics.drawscope.withTransform
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.semantics.clearAndSetSemantics
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.drawText
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.rememberTextMeasurer
import androidx.compose.ui.unit.sp
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.withTimeoutOrNull
import kotlin.math.PI
import kotlin.math.cos
import kotlin.math.exp
import kotlin.math.ln
import kotlin.math.max
import kotlin.math.sin
private class KaleidoFacet(val points:List<Offset>,val centroid:Offset,val color:Color,val angle:Float)
private class ApertureFacet(val points:List<Offset>,val color:Color,val normal:Offset)
// Exact geometry and colors from brand_mark.xml, centered on its 64-unit viewport.
// Each facet carries its centroid and the angle of its hexagon edge's outward normal.
private val kaleidoFacets=listOf(
// Each facet carries the outward normal of its hexagon edge for the iris motion.
private val apertureFacets=listOf(
floatArrayOf(33f,4f,55.5f,17f,42.5f,24.5f,33f,19f) to 0xFFC3E8D3,
floatArrayOf(56.5f,19f,56.5f,45f,43.5f,37.5f,43.5f,26.5f) to 0xFF71B9B0,
floatArrayOf(55.5f,47f,33f,60f,33f,45f,42.5f,39.5f) to 0xFF3D7C7B,
@ -41,65 +47,52 @@ private val kaleidoFacets=listOf(
floatArrayOf(7.5f,45f,7.5f,19f,20.5f,26.5f,20.5f,37.5f) to 0xFFE9D8AE,
floatArrayOf(8.5f,17f,31f,4f,31f,19f,21.5f,24.5f) to 0xFFEEF2DD
).mapIndexed { index,(points,color) ->
val corners=points.toList().chunked(2){Offset(it[0]-32f,it[1]-32f)}
val centroid=Offset(corners.sumOf{it.x.toDouble()}.toFloat()/4,corners.sumOf{it.y.toDouble()}.toFloat()/4)
KaleidoFacet(corners,centroid,Color(color),rad(-60f+60*index))
val angle=(-60.0+60*index)*PI/180
ApertureFacet(points.toList().chunked(2){Offset(it[0]-32f,it[1]-32f)},Color(color),Offset(cos(angle).toFloat(),sin(angle).toFloat()))
}
// Loose shards around each facet: angle from the facet's normal (degrees), starting radius (dp),
// size, palette offset and how far they tumble on the way in.
private class Shard(val angle:Float,val radius:Float,val scale:Float,val color:Int,val spin:Float)
private val shards=listOf(
Shard(20f,170f,.42f,2,1.2f),Shard(-20f,170f,.42f,4,-1.2f),
Shard(36f,320f,.3f,3,2.1f),Shard(-36f,320f,.3f,1,-2.1f),
Shard(8f,420f,.2f,5,3f),Shard(-8f,420f,.2f,5,-3f)
)
// Inner hexagon traced by the facets' inner edges: the aperture the exit flies through.
private const val InnerRadius=13.6f
private const val MarkBox=140f
// Timeline in ms. The shard field fades in, still, until GatherEnd and holds there until startup is ready; the
// gather then plays in motion time (timeline minus GatherEnd). Completion is reported at IntroEnd; the timeline
// keeps running to TimelineEnd only so the mark stays alive while the exit plays or startup loads.
private const val InnerApothem=11.8f
private const val IntroBox=132f
// The settled lockup is the header Brand() scaled up, so it reads as the same mark.
private const val LockScale=2.75f
private const val LockBox=29f*LockScale
private const val LockGap=7f*LockScale
// Opening timeline in ms, paused at GatherEnd until startup is ready. Completion is reported at IntroEnd; the timeline keeps
// running to TimelineEnd only for the slow settle while the exit plays or startup loads.
private const val GatherEnd=260f
private const val IntroEnd=GatherEnd+1700f
private const val TimelineEnd=GatherEnd+8000f
private const val IntroEnd=2260f
private const val TimelineEnd=2900f
const val StartupExitMillis=640
// The mark is larger than the old lockup, so it zooms less to end the flight at the same size.
private const val FlightZoom=30f
private val Emphasized=CubicBezierEasing(.2f,0f,0f,1f)
private val EmphasizedDecelerate=CubicBezierEasing(.05f,.7f,.1f,1f)
private val Standard=CubicBezierEasing(.4f,0f,.2f,1f)
private val InOut=CubicBezierEasing(.45f,0f,.55f,1f)
// A mechanical iris: the blades gather, snap open, and overshoot slightly as they lock.
private val IrisOpen=CubicBezierEasing(.55f,0f,.15f,1f)
private val IrisTwist=CubicBezierEasing(.5f,0f,.18f,1.1f)
// Applied in log space: a brief pull back, then an accelerating flight.
private val Flight=CubicBezierEasing(.55f,-.06f,.8f,.36f)
private val SeaGlass=Color(0xFF71B9B0)
private val Light=Color(0xFFEEF2DD)
private fun rad(degrees:Float)=degrees*PI.toFloat()/180
private fun phase(time:Float,start:Float,end:Float)=((time-start)/(end-start)).coerceIn(0f,1f)
private fun mix(from:Float,to:Float,amount:Float)=from+(to-from)*amount
/** A facet turned [rotation] about the mark center, shrunk and spun about its own centroid, then offset. */
private fun Path.facet(facet:KaleidoFacet,center:Offset,unit:Float,rotation:Float=0f,scale:Float=1f,spin:Float=0f,offset:Offset=Offset.Zero) {
val cr=cos(rotation);val sr=sin(rotation);val cs=cos(spin);val ss=sin(spin)
facet.points.forEachIndexed { index,point ->
val rx=point.x-facet.centroid.x;val ry=point.y-facet.centroid.y
val x=facet.centroid.x+(rx*cs-ry*ss)*scale;val y=facet.centroid.y+(rx*ss+ry*cs)*scale
val px=center.x+(x*cr-y*sr)*unit+offset.x;val py=center.y+(x*sr+y*cr)*unit+offset.y
if(index==0)moveTo(px,py)else lineTo(px,py)
}
close()
private class Iris(val inward:Float,val theta:Float,val grow:Float)
private fun irisAt(time:Float):Iris {
val progress=phase(time,140f,1180f)
return Iris(InnerApothem*(1f-IrisOpen.transform(progress)),(-44f*(1f-IrisTwist.transform(progress))*PI/180).toFloat(),
mix(.64f,1f,Emphasized.transform(progress)))
}
/** A loose facet shape with its centroid at [position]. */
private fun Path.shard(facet:KaleidoFacet,position:Offset,size:Float,angle:Float) {
val c=cos(angle);val s=sin(angle)
private fun Path.facet(facet:ApertureFacet,iris:Iris,unit:Float,center:Offset) {
val c=cos(iris.theta);val s=sin(iris.theta);val k=unit*iris.grow
facet.points.forEachIndexed { index,point ->
val x=point.x-facet.centroid.x;val y=point.y-facet.centroid.y
val px=position.x+(x*c-y*s)*size;val py=position.y+(x*s+y*c)*size
val x=point.x-facet.normal.x*iris.inward;val y=point.y-facet.normal.y*iris.inward
val px=center.x+(x*c-y*s)*k;val py=center.y+(x*s+y*c)*k
if(index==0)moveTo(px,py)else lineTo(px,py)
}
close()
@ -118,21 +111,21 @@ private fun Path.hexagon(center:Offset,radius:Float) {
fun startupArrivalScale(exit:Float)=mix(1.14f,1f,EmphasizedDecelerate.transform(phase(exit,.25f,1f)))
/**
* The cold-start brand sequence, the same as Kaleido Desktop: a kaleidoscope. A mirrored field of shards turns
* and gathers into the mark's six facets once [ready]; small shards circle the mark if startup runs on. [exit]
* (0–1, linear) then flies the camera through the mark's open center, revealing the app drawn beneath.
* The cold-start brand sequence: a closed iris lit from behind twists open once [ready], light catches
* the facets, and the wordmark slides out of the mark. [exit] (0–1, linear) then flies
* the camera through the aperture's dark center, revealing the app drawn beneath.
*/
@Composable fun StartupSplash(exit:()->Float,ready:()->Boolean,onComplete:()->Unit) {
val timeline=remember{Animatable(0f)}
val complete by rememberUpdatedState(onComplete)
LaunchedEffect(Unit){
// Animatable honors Android's animation duration scale, including animations off.
// The field fades in faint and still straight away, so the first cold-start frames
// can hitch there without being noticed.
// Light gathers on the closed iris straight away. It is nearly still, so the first
// cold-start frames can hitch there without being noticed.
timeline.animateTo(GatherEnd,tween(GatherEnd.toInt(),easing=LinearEasing))
// Startup data arriving composes the app beneath the splash in one long frame. Hold
// until that has happened and frames arrive steadily again (at most 700 ms), so
// the gather, fastest at its start, never runs through it.
// the iris never opens through it.
withTimeoutOrNull(700){
snapshotFlow{ready()}.first{it}
awaitSteadyFrames(4)
@ -143,23 +136,42 @@ fun startupArrivalScale(exit:Float)=mix(1.14f,1f,EmphasizedDecelerate.transform(
snapshotFlow{timeline.value>=IntroEnd}.first{it}
complete()
}
val measurer=rememberTextMeasurer()
val density=LocalDensity.current
val style=TextStyle(color=Accent,fontSize=(19f*LockScale).sp,fontWeight=FontWeight.Bold)
val letters=remember(measurer,density){"KALEIDO".map{measurer.measure(it.toString(),style)}}
val letterX=remember(letters,density){
val tracking=with(density){(1.4f*LockScale).sp.toPx()}
letters.runningFold(0f){x,letter->x+letter.size.width+tracking}
}
val textWidth=letterX.last()-with(density){(1.4f*LockScale).sp.toPx()}
val capHeight=with(density){style.fontSize.toPx()}*.711f
val paths=remember{List(4){Path()}}
Canvas(Modifier.fillMaxSize().clearAndSetSemantics{contentDescription="Kaleido starting"}) {
val time=timeline.value
val motion=time-GatherEnd
val prelude=EmphasizedDecelerate.transform(phase(time,0f,GatherEnd))
val q=exit()
val dp=density
val zoom=if(q>0f)exp(ln(FlightZoom)*Flight.transform(q))else 1f
val unit=MarkBox*dp/64f*zoom
val origin=center
val gather=Emphasized.transform(phase(motion,0f,1450f))
// The whole field turns a little less than half a revolution as it gathers.
val field=rad(-150f)*(1f-Emphasized.transform(phase(motion,0f,1550f)))
val (surface,aperture,shape,ring)=paths
val dp=density.density
val lockup=Emphasized.transform(phase(time,1250f,2000f))
val lockWidth=(LockBox+LockGap)*dp+textWidth
var box=mix(IntroBox,LockBox,lockup)*dp
// A slow push-in keeps the settled frame alive.
val drift=1f+.025f*InOut.transform(phase(time,1900f,2900f))
var cx=mix(center.x,center.x-lockWidth/2+LockBox*dp/2,lockup)
var cy=center.y
var zoom=1f;var textAlpha=1f;var textShift=0f;var hole=0f
if(q>0f) {
zoom=exp(ln(52f)*Flight.transform(q))
val recenter=Standard.transform((q/.75f).coerceAtMost(1f))
cx=mix(cx,center.x,recenter);cy=mix(cy,center.y,recenter)
textAlpha=1f-Standard.transform(phase(q,0f,.4f))
textShift=-14f*dp*Standard.transform(phase(q,0f,.4f))
hole=InOut.transform(phase(q,.12f,.5f))
}
val unit=box/64f*drift*zoom
val origin=Offset(cx,cy)
val (surface,aperture,facets,ray)=paths
// Splash surface: Ink everywhere, with the aperture's center cut away on exit.
val hole=InOut.transform(phase(q,.12f,.5f))
if(hole<=0f)drawRect(Ink)
else {
surface.rewind();surface.fillType=PathFillType.EvenOdd
@ -168,70 +180,81 @@ fun startupArrivalScale(exit:Float)=mix(1.14f,1f,EmphasizedDecelerate.transform(
if(hole<1f){aperture.rewind();aperture.hexagon(origin,InnerRadius*unit);drawPath(aperture,Ink,alpha=1f-hole)}
}
// The kaleidoscope's mirror lines, turning with the field.
val lines=max(.5f*prelude,InOut.transform(phase(motion,0f,450f)))*(1f-Standard.transform(phase(motion,1100f,1700f)))
if(lines>0f) for(index in 0 until 6) {
val angle=field+rad(-90f+60*index)
val end=origin+Offset(cos(angle),sin(angle))*(640f*dp)
drawLine(Brush.linearGradient(0f to Light.copy(alpha=.2f*lines),1f to Color.Transparent,start=origin,end=end),origin,end,dp)
}
val bloom=.09f*InOut.transform(phase(motion,200f,1000f))*(1f-Standard.transform(phase(motion,1500f,2600f)))
if(bloom>.001f) {
val radius=300f*dp
drawCircle(Brush.radialGradient(0f to SeaGlass.copy(alpha=bloom),.45f to SeaGlass.copy(alpha=bloom*.3f),1f to Color.Transparent,
center=origin,radius=radius),radius,origin,blendMode=BlendMode.Plus)
}
// Shards spiral inward, faster than the field turns, and vanish into the center.
val inward=Emphasized.transform(phase(motion,0f,1350f))
kaleidoFacets.forEachIndexed { s,facet ->
shards.forEachIndexed { j,shard ->
val appear=max(.3f*prelude,Standard.transform(phase(motion,j*50f+s*25,j*50f+s*25+420)))
val vanish=Standard.transform(phase(motion,750f+j*45,1350f+j*45))
if(appear>0f&&vanish<1f) {
val angle=facet.angle+rad(shard.angle)+field*1.5f
val radius=shard.radius*dp*(1f-.88f*inward)
shape.rewind()
shape.shard(facet,origin+Offset(cos(angle),sin(angle))*radius,unit*shard.scale*(1f-.6f*vanish),field*2+shard.spin*(1f-gather))
drawPath(shape,kaleidoFacets[(s+shard.color)%6].color,alpha=appear*(1f-vanish)*.9f,blendMode=BlendMode.Screen)
val iris=irisAt(time)
val lightUp=EmphasizedDecelerate.transform(phase(time,0f,620f))
val light=lightUp*(1f-Standard.transform(phase(time,620f,1250f)))
val ambient=.03f*InOut.transform(phase(time,300f,900f))*(1f-Standard.transform(phase(time,1500f,2300f)))
// Light behind the blades: a soft bloom, a hot core, and rays leaking through
// the six gaps while the iris turns.
if(light>.001f||ambient>.001f) {
val bloom=250f*dp
drawCircle(Brush.radialGradient(0f to SeaGlass.copy(alpha=.16f*light+ambient),.45f to SeaGlass.copy(alpha=.04f*light+ambient*.3f),
1f to Color.Transparent,center=origin,radius=bloom),bloom,origin,blendMode=BlendMode.Plus)
val core=26f*unit/2.0625f*mix(.6f,1f,light)
if(light>.001f) {
drawCircle(Brush.radialGradient(0f to Color(1f,.98f,.925f,.95f*light),.35f to Color(0xFFEEF2DD).copy(alpha=.55f*light),
1f to Color.Transparent,center=origin,radius=core),core,origin,blendMode=BlendMode.Plus)
val rays=light*(IrisOpen.transform(phase(time,140f,1180f))*2.5f).coerceAtMost(1f)
for(index in 0 until 6) {
val angle=((-90.0+60*index)*PI/180).toFloat()+iris.theta
val length=mix(40f,250f,lightUp)*(.75f+.25f*sin(index*2.1f+1f))*dp
ray.rewind();ray.moveTo(origin.x,origin.y)
ray.lineTo(origin.x+cos(angle-.014f)*length,origin.y+sin(angle-.014f)*length)
ray.lineTo(origin.x+cos(angle+.014f)*length,origin.y+sin(angle+.014f)*length);ray.close()
drawPath(ray,Brush.linearGradient(0f to Color(1f,.973f,.902f,.42f*rays),.25f to Color(0xFFD6ECE2).copy(alpha=.12f*rays),
1f to Color.Transparent,start=origin,end=Offset(origin.x+cos(angle)*length,origin.y+sin(angle)*length)),blendMode=BlendMode.Plus)
}
}
}
// The six facets ride in from the field and lock into the mark.
kaleidoFacets.forEachIndexed { s,facet ->
val radius=240f*dp*(1f-gather);val angle=facet.angle+field
shape.rewind()
shape.facet(facet,origin,unit,field,mix(.55f,1f,gather),rad(-60f)*(1f-gather),Offset(cos(angle),sin(angle))*radius)
drawPath(shape,facet.color,alpha=max(.3f*prelude,Standard.transform(phase(motion,s*25f,s*25f+420))))
// Facets. Short echoes of earlier frames act as motion blur while the blades
// turn; they disappear beneath the facets once the iris is still.
fun facetAlpha(index:Int)=EmphasizedDecelerate.transform(phase(time,40f+index*34,380f+index*34))
if(time<1400f) for((delay,alpha) in listOf(84f to .07f,56f to .12f,28f to .2f)) {
val echo=irisAt(time-delay)
apertureFacets.forEachIndexed { index,facet ->
facets.rewind();facets.facet(facet,echo,unit,origin);drawPath(facets,facet.color,alpha=alpha*facetAlpha(index))
}
}
apertureFacets.forEachIndexed { index,facet ->
facets.rewind();facets.facet(facet,iris,unit,origin);drawPath(facets,facet.color,alpha=facetAlpha(index))
}
// A ring pulses out as the facets lock.
val pulse=phase(motion,1380f,2050f)
if(pulse>0f&&pulse<1f) {
ring.rewind();ring.hexagon(origin,(30f+24f*EmphasizedDecelerate.transform(pulse))*unit)
drawPath(ring,SeaGlass,alpha=.45f*(1f-pulse),style=Stroke(1.5f*dp))
val sheen=phase(time,980f,1560f)
if(light>.01f||(sheen>0f&&sheen<1f)) {
facets.rewind();apertureFacets.forEach{facets.facet(it,iris,unit,origin)}
clipPath(facets) {
// Backlight tints the blades while the core is hot, so they read as glass.
if(light>.01f) {
val radius=36f*unit/2.0625f
drawCircle(Brush.radialGradient(0f to Color(1f,.988f,.94f,.26f*light),1f to Color.Transparent,center=origin,radius=radius),radius,origin)
}
// One diagonal band of light crosses the settled mark.
if(sheen>0f&&sheen<1f) {
val reach=34f*unit;val angle=36f*PI.toFloat()/180;val direction=Offset(cos(angle),sin(angle))
val position=mix(-1.25f,1.25f,InOut.transform(sheen))*reach;val width=10f*unit
val peak=.42f*sin((sheen*1.1f).coerceAtMost(1f)*PI.toFloat())
drawRect(Brush.linearGradient(0f to Color.Transparent,.5f to Color.White.copy(alpha=peak),1f to Color.Transparent,
start=origin+direction*(position-width),end=origin+direction*(position+width)),origin-Offset(reach,reach),Size(reach*2,reach*2))
}
}
}
// Still starting: small shards keep circling the mark.
val idle=Standard.transform(phase(motion,2300f,2900f))*(1f-phase(q,0f,.25f))
if(idle>0f) for(s in 0 until 6) for(side in intArrayOf(-1,1)) {
val angle=rad(-60f+60*s)+side*rad(11f)+(motion-2300f)*.00032f
shape.rewind();shape.shard(kaleidoFacets[s],origin+Offset(cos(angle),sin(angle))*(50f*unit),unit*.16f,angle*2)
drawPath(shape,kaleidoFacets[(s+if(side>0)2 else 4)%6].color,alpha=.4f*idle,blendMode=BlendMode.Screen)
}
// A band of light crosses the settled mark, then again every few seconds while it waits.
val sheen=if(motion<1500f)0f else ((motion-1500f)%3600f)/900f
if(q==0f&&sheen>0f&&sheen<1f) {
shape.rewind();kaleidoFacets.forEach{shape.facet(it,origin,unit)}
clipPath(shape) {
val reach=40f*unit;val angle=rad(36f);val direction=Offset(cos(angle),sin(angle))
val position=mix(-1.25f,1.25f,InOut.transform(sheen))*reach;val width=10f*unit
val peak=.42f*sin((sheen*1.1f).coerceAtMost(1f)*PI.toFloat())
drawRect(Brush.linearGradient(0f to Color.Transparent,.5f to Color.White.copy(alpha=peak),1f to Color.Transparent,
start=origin+direction*(position-width),end=origin+direction*(position+width)),origin-Offset(reach,reach),Size(reach*2,reach*2))
// The wordmark slides out from behind the mark as it moves into the lockup.
if(time>=1400f&&textAlpha>0f) {
val scale=box/(LockBox*dp)*drift
val textLeft=cx-box*drift/2+(LockBox+LockGap)*dp*scale
val slide=EmphasizedDecelerate.transform(phase(time,1400f,2050f))
val baseline=cy+capHeight/2*scale
clipRect(left=cx+24.5f*unit+2f*dp*scale) {
letters.forEachIndexed { index,letter ->
val start=1460f+index*45
val reveal=Standard.transform(phase(time,start,start+320f))
if(reveal>0f) withTransform({
translate(textLeft+(letterX[index]-(1f-slide)*textWidth*.42f)*scale+textShift,baseline-letter.firstBaseline*scale)
scale(scale,scale,pivot=Offset.Zero)
}) {drawText(letter,alpha=reveal*textAlpha)}
}
}
}
}

View file

@ -81,16 +81,39 @@ import kotlinx.coroutines.launch
// An episode started from the season row gets focus back itself, once the rebuilt row composes.
LaunchedEffect(vm.playbackReturn){if(vm.playbackReturn!=seenReturn[0]){seenReturn[0]=vm.playbackReturn;if(vm.focusId.startsWith("children:${item.id}:"))return@LaunchedEffect;withFrameNanos{};list.scrollToItem(0);withFrameNanos{};runCatching{actionFocus.requestFocus()}}}
Box(Modifier.fillMaxSize().background(Ink)) {
// The browse previews' framing, so opening a title keeps its artwork in place; a season's
// artwork follows the episode it shows. Scroll is read in the layer, never in composition.
BrowseBackdrop(vm.api,if(episodic)previewArt(shown)else item.art.ifBlank{item.thumb},Modifier.fillMaxSize().graphicsLayer {
alpha=if(list.firstVisibleItemIndex>0)0f else (1f-list.firstVisibleItemScrollOffset/backdropFadeDistance).coerceIn(0f,1f)
},header=true,wash=vm.colourWash,animate=true)
val usesPosterHeader=item.type in listOf("show","movie")
if(usesPosterHeader||episodic) {
// Season headers are shorter than 16:9: cropping into that box cut off heads.
// Frame TV artwork against the full page, with its top edge flush to movies.
val showArtwork=item.type=="show"||episodic
BrowseBackdrop(vm.api,item.art.ifBlank{item.thumb},Modifier.fillMaxSize().graphicsLayer {
alpha=if(list.firstVisibleItemIndex>0)0f else (1f-list.firstVisibleItemScrollOffset/backdropFadeDistance).coerceIn(0f,1f)
},cinematic=true,alignment=if(showArtwork)Alignment.TopCenter else Alignment.Center,contentScale=if(showArtwork)ContentScale.FillWidth else ContentScale.Crop)
// Keep the scene in the header; rows and captions sit on near-black. Read scroll
// in the layer so scrolling doesn't recompose the details and cast hierarchy.
Box(Modifier.fillMaxSize().background(Brush.verticalGradient(0f to Ink.copy(alpha=.4f),.35f to Ink.copy(alpha=.5f),.62f to Ink.copy(alpha=.96f),.8f to Ink)))
}
// Actions lead to the first row below them: seasons/episodes, otherwise the first cast member.
val below=if(vm.children.isNotEmpty())childFocus else if(item.castMembers.isNotEmpty())castFocus else null
CompositionLocalProvider(LocalBringIntoViewSpec provides DetailsScroll) {
LazyColumn(state=list,contentPadding=PaddingValues(bottom=30.dp),verticalArrangement=Arrangement.spacedBy(18.dp),modifier=Modifier.fillMaxSize()) {
item(key="details-${item.id}"){DetailHeader(vm,shown,item,actionFocus,below,!restoreRow)}
item(key="details-${item.id}") {
// A fixed episode header, so moving along the season row never shifts the page.
Box(Modifier.fillMaxWidth().then(if(usesPosterHeader)Modifier.heightIn(min=248.dp)else if(episodic)Modifier.height(322.dp)else Modifier.heightIn(min=286.dp))) {
if(!usesPosterHeader&&!episodic) {
Artwork(vm.api,item.art,Modifier.matchParentSize(),1920,1080)
Box(Modifier.matchParentSize().background(Brush.horizontalGradient(listOf(Ink.copy(alpha=.98f),Ink.copy(alpha=.8f),Color.Transparent))))
Box(Modifier.matchParentSize().background(Brush.verticalGradient(listOf(Color.Black.copy(alpha=.12f),Color.Transparent,Ink))))
}
IconControl(Icons.AutoMirrored.Outlined.ArrowBack,"Back",modifier=Modifier.padding(start=36.dp,top=14.dp)){vm.back()}
if(usesPosterHeader) {
Row(Modifier.fillMaxWidth().padding(start=Cinema.gutter,end=Cinema.gutter,top=56.dp),horizontalArrangement=Arrangement.spacedBy(24.dp),verticalAlignment=Alignment.Top) {
Artwork(vm.api,item.poster.ifBlank{item.thumb},Modifier.width(128.dp).height(192.dp).clip(androidx.compose.foundation.shape.RoundedCornerShape(6.dp)),384,576,animate=false,contentScale=ContentScale.Fit)
TitleInformation(vm,item,item,actionFocus,below,!restoreRow,Modifier.weight(1f))
}
}else TitleInformation(vm,shown,item,actionFocus,below,!restoreRow,Modifier.align(Alignment.CenterStart).padding(start=Cinema.gutter,end=Cinema.gutter,top=64.dp,bottom=24.dp).fillMaxWidth())
}
}
// Rebuilt after playback so the row scrolls to the episode last played.
if(vm.children.isNotEmpty())item(key="children-${item.id}-${if(episodic)vm.playbackReturn else 0}") {
if(episodic)MediaRow(vm,if(item.type=="season")item.title else "Season ${item.parentIndex}",vm.children,"children:${item.id}",landscape=true,entryFocus=childFocus,episodeTitles=true,
@ -114,75 +137,40 @@ private object DetailsScroll:BringIntoViewSpec {
}
}
/**
* The header, after the browse previews: title art, facts and format, synopsis, then actions.
* [page] is the open title; on a season or episode page, [item] is the episode it shows, and
* moving along the season row fades its copy like the previews. Fixed heights keep the rows
* below in place, and leave a show's season captions on screen.
*/
@Composable private fun DetailHeader(vm:KaleidoViewModel,item:Title,page:Title,actionFocus:FocusRequester,below:FocusRequester?,initialFocus:Boolean) {
var summaryOverflow by remember(item.id){mutableStateOf(false)}
val episodic=page.type in listOf("season","episode")
val technical=item.type in listOf("movie","episode")
val height=when{episodic->296.dp;technical->276.dp;else->250.dp}
Box(Modifier.fillMaxWidth().height(height)) {
IconControl(Icons.AutoMirrored.Outlined.ArrowBack,"Back",modifier=Modifier.padding(start=36.dp,top=14.dp)){vm.back()}
Column(Modifier.align(Alignment.BottomStart).padding(start=Cinema.gutter,end=Cinema.gutter,bottom=4.dp)) {
CompositionLocalProvider(LocalTextStyle provides LocalTextStyle.current.copy(shadow=CaptionShadow)) {
FadingCopy(item,{it.id},with(LocalDensity.current){HeaderLift.toPx()},Modifier.height(if(episodic)166.dp else 150.dp),Alignment.BottomStart) {shown->
DetailCopy(vm,shown,page){if(shown.id==item.id)summaryOverflow=it}
}
}
DetailActions(vm,item,page,actionFocus,below,initialFocus,summaryOverflow)
if(technical)item.media.getOrNull(vm.mediaIndex(item))?.let{Text(it.technical,color=Cinema.quiet,fontSize=9.5.sp,lineHeight=13.sp,maxLines=1,modifier=Modifier.padding(top=10.dp))}
}
}
}
@Composable private fun DetailCopy(vm:KaleidoViewModel,item:Title,page:Title,onOverflow:(Boolean)->Unit) {
val runtime=when{item.duration<=0->"";item.offset>0->runtimeLabel(item.duration-item.offset)+" left";else->runtimeLabel(item.duration)}
val seasons=vm.children.size.takeIf{page.id==item.id&&item.type=="show"&&it>0}?.let{if(it==1)"1 season"else "$it seasons"}.orEmpty()
val facts=when(item.type) {
"episode"->listOf("S${item.parentIndex} · E${item.index}",airDate(item.releaseDate),runtime)
"season"->listOf(item.subtitle)
"show"->listOf(item.year,item.genres.take(2).joinToString(" / "),seasons,if(item.leafCount>0)"${item.leafCount} episodes"else "")
else->listOf(item.year,item.genres.take(2).joinToString(" / "),runtime)
}
Column(Modifier.width(560.dp)) {
// Episodes name their show with its title art, then the episode itself.
if(item.type=="episode") {
TitleIdentity(vm.api,item,Modifier.size(280.dp,48.dp))
Text(item.title,color=Accent,fontSize=19.sp,lineHeight=24.sp,fontWeight=FontWeight.SemiBold,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.padding(top=8.dp))
}else TitleIdentity(vm.api,item,Modifier.size(340.dp,64.dp))
Row(Modifier.padding(top=9.dp,bottom=7.dp).height(17.dp),verticalAlignment=Alignment.CenterVertically) {
if(item.contentRating.isNotBlank())FormatBadge(item.contentRating,Modifier.padding(end=8.dp))
Text(facts.filter{it.isNotBlank()}.joinToString(" · "),color=Cinema.secondary,fontSize=11.sp,lineHeight=15.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.weight(1f,fill=false))
AudienceRatings(item,Modifier.padding(start=10.dp))
formatLabels(item.media.getOrNull(vm.mediaIndex(item))).forEachIndexed{index,label->FormatBadge(label,Modifier.padding(start=if(index==0)14.dp else 6.dp))}
}
Text(item.summary,color=Cinema.secondary,fontSize=12.sp,lineHeight=17.5.sp,maxLines=3,overflow=TextOverflow.Ellipsis,onTextLayout={onOverflow(it.hasVisualOverflow)})
}
}
@Composable private fun DetailActions(vm:KaleidoViewModel,item:Title,page:Title,actionFocus:FocusRequester,below:FocusRequester?,initialFocus:Boolean,summaryOverflow:Boolean) {
/** [page] is the open title; on a season or episode page, [item] is the episode it shows. */
@Composable private fun TitleInformation(vm:KaleidoViewModel,item:Title,page:Title,actionFocus:FocusRequester,below:FocusRequester?,initialFocus:Boolean,modifier:Modifier) {
val actionNavigation=Modifier.focusProperties{if(below!=null)down=below}
var summaryOverflow by remember(item.id){mutableStateOf(false)}
var showSynopsis by remember(item.id){mutableStateOf(false)}
var showVersions by remember(item.id){mutableStateOf(false)}
val media=item.media.getOrNull(vm.mediaIndex(item))
// Scrolls sideways only if a title has more actions than fit the page.
if(item.type!="collection")Row(Modifier.padding(top=9.dp).horizontalScroll(rememberScrollState()).padding(vertical=3.dp),horizontalArrangement=Arrangement.spacedBy(9.dp),verticalAlignment=Alignment.CenterVertically) {
ActionButton(if(item.offset>0)"Resume from ${clockTime(item.offset)}"else if(item.type=="show")"Watch next"else "Play",Icons.Filled.PlayArrow,modifier=actionNavigation.focusRequester(actionFocus),primary=true,initialFocus=initialFocus){played(vm,page);vm.play(item)}
if(item.offset>0)ActionButton("Start over",Icons.Outlined.Replay,modifier=actionNavigation){played(vm,page);vm.play(item,true)}
if(page.type=="show"&&item.type=="show")ActionButton("Shuffle episodes",Icons.Outlined.Shuffle,modifier=actionNavigation){played(vm,page);vm.playShuffled(item)}
if(item.type in listOf("movie","show","season","episode")) {
val watched=item.isWatched(vm.watchedPercent)
ActionButton(if(vm.markingId==item.id)"Updating…"else if(watched)"Mark unwatched"else "Mark watched",if(watched)Icons.Outlined.CheckCircle else Icons.Outlined.Check,modifier=actionNavigation){vm.mark(item)}
Column(modifier) {
CompositionLocalProvider(LocalTextStyle provides LocalTextStyle.current.copy(shadow=Shadow(Color.Black.copy(alpha=.95f),Offset(0f,2f),6f))) {
// Seasons and episodes name their show above the title.
val show=when(page.type){"episode"->page.grandparentTitle;"season"->page.parentTitle;else->""}.ifBlank{item.grandparentTitle.takeIf{item.type=="episode"}.orEmpty()}
if(show.isNotBlank())Text(show,color=Cinema.secondary,fontSize=12.sp,lineHeight=16.sp,fontWeight=FontWeight.Medium)
Text(item.title,color=Accent,fontSize=32.sp,lineHeight=36.sp,fontWeight=FontWeight.Bold,maxLines=if(page.type in listOf("season","episode"))1 else 2,overflow=TextOverflow.Ellipsis,modifier=Modifier.widthIn(max=560.dp))
Row(Modifier.widthIn(max=620.dp).padding(top=9.dp),verticalAlignment=Alignment.CenterVertically) {
Text(listOf(item.subtitle,airDate(item.releaseDate).takeIf{item.type=="episode"}.orEmpty(),item.contentRating).filter{it.isNotBlank()}.joinToString(" · "),color=Muted,fontSize=10.5.sp,lineHeight=16.sp,maxLines=1,overflow=TextOverflow.Ellipsis,modifier=Modifier.weight(1f,fill=false))
AudienceRatings(item,Modifier.padding(start=12.dp))
}
item.trailer?.let{trailer->ActionButton("Trailer",Icons.Outlined.Movie,modifier=actionNavigation){vm.play(trailer)}}
// Name the version by resolution unless several share it, e.g. two 1080p encodes.
if(item.media.size>1)ActionButton(if(item.media.map{it.resolutionLabel}.distinct().size==item.media.size&&media?.resolutionLabel?.isNotBlank()==true)"Version · ${media.resolutionLabel}"
else "Version ${vm.mediaIndex(item)+1} of ${item.media.size}",Icons.Outlined.Layers,modifier=actionNavigation){showVersions=true}
if(item.type in listOf("show","movie")&&summaryOverflow)ActionButton("Synopsis",Icons.Outlined.Description,modifier=actionNavigation){showSynopsis=true}
Text(item.summary,color=Cinema.secondary,fontSize=12.sp,lineHeight=18.sp,maxLines=3,overflow=TextOverflow.Ellipsis,onTextLayout={summaryOverflow=it.hasVisualOverflow},modifier=Modifier.widthIn(max=560.dp).padding(top=10.dp,bottom=17.dp))
}
// Scrolls sideways only if a title has more actions than fit beside its poster.
if(item.type!="collection")Row(Modifier.horizontalScroll(rememberScrollState()).padding(vertical=3.dp),horizontalArrangement=Arrangement.spacedBy(9.dp),verticalAlignment=Alignment.CenterVertically) {
ActionButton(if(item.offset>0)"Resume from ${clockTime(item.offset)}"else if(item.type=="show")"Watch next"else "Play",Icons.Filled.PlayArrow,modifier=actionNavigation.focusRequester(actionFocus),primary=true,initialFocus=initialFocus){played(vm,page);vm.play(item)}
if(item.offset>0)ActionButton("Start over",Icons.Outlined.Replay,modifier=actionNavigation){played(vm,page);vm.play(item,true)}
if(item.type in listOf("movie","show","season","episode")) {
val watched=item.isWatched(vm.watchedPercent)
ActionButton(if(vm.markingId==item.id)"Updating…"else if(watched)"Mark unwatched"else "Mark watched",if(watched)Icons.Outlined.CheckCircle else Icons.Outlined.Check,modifier=actionNavigation){vm.mark(item)}
}
item.trailer?.let{trailer->ActionButton("Trailer",Icons.Outlined.Movie,modifier=actionNavigation){vm.play(trailer)}}
// Name the version by resolution unless several share it, e.g. two 1080p encodes.
if(item.media.size>1)ActionButton(if(item.media.map{it.resolutionLabel}.distinct().size==item.media.size&&media?.resolutionLabel?.isNotBlank()==true)"Version · ${media.resolutionLabel}"
else "Version ${vm.mediaIndex(item)+1} of ${item.media.size}",Icons.Outlined.Layers,modifier=actionNavigation){showVersions=true}
if(item.type in listOf("show","movie")&&summaryOverflow)ActionButton("Synopsis",Icons.Outlined.Description,modifier=actionNavigation){showSynopsis=true}
}
if(item.type !in listOf("show","season"))media?.let{Text(it.description(),color=Cinema.quiet,fontSize=9.5.sp,modifier=Modifier.padding(top=12.dp))}
}
if(showSynopsis)SynopsisDialog(vm.api,item){showSynopsis=false}
if(showVersions)ChoiceDialog("Versions",item.media.map{it.description(includeSize=true)},vm.mediaIndex(item),{showVersions=false}){vm.chooseMedia(item,it);showVersions=false}
@ -233,7 +221,6 @@ internal fun nextUp(episodes:List<Title>,watchedPercent:Int)=episodes.firstOrNul
@Composable private fun CastRail(vm:KaleidoViewModel,item:Title,actionFocus:FocusRequester,entry:FocusRequester) {
val initial=remember(item.id){item.castMembers.indexOfFirst{"cast:${item.id}:${it.id.ifBlank{it.name}}"==vm.focusId}.coerceAtLeast(0)}
val row=rememberLazyListState(initialFirstVisibleItemIndex=initial)
val entryIndex by rememberRowEntry(row,0)
Column {
Text("Cast",color=Accent,fontSize=17.sp,fontWeight=FontWeight.SemiBold,modifier=Modifier.padding(start=Cinema.gutter,bottom=10.dp))
LazyRow(state=row,contentPadding=PaddingValues(horizontal=Cinema.gutter),horizontalArrangement=Arrangement.spacedBy(16.dp),modifier=Modifier.focusRestorer(fallback=entry)) {
@ -242,7 +229,7 @@ internal fun nextUp(episodes:List<Title>,watchedPercent:Int)=episodes.firstOrNul
var focused by remember{mutableStateOf(false)}
val requester=remember{FocusRequester()}
LaunchedEffect(Unit){if(vm.focusId==key){withFrameNanos{};runCatching{requester.requestFocus()}}}
Column(Modifier.width(108.dp).then(if(index==entryIndex)Modifier.focusRequester(entry)else Modifier).focusRequester(requester).focusProperties{if(item.type!="collection"&&vm.children.isEmpty())up=actionFocus}.navigationSound().onFocusChanged{
Column(Modifier.width(108.dp).then(if(index==0)Modifier.focusRequester(entry)else Modifier).focusRequester(requester).focusProperties{if(item.type!="collection"&&vm.children.isEmpty())up=actionFocus}.navigationSound().onFocusChanged{
focused=it.isFocused;if(it.isFocused)vm.focusId=key
}.clickable(enabled=actor.id.isNotBlank()){vm.openActor(actor)}.clearAndSetSemantics{
contentDescription=listOf(actor.name,actor.role).filter{it.isNotBlank()}.joinToString(". ")

View file

@ -0,0 +1,29 @@
package tv.kaleido.app
import androidx.media3.common.C
import androidx.media3.common.audio.AudioProcessor.AudioFormat
import androidx.media3.common.audio.AudioProcessor.UnhandledAudioFormatException
import androidx.media3.common.audio.BaseAudioProcessor
import java.nio.ByteBuffer
import kotlin.math.pow
import kotlin.math.roundToInt
/** Applied after decoding, for every channel and delivery mode; passthrough is disabled when on. */
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
internal class VolumeBoostProcessor(db:Int,private val onProcessing:(()->Unit)?=null):BaseAudioProcessor() {
private val gain=boostGain(db)
private var reported=false
override fun onConfigure(inputAudioFormat:AudioFormat):AudioFormat {
if(inputAudioFormat.encoding!=C.ENCODING_PCM_16BIT)throw UnhandledAudioFormatException(inputAudioFormat)
return if(gain>1.0)inputAudioFormat else AudioFormat.NOT_SET
}
override fun queueInput(inputBuffer:ByteBuffer) {
if(!reported&&inputBuffer.hasRemaining()) { reported=true;onProcessing?.invoke() }
val output=replaceOutputBuffer(inputBuffer.remaining())
while(inputBuffer.remaining()>=2)output.putShort(boostSample(inputBuffer.short,gain))
output.flip()
}
}
internal fun boostGain(db:Int):Double=10.0.pow(db.coerceIn(0,12)/20.0)
internal fun boostSample(sample:Short,gain:Double):Short=(sample*gain).roundToInt().coerceIn(Short.MIN_VALUE.toInt(),Short.MAX_VALUE.toInt()).toShort()

View file

@ -2,8 +2,31 @@ package tv.kaleido.app
import org.junit.Assert.*
import org.junit.Test
import java.nio.ByteBuffer
import java.nio.ByteOrder
import androidx.media3.common.C
import androidx.media3.common.audio.AudioProcessor.AudioFormat
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
class AudioPreferencesTest {
@Test fun boostProcessesEveryChannelAndSaturatesWithoutWrapping() {
val processor=VolumeBoostProcessor(6)
processor.configure(AudioFormat(48000,2,C.ENCODING_PCM_16BIT))
val input=ByteBuffer.allocateDirect(12).order(ByteOrder.nativeOrder())
listOf(1000,-1000,30000,-30000,0,Short.MIN_VALUE.toInt()).forEach { input.putShort(it.toShort()) }
input.flip();processor.queueInput(input)
val output=processor.output.order(ByteOrder.nativeOrder())
val samples=generateSequence { if(output.remaining()>=2)output.short.toInt()else null }.toList()
assertEquals(listOf(1995,-1995,32767,-32768,0,-32768),samples)
assertFalse(input.hasRemaining())
}
@Test fun boostOffPreservesSamplesAndBoundsGain() {
assertEquals(1.0,boostGain(0),0.0)
assertEquals(1.0,boostGain(-30),0.0)
assertEquals(boostGain(12),boostGain(99),0.0)
assertEquals(1234.toShort(),boostSample(1234,boostGain(0)))
assertEquals((-1234).toShort(),boostSample(-1234,boostGain(0)))
}
@Test fun themesUseOnlyServerRelativePaths() {
assertEquals("/library/metadata/6115/theme/1",safeThemePath("/library/metadata/6115/theme/1"))
assertEquals("",safeThemePath("https://elsewhere.example/theme.mp3"))

View file

@ -51,13 +51,6 @@ class PlaybackModelTest {
@Test fun speedLabels() {
assertEquals("Normal",speedLabel(1f));assertEquals("1.25×",speedLabel(1.25f));assertEquals("2×",speedLabel(2f))
}
@Test fun originalQualityUsesTheSelectedVersionsBitrate() {
val media=Media("1","mkv","hevc","eac3","4k",3840,2160,19094,emptyList())
assertEquals("Original quality · 19.1 Mbps",StreamQuality.Original.forMedia(media))
assertEquals("Original quality · 0.8 Mbps",StreamQuality.Original.forMedia(media.copy(bitrate=768)))
assertEquals("Original quality · Bitrate unavailable",StreamQuality.Original.forMedia(media.copy(bitrate=0)))
assertEquals(StreamQuality.FullHD.label,StreamQuality.FullHD.forMedia(media))
}
@Test fun seasonPagesShowTheNextEpisode() {
val watched=title("episode","1").copy(watched=true)
val unwatched=title("episode","2");val started=title("episode","3").copy(duration=60_000,offset=10_000)

View file

@ -1,13 +0,0 @@
package tv.kaleido.app
import org.junit.Assert.assertEquals
import org.junit.Test
class PlaybackTerminationTest {
@Test fun serverReasonFollowsTheExplanation() {
assertEquals("The server stopped this stream.\n\nMaintenance tonight",PlaybackTermination(2006," Maintenance tonight ").message)
}
@Test fun blankReasonLeavesOnlyTheExplanation() {
assertEquals("The server stopped this stream.",PlaybackTermination(2006,"").message)
}
}

View file

@ -1,32 +0,0 @@
package tv.kaleido.app
import androidx.compose.foundation.lazy.LazyListItemInfo
import org.junit.Assert.assertEquals
import org.junit.Test
class RowEntryTest {
private fun card(index:Int,offset:Int)=object:LazyListItemInfo {
override val index=index
override val key:Any=index
override val offset=offset
override val size=264
}
// A 264 px card plus 24 px spacing; the row's start padding is 88 px (viewportStart -88).
private fun row(first:Int,firstOffset:Int,count:Int)=List(count){card(first+it,firstOffset+it*288)}
@Test fun keepsThePreferredCardWhileItIsInView() {
assertEquals(0,rowEntryIndex(0,row(0,0,7),-88))
assertEquals(3,rowEntryIndex(3,row(1,-100,7),-88))
}
@Test fun scrolledAwayRowEntersAtTheFirstFullyVisibleCard() {
// Seasons row restored to its end: Season 6 (index 5) is clipped, Season 7 is the first whole card.
assertEquals(6,rowEntryIndex(0,row(5,-167,7),-88))
// A card resting in the start padding is still wholly on screen.
assertEquals(4,rowEntryIndex(0,row(4,-60,7),-88))
}
@Test fun emptyLayoutKeepsThePreferredCard() {
assertEquals(2,rowEntryIndex(2,emptyList(),-88))
}
}

View file

@ -1,76 +0,0 @@
package tv.kaleido.app
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Test
import kotlin.random.Random
class ShuffleEpisodesTest {
@Test fun previousEpisodeReturnsToTheEarlierPickOnly() {
val shuffle=ShuffleEpisodes(listOf("e1","e2","e3","e4"),{it},Random(7))
val first=shuffle.first!!
assertNull(shuffle.preceding(first))
val second=shuffle.following(first)!!
assertTrue(shuffle.advance(first,second))
assertEquals(first,shuffle.preceding(second))
assertTrue(!shuffle.retreat(second,"not-played"))
assertTrue(shuffle.retreat(second,first))
// Stepping back keeps the bag: the same episode follows again.
assertEquals(second,shuffle.following(first))
assertNull(shuffle.preceding(second))
}
@Test fun eachBagContainsEveryEpisodeOnceAndBoundaryDoesNotRepeat() {
val episodes=listOf("e1","e2","e3","e4","e5")
val shuffle=ShuffleEpisodes(episodes,{it},Random(42))
var current=shuffle.first
assertNotNull(current)
val firstBag=mutableListOf(current!!)
repeat(episodes.size-1) {
val next=shuffle.following(current!!)
assertNotNull(next)
assertTrue(shuffle.advance(current!!,next!!))
current=next
firstBag+=current!!
}
assertEquals(episodes.size,firstBag.distinct().size)
assertEquals(episodes.toSet(),firstBag.toSet())
val previous=current!!
val next=shuffle.following(previous)
assertNotNull(next)
assertNotEquals(previous,next)
assertTrue(shuffle.advance(previous,next!!))
current=next
val secondBag=mutableListOf(current!!)
repeat(episodes.size-1) {
val upcoming=shuffle.following(current!!)
assertNotNull(upcoming)
assertTrue(shuffle.advance(current!!,upcoming!!))
current=upcoming
secondBag+=current!!
}
assertEquals(episodes.size,secondBag.distinct().size)
assertEquals(episodes.toSet(),secondBag.toSet())
}
@Test fun onlyEpisodeRepeatsWhenItIsTheWholeShow() {
val shuffle=ShuffleEpisodes(listOf("only"),{it},Random(42))
assertEquals("only",shuffle.first)
assertEquals("only",shuffle.following("only"))
assertTrue(shuffle.advance("only","only"))
assertEquals("only",shuffle.following("only"))
}
@Test fun rejectsUnknownCurrentAndUnexpectedAdvance() {
val shuffle=ShuffleEpisodes(listOf("e1","e2","e3"),{it},Random(42))
assertNull(shuffle.following("missing"))
val current=shuffle.first!!
assertEquals(false,shuffle.advance(current,"missing"))
assertNotNull(shuffle.following(current))
}
}

Binary file not shown.

View file

@ -1 +1 @@
2fd832eb90633d1519c15abccc122970a3c5ef51933da35634b8a5b1429d5bc3 Kaleido.apk
6644676bc7c84caf8b3a917bb2f48c088ae6ad5871c3681308713eece3442d6a Kaleido.apk

View file

@ -1,7 +1,7 @@
{
"version": "0.8.1",
"versionCode": 25,
"url": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.8.1/distribution/Kaleido.apk",
"checksumUrl": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.8.1/distribution/Kaleido.apk.sha256",
"notes": "- Fix a title page where Down from the buttons did nothing, leaving you stuck at the top. This happened when the Seasons, Cast or another row below had been scrolled away from its first card, for example by reopening a show from Continue Watching. Down now moves to a card in view."
"version": "0.4.1",
"versionCode": 18,
"url": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.4.1/distribution/Kaleido.apk",
"checksumUrl": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.4.1/distribution/Kaleido.apk.sha256",
"notes": "- Make Categories about the genre: large centered labels over dim artwork with subdued natural color, a compact four-column grid and a restrained focus outline. Remove title captions and FILM/SERIES badges from category cards.\n- Give every movie and TV category a distinct artwork source. Match overlapping genres together, preserve scarce choices, and fetch more candidates when needed instead of reusing a background."
}

View file

@ -5,16 +5,16 @@ The interface gives artwork priority. App chrome uses neutral near-black, charco
## Layout and typography
- Horizontal safe gutter: 44 dp. Navigation: 62 dp, with centered text destinations and independent search/settings icons.
- Home retains a large cinematic feature: an 80 percent stage with original title artwork, synopsis, playback and information actions, with Continue Watching peeking below. Entering the rows compacts it into a Silo-style preview of the focused card instead of scrolling it away: the hero lifts and fades as the rows slide up beneath a bottom-anchored block (64 dp title art, content-rating badge, year/episode, genre, runtime or time left, ratings, three synopsis lines, three cast names and 4K/HDR/Atmos format badges). The card's own image (an episode's still, not its show's art) is scaled whole into a top-right box of 72 × 78 percent of the screen, baked off-thread to fade into the page toward its left and bottom edges. Movies and TV use the same preview (56 dp title art) beneath their Discover/Library/Categories line, with rows starting 300 dp down; their row content stays distinct. With Settings › Interface › Artwork colour wash (default On), the page beneath carries the artwork's average colour normalized to 0.22 luminance, diagonally from the top-right (full) to the bottom-left (18 percent), as Silo does. It is baked into the same cached 960 × 540 frame, so it costs nothing per frame and changes through the artwork crossfade. A 1280 × 720 frame was tried for sharper art and raised Movies' horizontal p95 from about 31 to 36 ms through larger texture uploads, so it was not kept. The preview stays composed, invisible, under the hero with the first row's first card, so entering the rows is only a fade. Up from the first row or Back restores the hero. Features interleave recently released, highly rated unwatched, and Plex-suggested movies/shows, excluding Continue Watching, without a label naming the source. They shuffle per refresh and rotate every 12 seconds while the hero is active, pausing during row browsing.
- Home retains a large cinematic feature: an 80 percent stage with original title artwork, synopsis, playback and information actions. The scene continues beneath Continue Watching; entering the rail scrolls the feature away and the backdrop follows focused titles. Features interleave recently released, highly rated unwatched, and Plex-suggested movies/shows, excluding Continue Watching. They shuffle per refresh and rotate every 12 seconds while the hero is active, pausing during row browsing.
- Movies uses a compact fixed preview above poster rows, with the backdrop and synopsis following focused titles. Recently released films and movie recommendations lead. TV uses a shorter preview, larger episode thumbnails, next episodes, newly added seasons, and then new episodes and show recommendations. Redundant TV hubs are omitted when their episode lists match exactly. These are deliberately different compositions.
- Library: title and discovery/full-library navigation share a 64 dp header. A 43 dp filter row sits immediately above the six-column poster grid.
- Browsing card widths: landscape 214 dp, TV episodes 264 dp, posters 120 dp. Landscape artwork uses 16:9; posters use 2:3. The full grid scales six columns to available width. Captions reserve a fixed height.
- Search uses three columns of landscape results. Episodes use their actual stills, preserving their native proportions instead of cropping them into posters.
- Movie and episode information pages place a horizontal Cast row beneath the description and actions, using Plex portraits, names and character roles. TV show pages place Seasons first, then Cast, then server-provided Related shows; season pages likewise keep Episodes ahead of Cast. Missing portraits use a neutral person placeholder. Actor cards open a six-column filmography of available movies and shows across the connected server's libraries, using Plex actor identifiers and pagination.
- Movie, show, season and episode pages share the browse previews' language: the same top-right artwork frame and optional colour wash (so opening a title keeps its artwork in place), original title art (340 × 64 dp; episodes show their show's art at 280 × 48 dp above the episode name), a facts line with the content-rating badge, ratings and 4K/HDR/Atmos badges, and a three-line synopsis capped at 560 dp. A truncated movie or show synopsis offers a Synopsis action. Codec, audio layout and bitrate sit quietly beneath the actions. Season and episode pages follow the focused episode: its still crossfades and its copy fades and lifts as on the browse pages, while the actions stay in place. Fixed header heights (250 dp shows, 276 dp movies, 296 dp seasons/episodes) keep the rows still and a show's season captions on the initial screen. The Back control stays in the safe area; artwork disappears over the first 180 dp of scrolling. Soft text shadows preserve contrast.
- TV show information uses a full-screen backdrop behind a fitted 128 × 192 dp poster and a top-aligned text block capped at 560 dp, matching movie details. The three-line summary offers a Synopsis action when truncated, opening the full text with D-pad scrolling. Its 248 dp minimum header keeps season artwork and captions on the initial screen at the standard TV density; longer titles can grow the header. The Back control stays in the safe area; focus only scrolls controls that are out of view. Artwork fades to near-black before the lower rows and disappears over the first 180 dp of scrolling. Soft text shadows preserve header contrast.
- Movie, episode, show and season information pages expose labelled Mark watched / Mark unwatched actions. Changes are sent to Plex and reflected in the title, descendant episodes/seasons, library cards, actor results and recommendations. An in-flight write survives navigation and prevents duplicate submissions. Partial episode-list records update watch fields without replacing full cast/detail metadata.
- Settings uses a fixed category rail (Connection, Playback, Interface, Updates) beside compact value/action rows. Focus selects categories; Right enters their controls and Left returns to the rail. Neutral surfaces, white focus, existing typography and restrained motion match the browsing destinations. Existing account, quality, watched-threshold, navigation-sound and updater preferences keep their behavior.
- Features use original Plex clear-logo artwork within 264 × 80 dp, falling back to title text. Library title: 29/34 sp. Discovery rail heading: 17/22 sp. Supporting information: 10/14 sp.
- Features use original Plex clear-logo artwork within 264 × 80 dp, falling back to title text. Detail title: 32/36 sp. Library title: 29/34 sp. Discovery rail heading: 17/22 sp. Supporting information: 10/14 sp.
- Poster and thumbnail corners: 6 dp. Compact action corners: 5 dp. Cards have no idle border; a compact bottom-right check marks watched titles, or a number shows remaining episodes for a show/season when Plex provides counts. Unwatched movies have no badge. Resumed movies/episodes only show a check after the configured playback threshold (80 percent by default), even if Plex retains a historical watched flag. Completed titles with no resume position retain Plex's watched state. Progress uses a two-dp inset line.
- The abstract six-facet aperture mark is shared by the header, sign-in, app icon, TV banner, and the cold-start aperture sequence. It uses muted sea-glass and warm ivory facets around a dark center, with no letterform or sparkle. The launcher banner and app icon place it on a diagonal light, deep sea-glass at the top right through near-black to a warm tan glow at the bottom left, with a soft vignette and nothing over the aperture; `scripts/generate_brand_tiles.py` regenerates both from `brand_mark.xml`.
- Audience ratings display Rotten Tomatoes as a percentage beside its official Popcornmeter artwork, and IMDb on its native ten-point scale beside the gold IMDb logo. Both appear when Plex exposes both; TVDB is retained as a fallback when neither is available. Critic scores and unsupported providers are omitted. Stable preview focus hydrates detail metadata, where Plex exposes the full provider list. The official red Hot mark appears at 60 percent or above and the green Stale mark below 60 percent; each fits a stable, font-scaled square without recoloring or distortion. Verified Hot is not inferred from a percentage. Asset provenance is in [brand-assets.md](brand-assets.md). The IMDb vector uses the official gold primary mark and supplied clear space from the [IMDb brand toolkit](https://brand.imdb.com/imdb).
@ -27,7 +27,7 @@ The interface gives artwork priority. App chrome uses neutral near-black, charco
- Navigation contrast comes from a gradient extending past the controls and fading to transparent. Home/Movies/TV activate on focus. Explicit row and column links prevent beyond-bounds focus searches when holding a remote direction.
- A spaced D-pad move predicts the actual row/column destination before starting its scroll or focus change. The target backdrop is fetched and contrast-processed through the same Coil request/cache as the visible scene. Speculative artwork uses one low-priority worker so it cannot flood normal decode workers during a burst of input. Metadata starts in parallel; the visible preview and details page share that in-flight request. Rapid horizontal input settles to the latest target before starting speculative work. Full metadata uses a 64-item LRU with a 30-second lifetime, cleared on account/server changes and refreshed after watched updates. Neutral library/search grids prefetch metadata without fetching an unused full-screen backdrop.
- Home's vertical list prepares content within one viewport ahead and retains one viewport behind, using Compose's bounded lazy-layout cache window. This keeps the hero and nearby rows ready when moving between them, rather than repeatedly composing and measuring the exposed image cards during the animation. Movies/TV use the same window. The window only fills ahead after the list has scrolled, so once a section settles it is nudged 1 px and back, letting the next rows compose in idle frames instead of during the first move down. Card sizes, row targets and the large cinematic Home layout are unchanged.
- Home, Movies and TV previews follow focus once it rests for 110 ms and retain previous artwork until replacement data is ready. New artwork fades in over the old for 320 ms, including cache hits; the outgoing title and synopsis lift slightly as they fade while the new ones rise 12 dp into place (380 ms). Hero recommendation changes use the same artwork and copy transitions, holding the copy up to 700 ms for the new artwork to decode. These fades, and the hero/preview exchange, are single animations read only in graphics layers, so they add no per-frame composition or layout. Contrast gradients are baked into a cached bitmap on a worker thread, reducing GPU overdraw. Rotation pauses on the information/next controls and preserves their focus. Vertical row changes animate to explicit row/column targets; page entrances fade and slide 28 dp over 280 ms, using per-draw alpha rather than an offscreen layer, and start once the new section's composition frames have passed (at most 300 ms). While a section enters, its cards lay out at their fixed size first and fill in artwork and titles three per frame under the fade, so the section's first frame stays short. Focusing a top tab lets its highlight draw before the section switches. The cold-start sequence is a kaleidoscope, the same as Kaleido Desktop's, and lasts about 2.6 seconds. A faint mirrored field of shards fades in, still, for 260 ms and holds there (at most 700 ms) until startup data has arrived and frames are steady, so cold-start hitches never interrupt the motion. The field then turns 150° while the shards spiral inward and vanish and the six exact facets ride in from it and lock into the mark (1.7 s), a hexagonal ring pulses out and a sheen crosses the settled mark. Once loading finishes (up to 600 ms extra; small shards begin circling the mark if it runs long) the camera flies through the mark's open center over 640 ms, revealing the app beneath as it settles from 114 percent scale. The completed mark itself is never redesigned. Android animation duration scale is honored, including animations off. It does not replay when returning from background.
- Section previews settle for 120 ms (Home artwork for 90 ms), overlapping the navigation animation, and retain previous artwork until replacement data is ready. Contrast gradients are baked into a cached bitmap on a worker thread, reducing GPU overdraw. Hero recommendation changes crossfade the artwork over 220 ms, including cache hits, and fade the title/summary out for 100 ms and back in over 180 ms. Rotation pauses on the information/next controls and preserves their focus. Vertical row changes animate to explicit row/column targets; page entrances fade and slide 28 dp over 280 ms, using per-draw alpha rather than an offscreen layer, and start once the new section's composition frames have passed (at most 300 ms). While a section enters, its cards lay out at their fixed size first and fill in artwork and titles three per frame under the fade, so the section's first frame stays short. Focusing a top tab lets its highlight draw before the section switches. The cold-start sequence lasts 2.9 seconds. The six exact facets begin as a closed, overlapping iris lit from behind; it holds there (at most 700 ms) until startup data has arrived and frames are steady, so cold-start hitches never interrupt the motion. The iris then twists 44° open and locks with a slight overshoot while light leaks through the six gaps, a single sheen crosses the settled mark, and the mark shrinks into a lockup scaled from the header brand as KALEIDO slides out from behind it. Once loading finishes (up to 600 ms extra) the camera flies through the aperture's dark center over 640 ms, revealing the app beneath as it settles from 114 percent scale. The completed mark itself is never redesigned. Android animation duration scale is honored, including animations off. It does not replay when returning from background.
- Returning from details restores the library's mode, scroll position, and previously focused title.
- Entering Movies/TV from the top bar focuses the fixed Discover control immediately. Down from Discover explicitly reveals the first catalog card; focus on already-visible targets changes before scrolling. A quick tab/Down sequence queues entry for the new destination, and focused tabs never repeat their delayed initial-focus request.
- Offscreen card navigation requests the next lazy layout instead of forcing synchronous composition between key events. Up at the top bar is consumed because there is no destination above it; it must not start a lazy-list focus search.
@ -37,11 +37,11 @@ The interface gives artwork priority. App chrome uses neutral near-black, charco
## Player
Controls occupy a bottom gradient. The title uses the same original title art (240 × 44 dp) and rating badge/facts line as the browse and details pages, with the delivery quality quietly at the right; a slim timeline, small time labels, central transport icons, and right-aligned track icons replace the rectangular button grid. The timeline is a true D-pad focus target: Up from transport reaches it, Left/Right seek, and Down returns to Play/Pause. Holding a direction increases the seek step. Dedicated media keys remain supported.
Controls occupy a shallow bottom gradient. A compact title, slim timeline, small time labels, central transport icons, and right-aligned track icons replace the rectangular button grid. The timeline is a true D-pad focus target: Up from transport reaches it, Left/Right seek, and Down returns to Play/Pause. Holding a direction increases the seek step. Dedicated media keys remain supported.
The controls fade and slide away after five seconds during playback. While they are hidden, a Left/Right tap skips 10 seconds without revealing anything (quick taps add up into one seek), and holding Left/Right reveals the focused timeline for scrubbing. OK and Down reveal them; Back hides them before exiting. Audio and subtitle panels open above their icons and restore focus when dismissed. A gear exposes quality, audio, subtitles, speed, and chapters. Quality is one list shared with Settings: Original quality (the default, direct stream of the source video), then 4K, 1080p, 720p and 480p conversions. The timeline includes buffered progress and server-generated video/chapter previews. Skip actions have opaque contrast surfaces.
Credits (automatically, or through Skip credits) and episode endings open Up Next: the playing video shrinks to a 352 × 198 dp frame at the top left and keeps playing, beside the next episode's still (top right, fading into the page), title art, episode title, facts line and three-line synopsis, with the season and related shows below. The page is drawn beneath the PlayerView so its SurfaceView shows through. Play next episode carries the only countdown (Settings › Autoplay next episode) as a sweeping fill; any remote press stops it. Left from Play next focuses the video; selecting it, or Back, returns to the full-screen credits. Each player session has a unique Media3 session ID so overlapping Compose disposal and next-episode creation cannot collide.
Episode endings and Skip credits open a five-second, cancellable next-episode countdown with season episodes and related shows. Each player session has a unique Media3 session ID so overlapping Compose disposal and next-episode creation cannot collide.
Settings includes a persistent watched percentage. Timeline reporting scrobbles the item in Plex once the selected percentage is reached, retries a failed write, and avoids repeated scrobbles within the same player session. This preference belongs to Kaleido and does not change the Plex server's global settings. Explicit watched changes refresh the title and parent episode counts across browsing caches.

View file

@ -22,7 +22,7 @@ Open Kaleido and enter its code at [plex.tv/link](https://plex.tv/link). Setting
D-pad moves focus, OK activates, and Back returns through details and seasons. In the player, OK shows controls; Left/Right while controls are hidden seeks; dedicated media keys control playback. The on-screen controls provide pause, seeking, audio, subtitles, next episode, and exit. Back first hides controls, then exits playback. Stopping or leaving the app reports the latest position to Plex.
Original quality is the default, requesting the source video and remuxing where supported, with a 1080p conversion fallback. The player gear exposes the same quality preference as Settings, along with audio, subtitles, speed and chapters. Media3's SurfaceView preserves supported HDR. Actual HDR, Dolby Vision, codecs, and audio passthrough depend on the device, connected display/receiver, source profile, and server. Plex owns transcoding capability and any account entitlements. Unsupported subtitle formats use server conversion. Intro and credit buttons appear when the server supplies markers. Scrubbing displays server-generated video previews or chapter thumbnails when available; the timeline also shows buffered progress. Credits and episode endings open Up Next: the video keeps playing in a corner beside the next episode, its single countdown, the season and related shows.
Original quality is the default, requesting the source video and remuxing where supported, with a 1080p conversion fallback. The player gear exposes the same quality preference as Settings, along with audio, subtitles, speed and chapters. Media3's SurfaceView preserves supported HDR. Actual HDR, Dolby Vision, codecs, and audio passthrough depend on the device, connected display/receiver, source profile, and server. Plex owns transcoding capability and any account entitlements. Unsupported subtitle formats use server conversion. Intro and credit buttons appear when the server supplies markers. Scrubbing displays server-generated video previews or chapter thumbnails when available; the timeline also shows buffered progress. Episode endings and Skip credits show a cancellable five-second next-episode countdown, season episodes, and related shows.
## Updates and releases

View file

@ -4,46 +4,6 @@ For the 2026-10-26 codec/HDR sweep and its native-versus-converted playback find
Target: the authorized onn at `192.168.50.195:5555`, package `tv.kaleido.app`. Other applications and the launcher were not modified. Screenshots, traces, UI dumps and server-specific logs stay in ignored `evidence/private/`.
## 2026-10-28/29 browse frame pacing toward 60 fps (0.6.1)
Measured on the onn with signed release builds, each freshly installed, profile-broadcast and `speed-profile` compiled (the same preparation for 0.6.0 and every candidate; a long-lived `bg-dexopt` install measures faster and is not comparable). `profile_transitions.py` now reports `dropped`: refreshes that repeated a frame, from `DisplayPresentTime`. A gap longer than about six frames counts only when the frame before it ran long enough to cause it. Frame latency alone misleads: the render thread usually waits 8–12 ms in `dequeueBuffer` because the pipeline is full, and buffer stuffing hides many 20–30 ms UI frames. The metric still cannot tell a deliberate pause from a stall, and run-to-run variance is large (the same code measured 24–38 drops), so compare totals across several runs.
Causes found with atrace, temporary measure sections and `simpleperf` (a temporarily `profileable` release):
- **Tab switches** disposed one section (~31 ms of `onForgotten`) and composed the next (50–100 ms frames). Home, Movies and TV now stay composed once shown; hidden ones are neither measured, placed nor drawn, carry `clearAndSetSemantics{}`, and take no focus. A hidden screen gives up focus and moves none; shown again it focuses what a new screen would. Movies and TV rows are kept per destination and keep their previous rows while the same library reloads. A retained switch is now one ~25 ms frame (placing and redrawing the screen).
- **The hero** was composed again on every return; it stays composed as a zero-alpha layer without semantics.
- **Prefetch**: Compose's scheduler treats a frame after a late one as idle and gives its request unlimited time; it composed whole rows (35–45 ms) mid-scroll. `FramePrefetch` uses only what is left of each frame, unlimited only when nothing has drawn for two frames, and rotates past a request that cannot progress (a hidden screen's list) instead of letting it block the queue. `CacheWindows` keeps Compose's cache-window strategy on that scheduler; it must subclass `CacheWindowLogic`, because the list measure policy only keeps scrolled-out items when the strategy is one. Nested prefetch composes and measures each card a row will show (Compose precomposes two). The catalog window is two viewports each way, refilled after row changes.
- **Accessibility** was the largest single cost. With any accessibility service enabled (the onn runs Luma's; Button Mapper was removed at the user's request), Compose rebuilds and geometry-sorts its whole semantics tree, placed or not, after every layout change, at most every 100 ms: about 40% of main-thread time while browsing. Rows and cards outside the viewport now carry no semantics (`semanticsOnScreen`, a `Modifier.Node` that observes the list and never recomposes). With accessibility temporarily disabled (restored afterwards), all 42 transitions dropped 16 frames; with Luma's service the best runs dropped 24–33.
- **Cards**: `CardArtwork` draws a memory-cache hit directly and otherwise loads then draws without recomposing, instead of Coil's painter (~2.5 ms per card). Staging applies only while a section first enters. Both title weights are laid out with the card and focus swaps their layers, so a move no longer re-measures two titles. Models are `@Immutable`, so equal rows and cards skip recomposition after a refresh.
- **The preview and hero copy** compose their parts over the first frames of their fade while still transparent (12 ms in one frame before).
- **Library sync** refreshes every 60 s, and Plex varies some Movies hubs on each request, so each refresh rebuilt rows; landing mid-move it caused a recurring 80–150 ms frame. The staged snapshot now waits for 2 s without a key before it is validated and applied. That exposed a latent bug: after a refresh replaced the focused card, the replacement could compose a frame after focus was requested, leaving nothing focused. `moveToRow` now retries for a few frames.
Dropped frames across three cycles of all 14 transitions (cycle 1 is the first pass after launch), 0.6.0 versus this build, Luma's service enabled:
| Transition | 0.6.0 | this build |
| --- | --- | --- |
| home: tab -> hero | 5 / 0 / 0 | 5 / 0 / 0 |
| home: row -> row | 4 / 0 / 2 | 4 / 1 / 1 |
| home: hero <- row | 1 / 1 / 1 | 0 / 0 / 0 |
| tabs: home -> movies | 7 / 4 / 5 | 6 / 2 / 1 (the first composes Movies) |
| movies: row -> row | 1 / 2 / 0 | 1 / 0 / 1 |
| tabs: home <- movies | 2 / 7 / 6 | 2 / 1 / 2 |
| all 42 transitions | 55 | 33 (24–38 across runs) |
On the TCL (two cycles, 28 transitions) 0.6.0 dropped 39 and this build 31; Movies → Home frames fell from 118 ms to 30 ms of UI time. The TCL is GPU-bound: the preview crossfade takes 17–18 ms of GPU time per frame (two full-screen backdrop layers), against 7 ms at rest. Its ADB reset sometimes failed and its later frames arrived every 25 ms, so treat those numbers as indicative.
Tried and reverted: delaying tab activation until the highlight settles (not measurably better, adds latency); a graphics layer per retained screen (the redraw was not avoided); preloading Movies/TV after startup and composing them unseen (first visit 7 → 2 drops, but it added post-startup load and coincided with an accessibility-dump anomaly); capping idle prefetch to one frame (rows were unprepared for quick moves). Silo's Android source was reviewed: standard Compose for TV with default prefetch, per-card spring focus animations, Coil 3 and a Macrobenchmark baseline profile; its settled-focus prefetch matches Kaleido's `anticipate`. JIT was ruled out here (about 16 compilations in a 6 s trace). On Google TV the default-Home preference is ignored (`launcherx` keeps resolving), and disabling `launcherx` would hand Home to Google's setup recovery activity, so Luma still needs its service.
Checks: `Build.ps1 -Release -Test` passed; `repro_runtime.py browse` passed (stable geometry, GPU p95 6 ms); `verify_ui.py browse` (8), `repro_runtime.py sections`, `verify_movie_details.py` and `verify_library_jump.py` passed. `verify_library_jump.py` now reads the first of a rail entry's labels (`# #`); it failed identically on 0.6.0. Since Button Mapper's removal, `verify_details_layout.py` fails at the synopsis dialog on 0.6.0 and this build alike: uiautomator dumps the window behind the dialog, while the dialog is shown with Close focused. The goal of no dropped frames is not met: tab switches still have one long frame, row moves sometimes drop one or two, the first Movies visit composes the section, and the Fire TV was not measured. Playback suites were not run; playback code did not change.
## 2026-10-28 playback quality, audio selection and show shuffle (0.5.0)
- Original quality now uses the selected media version's source bitrate; Infinity War shows `19.1 Mbps`. No source bitrate is invented when Plex omits it. The quality menu and audio-track popup were checked in actual device screenshots.
- `scripts/verify_playback_changes.py audio` passed real Infinity War track switches in Original mode and Plex conversion. Selected stereo audio was actually delivered as AC3 two-channel audio and AAC two-channel audio respectively; the paused state and timeline position survived both switches. The script restored the prior Plex audio selection and local preferences. Validation playback suppresses timeline/scrobble writes.
- Twelve focused unit checks passed (`PlaybackModelTest`, `ShuffleEpisodesTest`), along with lint and signed debug/release builds. The opt-in `PlaybackChangesIntegrationTest` passed two natural episode endings through the real player/Compose post-play path with ordinary autoplay set to Off; shuffle continued to different episodes. The test restored the original autoplay preference. Shuffle bags cover every eligible episode from all seasons before reshuffling and avoid repeating the previous episode at a bag boundary; a one-episode show explicitly recreates playback for its next cycle.
- The reported intermittent Infinity War audio stutter remains unresolved. A 45-second steady baseline near one hour played its original Dolby Vision video and EAC3 eight-channel audio without player errors or audio underruns; the user reports that rewinding does not repeat the symptom and that it also happens with boost disabled. No codec, output routing or buffer change was made without a reproduction. Release logcat now records sparse `KaleidoAudio` underrun/sink-error events with position and audio path, and the debug validation harness can fail on audio underruns with `--fail-on-audio-underrun`.
- The signed release passed the focused show/season UI check: Shuffle is remote-focusable on Silo's show page and absent on its season page. Reinstalled the release, installed its baseline profile and compiled only Kaleido with `speed-profile`, then returned the onn to Home. The user authorized publication after these local checks.
## 2026-10-28 genre-led category revision (0.4.1)
- The user requested a genre-led page instead of title-led cards: four columns, centered 22 sp genre labels, no title captions or FILM/SERIES badges, and dim artwork in the background. Natural artwork color is retained at 65% saturation after a monochrome preview was rejected. There are no added genre color tints.
@ -255,13 +215,3 @@ The user reported severe lag while the devices still had temporary debug APKs in
The signed 0.1.10 APK uses the existing production certificate, version code 11. APK checks found neither private session data nor debug playback intent strings. Raw comparison records remain in ignored `evidence/private/release-comparison/`. The new benchmark scripts reject debuggable APKs and require `speed-profile`, so functional debug results cannot be mistaken for release performance evidence. The user explicitly authorized leaving Dolby Vision/HDR10 enabled; cleanup must not restore the earlier disabled list.
The actual non-debuggable release was also opened through Search and title details and played the 4K HEVC fixture from the beginning. Playback reached PLAYING/READY in 2.565 seconds; the recorded 30-second steady sample had zero BUFFERING transitions and one READY event. A preceding one-minute session also completed without a second READY event, but its harness incorrectly expected Home instead of the originating details page, so it is not counted as a fully completed benchmark. The corrected run returned normally and restored the exact previous resume point with the watched count unchanged. This checks real release playback, rather than ignored debug test intents.
## Silo-style browse and details redesign - 2026-10-28
Verified on the onn with the profiled release (baseline profile installed, `speed-profile` compiled). The first Home version used AnimatedVisibility/AnimatedContent and read the hero mode in the catalog's composition; `profile_home.py` failed at p95 39.9 ms, and atrace showed recomposition and layout on nearly every frame plus one 44 ms frame on entry. Driving the header, copy and artwork fades from single animations read only in graphics layers, and keeping the invisible preview composed under the hero, brought five hero → Continue Watching transitions to median 16.9 ms, p95 25.1 ms and none above 33.34 ms (the pre-redesign baseline was p95 28.6 ms). `repro_runtime.py browse` passed at Movies p95 31–34 ms; a 1280 × 720 preview frame raised it to 36 ms through larger texture uploads and was not kept. Moving along a season's episode row measured p95 32 ms. `verify_ui.py browse` (8 checks), `repro_runtime.py sections`, `verify_settings.py`, `verify_details_layout.py` and `verify_movie_details.py` passed. The last two needed their library navigation updated for the genre/sort filter row; titles shown as title art are now read from their content description. `verify_details.py` and the live playback suites were not run: they change Plex state, and `verify_details.py` still expects Mark watched directly after Watch next on shows. The player title area was observed during a brief accidental playback, which Plex did not record as progress.
## Kaleidoscope startup animation - 2026-10-31
The iris was replaced with Kaleido Desktop's kaleidoscope (approved there from a canvas prototype): a mirrored field of shards turns and gathers into the six facets, then the existing fly-through exit, zoomed 30× instead of 52× because the mark is larger than the old lockup. The gather is fastest at its start, so the TV keeps the iris's safeguard: a 260 ms still, faint shard field that holds (at most 700 ms) until `busy` clears and four steady frames arrive. The Compose port draws only paths and gradients (Screen and Plus blend modes); there is no blur.
On the onn with the profiled release, a screen recording of a cold start (ignored `evidence/private/splash-kaleidoscope/`) showed the still field for about 0.8 s, the gather, the settled mark and the reveal into Home. Framestats from three cold starts, bucketed per 250 ms: the 75–190 ms frames fall in the first 0.75 s, inside the hold; during the gather runs 1–2 completed every frame within 26 ms at 15 frames per bucket, and run 3 had a few 30–41 ms frames with 13–15 frames per bucket. Frames from about 2.25 s include Home appearing beneath and reach 42–69 ms, as with the iris. GPU time stayed below 12 ms at p99. These are device samples, not a guarantee; the Fire TV and TCL were not measured. `Build.ps1 -Release -Test` and `repro_runtime.py sections` passed, and the optimized release was left on Home.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 KiB

After

Width:  |  Height:  |  Size: 1.4 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 191 KiB

After

Width:  |  Height:  |  Size: 1 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 KiB

After

Width:  |  Height:  |  Size: 1.3 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 KiB

After

Width:  |  Height:  |  Size: 1.4 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 294 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 KiB

After

Width:  |  Height:  |  Size: 1.4 MiB

Before After
Before After

View file

@ -4,9 +4,6 @@ ROOT=pathlib.Path(__file__).resolve().parents[1]
version=dict(l.split('=',1) for l in (ROOT/'version.properties').read_text(encoding='utf-8').splitlines() if '=' in l)
apk=ROOT/'app/build/outputs/apk/release/app-release.apk'
if not apk.exists():raise SystemExit('Run Build.ps1 -Release first.')
# The APK left by an earlier build must not be published under this version's name.
from verify_distribution import check_apk
check_apk(apk,version['versionName'],int(version['versionCode']))
out=ROOT/'distribution';out.mkdir(exist_ok=True)
shutil.copyfile(apk,out/'Kaleido.apk')
digest=hashlib.sha256(apk.read_bytes()).hexdigest()

View file

@ -37,18 +37,8 @@ def summarize(rows,period):
# 300 ms, is idle time (on weak GPUs every frame's latency exceeds one interval).
skipped=sum(max(0,round((b['IntendedVsync']-a['IntendedVsync'])/period)-1) for a,b in zip(rows,rows[1:])
if a['FrameCompleted']-a['IntendedVsync']>period and b['IntendedVsync']-a['IntendedVsync']<3e8)
# What the viewer sees: refreshes that repeated the previous frame while frames kept coming.
# Buffer stuffing hides many slow UI frames, so this is stricter than latency and catches
# stalls the heuristic above misses. Invalid present times (0 or before the vsync) are skipped.
# A gap longer than ~6 frames counts only when the frame before it ran long enough to cause it;
# otherwise nothing was animating (e.g. a later image arriving after an idle pause).
shown=[r for r in rows if r.get('DisplayPresentTime',0)>r['IntendedVsync']]
def stalled(a,b):
gap=b['DisplayPresentTime']-a['DisplayPresentTime']
return 0<gap<3e8 and (gap<=6.5*period or a['FrameCompleted']-a['IntendedVsync']>=gap-period)
dropped=sum(max(0,round((b['DisplayPresentTime']-a['DisplayPresentTime'])/period)-1) for a,b in zip(shown,shown[1:]) if stalled(a,b))
pick=lambda v,p:v[min(len(v)-1,int((len(v)-1)*p))]
return {'frames':len(rows),'skipped':skipped,'dropped':dropped,'median':round(pick(latency,.5),1),'p95':round(pick(latency,.95),1),
return {'frames':len(rows),'skipped':skipped,'median':round(pick(latency,.5),1),'p95':round(pick(latency,.95),1),
'max':round(latency[-1],1),'uiMax':round(ui[-1],1)}
def measure(name,code,expect,window,results):
@ -100,10 +90,10 @@ def main():
measure('tabs: home <- movies',21,lambda r:focus(r)=='Home',args.window*2,results)
summary={}
for name,runs in results.items():
summary[name]={'dropped':[r.get('dropped',0) for r in runs],'skipped':[r['skipped'] for r in runs],'p95':max(r.get('p95',0) for r in runs),'max':max(r.get('max',0) for r in runs),'uiMax':max(r.get('uiMax',0) for r in runs)}
summary[name]={'skipped':[r['skipped'] for r in runs],'p95':max(r.get('p95',0) for r in runs),'max':max(r.get('max',0) for r in runs),'uiMax':max(r.get('uiMax',0) for r in runs)}
report={'device':DEVICE,'transitions':summary,'runs':results}
(OUT/f'transitions-{args.label}.json').write_text(json.dumps(report,indent=2)+'\n')
print('\nSUMMARY',args.label,DEVICE)
for name,s in summary.items():print(f" {name:28} dropped={s['dropped']} skipped={s['skipped']} p95={s['p95']} max={s['max']} uiMax={s['uiMax']}")
for name,s in summary.items():print(f" {name:28} skipped={s['skipped']} p95={s['p95']} max={s['max']} uiMax={s['uiMax']}")
if __name__=='__main__':main()

View file

@ -105,28 +105,24 @@ def credits():
marker=next(m for m in item['Marker'] if m['type']=='credits')
adb('shell','am','force-stop','tv.kaleido.app');adb('logcat','-c')
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity','--es','testTitleId','7599','--el','testOffset',str(marker['startTimeOffset']+2000),'--ei','testMode','2','--ez','testValidation','true')
await_ready(7599)
def log():return adb('logcat','-d','-s','KaleidoPlayback:I','AndroidRuntime:E','*:S').decode(errors='replace')
# Automatic credits open Up Next at once; with "Show button" the Skip credits button opens it.
deadline=time.monotonic()+4
while time.monotonic()<deadline and 'POSTPLAY focus=play' not in log():time.sleep(.2)
if 'POSTPLAY focus=play' not in log():
key(127);focused('Play');key(19);focused('Playback timeline');key(19);focused('Skip credits')
screenshot('skip-credits-contrast');key(23)
deadline=time.monotonic()+8
while time.monotonic()<deadline and 'POSTPLAY focus=play' not in log():time.sleep(.1)
assert 'POSTPLAY focus=play' in log(),'Up Next initial action never received focus'
screenshot('up-next')
key(20) # any press stops the countdown
time.sleep(6);root=snapshot();found=labels(root)
assert 'Up next' in found or 'UP NEXT' in found,'Cancellation failed to keep Up Next open'
assert any(l.startswith('Season ') for l in found),'Season episodes absent'
assert 'Related shows' in found,'Related shows absent'
logs=log()
assert 'AUTOPLAY cancelled' in logs and 'AUTOPLAY starting' not in logs,'Cancelled autoplay still advanced'
key(4);time.sleep(1)
assert 'POSTPLAY closed' in log(),'Back did not return to the video'
(OUT/'postplay-cancel.log').write_text(log())
print('PASS credits -> Up Next, episode/related rows, any press stops autoplay, Back returns to video')
await_ready(7599);key(127);focused('Play');key(19);focused('Playback timeline');key(19);focused('Skip credits')
screenshot('skip-credits-contrast');key(23)
deadline=time.monotonic()+8
while time.monotonic()<deadline:
time.sleep(.1)
ready=adb('logcat','-d','-s','KaleidoPlayback:I','*:S').decode(errors='replace')
if 'POSTPLAY focus=play' in ready:break
assert 'POSTPLAY focus=play' in ready,'Postplay initial action never received focus'
key(22);key(23)
wait(lambda r:'Autoplay off' in labels(r),'Autoplay cancellation')
screenshot('postplay-season-and-related');time.sleep(6)
root=snapshot();assert 'Up next' in labels(root),'Cancellation failed to keep postplay open'
assert 'Episodes in this season' in labels(root),'Season episodes absent'
assert 'Related shows' in labels(root),'Related shows absent'
logs=adb('logcat','-d','-s','KaleidoPlayback:I','AndroidRuntime:E','*:S').decode(errors='replace')
assert 'reason=skip-credits' in logs,'Skip credits did not open postplay'
assert 'AUTOPLAY starting' not in logs,'Cancelled autoplay still advanced'
(OUT/'postplay-cancel.log').write_text(logs)
print('PASS skip credits -> postplay, episode/related rows, cancellable autoplay')
if __name__=='__main__':globals()[sys.argv[1]]()

View file

@ -26,7 +26,7 @@ def main():
label,setup,measured=sys.argv[1],sys.argv[2],sys.argv[3]
launch()
for code in filter(None,setup.split(',')):adb('shell','input','keyevent',code);time.sleep(1.2)
pid=adb("shell","pidof","tv.kaleido.app").decode().split()[0];time.sleep(float(__import__("os").environ.get("KALEIDO_SETTLE","0")))
pid=adb('shell','pidof','tv.kaleido.app').decode().split()[0]
time.sleep(1)
adb('shell','atrace','--async_start','-b','16384','-a','tv.kaleido.app','gfx','view','sched','dalvik')
for code in measured.split(','):adb('shell','input','keyevent',code);time.sleep(1.5)

View file

@ -34,7 +34,6 @@ def main():
parser.add_argument('--expect-width',type=int)
parser.add_argument('--expect-channels',type=int)
parser.add_argument('--expect-audio-encoding',type=int)
parser.add_argument('--fail-on-audio-underrun',action='store_true')
args=parser.parse_args()
folder=OUT/'playback-validation'/('onn' if DEVICE=='192.168.50.195:5555' else 'tcl')/args.label
folder.mkdir(parents=True,exist_ok=True)
@ -112,13 +111,11 @@ def main():
'errors':[r['code'] for r in records if r['event']=='error'],'errorDetails':[r for r in records if r['event'] in ('error','prepareFailure')],'finalSample':last,'seek':seek_result,
'expectsVideo':expects_video,'videoRendered':not expects_video or any(r.get('videoCounters',{}).get('rendered',0)>5 for r in samples),
'closed':any(r['event']=='closed' for r in records),'before':watched(before),'after':watched(after),
'audioUnderruns':[r for r in records if r['event']=='audioUnderrun'],
'transport':'private-local-fixture' if args.fixture else 'Plex','progressUnchanged':None if args.fixture else watched(before)==watched(after)}
(folder/'result.json').write_text(json.dumps(result,indent=2))
print(json.dumps({k:result[k] for k in ('label','readySeconds','firstFrame','audioAdvancing','videoDecoders','errors','progressUnchanged')}),flush=True)
print('Output:',last.get('video'),last.get('audio'),'mode:',last.get('mode'),'seek:',seek_result,flush=True)
if ready is None:raise SystemExit('Playback did not become ready; see private evidence')
if args.fail_on_audio_underrun and result['audioUnderruns']:raise SystemExit('Audio underrun detected; see private evidence')
if not result['closed']:raise SystemExit('Player did not close cleanly')
if result['progressUnchanged'] is False:raise SystemExit('Unexpected progress change; see before/after evidence')
if args.seek and not seek_result['correct']:raise SystemExit('Seek did not reach the expected absolute position')

View file

@ -1,4 +1,4 @@
"""Validate optional themes and the normal audio path on the authorized onn; restore the prior audio preferences."""
"""Validate optional themes and PCM boost on the authorized onn; restore the prior audio preferences."""
import re,time,sys,xml.etree.ElementTree as ET
from device import adb,OUT,screenshot
from verify_ui import launch,key,text,focused,focus,snapshot,labels,wait,passed
@ -38,7 +38,7 @@ if __name__=='__main__':
original_xml=adb('shell','run-as','tv.kaleido.app','cat','shared_prefs/preferences.xml')
(OUT/'030-audio-original-preferences.xml').write_bytes(original_xml)
tree=ET.fromstring(original_xml)
for name,kind,value in [('themeMusic','boolean','true'),('themeVolume','int','20')]:
for name,kind,value in [('themeMusic','boolean','true'),('themeVolume','int','20'),('volumeBoostDb','int','6')]:
node=next((n for n in tree if n.get('name')==name),None)
if node is None:node=ET.SubElement(tree,kind,{'name':name})
node.set('value',value)
@ -51,10 +51,14 @@ if __name__=='__main__':
key(20);focused('Theme music volume')
original_volume=re.search(r'(\d+)%$',focus(snapshot())).group(1)+'%'
choose([str(n)+'%' for n in range(10,101,10)],'20%');focused('Theme music volume')
settings(1);focused('Playback quality');key(20,6);focused('Volume boost')
current=focus(snapshot());original_boost='Off (+0 dB)' if current.endswith('Off (+0 dB)') else re.search(r'\+\d+ dB$',current).group()
choose(['Off (+0 dB)','+3 dB','+6 dB','+9 dB','+12 dB'],'+6 dB');focused('Volume boost')
screenshot('030-volume-boost')
settings(3);key(20);focused('Theme music');assert focus(snapshot()).endswith('On')
key(20);focused('Theme music volume');assert focus(snapshot()).endswith('20%')
screenshot('030-theme-settings')
passed('Theme toggle and theme volume persist through cold starts; dialogs restore focus')
passed('Theme toggle, theme volume and boost persist through cold starts; dialogs restore focus')
try:
adb('logcat','-c');open_silo();wait_log('KaleidoTheme: READY volume=20%')
screenshot('030-silo-theme')
@ -72,24 +76,24 @@ if __name__=='__main__':
# Actual video uses validation mode, which avoids changing Plex progress.
adb('logcat','-c')
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity','--es','testTitleId','7599','--el','testOffset','90000','--ei','testMode','0','--ez','testValidation','true')
wait_log('STOP');wait_log('READY item=7599')
wait_log('STOP');wait_log('BOOST processing PCM db=6');wait_log('READY item=7599')
time.sleep(4)
audit=adb('shell','run-as','tv.kaleido.app','cat','files/playback-validation.jsonl')
(OUT/'030-audio-validation.jsonl').write_bytes(audit)
(OUT/'030-boost-validation.jsonl').write_bytes(audit)
import json
events=[json.loads(line) for line in audit.decode().splitlines()]
assert any(e.get('event')=='audioAdvancing' for e in events),'Decoded audio must advance'
assert any(e.get('event')=='firstFrame' for e in events),'Video must render'
passed('Theme stops for actual video; audio and video advance')
passed('Theme stops for actual video; +6 dB processor receives decoded PCM and audio/video advance')
adb('shell','am','force-stop','tv.kaleido.app');adb('logcat','-c')
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity','--es','testTitleId','9776','--el','testOffset','90000','--ei','testMode','2','--ez','testValidation','true')
wait_log('READY item=9776');time.sleep(4)
wait_log('BOOST processing PCM db=6');wait_log('READY item=9776');time.sleep(4)
movie_audit=adb('shell','run-as','tv.kaleido.app','cat','files/playback-validation.jsonl')
(OUT/'030-audio-movie-validation.jsonl').write_bytes(movie_audit)
(OUT/'030-boost-movie-validation.jsonl').write_bytes(movie_audit)
movie_events=[json.loads(line) for line in movie_audit.decode().splitlines()]
assert any(e.get('event')=='audioAdvancing' for e in movie_events)
assert any(e.get('event')=='firstFrame' for e in movie_events)
passed('A real Plex-converted movie renders audio and video')
passed('Volume boost also processes a real Plex-converted movie with rendered audio/video')
adb('shell','am','force-stop','tv.kaleido.app')
finally:
if playback_only:
@ -97,9 +101,11 @@ if __name__=='__main__':
adb('shell','run-as','tv.kaleido.app','sh','-c','"cat > shared_prefs/preferences.xml"',data=original_xml)
assert adb('shell','run-as','tv.kaleido.app','cat','shared_prefs/preferences.xml')==original_xml
else:
settings(1);key(20,6);focused('Volume boost')
choose(['Off (+0 dB)','+3 dB','+6 dB','+9 dB','+12 dB'],original_boost)
settings(3);key(20);focused('Theme music')
if focus(snapshot()).endswith('On')!=original_on:key(23)
key(20);focused('Theme music volume');choose([str(n)+'%' for n in range(10,101,10)],original_volume)
launch()
(OUT/'030-audio.log').write_text(logs())
passed('Prior theme preferences restored; device returned to Home')
passed('Prior theme and boost preferences restored; device returned to Home')

View file

@ -45,7 +45,7 @@ def main():
screenshot('details-cast-restored')
results.append('Actor titles match both Plex libraries; title and cast focus restore');print('PASS '+results[-1],flush=True)
key(4);key(4);focused('Home');key(22,2);focused('TV Shows');key(20);focused('Discover');key(22);focused('Library');key(23)
wait(lambda r:any(x.startswith('Unwatched') for x in labels(r)),'Show library filters loaded');focused('Library');key(20)
wait(lambda r:any(x.startswith('All genres') for x in labels(r)),'Show library filters loaded');focused('Library');key(20)
if show['title'] not in focus(snapshot()):key(21)
focused(show['title']);key(23)
text('Seasons');focused('Watch next');text('Mark watched');key(22);focused('Mark watched');touched.add(SHOW);key(23);focused('Mark unwatched')

View file

@ -4,16 +4,11 @@ from device import screenshot
from verify_ui import launch,key,focused,wait,focus,labels,snapshot
launch();key(22,2);focused('TV Shows');key(20);focused('Discover');key(22);focused('Library');key(23)
wait(lambda r:any(x.startswith('Unwatched') for x in labels(r)),'Show library loaded');focused('Library');key(20)
# The genre/sort filters sit between the section tabs and the grid.
if focus(snapshot()).startswith('Unwatched'):key(20)
# The grid is entered beneath the filter that held focus; walk back to the first column.
for _ in range(6):
if '3 Body Problem' in focus(snapshot()):break
key(21)
wait(lambda r:any(x.startswith('All genres') for x in labels(r)),'Show library loaded');focused('Library');key(20)
if '3 Body Problem' not in focus(snapshot()):key(21)
focused('3 Body Problem');key(23);focused('Watch next')
root=snapshot();screenshot('show-layout-current')
title=next(n for n in root.iter('node') if '3 Body Problem' in (n.get('text'),n.get('content-desc')))
title=next(n for n in root.iter('node') if n.get('text')=='3 Body Problem')
bounds=list(map(int,re.findall(r'\d+',title.get('bounds'))))
back=next((n for n in root.iter('node') if n.get('content-desc')=='Back'),None)
print('Title bounds:',bounds,'Back visible:',back is not None,flush=True)

View file

@ -1,56 +0,0 @@
"""Check that an APK really is the release it is published as.
Used by package_release.py before staging, and by CI against the checked-in distribution:
a stale or debug APK must not pass because its checksum and manifest were regenerated around it.
"""
import argparse, hashlib, json, os, pathlib, re, shutil, subprocess, sys
ROOT=pathlib.Path(__file__).resolve().parents[1]
PACKAGE='tv.kaleido.app'
def properties():
return dict(l.split('=',1) for l in (ROOT/'version.properties').read_text(encoding='utf-8').splitlines() if '=' in l)
def aapt2():
names=['aapt2.exe','aapt2'] if os.name=='nt' else ['aapt2']
roots=[ROOT/'.tools/sdk']+[pathlib.Path(os.environ[k]) for k in ('ANDROID_HOME','ANDROID_SDK_ROOT') if os.environ.get(k)]
for root in roots:
tools=sorted((root/'build-tools').glob('*'),key=lambda p:[int(x) if x.isdigit() else 0 for x in p.name.split('.')],reverse=True) if (root/'build-tools').is_dir() else []
for folder in tools:
for name in names:
if (folder/name).is_file():return str(folder/name)
found=shutil.which('aapt2')
if found:return found
raise SystemExit('aapt2 was not found. Install Android build-tools or set ANDROID_HOME.')
def badging(apk):
"""(package, versionName, versionCode, debuggable) from the APK's own manifest."""
out=subprocess.run([aapt2(),'dump','badging',str(apk)],capture_output=True,text=True,check=True).stdout
m=re.search(r"^package: name='([^']+)' versionCode='(\d+)' versionName='([^']+)'",out,re.M)
if not m:raise SystemExit(f'Could not read the version of {apk}.')
return m.group(1),m.group(3),int(m.group(2)),'application-debuggable' in out
def check_apk(apk,version_name,version_code):
package,name,code,debuggable=badging(apk)
problems=[]
if package!=PACKAGE:problems.append(f'package is {package}, expected {PACKAGE}')
if (name,code)!=(version_name,version_code):problems.append(f'APK is {name} ({code}), expected {version_name} ({version_code}); rebuild it')
if debuggable:problems.append('APK is a debuggable build, not the release')
if problems:raise SystemExit(f'{apk}: '+'; '.join(problems)+'.')
def main():
parser=argparse.ArgumentParser(description=__doc__)
parser.add_argument('--release',action='store_true',help='also require the distribution to match version.properties (tag builds)')
args=parser.parse_args()
out=ROOT/'distribution';apk=out/'Kaleido.apk'
if not apk.exists():print('No distribution to verify.');return
digest=hashlib.sha256(apk.read_bytes()).hexdigest()
if (out/'Kaleido.apk.sha256').read_text().split()[0]!=digest:raise SystemExit('Kaleido.apk does not match Kaleido.apk.sha256.')
manifest=json.loads((out/'latest.json').read_text(encoding='utf-8'))
check_apk(apk,manifest['version'],int(manifest['versionCode']))
if args.release:
version=properties()
if (manifest['version'],int(manifest['versionCode']))!=(version['versionName'],int(version['versionCode'])):
raise SystemExit('distribution/latest.json does not match version.properties; run scripts/package_release.py.')
print('Distribution verified:',manifest['version'],f"({manifest['versionCode']})",'SHA-256',digest)
if __name__=='__main__':main()

View file

@ -28,8 +28,7 @@ def first_at_letter(section,media_type,letter,genre=''):
def enter_rail():
for _ in range(10):
# A rail entry reports its letter in more than one label, e.g. "# #".
value=(focus(snapshot()).split() or [''])[0]
value=focus(snapshot())
if value in LETTERS:return value
key(22)
raise AssertionError('Right edge must enter letter bar; focus='+focus(snapshot()))
@ -58,7 +57,7 @@ def section_check(tab,media_type):
for _ in range(8):
if focus(snapshot())=='Animation':break
key(22)
focused('Animation');key(23);text('Z')
focused('Animation');key(23);text('Animation ⌄');text('Z')
expected,offset=first_at_letter('',media_type,'S','Animation')
jump('S',expected)
screenshot('030-'+media_type+'-animation-jump')

View file

@ -4,17 +4,15 @@ from device import screenshot
from verify_ui import launch,key,focused,wait,focus,labels,snapshot
launch();key(22);focused('Movies');key(20);focused('Discover');key(22);focused('Library');key(23)
wait(lambda r:any(x.startswith('Unwatched') for x in labels(r)),'Movie library loaded')
wait(lambda r:any(x.startswith('All genres') for x in labels(r)),'Movie library loaded')
key(20)
# The genre/sort filters sit between the section tabs and the grid.
if focus(snapshot()).startswith('Unwatched'):key(20)
wait(lambda r:bool(focus(r)) and focus(r) not in ('Library','Discover') and not focus(r).startswith('Unwatched'),'Movie card focus')
wait(lambda r:bool(focus(r)) and focus(r) not in ('Library','Discover') and 'All genres' not in focus(r),'Movie card focus')
selected=focus(snapshot());key(23)
wait(lambda r:focus(r)=='Play' or focus(r).startswith('Resume'),'Movie play action')
root=snapshot();screenshot('movie-details-0.1.11')
back=next((n for n in root.iter('node') if n.get('content-desc')=='Back'),None)
assert back is not None,'Movie Back control must be visible on entry'
assert any((n.get('text') or n.get('content-desc')) and (n.get('text') or n.get('content-desc')) in selected and int(re.findall(r'\d+',n.get('bounds'))[1])>=88 for n in root.iter('node')),'Movie title must remain below the safe header'
assert any(n.get('text') and n.get('text') in selected and int(re.findall(r'\d+',n.get('bounds'))[1])>=88 for n in root.iter('node')),'Movie title must remain below the safe header'
print('PASS movie safe header and initial action focus',flush=True)
key(20)
wait(lambda r:focus(r) not in ('Play','') and not focus(r).startswith('Resume'),'Cast or related row focus')

View file

@ -1,78 +0,0 @@
"""Focused 0.5 checks: bitrate and actual audio switching, plus show-only Shuffle placement."""
import argparse,json,time,urllib.parse,urllib.request
from device import adb,OUT,screenshot
from inspect_server import get,base,token
from validate_playback import audit
from verify_ui import key,focused,text,wait,labels,focus,snapshot,launch,passed
def wait_for(check,description,timeout=50):
deadline=time.monotonic()+timeout
while time.monotonic()<deadline:
if check():return
time.sleep(.25)
raise AssertionError(description)
def audio():
item=get('/library/metadata/870')['Metadata'][0]
part=item['Media'][0]['Part'][0]
streams=[s for s in part['Stream'] if s['streamType']==2]
original=next((s for s in streams if s.get('selected')),streams[0])
stereo=next(s for s in streams if s.get('channels')==2)
preferences=adb('shell','run-as','tv.kaleido.app','cat','shared_prefs/preferences.xml')
def restore_track():
request=urllib.request.Request(base+'/library/parts/'+str(part['id'])+'?'+urllib.parse.urlencode({'audioStreamID':original['id'],'allParts':1}),method='PUT',headers={'X-Plex-Token':token})
with urllib.request.urlopen(request,timeout=20) as r:assert r.status==200
try:
for mode in (0,2):
restore_track()
adb('shell','am','force-stop','tv.kaleido.app')
adb('shell','run-as','tv.kaleido.app','rm','-f','files/playback-validation.jsonl')
print('Checking audio mode',mode,flush=True)
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity','--es','testTitleId','870','--el','testOffset','90000','--ei','testMode',str(mode),'--ez','testValidation','true')
wait_for(lambda:any(r['event']=='sample' and r.get('playing') and r.get('position',0)>90000 for r in audit()[1]),'Playback ready')
key(127);focused('Play')
wait_for(lambda:(lambda s:bool(s) and not s[-1]['playing'])([r for r in audit()[1] if r['event']=='sample']),'Playback paused')
key(22,4);focused('Playback options');key(23);focused('Audio ·')
if mode==0:
key(20);focused('Quality ·');key(23);focused('Original quality · 19.1 Mbps')
screenshot('050-original-bitrate');key(4);focused('Quality ·');key(19);focused('Audio ·')
key(23);text('Audio tracks')
screenshot('050-audio-tracks-'+str(mode))
# The selected Plex default receives initial focus.
delta=streams.index(stereo)-streams.index(original)
key(20 if delta>=0 else 19,abs(delta));focused(stereo['displayTitle'])
before=[r for r in audit()[1] if r['event']=='sample'][-1]['position']
key(23);focused('Playback options')
wait_for(lambda:any(r['event']=='selectedTracks' and any(a.get('channels')==2 for a in r.get('audio',[])) for r in audit()[1]),'Stereo track must actually be selected')
wait_for(lambda:(lambda s:bool(s) and s[-1]['state']==3)([r for r in audit()[1] if r['event']=='sample']),'Track switch ready')
samples=[r for r in audit()[1] if r['event']=='sample']
assert not samples[-1]['playing'],'Paused state must survive track switch'
assert abs(samples[-1]['position']-before)<2500,'Track switch must preserve position'
key(126)
wait_for(lambda:(lambda s:bool(s) and s[-1].get('audio',{}).get('channels')==2 and s[-1].get('playing'))([r for r in audit()[1] if r['event']=='sample']),'Selected stereo audio must play')
raw,records=audit();(OUT/('050-track-switch-'+str(mode)+'.jsonl')).write_bytes(raw)
assert not any(r['event']=='error' for r in records)
passed('Actual stereo selection, position and pause preservation in '+('Original' if mode==0 else 'Plex conversion'))
finally:
adb('shell','am','force-stop','tv.kaleido.app');restore_track()
adb('shell','run-as','tv.kaleido.app','sh','-c','"cat > shared_prefs/preferences.xml"',data=preferences)
def show():
launch();key(22,3);focused('Search');key(23)
focused('Movies, shows, episodes, people')
adb('shell','input','text','silo');text('TV shows');key(66);focused('Silo');key(23);text('Seasons')
root=text('Shuffle episodes');screenshot('050-show-shuffle')
# Focus starts on the season rail. Reach its action row and explicitly focus Shuffle.
if 'Season' in focus(root):key(19)
wait(lambda r:any(x in focus(r) for x in ('Play','Resume','Watch next','Shuffle')),'Show actions')
if 'Shuffle' not in focus(snapshot()):key(22)
focused('Shuffle episodes')
key(20);focused('Season 1');key(23)
wait(lambda r:'Episodes' in labels(r) or any(x.startswith(('Play','Resume')) for x in labels(r)),'Season page')
assert not any('Shuffle' in s for s in labels(snapshot())),'Shuffle must not appear on seasons'
screenshot('050-season-without-shuffle')
passed('Show Shuffle is remote-focusable and absent from season pages')
if __name__=='__main__':
parser=argparse.ArgumentParser();parser.add_argument('check',choices=['audio','show']);args=parser.parse_args()
(audio if args.check=='audio' else show)()

View file

@ -1,132 +0,0 @@
"""Previous episode, timed auto-skip with remote cancellation, server-picker Back and resume refresh.
Requires the **debug** build (test intents and run-as). Playback runs as validation, so it reports no
Plex progress. The refresh check moves one Continue Watching offset and restores it; the auto-skip
preferences are restored as found.
"""
import json,pathlib,re,sys,time,urllib.request,urllib.parse
sys.path.insert(0,str(pathlib.Path(__file__).resolve().parent))
from device import adb,ROOT,screenshot
from verify_ui import key,snapshot,focus,labels,wait,focused,text,launch
from repro_runtime import await_ready
PREFS='shared_prefs/preferences.xml'
INTRO_EPISODE=11621 # The Big Bang Theory 10x24: intro marker 117.4-146.7 s
SILO_FIRST,SILO_SECOND=7599,8594
def logs(tag='KaleidoPlayback'):return adb('logcat','-d','-s',f'{tag}:I','AndroidRuntime:E','*:S').decode(errors='replace')
def wait_log(needle,timeout=30,tag='KaleidoPlayback'):
deadline=time.monotonic()+timeout
while time.monotonic()<deadline:
if needle in logs(tag):return
time.sleep(.3)
raise AssertionError(f'Log never showed {needle!r}')
def start(item,offset):
adb('shell','am','force-stop','tv.kaleido.app');adb('logcat','-c')
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity','--es','testTitleId',str(item),'--el','testOffset',str(offset),'--ei','testMode','1','--ez','testValidation','true')
await_ready(item)
def read_prefs():return adb('shell','run-as','tv.kaleido.app','cat',PREFS).decode()
def write_prefs(xml):
adb('shell','am','force-stop','tv.kaleido.app')
adb('shell','run-as','tv.kaleido.app','sh','-c','"cat > '+PREFS+'"',data=xml.encode())
def with_int(xml,name,value):
entry=f'<int name="{name}" value="{value}" />'
pattern=re.compile(r'<int name="'+name+r'" value="-?\d+" />')
return pattern.sub(entry,xml) if pattern.search(xml) else xml.replace('</map>',f' {entry}\n</map>')
def auto_skip():
start(INTRO_EPISODE,112000)
wait_log('AUTOSKIP countdown intro seconds=5')
root=wait(lambda r:'Skipping intro' in labels(r),'Pending skip reads "Skipping intro", without a number')
assert not any(re.search(r'Skip(ping)? intro.*\d',l) for l in labels(root)),'Skip button shows a numeric countdown'
screenshot('auto-skip-pending')
wait_log(f'AUTOSKIP intro item={INTRO_EPISODE}',timeout=15)
assert 'AUTOSKIP cancelled' not in logs()
print('PASS intro skips itself after the countdown, shown as a fill rather than a number',flush=True)
for code,name in ((20,'Down'),(4,'Back')):
start(INTRO_EPISODE,112000)
wait_log('AUTOSKIP countdown intro')
key(code);wait_log('AUTOSKIP cancelled intro',timeout=5)
time.sleep(7)
assert f'AUTOSKIP intro item={INTRO_EPISODE}' not in logs(),f'{name} did not cancel the automatic skip'
root=wait(lambda r:'Skip intro' in labels(r),'Manual Skip intro stays available after cancelling')
assert adb('shell','pidof','tv.kaleido.app').strip(),'Player process exited'
assert 'Skipping intro' not in labels(root)
print(f'PASS {name} cancels the automatic skip and leaves the player open',flush=True)
screenshot('auto-skip-cancelled')
key(4);key(4)
def previous_episode():
start(SILO_SECOND,90000)
key(127);focused('Play');screenshot('player-bar-episode')
key(21);focused('Back 10 seconds');key(21);focused('Previous episode');key(23)
await_ready(SILO_FIRST)
assert 'FATAL EXCEPTION' not in logs(),'Previous episode crashed'
print('PASS Previous episode replaced the player with the earlier episode',flush=True)
time.sleep(2);key(127);focused('Play')
# The series' first episode has no previous one once its season list has loaded.
wait(lambda r:'Next episode' in labels(r) and 'Previous episode' not in labels(r),'No Previous episode on the first episode')
key(21);focused('Back 10 seconds');key(21)
assert 'Back 10 seconds' in focus(snapshot()) or 'Exit playback' in focus(snapshot())
print('PASS first episode offers Next but not Previous',flush=True)
key(4);key(4)
def server_picker():
launch();key(22,4);focused('Settings');key(23);focused('Switch account');key(22)
if 'Choose server' not in focus(snapshot()):print('SKIP no account-linked server list (server-token session)');key(4);return
key(23);text('Choose your Plex server');screenshot('server-picker')
key(4)
wait(lambda r:'Choose your Plex server' not in labels(r) and 'Choose server' in labels(r),'Back closes the server picker over Settings')
assert adb('shell','pidof','tv.kaleido.app').strip()
key(22) # Choose server again, now via the Cancel button
if 'Choose server' not in focus(snapshot()):key(21)
focused('Choose server');key(23);text('Choose your Plex server')
for _ in range(12):
if focus(snapshot())=='Cancel':break
key(20)
focused('Cancel');key(23)
wait(lambda r:'Choose your Plex server' not in labels(r) and 'Choose server' in labels(r),'Cancel closes the server picker')
print('PASS Back and Cancel close Settings > Choose server',flush=True)
key(4)
def plex(path,params):
env=dict(l.strip().split('=',1) for l in (ROOT/'.env').read_text().splitlines() if '=' in l and not l.startswith('#'))
url=env['PLEX_SERVER_URL'].strip('"\'').rstrip('/')+path+'?'+urllib.parse.urlencode(params)
req=urllib.request.Request(url,headers={'X-Plex-Token':env['PLEX_TOKEN'].strip('"\''),'Accept':'application/json','X-Plex-Client-Identifier':'kaleido-development','X-Plex-Product':'Kaleido'})
with urllib.request.urlopen(req,timeout=20) as r:return r.read()
def offset(item,field='viewOffset'):
from inspect_server import get
return int(get(f'/library/metadata/{item}')['Metadata'][0].get(field,0))
def set_offset(item,ms):plex('/:/progress',{'key':str(item),'identifier':'com.plexapp.plugins.library','time':str(ms),'state':'stopped'})
def refresh():
original=offset(SILO_FIRST)
# Continue Watching progress is compared in 5% steps; move by more than one step each time.
step=offset(SILO_FIRST,'duration')*6//100
try:
launch();time.sleep(4);adb('logcat','-c')
# Watched elsewhere while Kaleido is in the background: shown promptly on return.
key('KEYCODE_HOME');time.sleep(3)
set_offset(SILO_FIRST,original+step)
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity')
began=time.monotonic();wait_log('APPLIED',timeout=10,tag='KaleidoSync')
print(f'PASS returning to Kaleido applied Continue Watching changes in {time.monotonic()-began:.1f}s',flush=True)
# Watched elsewhere while Kaleido stays open: the background poll picks it up.
time.sleep(3);adb('logcat','-c');set_offset(SILO_FIRST,original+2*step);began=time.monotonic()
wait_log('APPLIED',timeout=25,tag='KaleidoSync')
print(f'PASS open Kaleido applied a progress change from another device in {time.monotonic()-began:.1f}s',flush=True)
finally:
set_offset(SILO_FIRST,original)
assert offset(SILO_FIRST)==original,'Fixture progress was not restored'
if __name__=='__main__':
phases=sys.argv[1:] or ['previous_episode','auto_skip','server_picker','refresh']
original=read_prefs()
try:
if 'auto_skip' in phases:
write_prefs(with_int(with_int(original,'autoSkipIntroSeconds',5),'autoSkipCreditsSeconds',0))
for phase in phases:globals()[phase]()
finally:
write_prefs(original)
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity')

View file

@ -10,10 +10,7 @@ key(20);focused('Remote quality');key(23)
wait(lambda r:any(q in focus(r) for q in ('Original quality','4K','1080p','720p','480p')),'Remote quality choices');key(4);focused('Remote quality')
key(20);focused('Watched status');key(23);focused('80%');key(4);focused('Watched status')
key(20);focused('Autoplay next episode');key(23);focused('After 5 seconds');key(4);focused('Autoplay next episode')
key(20);focused('Skip intros');key(23)
wait(lambda r:any(q in focus(r) for q in ('Show button','Automatically after')),'Skip intro delay choices');key(4);focused('Skip intros')
key(20);focused('Skip credits');key(23)
wait(lambda r:any(q in focus(r) for q in ('Show button','Automatically after')),'Skip credits delay choices');key(4);focused('Skip credits')
key(20);focused('Skip intros');key(20);focused('Skip credits')
print('PASS playback dialogs cancel back to their controls',flush=True)
screenshot('settings-playback-current')
key(21);focused('Playback');key(20);focused('Subtitles');key(22);focused('Size');key(23);focused('Normal');key(4);focused('Size')

View file

@ -10,8 +10,7 @@ def key(code,count=1):
def snapshot():
adb('shell','uiautomator','dump','/data/local/tmp/kaleido-window.xml')
return ET.fromstring(adb('shell','cat','/data/local/tmp/kaleido-window.xml'))
# Title art exposes its title as a content description rather than text.
def labels(root):return [n.get('text','') for n in root.iter('node') if n.get('text')]+[n.get('content-desc') for n in root.iter('node') if n.get('content-desc') and not n.get('text')]
def labels(root):return [n.get('text','') for n in root.iter('node') if n.get('text')]
def focus(root):
n=next((n for n in root.iter('node') if n.get('focused')=='true'),None)
if n is None:return ''
@ -47,7 +46,7 @@ def browse():
key(4);focused(selected);passed('Discovery details returns to the same focused card')
key(19);wait(lambda r:focus(r) in ('Play','Resume'),'Return to Home hero');key(19);focused('Home');key(22);text('Recently released');focused('Movies')
capture('movies-discover');key(20);focused('Discover');key(22);focused('Library');key(23)
wait(lambda r:any(x.startswith('Unwatched') for x in labels(r)),'Library filters');focused('Library');capture('movies-library')
text('All genres ⌄');focused('Library');capture('movies-library')
passed('Movies prioritizes recent releases and retains a separate filtered A-Z grid')
key(20);wait(lambda r:bool(focus(r)) and 'Library' not in focus(r),'Library content or filter focus')
key(4);focused('Discover');key(19);focused('Movies');key(22)
@ -93,14 +92,14 @@ def player():
passed('Compact player controls over actual video')
key(19);focused('Playback timeline');key(22);capture('timeline');key(20);focused('Play')
passed('D-pad Up focuses timeline, Right seeks, Down returns to play')
key(22,2);focused('Audio tracks');key(23);text('Audio tracks');capture('audio')
key(22,2);focused('Audio tracks');key(23);text('Audio');capture('audio')
key(4);focused('Audio tracks');key(22);focused('Subtitles');key(23);text('Off');capture('subtitles')
passed('Audio and subtitle panels open, close, and restore focus')
key(4);focused('Subtitles');key(22);focused('Playback options');key(23);text('Playback options')
key(20,2);focused('Speed');key(23);text('Playback speed');focused('Normal');key(20);focused('1.25×');key(23)
key(20);focused('Speed');key(23);text('Playback speed');focused('Normal');key(20);focused('1.25×');key(23)
focused('Playback options');key(23);text('Speed · 1.25×');key(4);focused('Playback options')
key(23);text('Playback options');key(20);key(23);text('Playback quality');focused('Original quality');key(20);focused('4K');key(19);focused('Original quality');key(23)
focused('Playback options');time.sleep(5);key(23);wait(lambda r:any(s.startswith('Quality · Original quality') for s in labels(r)),'Original bitrate quality label');key(4);focused('Playback options')
key(23);text('Playback options');key(23);text('Playback quality');focused('Original quality');key(20);focused('4K');key(19);focused('Original quality');key(23)
focused('Playback options');time.sleep(5);key(23);text('Quality · Original quality');key(4);focused('Playback options')
passed('Player gear changes speed and switches a conversion to Original quality while retaining focus')
key(4)
wait(lambda r:focus(r)=='' and '2 Fast 2 Furious' not in labels(r),'Controls hidden by Back')

View file

@ -1,2 +1,2 @@
versionName=0.8.1
versionCode=25
versionName=0.4.1
versionCode=18