diff --git a/CHANGELOG.md b/CHANGELOG.md index 6656595..b281c27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.1.0-beta.16 + +- Simplify playback settings: group intro, credits and skip-delay choices together, show the delay only when automatic skipping is enabled, and combine the next-episode switch and countdown into one Off / After … seconds selection. Existing preferences are preserved. +- Make Up Next readable over bright artwork with a dark backdrop across the page, brighter secondary text and larger synopsis and autoplay hints. The playing video stays at its original brightness. + ## 0.1.0-beta.15 A new Up Next screen, adapted from Kaleido for Android TV for mouse and keyboard. diff --git a/package-lock.json b/package-lock.json index bbfdf4d..65e2443 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kaleido-desktop", - "version": "0.1.0-beta.15", + "version": "0.1.0-beta.16", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kaleido-desktop", - "version": "0.1.0-beta.15", + "version": "0.1.0-beta.16", "dependencies": { "@fontsource-variable/inter": "^5.3.0", "@tanstack/react-query": "^5.105.0", diff --git a/package.json b/package.json index 3700006..28680cb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "kaleido-desktop", "private": true, - "version": "0.1.0-beta.15", + "version": "0.1.0-beta.16", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index c4c276e..17a9765 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "kaleido" -version = "0.1.0-beta.15" +version = "0.1.0-beta.16" dependencies = [ "fs2", "futures-util", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index e8daa1f..958479f 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kaleido" -version = "0.1.0-beta.15" +version = "0.1.0-beta.16" description = "Kaleido — a Plex client for Windows" authors = ["Elijah"] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index ad6166f..173497f 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Kaleido", - "version": "0.1.0-beta.15", + "version": "0.1.0-beta.16", "identifier": "tv.kaleido.desktop", "build": { "beforeDevCommand": "npm run dev", diff --git a/src/screens/settings/AppSettings.tsx b/src/screens/settings/AppSettings.tsx index 8d271ae..67594c7 100644 --- a/src/screens/settings/AppSettings.tsx +++ b/src/screens/settings/AppSettings.tsx @@ -188,27 +188,38 @@ export function AppSettings({ tab }: { tab: string }) { set('hdrPassthrough', v)} /> - - - set('skipCredits', v)} options={skipOptions} /> - - + +
+ +
+
+ Intros + set('skipCredits', v)} options={skipOptions} /> +
+ {(s.skipIntro === 'auto' || s.skipCredits === 'auto') && ( +
+ Skip delay + set('autoSkipDelay', v)} - options={[0, 3, 5, 10].map((v) => ({ value: v, label: v ? `${v} seconds` : 'Skip straight away' }))} + label="Autoplay next episode" + value={s.autoplayNext ? s.countdownSeconds : 0} + onChange={(seconds) => { + set('autoplayNext', seconds > 0); + if (seconds > 0) set('countdownSeconds', seconds); + }} + options={[{ value: 0, label: 'Off' }, ...[5, 8, 10, 15, 20, 30].map((v) => ({ value: v, label: `After ${v} seconds` }))]} /> - - set('autoplayNext', v)} /> - - - set('seekStep', v)} options={[5, 10, 15, 30].map((v) => ({ value: v, label: `${v} seconds` }))} /> diff --git a/src/styles/player.css b/src/styles/player.css index 77ea766..bfee1b9 100644 --- a/src/styles/player.css +++ b/src/styles/player.css @@ -717,6 +717,16 @@ only the rows scroll. */ background: var(--bg); pointer-events: none; } +/* Up Next places copy on the right as well as the left. Keep every part of + the artwork dark enough for text, including with the colour wash enabled. + This layer shares the scene's video cutout, so it never dims the credits. */ +.up-next-scene::after { + content: ''; + position: absolute; + inset: 0; + z-index: 1; + background: linear-gradient(180deg, rgba(9, 10, 12, 0.76), rgba(9, 10, 12, 0.9)); +} .up-next.placed .up-next-scene { -webkit-mask-image: linear-gradient(#000 0 0), url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 160 90'%3E%3Crect width='160' height='90' rx='3'/%3E%3C/svg%3E"); -webkit-mask-size: 100% 100%, var(--up-video-w) var(--up-video-h); @@ -748,7 +758,7 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { align-items: center; gap: 8px; font-size: 13px; - color: #b6bdbf; + color: #d6dcde; padding: 8px 0; } .up-next-back:hover, .up-next-cancel:hover { @@ -796,7 +806,7 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { gap: 12px; margin: 14px 0 8px; font-size: 12px; - color: #b8bfc1; + color: #cbd2d4; } .up-next-caption > span { overflow: hidden; @@ -825,7 +835,10 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { .up-next-details .micro { display: block; margin-bottom: 10px; - color: #a5adaf; + color: #c3cbcd; +} +.up-next-details .facts { + color: #d0d6d8; } .up-next-details .title-art { margin-bottom: 10px; @@ -837,8 +850,8 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { letter-spacing: -.025em; } .up-next-summary { - color: #b6bdbf; - font-size: 13px; + color: #d6dcde; + font-size: 14px; line-height: 1.65; margin: 12px 0 18px; display: -webkit-box; @@ -879,8 +892,8 @@ html.os-macos:not(.window-fullscreen) .up-next-toolbar { box-shadow: 0 0 0 2px #ffffff40; } .up-next-hint { - font-size: 11px; - color: #90999c; + font-size: 12px; + color: #bdc7ca; margin: 10px 0 0; } .up-next-rows { diff --git a/src/styles/screens.css b/src/styles/screens.css index 64b7acd..191a778 100644 --- a/src/styles/screens.css +++ b/src/styles/screens.css @@ -1152,6 +1152,29 @@ button.chip:hover { gap: 8px; flex: none; } +.marker-preference .pref { + flex-direction: column; + align-items: flex-start; + gap: 14px; +} +.marker-preference .pref-control { + width: 100%; +} +.marker-controls { + display: flex; + flex-wrap: wrap; + gap: 12px 20px; +} +.marker-control { + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 6px; +} +.marker-control > span { + font-size: 11.5px; + color: var(--muted); +} .pref-input { width: 240px; min-height: 34px;