feat: add game list sorting by name and default order in amiidb #344

solosky · solosky · commit 72b9c9059955 · 2025-09-04T00:01:38.000+08:00
diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_game_list.c b/fw/application/src/app/amiidb/scene/amiidb_scene_game_list.c
@@ -45,7 +45,12 @@ static int amiidb_scene_game_list_list_view_sort_cb(const mui_list_item_t *p_ite
     if (p_item_a->icon == ICON_FOLDER && p_item_b->icon == ICON_FOLDER) {
         db_game_t *p_game_a = (db_game_t *)p_item_a->user_data;
         db_game_t *p_game_b = (db_game_t *)p_item_b->user_data;
-        return p_game_b->order - p_game_a->order;
+        settings_data_t *p_settings_data = settings_get_data();
+        if (p_settings_data->amiidb_sort_column == AMIIDB_SORT_COLUMN_NAME) {
+            return strcmp(p_game_a->name_en, p_game_b->name_en);
+        } else {
+            return p_game_b->order - p_game_a->order;
+        }
     } else if (p_item_a->icon == ICON_FOLDER && p_item_b->icon == ICON_FILE) {
         return -1;
     } else {
@@ -115,7 +120,7 @@ void amiidb_scene_game_list_on_enter(void *user_data) {
     app_amiidb_t *app = (app_amiidb_t *)user_data;
     amiidb_scene_game_list_reload(app);
 
-    //restore states
+    // restore states
     mui_list_view_set_focus(app->p_list_view, app->cur_focus_index);
     mui_list_view_set_scroll_offset(app->p_list_view, app->cur_scroll_offset);
 }
diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_settings.c b/fw/application/src/app/amiidb/scene/amiidb_scene_settings.c
@@ -19,6 +19,14 @@ static void amiidb_scene_settings_on_selected(mui_list_view_event_t event, mui_l
     case ICON_SLOT: {
         mui_scene_dispatcher_next_scene(app->p_scene_dispatcher, AMIIDB_SCENE_SETTINGS_SLOT_NUM);
     } break;
+
+    case ICON_SETTINGS: {
+        settings_data_t *p_settings = settings_get_data();
+        p_settings->amiidb_sort_column = (p_settings->amiidb_sort_column + 1) % 2;
+        char txt[32];
+        sprintf(txt, "[%s]",(p_settings->amiidb_sort_column == AMIIDB_SORT_COLUMN_DEFAULT ? getLangString(_L_APP_AMIIDB_SORT_DEFAULT) : getLangString(_L_APP_AMIIDB_SORT_NAME)));
+        mui_list_view_item_set_sub_text(p_item, txt);
+    } break;
     }
 }
 
@@ -35,6 +43,8 @@ void amiidb_scene_settings_on_enter(void *user_data) {
     mui_list_view_add_item(app->p_list_view, ICON_KEY, txt, (void *)0);
     sprintf(txt, "%s [%d]", getLangString(_L_APP_AMIIDB_SETTINGS_SLOT_NUM), p_settings->amiidb_data_slot_num);
     mui_list_view_add_item(app->p_list_view, ICON_SLOT, txt, (void *)0);
+    sprintf(txt, "[%s]",(p_settings->amiidb_sort_column == AMIIDB_SORT_COLUMN_DEFAULT ? getLangString(_L_APP_AMIIDB_SORT_DEFAULT) : getLangString(_L_APP_AMIIDB_SORT_NAME)));
+    mui_list_view_add_item_ext(app->p_list_view, ICON_SETTINGS, getLangString(_L_APP_AMIIDB_SORT_FIELD), txt, (void *)0);
     mui_list_view_add_item(app->p_list_view, ICON_EXIT, getLangString(_L_APP_AMIIDB_BACK), (void *)0);
 
     mui_list_view_set_selected_cb(app->p_list_view, amiidb_scene_settings_on_selected);
diff --git a/fw/application/src/i18n/de_DE.c b/fw/application/src/i18n/de_DE.c
@@ -144,6 +144,9 @@ const char * const lang_de_DE[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Favorisieren fehlgeschlagen!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Speichern erfolgreich",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Speichern fehlgeschlagen!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Sortierfeld",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Standard",
+    [_L_APP_AMIIDB_SORT_NAME] = "Name",
     [_L_APP_CHAMELEON] = "Karten Emulator",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normal",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Verweigern",
diff --git a/fw/application/src/i18n/en_US.c b/fw/application/src/i18n/en_US.c
@@ -144,6 +144,9 @@ const char * const lang_en_US[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Favorite Failed!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Save Success",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Save Failed!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Sort Field",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Default",
+    [_L_APP_AMIIDB_SORT_NAME] = "Name",
     [_L_APP_CHAMELEON] = "Card Emulator",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normal",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Deny",
diff --git a/fw/application/src/i18n/es_ES.c b/fw/application/src/i18n/es_ES.c
@@ -144,6 +144,9 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "¡Fallo al adicionar\na Favoritos!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Asignación correcta",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "¡Asignación fallida!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Campo de ordenación",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Por defecto",
+    [_L_APP_AMIIDB_SORT_NAME] = "Nombre",
     [_L_APP_CHAMELEON] = "Emular Etiqueta RFID",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normal",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Negar",
diff --git a/fw/application/src/i18n/fr_FR.c b/fw/application/src/i18n/fr_FR.c
@@ -144,6 +144,9 @@ const char * const lang_fr_FR[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Échec du Favori!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Sauvegarder Succès",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Sauvegarde Échouée!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Champ de tri",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Par défaut",
+    [_L_APP_AMIIDB_SORT_NAME] = "Nom",
     [_L_APP_CHAMELEON] = "Emulateur de Carte",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normal",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Refuser",
diff --git a/fw/application/src/i18n/hu_HU.c b/fw/application/src/i18n/hu_HU.c
@@ -144,6 +144,9 @@ const char * const lang_hu_HU[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Kedvenc Sikertelen!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Sikeresen Mentve",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Mentés Sikertelen!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Rendezési mező",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Alapértelmezett",
+    [_L_APP_AMIIDB_SORT_NAME] = "Név",
     [_L_APP_CHAMELEON] = "Kártya Emulátor",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normál",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Tagadni",
diff --git a/fw/application/src/i18n/it_IT.c b/fw/application/src/i18n/it_IT.c
@@ -144,6 +144,9 @@ const char * const lang_it_IT[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Preferito non aggiunto!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Assegnazione corretta",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Assegnazione fallita!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Campo di ordinamento",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Predefinito",
+    [_L_APP_AMIIDB_SORT_NAME] = "Nome",
     [_L_APP_CHAMELEON] = "Emula tag RFID",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normale",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Nega",
diff --git a/fw/application/src/i18n/ja_JP.c b/fw/application/src/i18n/ja_JP.c
@@ -144,6 +144,9 @@ const char * const lang_ja_JP[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "お気に入りに追加できませんでした!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "保存されました",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "保存に失敗しました!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "並べ替えフィールド",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "デフォルト",
+    [_L_APP_AMIIDB_SORT_NAME] = "名前",
     [_L_APP_CHAMELEON] = "カードエミュレータ",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "通常",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "拒否",
diff --git a/fw/application/src/i18n/nl_NL.c b/fw/application/src/i18n/nl_NL.c
@@ -144,6 +144,9 @@ const char * const lang_nl_NL[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Favoriet Mislukt!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Opslaan Succes",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Opslaan Mislukt!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Sorteerveld",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Standaard",
+    [_L_APP_AMIIDB_SORT_NAME] = "Naam",
     [_L_APP_CHAMELEON] = "Kaart Emulator",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normaal",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Weigeren",
diff --git a/fw/application/src/i18n/pl_PL.c b/fw/application/src/i18n/pl_PL.c
@@ -144,6 +144,9 @@ const char * const lang_pl_PL[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Błąd Dodawania do Ulubionych!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Zapisano",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Błąd Zapisywania!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Pole sortowania",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Domyślne",
+    [_L_APP_AMIIDB_SORT_NAME] = "Nazwa",
     [_L_APP_CHAMELEON] = "Emulator Kart",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normalny",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Odmów",
diff --git a/fw/application/src/i18n/pt_BR.c b/fw/application/src/i18n/pt_BR.c
@@ -144,6 +144,9 @@ const char * const lang_pt_BR[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Favorito Falhou!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Salvar Com Êxito",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Falha ao Salvar!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Campo de Ordenação",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Padrão",
+    [_L_APP_AMIIDB_SORT_NAME] = "Nome",
     [_L_APP_CHAMELEON] = "Emulador de Cartão",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normal",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Negar",
diff --git a/fw/application/src/i18n/pt_PT.c b/fw/application/src/i18n/pt_PT.c
@@ -144,6 +144,9 @@ const char * const lang_pt_PT[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Favorito falhou!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Guardado com sucesso",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Falha ao Guardar!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Campo de Ordenação",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Padrão",
+    [_L_APP_AMIIDB_SORT_NAME] = "Nome",
     [_L_APP_CHAMELEON] = "Emular Tag RFID",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normal",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Cancelar",
diff --git a/fw/application/src/i18n/ru_RU.c b/fw/application/src/i18n/ru_RU.c
@@ -144,6 +144,9 @@ const char * const lang_ru_RU[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Ошибка добавления",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Сохранено",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Ошибка сохранения",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Поле сортировки",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "По умолчанию",
+    [_L_APP_AMIIDB_SORT_NAME] = "Имя",
     [_L_APP_CHAMELEON] = "Эмулятор карт",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Разрешена",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Запрещена",
diff --git a/fw/application/src/i18n/string_id.h b/fw/application/src/i18n/string_id.h
@@ -145,6 +145,9 @@ typedef enum {
     _L_APP_AMIIDB_FAV_FAILED,
     _L_APP_AMIIDB_SLOT_SAVE_SUCCESS,
     _L_APP_AMIIDB_SLOT_SAVE_FAILED,
+    _L_APP_AMIIDB_SORT_FIELD,
+    _L_APP_AMIIDB_SORT_DEFAULT,
+    _L_APP_AMIIDB_SORT_NAME,
     _L_APP_CHAMELEON,
     _L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL,
     _L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED,
diff --git a/fw/application/src/i18n/sv_SE.c b/fw/application/src/i18n/sv_SE.c
@@ -144,6 +144,9 @@ const char * const lang_sv_SE[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "Favorit misslyckades!",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "Sparades",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "Spara misslyckades!",
+    [_L_APP_AMIIDB_SORT_FIELD] = "Sorteringsfält",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "Standard",
+    [_L_APP_AMIIDB_SORT_NAME] = "Namn",
     [_L_APP_CHAMELEON] = "Kort-emulator",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "Normal",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "Neka",
diff --git a/fw/application/src/i18n/zh_Hans.c b/fw/application/src/i18n/zh_Hans.c
@@ -144,6 +144,9 @@ const char * const lang_zh_Hans[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "收藏失败",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "保存成功",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "保存失败",
+    [_L_APP_AMIIDB_SORT_FIELD] = "排序字段",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "默认",
+    [_L_APP_AMIIDB_SORT_NAME] = "名字",
     [_L_APP_CHAMELEON] = "卡模拟器",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "正常",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "拒绝",
diff --git a/fw/application/src/i18n/zh_TW.c b/fw/application/src/i18n/zh_TW.c
@@ -144,6 +144,9 @@ const char * const lang_zh_TW[_L_COUNT] = {
     [_L_APP_AMIIDB_FAV_FAILED] = "收藏失敗",
     [_L_APP_AMIIDB_SLOT_SAVE_SUCCESS] = "保存成功",
     [_L_APP_AMIIDB_SLOT_SAVE_FAILED] = "保存失敗",
+    [_L_APP_AMIIDB_SORT_FIELD] = "排序欄位",
+    [_L_APP_AMIIDB_SORT_DEFAULT] = "預設",
+    [_L_APP_AMIIDB_SORT_NAME] = "名稱",
     [_L_APP_CHAMELEON] = "卡模擬器",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_NORMAL] = "正常",
     [_L_APP_CHAMELEON_TAG_MF1_WRITE_DENIED] = "拒絕",
diff --git a/fw/application/src/mod/settings.c b/fw/application/src/mod/settings.c
@@ -32,7 +32,8 @@ const settings_data_t def_settings_data = {.backlight = 0,
                                            .amiidb_data_slot_num = 20,
                                            .qrcode_enabled = true,
                                            .chameleon_default_slot_index = INVALID_SLOT_INDEX,
-                                            .app_enable_bits = 0xFFFF};
+                                            .app_enable_bits = 0xFFFF,
+                                            .amiidb_sort_column = 0};
 
 settings_data_t m_settings_data = {0};
 
diff --git a/fw/application/src/mod/settings.h b/fw/application/src/mod/settings.h
@@ -8,6 +8,8 @@
 #include "i18n/language.h"
 
 #define INVALID_SLOT_INDEX 0xFF
+#define AMIIDB_SORT_COLUMN_DEFAULT 0
+#define AMIIDB_SORT_COLUMN_NAME 1
 
 typedef struct {
     bool backlight; // deprecated, keep for capability issue
@@ -28,6 +30,7 @@ typedef struct {
     uint8_t amiidb_data_slot_num;
     uint8_t chameleon_default_slot_index;
     uint16_t app_enable_bits; // bitmask for app enable status (1: enabled, 0: disabled)
+    uint8_t amiidb_sort_column;
 } settings_data_t;
 
 int32_t settings_init();
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
