fixed solosky#207, show confirm box when reset settings

Author: solosky

fw/application/src/app/desktop/app_desktop.c

@@ -46,7 +46,7 @@ void app_desktop_on_run(mini_app_inst_t *p_app_inst) {
     mui_view_dispatcher_switch_to_view(p_app_handle->p_view_dispatcher, DESKTOP_VIEW_ID_MAIN);
 }
 
-void app_desktop_on_kill(mini_apddp_inst_t *p_app_inst) {
+void app_desktop_on_kill(mini_app_inst_t *p_app_inst) {
     app_desktop_t *p_app_handle = p_app_inst->p_handle;
 
     mui_view_dispatcher_switch_to_view(p_app_handle->p_view_dispatcher, VIEW_NONE);

fw/application/src/app/settings/scene/settings_scene_main.c

@@ -25,6 +25,7 @@ enum settings_main_menu_t {
     SETTINGS_MAIN_MENU_EXIT
 };
 
+static void settings_scene_main_reload(void *user_data);
 static void settings_reset_default(void *user_data) {
     app_settings_t *app = user_data;
     settings_data_t *p_settings = settings_get_data();
@@ -38,7 +39,16 @@ static void settings_reset_default(void *user_data) {
 
     mui_toast_view_show(app->p_toast_view, _T(APP_SET_RESET_DEFAULT_SUCCESS));
 }
-static void settings_scene_main_reload(void *user_data);
+
+static void settings_scene_main_msg_box_reset_settings_cb(mui_msg_box_event_t event, mui_msg_box_t *p_msg_box) {
+    app_settings_t *app = p_msg_box->user_data;
+    if (event == MUI_MSG_BOX_EVENT_SELECT_LEFT) {
+        settings_reset();
+        settings_reset_default(app);
+        settings_scene_main_reload(app);
+    }
+    mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, SETTINGS_VIEW_ID_MAIN);
+}
 
 static void settings_scene_main_list_view_on_selected(mui_list_view_event_t event, mui_list_view_t *p_list_view,
                                                       mui_list_item_t *p_item) {
@@ -108,11 +118,17 @@ static void settings_scene_main_list_view_on_selected(mui_list_view_event_t even
         system_reboot();
         break;
 
-    case SETTINGS_MAIN_MENU_RESET_DEFAULT:
-        settings_reset();
-        settings_reset_default(app);
-        settings_scene_main_reload(app);
-        break;
+    case SETTINGS_MAIN_MENU_RESET_DEFAULT: {
+        mui_msg_box_set_header(app->p_msg_box, _T(CONFIRM));
+        mui_msg_box_set_message(app->p_msg_box, _T(APP_SET_RESET_DEFAULT_CONFIRM));
+        mui_msg_box_set_btn_text(app->p_msg_box, _T(CONFIRM), NULL, _T(CANCEL));
+        mui_msg_box_set_btn_focus(app->p_msg_box, 2);
+        mui_msg_box_set_event_cb(app->p_msg_box, settings_scene_main_msg_box_reset_settings_cb);
+
+        mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, SETTINGS_VIEW_ID_MSG_BOX);
+    }
+
+    break;
     }
 }
 

fw/application/src/i18n/de_DE.c

@@ -30,6 +30,7 @@ const char * const lang_de_DE[_L_COUNT] = {
     [_L_APP_SET_REBOOT] = "System-Neustart",
     [_L_APP_SET_RESET_DEFAULT] = "Standardeinstellungen",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Einstellungen zurückgesetzt!",
+    [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "",
     [_L_15S] = "15 Sek",
     [_L_30S] = "30 Sek",
     [_L_45S] = "45 Sek",

fw/application/src/i18n/en_US.c

@@ -30,6 +30,7 @@ const char * const lang_en_US[_L_COUNT] = {
     [_L_APP_SET_REBOOT] = "System Reboot",
     [_L_APP_SET_RESET_DEFAULT] = "Reset Default Setting",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Reset Success!",
+    [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "Confirm Reset Settings?",
     [_L_15S] = "15 Seconds",
     [_L_30S] = "30 Seconds",
     [_L_45S] = "45 Seconds",

fw/application/src/i18n/es_ES.c

@@ -30,6 +30,7 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_APP_SET_REBOOT] = "Reiniciar",
     [_L_APP_SET_RESET_DEFAULT] = "Restablecer config.",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "¡Configuración Restablecida!",
+    [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "",
     [_L_15S] = "15 segundos",
     [_L_30S] = "30 segundos",
     [_L_45S] = "45 segundos",

fw/application/src/i18n/fr_FR.c

@@ -30,6 +30,7 @@ const char * const lang_fr_FR[_L_COUNT] = {
     [_L_APP_SET_REBOOT] = "Redémarrage du Système",
     [_L_APP_SET_RESET_DEFAULT] = "Rétablir les Paramètres par Défaut",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Réinitialiser les Paramètres Par Défaut",
+    [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "",
     [_L_15S] = "15 sec.",
     [_L_30S] = "30 sec.",
     [_L_45S] = "45 sec.",

fw/application/src/i18n/hu_HU.c

@@ -30,6 +30,7 @@ const char * const lang_hu_HU[_L_COUNT] = {
     [_L_APP_SET_REBOOT] = "Rendszer Újraindítása",
     [_L_APP_SET_RESET_DEFAULT] = "Alapért. Beállítás Visszaállítása",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Alapért. Beállítások Visszaállítása",
+    [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "",
     [_L_15S] = "15 sec.",
     [_L_30S] = "30 sec.",
     [_L_45S] = "45 sec.",

fw/application/src/i18n/ja_JP.c

@@ -30,6 +30,7 @@ const char * const lang_ja_JP[_L_COUNT] = {
     [_L_APP_SET_REBOOT] = "システム再起動",
     [_L_APP_SET_RESET_DEFAULT] = "デフォルト設定に戻す",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "設定を初期化",
+    [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "",
     [_L_15S] = "15秒",
     [_L_30S] = "30秒",
     [_L_45S] = "45秒",

fw/application/src/i18n/nl_NL.c

@@ -30,6 +30,7 @@ const char * const lang_nl_NL[_L_COUNT] = {
     [_L_APP_SET_REBOOT] = "Systeem Herstarten",
     [_L_APP_SET_RESET_DEFAULT] = "Terugzetten Naar Standaardwaarden",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Standaardinstellingen Herstellen",
+    [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "",
     [_L_15S] = "15 sec.",
     [_L_30S] = "30 sec.",
     [_L_45S] = "45 sec.",

fw/application/src/i18n/pt_BR.c

@@ -30,6 +30,7 @@ const char * const lang_pt_BR[_L_COUNT] = {
     [_L_APP_SET_REBOOT] = "Reinicialização do Sistema",
     [_L_APP_SET_RESET_DEFAULT] = "Restaurar Configurações Padrão",
     [_L_APP_SET_RESET_DEFAULT_SUCCESS] = "Redefinir a Configuração Padrão",
+    [_L_APP_SET_RESET_DEFAULT_CONFIRM] = "",
     [_L_15S] = "15 seg.",
     [_L_30S] = "30 seg.",
     [_L_45S] = "45 seg.",