Port statistics and the news tablet to the Modern UI (by Codex)
This commit is contained in:
1 parent
349c416f3a
commit
a45217c362
32 files changed
+2493
-23
No files matched your search
@@ -0,0 +1,236 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
std::string App::render_news_art(const Json &message, double size) {
|
||||
const auto kind = message.at("kind").get<std::string>();
|
||||
std::string art;
|
||||
if (kind == "club")
|
||||
art = crest(club(snap()), size * .69);
|
||||
else {
|
||||
const auto key =
|
||||
kind == "fixture" ? "button.league"
|
||||
: kind == "transfer" ? "button.contracts"
|
||||
: kind == "finance"
|
||||
? (gui_.contains("news.cash") ? "news.cash" : "icon.coins")
|
||||
: kind == "training" ? "button.training"
|
||||
: "button.stadium";
|
||||
art = img(key, size * .76, size * .76, false, false, 256);
|
||||
}
|
||||
return "<div class=\"news-art news-art-" + esc(kind) +
|
||||
"\" style=\"width:" + scalar(size) + "dp;height:" + scalar(size) +
|
||||
"dp;\">" + art + "</div>";
|
||||
}
|
||||
std::string App::render_news_feed(const Json &data) {
|
||||
std::string out;
|
||||
for (const auto &m : data.at("items")) {
|
||||
const auto id = m.at("id").get<std::string>(),
|
||||
name = m.at("title").get<std::string>();
|
||||
const bool unread = !m.at("read").get<bool>(),
|
||||
archived = m.at("folder") == "archive";
|
||||
out += "<div id=\"news-row-" + id + "\" class=\"news-message" +
|
||||
(unread ? " is-unread" : "") + "\">";
|
||||
if (unread)
|
||||
out += "<span class=\"news-unread-dot\"></span>";
|
||||
out += render_news_art(m) +
|
||||
"<div class=\"news-message-copy\"><div "
|
||||
"class=\"news-message-meta\"><span>" +
|
||||
esc(m.at("display_date").get<std::string>()) +
|
||||
"</span><span class=\"news-category\">" +
|
||||
esc(m.at("category").get<std::string>()) + "</span>" +
|
||||
(unread ? "<span class=\"news-new\">Neu</span>" : "") + "</div>";
|
||||
out += btn("news-open", esc(name), "news-message-title",
|
||||
"id=\"news-read-" + id + "\" data-id=\"" + id +
|
||||
"\" aria-label=\"Nachricht lesen: " + esc(name) + "\"");
|
||||
out += "<p class=\"news-excerpt\">" + esc(m.at("body").get<std::string>()) +
|
||||
"</p></div><div class=\"news-row-actions\">";
|
||||
// Native CSS line-art has no private bitmap or SVG dependency.
|
||||
out += btn(
|
||||
"news-move",
|
||||
"<span class=\"news-symbol archive" +
|
||||
std::string(archived ? " restore" : "") +
|
||||
"\"><span class=\"news-archive-lid\"></span><span "
|
||||
"class=\"news-archive-handle\"></span></span>",
|
||||
"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") +
|
||||
"\"");
|
||||
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\"");
|
||||
out += "</div></div>";
|
||||
}
|
||||
if (out.empty()) {
|
||||
const bool query = !news_view_.value("query", "").empty(),
|
||||
archive = news_view_.value("folder", "inbox") == "archive";
|
||||
out = "<div class=\"news-empty\"><div "
|
||||
"class=\"news-empty-art\"><span></span></div><h3>" +
|
||||
std::string(query ? "Keine Nachrichten gefunden"
|
||||
: archive ? "Dein Archiv ist noch leer"
|
||||
: "Alles auf dem neuesten Stand") +
|
||||
"</h3><p>" +
|
||||
std::string(
|
||||
query ? "Versuche einen anderen Suchbegriff."
|
||||
: archive ? "Archivierte Meldungen bleiben hier zum Nachlesen."
|
||||
: "Hier erscheinen neue Meldungen aus deinem Verein.") +
|
||||
"</p></div>";
|
||||
}
|
||||
return out;
|
||||
}
|
||||
std::string App::render_news_detail(const Json &message) {
|
||||
const auto name = message.at("title").get<std::string>();
|
||||
return "<div id=\"news-detail-layer\" class=\"news-detail-layer\"><div "
|
||||
"class=\"news-detail-shade\"></div><div class=\"news-detail-box\" "
|
||||
"role=\"dialog\" aria-modal=\"true\" "
|
||||
"aria-labelledby=\"news-detail-title\"><h2 id=\"news-detail-title\">" +
|
||||
esc(name) +
|
||||
"</h2><div class=\"news-detail\"><div class=\"news-detail-meta\">" +
|
||||
render_news_art(message) + "<div><p>" +
|
||||
esc(message.at("category").get<std::string>()) + "</p><p>" +
|
||||
esc(message.at("display_date").get<std::string>()) +
|
||||
"</p></div></div><p class=\"news-detail-body\">" +
|
||||
esc(message.at("body").get<std::string>()) +
|
||||
"</p><small>Fiktive Meldung für den "
|
||||
"Oberflächen-Prototyp.</small></div><div "
|
||||
"class=\"news-detail-actions\">" +
|
||||
btn("news-detail-close", "Schließen", {}, "id=\"news-detail-close\"") +
|
||||
btn("news-detail-move",
|
||||
message.at("folder") == "archive" ? "Ins Postfach" : "Archivieren",
|
||||
{}, "id=\"news-detail-move\"") +
|
||||
"</div></div></div>";
|
||||
}
|
||||
std::string App::render_news() {
|
||||
const auto s = snap();
|
||||
if (news_world_ != s.world || news_source_ != source_.get()) {
|
||||
reset_news();
|
||||
news_world_ = s.world;
|
||||
news_source_ = source_.get();
|
||||
}
|
||||
const auto data =
|
||||
demo_news_view(*s.world, s.state, news_view_.value("folder", "inbox"),
|
||||
news_view_.value("query", ""));
|
||||
if (!data.value("ok", false))
|
||||
return window("Nachrichten",
|
||||
"<p>Das Nachrichtenpostfach ist nicht verfügbar.</p>");
|
||||
const auto folder = news_view_.value("folder", "inbox");
|
||||
std::string content =
|
||||
"<div id=\"news-underlay\" class=\"news-layout\"><div "
|
||||
"class=\"news-masthead\"><div class=\"news-brand\"><span "
|
||||
"class=\"news-wordmark\">kicker</span><div><p>DEIN "
|
||||
"VEREINSJOURNAL</p><h2>Nachrichten</h2></div></div><div "
|
||||
"class=\"news-owner\"><div><strong>" +
|
||||
esc(data.at("club_name").get<std::string>()) + "</strong><p>" +
|
||||
esc(data.at("date").get<std::string>()) + "</p></div>" +
|
||||
crest(club(s), 88) + "</div></div>";
|
||||
content += "<div class=\"news-navigation\"><div class=\"news-tabs\" "
|
||||
"role=\"tablist\" aria-label=\"Postfach und Archiv\">";
|
||||
for (const auto &f : {std::string("inbox"), std::string("archive")})
|
||||
content +=
|
||||
btn("news-folder",
|
||||
"<span>" + std::string(f == "inbox" ? "Postfach" : "Archiv") +
|
||||
"</span><span class=\"news-tab-count\">" +
|
||||
std::to_string(data.at("counts").at(f).get<int>()) + "</span>",
|
||||
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 += "</div><div class=\"news-search\"><span "
|
||||
"class=\"news-search-symbol\"><span></span></span><input "
|
||||
"id=\"news-search\" maxlength=\"120\" type=\"text\" "
|
||||
"aria-label=\"Nachrichten durchsuchen\" placeholder=\"Nachrichten "
|
||||
"durchsuchen\" value=\"" +
|
||||
esc(news_view_.value("query", "")) + "\"/></div>";
|
||||
content +=
|
||||
btn("news-read-all", glyph("check", 36) + "<span>Alle gelesen</span>",
|
||||
"news-read-all",
|
||||
"id=\"news-read-all\" " +
|
||||
std::string(data.at("can_read").get<bool>() ? "" : "disabled"));
|
||||
content += "</div><div id=\"news-feed\" class=\"news-feed\" "
|
||||
"role=\"tabpanel\" aria-labelledby=\"news-tab-" +
|
||||
folder + "\">" + render_news_feed(data) +
|
||||
"</div><div class=\"news-bottom\"><p id=\"news-feedback\" "
|
||||
"role=\"status\">";
|
||||
const auto feedback = news_view_.value("feedback", "");
|
||||
content += esc(
|
||||
feedback.empty()
|
||||
? std::to_string(data.at("items").size()) +
|
||||
(data.at("items").size() == 1 ? " Nachricht" : " Nachrichten") +
|
||||
" · " + std::to_string(data.at("shown_unread").get<int>()) +
|
||||
" ungelesen"
|
||||
: feedback);
|
||||
content +=
|
||||
"</p>" +
|
||||
btn("news-undo",
|
||||
glyph("undo", 32) + "<span>Rückgängig</span>",
|
||||
"news-undo",
|
||||
"id=\"news-undo\" style=\"display:" +
|
||||
std::string(news_undo_.is_array() && !news_undo_.empty()
|
||||
? "flex"
|
||||
: "none") +
|
||||
";\"") +
|
||||
"</div></div>";
|
||||
if (!news_dialog_.empty()) {
|
||||
const auto all = demo_news_view(*s.world, s.state, 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();
|
||||
}
|
||||
return "<div class=\"window news-tablet\"><div "
|
||||
"class=\"news-camera\"></div><div class=\"titlebar\">" +
|
||||
btn("close", "<span>×</span>", "close",
|
||||
"id=\"window-close\" aria-label=\"Fenster schließen\"") +
|
||||
"<h1>Nachrichten</h1></div><div class=\"content\">" + content +
|
||||
"</div><div class=\"news-screen-footer\"><span>Fiktive "
|
||||
"Vereinsmeldungen · Modern UI "
|
||||
"Demo</span><span>OpenBMH</span></div><div "
|
||||
"class=\"news-homebar\"></div></div>";
|
||||
}
|
||||
|
||||
std::string App::render_news_widget(const Json &object) {
|
||||
const auto s = snap();
|
||||
const auto data = demo_news_view(*s.world, s.state, "inbox", "");
|
||||
if (!data.value("ok", false))
|
||||
return "";
|
||||
const bool small =
|
||||
object.value("w", 472) <= 472 && object.value("h", 472) <= 472;
|
||||
const int limit = small ? 2 : 3;
|
||||
std::string out =
|
||||
btn("open:news",
|
||||
"<span>Postfach · " + std::to_string(data.at("unread").get<int>()) +
|
||||
" ungelesen</span><span class=\"news-widget-arrow\">" +
|
||||
glyph("arrow-diagonal", 26) + "</span>",
|
||||
"news-widget-heading",
|
||||
"id=\"desktop-news-open\" data-interactive=\"true\" "
|
||||
"aria-label=\"Nachrichten öffnen\"");
|
||||
out += "<div class=\"news-widget-feed\">";
|
||||
int count = 0;
|
||||
// Gold's widget uses source order, independently of the open tablet's folder,
|
||||
// search and sorted list. Resolve templates through the same read projection.
|
||||
for (const auto &raw : s.state.at("news").at("items")) {
|
||||
if (raw.at("folder") != "inbox")
|
||||
continue;
|
||||
const auto &shown = data.at("items");
|
||||
const auto found =
|
||||
std::find_if(shown.begin(), shown.end(),
|
||||
[&](const auto &m) { return m.at("id") == raw.at("id"); });
|
||||
if (found == shown.end())
|
||||
continue;
|
||||
out += "<div class=\"news-widget-row" +
|
||||
std::string(found->at("read").get<bool>() ? "" : " unread") +
|
||||
"\"><span class=\"news-widget-dot\"></span><div "
|
||||
"class=\"news-widget-copy\"><span class=\"news-widget-date\">" +
|
||||
esc(found->at("display_date").get<std::string>()) +
|
||||
"</span><span class=\"news-widget-title\">" +
|
||||
esc(found->at("title").get<std::string>()) + "</span></div></div>";
|
||||
if (++count == limit)
|
||||
break;
|
||||
}
|
||||
return out + "</div>";
|
||||
}
|
||||
Reference in new issue
Block a user