Release Kaleido 0.6.0 with Silo-style browsing and details
All checks were successful
Validate and publish Kaleido / android (push) Successful in 2m35s
All checks were successful
Validate and publish Kaleido / android (push) Successful in 2m35s
Movie, show, season and episode pages now share the browse previews' design: the same top-right artwork and optional 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, and the player's controls show title art and the rating badge. The details tests step past the library filter row and read title art from its content description. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
7471f7cac2
commit
24042bebbc
14 changed files with 130 additions and 84 deletions
10
CHANGELOG.md
10
CHANGELOG.md
|
|
@ -1,5 +1,15 @@
|
|||
# Kaleido releases
|
||||
|
||||
## 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.
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ private val SectionPreviewHeight=190.dp
|
|||
private val SectionLogo=DpSize(280.dp,56.dp)
|
||||
private const val HeaderMillis=380
|
||||
private const val CopyMillis=380
|
||||
private val HeaderLift=12.dp
|
||||
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
|
||||
|
||||
|
|
@ -468,7 +468,7 @@ internal fun previewArt(item:Title)=if(item.type=="episode")item.still.ifBlank{i
|
|||
* 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 private fun <T:Any> FadingCopy(item:T?,id:(T)->String,lift:Float,modifier:Modifier=Modifier,contentAlignment:Alignment=Alignment.TopStart,content:@Composable (T)->Unit) {
|
||||
@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)}
|
||||
|
|
@ -533,8 +533,7 @@ internal fun previewArt(item:Title)=if(item.type=="episode")item.still.ifBlank{i
|
|||
// 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 media=metadata.media.firstOrNull()
|
||||
val formats=listOfNotNull(media?.resolutionLabel?.ifBlank{null},media?.dynamicRange?.ifBlank{null},media?.let{if(it.atmos)"Atmos"else it.channelLabel.ifBlank{null}})
|
||||
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(". ")}) {
|
||||
TitleIdentity(vm.api,item,Modifier.size(logo))
|
||||
|
|
@ -553,13 +552,16 @@ internal fun previewArt(item:Title)=if(item.type=="episode")item.still.ifBlank{i
|
|||
}
|
||||
}
|
||||
|
||||
/** 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 private fun FormatBadge(label:String,modifier:Modifier=Modifier) {
|
||||
@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))
|
||||
}
|
||||
|
||||
private fun runtimeLabel(ms:Long):String {val minutes=(ms/60000).coerceAtLeast(1);return if(minutes>=60)"${minutes/60}h ${minutes%60}m"else "${minutes}m"}
|
||||
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
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ data class Media(val id: String, val container: String, val videoCodec: 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"
|
||||
data class Marker(val type: String, val start: Long, val end: Long)
|
||||
|
|
|
|||
|
|
@ -161,11 +161,19 @@ import kotlinx.coroutines.delay
|
|||
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,.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))
|
||||
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)
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.width(18.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))
|
||||
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))
|
||||
}
|
||||
SeekTimeline(controller,item,Modifier.fillMaxWidth().focusRequester(timelineFocus).focusProperties{down=playFocus},::interacted)
|
||||
Box(Modifier.fillMaxWidth().height(40.dp)) {
|
||||
|
|
|
|||
|
|
@ -81,39 +81,16 @@ 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)) {
|
||||
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)))
|
||||
}
|
||||
// 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)
|
||||
// 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}") {
|
||||
// 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())
|
||||
}
|
||||
}
|
||||
item(key="details-${item.id}"){DetailHeader(vm,shown,item,actionFocus,below,!restoreRow)}
|
||||
// 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,
|
||||
|
|
@ -137,41 +114,75 @@ private object DetailsScroll:BringIntoViewSpec {
|
|||
}
|
||||
}
|
||||
|
||||
/** [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}
|
||||
/**
|
||||
* 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) {
|
||||
val actionNavigation=Modifier.focusProperties{if(below!=null)down=below}
|
||||
var showSynopsis by remember(item.id){mutableStateOf(false)}
|
||||
var showVersions by remember(item.id){mutableStateOf(false)}
|
||||
val media=item.media.getOrNull(vm.mediaIndex(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))
|
||||
// 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)}
|
||||
}
|
||||
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(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)}
|
||||
}
|
||||
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))}
|
||||
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(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}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
06d942779eae498db63c923746a38fd64640cbd3221953712e649fc86f9f2633 Kaleido.apk
|
||||
0a695c395d56a9a84241bf4226b493ef35b227122301cfe16ead7873800ac344 Kaleido.apk
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": "0.5.0",
|
||||
"versionCode": 19,
|
||||
"url": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.5.0/distribution/Kaleido.apk",
|
||||
"checksumUrl": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.5.0/distribution/Kaleido.apk.sha256",
|
||||
"notes": "- Show the selected version's source bitrate beside Original quality in the playback quality menu.\n- 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.\n- 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.\n- 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."
|
||||
"version": "0.6.0",
|
||||
"versionCode": 20,
|
||||
"url": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.6.0/distribution/Kaleido.apk",
|
||||
"checksumUrl": "https://git.elijahkuntz.com/Elijah/Kaleido/raw/tag/v0.6.0/distribution/Kaleido.apk.sha256",
|
||||
"notes": "- 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.\n- 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.\n- Give Movies and TV the same preview above their rows.\n- 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.\n- Add Settings \u203a Interface \u203a Artwork colour wash (on by default), which tints the page with the focused artwork's colour.\n- 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.\n- Show title art, the rating badge and episode details in the player's controls."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ The interface gives artwork priority. App chrome uses neutral near-black, charco
|
|||
- 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.
|
||||
- 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, 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.
|
||||
- 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. Detail title: 32/36 sp. 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. 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).
|
||||
|
|
@ -37,7 +37,7 @@ The interface gives artwork priority. App chrome uses neutral near-black, charco
|
|||
|
||||
## Player
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
|
|
|
|||
|
|
@ -223,3 +223,7 @@ 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.
|
||||
|
|
|
|||
|
|
@ -5,10 +5,15 @@ 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('All genres') for x in labels(r)),'Show library loaded');focused('Library');key(20)
|
||||
if '3 Body Problem' not in focus(snapshot()):key(21)
|
||||
# The genre/sort filters sit between the section tabs and the grid.
|
||||
if 'All genres' in focus(snapshot()):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)
|
||||
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 n.get('text')=='3 Body Problem')
|
||||
title=next(n for n in root.iter('node') if '3 Body Problem' in (n.get('text'),n.get('content-desc')))
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -6,13 +6,15 @@ 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('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 'All genres' in focus(snapshot()):key(20)
|
||||
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') 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'
|
||||
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'
|
||||
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')
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ 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'))
|
||||
def labels(root):return [n.get('text','') for n in root.iter('node') if n.get('text')]
|
||||
# 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 focus(root):
|
||||
n=next((n for n in root.iter('node') if n.get('focused')=='true'),None)
|
||||
if n is None:return ''
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
versionName=0.5.0
|
||||
versionCode=19
|
||||
versionName=0.6.0
|
||||
versionCode=20
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue