diff --git a/assets/modern/pages.rcss b/assets/modern/pages.rcss index 6dc5c4a..cb02b23 100644 --- a/assets/modern/pages.rcss +++ b/assets/modern/pages.rcss @@ -323,3 +323,56 @@ body .popup-box input {height:84dp;padding:0 26dp;border:2dp var(--p-div);border .alm-row .pg-match-side strong {display:block;white-space:nowrap;} .alm-ball {display:block;width:30dp;height:30dp;border:3dp var(--p-n9);border-radius:15dp;background-color:var(--p-n1);} .alm-event span {display:block;} + +/* --- the line-up: the squad as a table, the eleven as shirts on the pitch --- */ +.pg-root .lp-cell,.pg-root .lp-cell:hover {display:block;flex:none;height:100%;padding:0 8dp;border:0dp;border-radius:0dp;background-color:transparent;decorator:none;font-family:Modern;font-size:30dp;font-weight:normal;color:var(--p-text);text-align:center;white-space:nowrap;overflow:hidden;} +.lp-cell span,.lp-cell strong {display:inline-block;} +.lp-cell .pg-pos,.lp-cell .pg-dots,.lp-cell .pg-tag,.lp-flag {display:inline-block;vertical-align:middle;} +.lp-cell .pg-dots span {display:inline-block;margin:0 3dp;} +.lp-flag {width:45dp;height:27dp;} +.lp-pitch {display:block;position:relative;flex:none;border:2dp var(--p-n5);border-radius:58dp;overflow:hidden;} +.lp-shirt,.lp-shirt:hover,.lp-shirt:disabled {display:flex;flex-direction:column;align-items:center;width:220dp;padding:4dp 0;border:0dp;border-radius:27dp;background-color:transparent;decorator:none;} +.lp-shirt:hover {background-color:#ffffff40;} +.lp-shirt.sel,.lp-shirt.sel:hover {background-color:#ffffff80;border:6dp var(--p-a8);padding:0;width:220dp;} +.lp-shirt-art {display:block;position:relative;width:100dp;height:100dp;} +.lp-num {display:block;position:absolute;left:0;top:24dp;width:100dp;line-height:44dp;text-align:center;font-family:Display;font-size:34dp;color:#ffffff;} +.lp-name {display:block;max-width:214dp;height:38dp;line-height:38dp;padding:0 16dp;border-radius:19dp;background-color:var(--p-n1);font-family:Modern;font-size:26dp;font-weight:bold;color:var(--p-text);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.lp-team {gap:14dp;overflow-y:auto;} +.lp-team-row {display:flex;flex-wrap:wrap;gap:14dp 0dp;} +.lp-team .lp-shirt {width:206dp;} +.lp-team .lp-shirt:hover {background-color:var(--p-row);} +.lp-team .lp-shirt.sel {background-color:var(--p-a1);width:206dp;} +.lp-dot {border-radius:14dp;} +.lp-dot.a {background-color:#3fae6a;} .lp-dot.b {background-color:#e0b23c;} .lp-dot.c {background-color:#d9534f;} +.pg-root .lp-cell {line-height:64dp;} +.lp-pairs {display:flex;flex-wrap:wrap;margin-top:6dp;} +.lp-pair {display:block;width:50%;font-size:28dp;line-height:38dp;} +.lp-pair strong {font-weight:bold;} + +/* --- friendlies: the opponents as tiles, both crests on each --- */ +.fr-tiles {display:flex;flex-wrap:wrap;gap:18dp;align-content:flex-start;padding:4dp;} +.pg-root .fr-tile,.pg-root .fr-tile:hover {display:flex;align-items:center;gap:18dp;width:677dp;height:150dp;padding:0 27dp;border:2dp var(--p-div);border-radius:45dp;background-color:var(--p-n1);decorator:none;font-family:Modern;font-size:30dp;color:var(--p-text);text-align:left;} +.pg-root .fr-tile:hover {border-color:var(--p-a6);} +.pg-root .fr-tile.sel,.pg-root .fr-tile.sel:hover {background-color:var(--p-a1);border-color:var(--p-a6);} +.fr-versus {display:block;flex:none;font-family:Display;font-size:26dp;color:var(--p-n6);} +.fr-tile-text {display:block;flex:1;min-width:0;} +.fr-tile-text strong {display:block;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.fr-tile-text small {display:block;font-size:26dp;line-height:34dp;color:var(--p-n7);} +.fr-tile .pg-num {flex:none;} + +/* --- training: the game's own arrangement and pictures on the page --- */ +.tr-skill {display:flex;flex:none;align-items:center;gap:22dp;height:84dp;border-bottom:2dp var(--p-rule);} +.pg-root .training-balls {display:flex;flex:none;align-items:center;} +.pg-root .training-ball,.pg-root .training-ball:hover,.pg-root .training-ball:disabled {display:block;flex:none;padding:0;border:0dp;border-radius:40dp;background-color:transparent;decorator:none;} +.pg-root .training-ball.is-empty {opacity:.22;} +.pg-root .training-ball:hover {opacity:.75;} +.tr-pitch {display:block;position:relative;flex:none;width:540dp;height:440dp;border:2dp var(--p-n5);border-radius:36dp;overflow:hidden;} +.tr-stripe {position:absolute;top:0;width:54dp;height:440dp;} +.tr-line {position:absolute;border:3dp #fdfbf4;} +.tr-line.mid {left:268dp;top:0;width:0dp;height:440dp;border-width:0dp 0dp 0dp 3dp;} +.tr-line.circle {left:215dp;top:165dp;width:104dp;height:104dp;border-radius:55dp;} +.tr-line.box {top:120dp;width:70dp;height:194dp;} +.tr-line.box.left {left:-3dp;} .tr-line.box.right {right:-3dp;} +.tr-type {position:absolute;padding:8dp 14dp;border-radius:27dp;background-color:#fdfbf4cc;} +.pg-root .tr-auto {height:60dp;font-size:28dp;} +.tr-player select {width:360dp;height:54dp;padding:0 18dp;border:2dp var(--p-div);border-radius:27dp;background-color:var(--p-n1);font-size:27dp;color:var(--p-text);} diff --git a/src/modern/ui/lineup_page.inc b/src/modern/ui/lineup_page.inc new file mode 100644 index 0000000..afa6e60 --- /dev/null +++ b/src/modern/ui/lineup_page.inc @@ -0,0 +1,164 @@ +// SPDX-License-Identifier: GPL-3.0-only +// The line-up as a page of the notebook (the real game): the squad as a table at the left, +// grouped into starting eleven, bench and the rest; at the right the pitch seen from behind +// the own goal with the eleven as shirts, or the whole squad as shirts. Two players are +// clicked to swap them; any other cell of a row opens the player's card. +std::string App::render_lineup_page() { + const auto projection = engine_lineup_projection(engine_data_); + if (!projection.value("ok", false)) return "
Die Aufstellung ist derzeit nicht "
diff --git a/src/modern/ui/pages.inc b/src/modern/ui/pages.inc
index 1ad0211..54180e6 100644
--- a/src/modern/ui/pages.inc
+++ b/src/modern/ui/pages.inc
@@ -5,8 +5,8 @@
// The menus that are laid out as a page of the notebook. Every other career menu is still a
// sheet of the old format, shown scaled inside the book.
bool App::page_native() const {
- static const std::set Arten: " + std::to_string(type_total) +
- " / " + std::to_string(engine_mode_ ? t.at("limits").at("types").getFreundschaftsspiel vereinbaren · Saison "+esc(engine_data_.at("desktop").at("meta").at("season").at("label").get
Kondition/Technik: " +
- std::to_string(t["areas"][0].get
Fertigkeiten: " + std::to_string(skill_total) + " / " + std::to_string(engine_mode_ ? t.at("limits").at("otherAreas").get
Belastung" : "") +
- "