Merge pull request solosky#245 from Schokobecher/241

solosky · web-flow · commit 67654ab76ba1 · 2024-04-10T00:22:08.000+08:00
Add message box when clicking "More" in AmiiDB results list
diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_search.c b/fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_search.c
@@ -23,6 +23,21 @@ static void amiidb_scene_amiibo_search_text_input_event_cb(mui_text_input_event_
     }
 }
 
+static void amiidb_msg_box_error_cb(mui_msg_box_event_t event, mui_msg_box_t *p_msg_box) {
+    app_amiidb_t *app = p_msg_box->user_data;
+    mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIDB_VIEW_ID_LIST);
+}
+
+static void amiidb_show_message(app_amiidb_t *app, const char *msg) {
+    mui_msg_box_set_header(app->p_msg_box, getLangString(_L_ERR));
+    mui_msg_box_set_message(app->p_msg_box, msg);
+    mui_msg_box_set_btn_text(app->p_msg_box, NULL, getLangString(_L_KNOW), NULL);
+    mui_msg_box_set_btn_focus(app->p_msg_box, 1);
+    mui_msg_box_set_event_cb(app->p_msg_box, amiidb_msg_box_error_cb);
+
+    mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIDB_VIEW_ID_MSG_BOX);
+}
+
 static void amiidb_scene_amiibo_search_list_view_on_selected(mui_list_view_event_t event, mui_list_view_t *p_list_view,
                                                              mui_list_item_t *p_item) {
     uint16_t icon = p_item->icon;
@@ -49,6 +64,10 @@ static void amiidb_scene_amiibo_search_list_view_on_selected(mui_list_view_event
         mui_text_input_set_event_cb(app->p_text_input, amiidb_scene_amiibo_search_text_input_event_cb);
         mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIDB_VIEW_ID_INPUT);
     } break;
+
+    case ICON_ERROR: {
+        amiidb_show_message(app, _T(APP_AMIIDB_MORE_MESSAGE));
+    } break;
     }
 }
 
diff --git a/fw/application/src/i18n/de_DE.c b/fw/application/src/i18n/de_DE.c
@@ -115,6 +115,7 @@ const char * const lang_de_DE[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Zurück zur Liste]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Suche:",
     [_L_APP_AMIIDB_MORE] = "[Mehr...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "Zu viele Ergebnisse. Bitte Suche eingrenzen.",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<Leerer Amiibo>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "Zurücksetzen...",
     [_L_APP_AMIIDB_CONFIRM] = "Bestätigen",
diff --git a/fw/application/src/i18n/en_US.c b/fw/application/src/i18n/en_US.c
@@ -115,6 +115,7 @@ const char * const lang_en_US[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Back to List]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Search:",
     [_L_APP_AMIIDB_MORE] = "[More...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "Too many results. Try a more specific search.",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<Blank Amiibo>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "Reset...",
     [_L_APP_AMIIDB_CONFIRM] = "Confirm",
diff --git a/fw/application/src/i18n/es_ES.c b/fw/application/src/i18n/es_ES.c
@@ -115,6 +115,7 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Volver a Lista]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Buscar:",
     [_L_APP_AMIIDB_MORE] = "[Más...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<No Asignado>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "Borrar...",
     [_L_APP_AMIIDB_CONFIRM] = "Confirmar",
diff --git a/fw/application/src/i18n/fr_FR.c b/fw/application/src/i18n/fr_FR.c
@@ -39,7 +39,7 @@ const char * const lang_fr_FR[_L_COUNT] = {
     [_L_3MIN] = "3 min.",
     [_L_AMIIBO_KEY_UNLOADED] = "Clé Amiibo Non Chargée",
     [_L_UPLOAD_KEY_RETAIL_BIN] = "Téléchargez le fichier key_retail.bin dans le répertoire racine du stockage.",
-    [_L_KNOW] = "Compris  (NOTE please feel free to simply change any entry as needed)",
+    [_L_KNOW] = "Compris",
     [_L_RANDOM_GENERATION] = "Randomiser la Balise",
     [_L_AUTO_RANDOM_GENERATION] = "Randomisation Automatique",
     [_L_SHOW_QRCODE] = "Afficher le Code QR",
@@ -115,6 +115,7 @@ const char * const lang_fr_FR[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Retour à la Liste]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Recherche:",
     [_L_APP_AMIIDB_MORE] = "[Plus...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<Amiibo Vierge>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "Réinitialiser...",
     [_L_APP_AMIIDB_CONFIRM] = "Confirmer",
diff --git a/fw/application/src/i18n/hu_HU.c b/fw/application/src/i18n/hu_HU.c
@@ -115,6 +115,7 @@ const char * const lang_hu_HU[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Vissza a Listához]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Keresés:",
     [_L_APP_AMIIDB_MORE] = "[Bővebben...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<Üres Amiibo>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "Újraindítás...",
     [_L_APP_AMIIDB_CONFIRM] = "Megerősítés",
diff --git a/fw/application/src/i18n/it_IT.c b/fw/application/src/i18n/it_IT.c
@@ -115,6 +115,7 @@ const char * const lang_it_IT[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Torna alla lista]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Cerca:",
     [_L_APP_AMIIDB_MORE] = "[Più...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<Non assegnato>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "Elimina...",
     [_L_APP_AMIIDB_CONFIRM] = "Conferma",
diff --git a/fw/application/src/i18n/ja_JP.c b/fw/application/src/i18n/ja_JP.c
@@ -115,6 +115,7 @@ const char * const lang_ja_JP[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[リストに戻る］",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "検索する:",
     [_L_APP_AMIIDB_MORE] = "[もっと見る...］",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<Amiiboが見つかりません>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "リセット...",
     [_L_APP_AMIIDB_CONFIRM] = "確認する",
diff --git a/fw/application/src/i18n/nl_NL.c b/fw/application/src/i18n/nl_NL.c
@@ -115,6 +115,7 @@ const char * const lang_nl_NL[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Terug naar Lijst].",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Zoeken:",
     [_L_APP_AMIIDB_MORE] = "[Meer...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<Blanke Amiibo>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "Reset...",
     [_L_APP_AMIIDB_CONFIRM] = "Bevestigen",
diff --git a/fw/application/src/i18n/pt_BR.c b/fw/application/src/i18n/pt_BR.c
@@ -115,6 +115,7 @@ const char * const lang_pt_BR[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Voltar Para a Lista]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Pesquisar:",
     [_L_APP_AMIIDB_MORE] = "[Mais...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<Amiibo em Branco>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "Reiniciar...",
     [_L_APP_AMIIDB_CONFIRM] = "Confirmar",
diff --git a/fw/application/src/i18n/ru_RU.c b/fw/application/src/i18n/ru_RU.c
@@ -115,6 +115,7 @@ const char * const lang_ru_RU[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[Назад к списку]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "Поиск:",
     [_L_APP_AMIIDB_MORE] = "[Дальше...]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<пустой тег>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "Сброс...",
     [_L_APP_AMIIDB_CONFIRM] = "Да",
diff --git a/fw/application/src/i18n/string_id.h b/fw/application/src/i18n/string_id.h
@@ -116,6 +116,7 @@ typedef enum {
     _L_APP_AMIIDB_DETAIL_BACK_LIST,
     _L_APP_AMIIDB_SEARCH_HEAD,
     _L_APP_AMIIDB_MORE,
+    _L_APP_AMIIDB_MORE_MESSAGE,
     _L_APP_AMIIDB_EMPTY_TAG,
     _L_APP_AMIIDB_SLOT_DELETE,
     _L_APP_AMIIDB_CONFIRM,
diff --git a/fw/application/src/i18n/zh_Hans.c b/fw/application/src/i18n/zh_Hans.c
@@ -115,6 +115,7 @@ const char * const lang_zh_Hans[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[返回列表]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "搜索:",
     [_L_APP_AMIIDB_MORE] = "[更多]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "搜索结果过多，尝试增加搜索词。",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<空标签>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "重置...",
     [_L_APP_AMIIDB_CONFIRM] = "确认",
diff --git a/fw/application/src/i18n/zh_TW.c b/fw/application/src/i18n/zh_TW.c
@@ -115,6 +115,7 @@ const char * const lang_zh_TW[_L_COUNT] = {
     [_L_APP_AMIIDB_DETAIL_BACK_LIST] = "[返回列表]",
     [_L_APP_AMIIDB_SEARCH_HEAD] = "搜索:",
     [_L_APP_AMIIDB_MORE] = "[更多]",
+    [_L_APP_AMIIDB_MORE_MESSAGE] = "搜索結果過多，嘗試增加搜索詞。",
     [_L_APP_AMIIDB_EMPTY_TAG] = "<空標簽>",
     [_L_APP_AMIIDB_SLOT_DELETE] = "重置...",
     [_L_APP_AMIIDB_CONFIRM] = "確認",
diff --git a/fw/application/src/mui/u8g2_font_wqy12_t_gb2312a.c b/fw/application/src/mui/u8g2_font_wqy12_t_gb2312a.c
diff --git a/fw/data/i18n.csv b/fw/data/i18n.csv
