diff --git a/assets/modern/pages.rcss b/assets/modern/pages.rcss index aaf024b..9d3af25 100644 --- a/assets/modern/pages.rcss +++ b/assets/modern/pages.rcss @@ -451,3 +451,17 @@ body .pg-btn.pg-go[disabled] {opacity:1;background-color:var(--p-a3);border-colo .pg-dlg .pg-empty {flex:none;} /* an empty note is a block: bare text inside a flex box would not be drawn */ .pg-empty {display:block;padding:72dp 54dp;} + +/* --- the inbox --- */ +.pg-root .nw-search {display:block;flex:1;height:68dp;padding:0 27dp;border:2dp var(--p-div);border-radius:36dp;background-color:var(--p-n1);font-family:Modern;font-size:30dp;color:var(--p-text);} +.nw-row {display:flex;flex:none;align-items:center;gap:27dp;padding:16dp 14dp;border-bottom:2dp var(--p-rule);} +.nw-row:hover {background-color:var(--p-row);} +.nw-dot {display:block;flex:none;width:22dp;height:22dp;border-radius:11dp;} +.nw-row.is-unread .nw-dot {background-color:var(--p-a6);} +.nw-art {display:block;flex:none;} +.pg-root .news-art,.pg-ov .news-art {border:0dp;border-radius:22dp;background-color:var(--p-n2);} +.nw-copy {display:block;flex:1;min-width:0;} +.pg-root .nw-title {font-size:34dp;font-weight:normal;margin-top:4dp;} +.nw-row.is-unread .nw-title {font-weight:bold;} +.nw-excerpt {display:block;font-size:28dp;line-height:36dp;} +.nw-body {display:block;font-size:36dp;line-height:54dp;} diff --git a/src/modern/ui/engine_screens.inc b/src/modern/ui/engine_screens.inc index df6cf21..303f4c0 100644 --- a/src/modern/ui/engine_screens.inc +++ b/src/modern/ui/engine_screens.inc @@ -203,7 +203,7 @@ void App::engine_render() { if(menu_=="settings")out+="
"+window("Einstellungen",render_settings())+"
"; if(menu_=="indoor")out+="
"+window("Hallentabellen",render_indoor())+"
"; if(menu_=="balance")out+="
"+window("Bilanz",render_balance())+"
"; - if(menu_=="news")out+="
"+render_news()+"
"; + if(menu_=="news")out+="
"+render_news()+"
"; if(menu_=="achievements")out+="
"+window("Erfolge",render_achievements())+"
"; if(menu_=="transfer")out+="
"+window("Transfers",render_transfer())+"
"; if(menu_=="stadium")out+="
"+window("Stadion",render_stadium())+"
"; diff --git a/src/modern/ui/news_screens.inc b/src/modern/ui/news_screens.inc index a3199f7..de390b8 100644 --- a/src/modern/ui/news_screens.inc +++ b/src/modern/ui/news_screens.inc @@ -30,92 +30,53 @@ std::string App::render_news_art(const Json &message, double size) { "\" style=\"width:" + scalar(size) + "dp;height:" + scalar(size) + "dp;\">" + art + ""; } +// The messages of a folder as rows of the page: a dot while unread, the sender's picture, date +// and kind, the headline as a link, a line of the text, and the two things one does with a +// message. The controls replace this list alone while the player types a search. std::string App::render_news_feed(const Json &data) { + const std::string ink = theme_ == "midnight" ? "#d2d6dc" : theme_ == "matchday" ? "#3a4830" : "#474238"; + const auto icon = [&](const char *name, const char *path) { + return picture(renderer_.diagram(std::string("news-icon-") + name + "-" + theme_, "", 72), 36, 36); + }; std::string out; for (const auto &m : data.at("items")) { - const auto id = m.at("id").get(), - name = m.at("title").get(); - const bool unread = m.at("read").is_boolean() && !m.at("read").get(), - archived = m.at("folder") == "archive" || (engine_mode_&&m.at("folder")=="trash"); - out += "
"; - if (unread) - out += ""; - out += - render_news_art(m) + - "
" + - esc(m.at("display_date").get()) + - "" + - esc(m.at("category").get()) + "" + - (unread ? "Neu" : "") + - (data.value("fictional", false) ? "Demo" - : "") + - "
"; - out += btn("news-open", esc(name), "news-message-title", - "id=\"news-read-" + id + "\" data-id=\"" + id + - "\" aria-label=\"Nachricht lesen: " + esc(name) + "\""); - // a one-line message is its own headline; the excerpt would only repeat it - out += (m.at("body").get() == name ? std::string() : "

" + esc(m.at("body").get()) + "

") + - "
"; - // Native CSS line-art has no private bitmap or SVG dependency. - out += btn( - "news-move", - "", - "news-icon-button", - "id=\"news-move-" + id + "\" data-id=\"" + id + "\" aria-label=\"" + - std::string(archived ? "Ins Postfach verschieben: " - : "Archivieren: ") + - esc(name) + "\" title=\"" + - std::string(archived ? "Ins Postfach verschieben" : "Archivieren") + - "\" " + std::string(engine_mode_&&m.value("mutable",false)==false?"disabled":"")); - out += btn("news-delete", glyph("trash", 36), "news-icon-button", - "id=\"news-delete-" + id + "\" data-id=\"" + id + - "\" aria-label=\"Löschen: " + esc(name) + - "\" title=\"Löschen\" " + std::string(engine_mode_&&(m.value("mutable",false)==false||m.at("folder")=="trash")?"disabled":"")); - out += "
"; + const auto id = m.at("id").get(), name = m.at("title").get(); + const bool unread = m.at("read").is_boolean() && !m.at("read").get(), archived = m.at("folder") == "archive" || (engine_mode_ && m.at("folder") == "trash"); + const auto category = m.at("category").get(); + out += "
" + render_news_art(m, 86) + "
" + esc(m.at("display_date").get()) + "" + esc(category) + "" + + (unread ? "Neu" : "") + (data.value("fictional", false) ? "Demo" : "") + "
" + + btn("news-open", "" + esc(name) + "", "pg-link nw-title", "id=\"news-read-" + id + "\" data-id=\"" + id + "\" aria-label=\"Nachricht lesen: " + esc(name) + "\"") + + // a one-line message is its own headline; the excerpt would only repeat it + (m.at("body").get() == name ? std::string() : "" + esc(m.at("body").get()) + "") + "
" + + pg_button("news-move", icon(archived ? "restore" : "archive", archived ? "M3 10l4-4v3h10v2H7v3z" : "M3 4h14v4H3zM4 8v8h12V8M8 11h4"), "round", + "id=\"news-move-" + id + "\" data-id=\"" + id + "\" aria-label=\"" + std::string(archived ? "Ins Postfach verschieben: " : "Archivieren: ") + esc(name) + "\" title=\"" + std::string(archived ? "Ins Postfach verschieben" : "Archivieren") + "\" " + + std::string(engine_mode_ && m.value("mutable", false) == false ? "disabled" : "")) + + pg_button("news-delete", icon("trash", "M4 6h12M8 6V4h4v2M6 6l1 10h6l1-10"), "round", + "id=\"news-delete-" + id + "\" data-id=\"" + id + "\" aria-label=\"Löschen: " + esc(name) + "\" title=\"Löschen\" " + std::string(engine_mode_ && (m.value("mutable", false) == false || m.at("folder") == "trash") ? "disabled" : "")) + + "
"; } if (out.empty()) { - const bool query = !news_view_.value("query", "").empty(), - archive = news_view_.value("folder", "inbox") == "archive"; - out = "

" + - std::string(query ? "Keine Nachrichten gefunden" - : archive ? "Dein Archiv ist noch leer" - : "Alles auf dem neuesten Stand") + - "

" + - std::string(query ? "Versuche einen anderen Suchbegriff." - : archive - ? "Archivierte Meldungen bleiben hier zum Nachlesen." - : "Hier erscheinen neue Meldungen für dein Team.") + - "

"; + const bool query = !news_view_.value("query", "").empty(), archive = news_view_.value("folder", "inbox") == "archive"; + out = "
" + std::string(query ? "Keine Nachrichten gefunden" : archive ? "Dein Archiv ist noch leer" : "Alles auf dem neuesten Stand") + "" + + std::string(query ? "Versuche einen anderen Suchbegriff." : archive ? "Archivierte Meldungen bleiben hier zum Nachlesen." : "Hier erscheinen neue Meldungen für dein Team.") + "
"; } return out; } std::string App::render_news_detail(const Json &message) { - const auto name = message.at("title").get(); - return "

" + - esc(name) + - "

" + - render_news_art(message) + "

" + - esc(message.at("category").get()) + "

" + - esc(message.at("display_date").get()) + - "

" + - (engine_mode_?news_body_markup(message.at("body").get()):esc(message.at("body").get())) + - "

" + std::string(engine_mode_?(message.value("source",std::string())=="mail"?"Aus dem Spielpostfach":"Bericht aus dem Almanach"):"Fiktive Meldung für den Oberflächen-Prototyp.") + "
" + - btn("news-detail-close", "Schließen", {}, "id=\"news-detail-close\"") + - btn("news-detail-move", - (message.at("folder") == "archive" || (engine_mode_&&message.at("folder")=="trash")) ? "Ins Postfach" : "Archivieren", - {}, "id=\"news-detail-move\" " + std::string(engine_mode_&&message.value("mutable",false)==false?"disabled":"")) + - "
"; + const auto name = message.at("title").get(), category = message.at("category").get(); + const bool archived = message.at("folder") == "archive" || (engine_mode_ && message.at("folder") == "trash"); + return "

" + esc(name) + + "

" + render_news_art(message, 144) + "
" + + esc(category) + "" + esc(message.at("display_date").get()) + "

" + + (engine_mode_ ? news_body_markup(message.at("body").get()) : esc(message.at("body").get())) + "

" + + std::string(engine_mode_ ? (message.value("source", std::string()) == "mail" ? "Aus dem Spielpostfach" : "Bericht aus dem Almanach") : "Fiktive Meldung für den Oberflächen-Prototyp.") + "
" + + pg_button("news-detail-move", archived ? "Ins Postfach" : "Archivieren", "", "id=\"news-detail-move\" " + std::string(engine_mode_ && message.value("mutable", false) == false ? "disabled" : "")) + + pg_button("news-detail-close", "Schließen", "primary", "id=\"news-detail-close\"") + "
"; } +// The inbox as a page of the notebook: whose it is, the folders as tabs, the search, the +// messages, and at the foot what there is and the way back from the last move. std::string App::render_news() { const auto s = engine_mode_?Snapshot{}:snap(); if (!engine_mode_ && (news_world_ != s.world || news_source_ != source_.get())) { @@ -124,98 +85,34 @@ std::string App::render_news() { news_source_ = source_.get(); } const auto data = news_data(news_view_.value("folder","inbox"),news_view_.value("query","")); - if (!data.value("ok", false)) - return window("Nachrichten", - "

Das Nachrichtenpostfach ist nicht verfügbar.

"); + if (!data.value("ok", false)) return window("Nachrichten", "
Das Nachrichtenpostfach ist nicht verfügbar.
"); const auto folder = news_view_.value("folder", "inbox"); - std::string content = - "
Dreierpack

" + std::string(engine_mode_ ? "" : "DEIN SPIELJOURNAL") + "

Nachrichten

" + - esc(data.at("club_name").get()) + "

" + - esc(data.at("date").get()) + "

" + - (data.value("scope", Json::object()).value("kind", std::string()) == - "national" - ? picture(renderer_.diagram("news-header-national", - ui_nation_flag_svg("de"), 176), - 88, 59) - : crest(world_->find("clubs", data.value("club", std::string())), - 88)) + - "
"; - content += "
"; - for (const auto &f : (engine_mode_?std::vector{"inbox","archive","trash"}:std::vector{"inbox","archive"})) - content += - btn("news-folder", - "" + std::string(f == "inbox" ? "Postfach" : f=="archive"?"Archiv":"Papierkorb") + - "" + - std::to_string(data.at("counts").at(f).get()) + "", - std::string("news-tab ") + (folder == f ? "active" : ""), - "id=\"news-tab-" + f + "\" data-id=\"" + f + - "\" role=\"tab\" aria-controls=\"news-feed\" aria-selected=\"" + - (folder == f ? "true" : "false") + "\" tabindex=\"" + - (folder == f ? "0" : "-1") + "\""); - content += "
"; - content += - btn("news-read-all", glyph("check", 36) + "Alle gelesen", - "news-read-all", - "id=\"news-read-all\" " + - std::string(data.at("can_read").get() ? "" : "disabled")); - content += "
" + render_news_feed(data) + - "

"; + std::string content = "

" + + (data.value("scope", Json::object()).value("kind", std::string()) == "national" ? picture(renderer_.diagram("news-header-national", ui_nation_flag_svg("de"), 176), 104, 70) + : crest(world_->find("clubs", data.value("club", std::string())), 104)) + + "
" + esc(data.at("club_name").get()) + "" + esc(data.at("date").get()) + + "
"; + for (const auto &f : (engine_mode_ ? std::vector{"inbox", "archive", "trash"} : std::vector{"inbox", "archive"})) + content += btn("news-folder", "" + std::string(f == "inbox" ? "Postfach" : f == "archive" ? "Archiv" : "Papierkorb") + " · " + std::to_string(data.at("counts").at(f).get()) + "", folder == f ? "on" : "", + "id=\"news-tab-" + f + "\" data-id=\"" + f + "\" role=\"tab\" aria-controls=\"news-feed\" aria-selected=\"" + (folder == f ? "true" : "false") + "\" tabindex=\"" + (folder == f ? "0" : "-1") + "\""); + content += "
" + + pg_button("news-read-all", "Alle gelesen", "", "id=\"news-read-all\" " + std::string(data.at("can_read").get() ? "" : "disabled")) + + "
" + render_news_feed(data) + + "
"; + content += esc(" · " + std::to_string(data.at("unbound_count").get()) + (data.at("unbound_count").get() == 1 ? " Altbestand ohne Besitzerbeleg unverändert erhalten" : " Altbestände ohne Besitzerbeleg unverändert erhalten")); + content += "" + pg_button("news-undo", "Rückgängig", "", "id=\"news-undo\" style=\"display:" + std::string((engine_mode_ ? engine_news_undo_.is_object() : news_undo_.is_array() && !news_undo_.empty()) ? "flex" : "none") + ";\"") + "
"; if (!news_dialog_.empty()) { const auto all = news_data(folder,""); const auto &items = all.at("items"); - const auto found = - std::find_if(items.begin(), items.end(), - [&](const auto &m) { return m.at("id") == news_dialog_; }); - if (found != items.end()) - content += render_news_detail(*found); - else - news_dialog_.clear(); + const auto found = std::find_if(items.begin(), items.end(), [&](const auto &m) { return m.at("id") == news_dialog_; }); + if (found != items.end()) content += render_news_detail(*found); + else news_dialog_.clear(); } - return "
" + - btn("close", "×", "close", - "id=\"window-close\" aria-label=\"Fenster schließen\"") + - "

Nachrichten

" + content + - "
" + std::string(engine_mode_?"":"Fiktive Meldungen · Modern UI Demo") + "Dreierpack Manager
"; + return window("Nachrichten", content); } - std::string App::render_news_widget(const Json &object) { const auto data = news_data("inbox", ""); const auto raw_items = engine_mode_ ? engine_news_value_.at("items") diff --git a/src/modern/ui/pages.inc b/src/modern/ui/pages.inc index 10d4932..b11827d 100644 --- a/src/modern/ui/pages.inc +++ b/src/modern/ui/pages.inc @@ -5,7 +5,7 @@ // 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 native{"transfer", "training", "almanac", "tactics", "achievements", "highscore", "balance", "contracts", "environment", "tables", "league", "other", "strengths", "fairplay", "indoor", "scorers"}; + static const std::set native{"news", "transfer", "training", "almanac", "tactics", "achievements", "highscore", "balance", "contracts", "environment", "tables", "league", "other", "strengths", "fairplay", "indoor", "scorers"}; if (menu_ == "calendar" || menu_ == "postpone" || menu_ == "lineup") return notebook_page() && engine_mode_; // a national coach arranges friendlies on the older sheet if (menu_ == "friendlies") return notebook_page() && engine_mode_ && engine_data_.contains("desktop") && engine_data_.at("desktop").at("meta").at("scope").at("role") == "club"; diff --git a/src/modern/ui/screens.inc b/src/modern/ui/screens.inc index d44879f..2321af2 100644 --- a/src/modern/ui/screens.inc +++ b/src/modern/ui/screens.inc @@ -173,7 +173,7 @@ std::string App::render_menu(const std::string &key) { if(key=="view-save"||key=="view-load")return render_files(true,key=="view-save"); if (key == "widgets" || key == "background" || key == "warning" || key == "quit") return render_widget_dialog(key); if (key == "news") - return "
" + render_news() + "
"; + return "
" + render_news() + "
"; std::string body; if(source_ && snap().state.at("career").value("role","club")=="national" && std::set{"achievements","friendlies","scorers"}.contains(key)) body=render_national(key);