From 9b33e1f8c12c6778ca6b82dd979689ec5a5568a2 Mon Sep 17 00:00:00 2001 From: Weyoune Date: Sat, 14 Nov 2026 16:35:31 +0100 Subject: [PATCH] Carry the match day's score board into the review; minutes on the time line; depth on the desk - The review after a match opens with the score board of the stage at its final whistle. - The time line names its quarter hours; the repeated status under a running match is gone. - Desk: cards and tiles cast a shadow and answer the pointer, the bar carries the club's colour along its foot, the club's name is set in the display serif. - Settings: themes are called Mitternacht, Papier and Spieltag; two filler lines removed. Co-Authored-By: Claude Fable 5.2 --- assets/modern/live.rcss | 9 +++++++-- assets/modern/theme.rcss | 10 +++++++++- src/modern/ui/engine_screens.inc | 6 +++++- src/modern/ui/live_controls.inc | 1 + src/modern/ui/live_screens.inc | 7 ++++++- src/modern/ui/postmatch_screens.inc | 9 ++++++++- src/modern/ui/settings_screens.inc | 15 ++++++--------- 7 files changed, 42 insertions(+), 15 deletions(-) diff --git a/assets/modern/live.rcss b/assets/modern/live.rcss index d24a1f1..03a3bfc 100644 --- a/assets/modern/live.rcss +++ b/assets/modern/live.rcss @@ -137,8 +137,13 @@ body.matchday {--live-bg:#242426;--live-surface:#302f34ec;--live-wash:#efc7ce0a; .live-demo-tag {border-radius:10dp;padding:10dp 22dp;} .live-body {left:48dp;right:48dp;top:128dp;bottom:150dp;height:auto;flex-direction:column;gap:28dp;} .live-cards {padding:0;display:flex;flex-wrap:wrap;gap:16dp;flex-shrink:0;} -.live-stage .live-game {position:relative;display:block;width:100%;height:600dp;flex-grow:0;flex-shrink:0;padding:18dp 40dp;border:2dp #00000090;border-radius:16dp;background-color:transparent;decorator:linear-gradient(180deg,#1d2832,#0f161d);color:#f1f4f6;overflow:hidden;} +.live-stage .live-game,.postmatch-stage .live-game {position:relative;display:block;width:100%;height:600dp;flex-grow:0;flex-shrink:0;padding:18dp 40dp;border:2dp #00000090;border-radius:16dp;background-color:transparent;decorator:linear-gradient(180deg,#1d2832,#0f161d);color:#f1f4f6;overflow:hidden;} .live-stage .live-game:hover,.live-stage .live-game:focus-visible {background-color:transparent;border-color:#ffffff66;} +.postmatch-stage {flex-shrink:0;margin-bottom:24dp;} +.postmatch-stage .live-game {pointer-events:none;font-size:36dp;} +.postmatch-stage .live-game .live-timeline {width:100%;} +.live-timeline-ticks {position:relative;height:30dp;margin:0 auto;color:#aab6c0;font-size:24dp;} +.live-timeline-ticks span {position:absolute;top:0;width:80dp;margin-left:-40dp;text-align:center;display:block;} .live-stage .live-game.duo {width:1296dp;} .live-stage .live-game.quad {width:1296dp;height:292dp;padding:10dp 28dp;} .live-stage .live-game.active {border-color:#00000090;} @@ -176,7 +181,7 @@ body.matchday {--live-bg:#242426;--live-surface:#302f34ec;--live-wash:#efc7ce0a; .live-game.duo .live-press {width:330dp;} .live-press-home {height:100%;} .live-press-away {flex:1;height:100%;} -.live-timeline {display:flex;justify-content:center;height:124dp;} +.live-timeline {display:flex;justify-content:center;height:112dp;} .live-game.quad .live-timeline {height:84dp;} @keyframes live-moment-in {from {opacity:0;transform:translateX(-220dp);} to {opacity:1;transform:translateX(0dp);}} .live-moment {position:absolute;left:0;right:0;top:120dp;height:260dp;display:flex;align-items:center;justify-content:center;gap:48dp;border-top:4dp #ffffffb0;border-bottom:4dp #ffffffb0;box-shadow:0dp 10dp 40dp #000000a0;color:#ffffff;pointer-events:none;} diff --git a/assets/modern/theme.rcss b/assets/modern/theme.rcss index 72f578f..8c24237 100644 --- a/assets/modern/theme.rcss +++ b/assets/modern/theme.rcss @@ -186,4 +186,12 @@ body.silver .titlebar {border-bottom-color:#4a433438;} .sheet-under.window-in {animation:0.3s cubic-out sheet-in;} body.calm .window.window-in,body.calm .sheet-under.window-in {animation:none;} button {transition:background-color border-color 0.12s cubic-out;} -.desktop-button img,.desktop-card {transition:transform 0.14s cubic-out;} +/* the desk: cards and tiles lie above the stadium and answer the pointer */ +.desktop-card {box-shadow:0dp 10dp 30dp #00000055;} +.desktop-card[data-action] {transition:transform box-shadow 0.14s cubic-out;} +.desktop-card[data-action]:hover {transform:translateY(-4dp);box-shadow:0dp 16dp 40dp #00000070;} +.desktop-app .app-tile {transition:transform 0.12s cubic-out;box-shadow:0dp 8dp 20dp #00000060;} +.desktop-app:hover .app-tile {transform:translateY(-6dp) scale(1.04);} +.desktop-app:active .app-tile {transform:scale(0.97);} +body.calm .desktop-app:hover .app-tile,body.calm .desktop-card[data-action]:hover {transform:none;} +.identity strong {font-family:Display;font-size:44dp;} diff --git a/src/modern/ui/engine_screens.inc b/src/modern/ui/engine_screens.inc index c4ae077..6d692a4 100644 --- a/src/modern/ui/engine_screens.inc +++ b/src/modern/ui/engine_screens.inc @@ -61,7 +61,11 @@ void App::engine_render() { } else { const auto &desk = engine_data_.at("desktop").at("data"), &meta = engine_data_.at("desktop").at("meta"); const auto &team = desk.at("team"), &person = desk.at("manager"); - out = "
" + engine_widget_crest(team, 82) + + // the bar carries the club's colour as a line along its foot + std::string club_line; + if (const auto *club = world_->find("clubs", team.at("id").get()); club && !club->value("crest", "").empty()) + if (const auto colour = renderer_.crest_colour(club->value("crest", "")); !colour.empty()) club_line = " style=\"border-bottom:8dp " + colour + ";\""; + out = "
" + engine_widget_crest(team, 82) + "" + esc(engine_text(team.at("name"))) + "" + esc(engine_text(person.at("name"))) + "
" + esc(ui_long_date(meta.at("date").get())) + "Saison " + esc(meta.at("season").at("label").get()) + "
Guthaben" + diff --git a/src/modern/ui/live_controls.inc b/src/modern/ui/live_controls.inc index f00b4bd..de09278 100644 --- a/src/modern/ui/live_controls.inc +++ b/src/modern/ui/live_controls.inc @@ -282,6 +282,7 @@ void App::live_set_speed(int value) { if (auto *node = element("live-pause")) node->SetInnerRML(live_text(value ? "Pause" : "Abspielen", "control-label")); const auto &frame = live_.fixture().at("frames")[live_.sequence()]; const bool recorded = live_.fixture().at("source") == "engine-recording"; + if (recorded) { if (auto *node = element("live-playback-status")) node->SetInnerRML(""); return; } const std::string phase = live_.finished() ? "Beendet" : frame.at("phase") == "interval" ? "Halbzeit" : value ? (recorded ? "Spiel läuft" : "Aufzeichnung läuft") : (recorded ? "Pausiert" : "Gemeinsam pausiert"); if (auto *node = element("live-phase-status")) node->SetInnerRML(esc(phase)); if (auto *node = element("live-playback-status")) node->SetInnerRML(esc(phase + " · " + std::to_string(frame.at("minute").get()) + (recorded ? "′" : "′ · keine Spielwertänderung"))); diff --git a/src/modern/ui/live_screens.inc b/src/modern/ui/live_screens.inc index bd15c9c..0af477d 100644 --- a/src/modern/ui/live_screens.inc +++ b/src/modern/ui/live_screens.inc @@ -260,7 +260,7 @@ std::string App::live_card(const Json &match, const Json &frame, const std::stri const bool quad = layout == "quad"; const double crest = layout == "solo" ? 250 : layout == "duo" ? 190 : 110; const auto id = match.at("id").get(); - const double tw = layout == "solo" ? 2480 : 1180, th = quad ? 84 : 124, W = tw / th * 100; + const double tw = layout == "solo" ? 2480 : 1180, th = quad ? 84 : 112, W = tw / th * 100; // the clock: a ring that fills with the minutes const double turn = std::clamp(double(minute) / duration, 0.0, 1.0) * 289.03; @@ -320,6 +320,11 @@ std::string App::live_card(const Json &match, const Json &frame, const std::stri ";\">
"; out += "
" + live_badge(match.at("away"), crest) + live_text(match.at("away").at("name"), "live-team-name") + "
"; out += "
" + picture(renderer_.diagram("live-line-" + std::to_string(index), timeline, 2048), tw, th) + "
"; + if (!quad) { + out += "
"; + for (int at = 15; at < duration; at += 15) out += "" + std::to_string(at) + "′"; + out += "
"; + } // a goal that has just fallen: a banner across this card, once if (!frame.at("events").empty()) { diff --git a/src/modern/ui/postmatch_screens.inc b/src/modern/ui/postmatch_screens.inc index d454a19..0d177cc 100644 --- a/src/modern/ui/postmatch_screens.inc +++ b/src/modern/ui/postmatch_screens.inc @@ -268,7 +268,7 @@ std::string App::render_postmatch() { "

" + live_text(selected.at("competition").get() + " · " + - postmatch_data_.at("date").get()) + + ui_long_date(postmatch_data_.at("date").get())) + "

" + live_text(postmatch_label(postmatch_tab_)) + "

"; if (postmatch_data_.at("role") == "club" && @@ -305,6 +305,13 @@ std::string App::render_postmatch() { "role=\"tabpanel\" aria-labelledby=\"postmatch-tab-" + postmatch_tab_ + "\">"; if (postmatch_tab_ == "results") { + // the score board of the match day's stage, at its final whistle + if (live_.available()) + for (const auto &played : live_.fixture().at("matches")) + if (played.at("home").at("id") == selected.at("home").at("id") && played.at("away").at("id") == selected.at("away").at("id")) { + try { body += "
" + live_card(played, live_.frame(), "solo", 0) + "
"; } catch (const std::exception &) {} + break; + } body += "
" + live_text("Heim", "home") + live_text("Ergebnis", "score") + live_text("Auswärts", "away") + diff --git a/src/modern/ui/settings_screens.inc b/src/modern/ui/settings_screens.inc index da7a89f..152342c 100644 --- a/src/modern/ui/settings_screens.inc +++ b/src/modern/ui/settings_screens.inc @@ -215,18 +215,15 @@ std::string App::render_settings() { std::string head = "

" + captions.at(settings_category_).first + "

" + captions.at(settings_category_).second + "

"; - if(settings_category_=="display")head+="Live-Ticker · feste Darstellungsart"; if (settings_category_ == "display") { pane = - "

Gestaltung

Wähle deinen Look. Die Gestaltung wird " - "mit „Anwenden“ übernommen.

"; + "

Gestaltung

"; const std::array, 3> themes{ - {{{"midnight", "Midnight Glass", - "Dunkles Glas · ruhige Blautöne · Mint"}}, - {{"silver", "Silver Glass", - "Helles Glas · klare Schrift · Silberblau"}}, - {{"matchday", "Matchday", "Graphit · klare Flächen · Vereinsrot"}}}}; + {{{"midnight", "Mitternacht", + "Dunkles Blau, mintgrüne Akzente"}}, + {{"silver", "Papier", + "Helles Papier, blaue Akzente"}}, + {{"matchday", "Spieltag", "Graphit, rote Akzente"}}}}; for (const auto &t : themes) { const std::string type = t[0]; const auto mini =