13 files changed, 49 insertions(+), 9 deletions(-)

M module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp
M module-apps/application-alarm-clock/models/NewEditAlarmModel.hpp
M module-apps/application-alarm-clock/presenter/AlarmClockEditWindowPresenter.cpp
M module-apps/application-alarm-clock/presenter/AlarmClockEditWindowPresenter.hpp
M module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp
M module-apps/application-alarm-clock/windows/NewEditAlarmWindow.hpp
M module-apps/application-phonebook/models/NewContactModel.cpp
M module-apps/application-phonebook/models/NewContactModel.hpp
M module-apps/application-phonebook/windows/PhonebookNewContact.cpp
M module-apps/application-phonebook/windows/PhonebookNewContact.hpp
M module-apps/application-settings/models/apps/SoundsModel.cpp
M module-apps/application-settings/windows/apps/SoundSelectWindow.cpp
M module-apps/application-settings/windows/apps/SoundSelectWindow.hpp

@@ 74,10 74,15 @@ namespace app::alarmClock
         }
     }
 
-    void NewEditAlarmModel::loadData(std::shared_ptr<AlarmEventRecord> record)
+    void NewEditAlarmModel::clearData()
     {
         list->reset();
         eraseInternalData();
+    }
+
+    void NewEditAlarmModel::loadData(std::shared_ptr<AlarmEventRecord> record)
+    {
+        clearData();
 
         rRulePresenter->loadRecord(record);
         createData();


@@ 114,7 119,7 @@ namespace app::alarmClock
             alarm->enabled = true;
             alarmsRepository->add(*alarm, [this](bool) { application->returnToPreviousWindow(); });
         }
-        list->reset();
-        eraseInternalData();
+
+        clearData();
     }
 } // namespace app::alarmClock

@@ 24,6 24,7 @@ namespace app::alarmClock
 
         virtual void loadData(std::shared_ptr<AlarmEventRecord> record)                     = 0;
         virtual void saveData(std::shared_ptr<AlarmEventRecord> record, AlarmAction action) = 0;
+        virtual void clearData()                                                            = 0;
         virtual void loadCustomRepeat()                                                     = 0;
     };
 


@@ 44,6 45,7 @@ namespace app::alarmClock
         void loadData(std::shared_ptr<AlarmEventRecord> record) override;
         void saveData(std::shared_ptr<AlarmEventRecord> alarm, AlarmAction action) override;
         void loadCustomRepeat() override;
+        void clearData() override;
         void createData();
 
         [[nodiscard]] unsigned int getMinimalItemSpaceRequired() const override;

@@ 30,4 30,9 @@ namespace app::alarmClock
         alarmFieldsProvider->loadCustomRepeat();
     }
 
+    void AlarmClockEditWindowPresenter::clearData()
+    {
+        alarmFieldsProvider->clearData();
+    }
+
 } // namespace app::alarmClock

@@ 25,6 25,7 @@ namespace app::alarmClock
             [[nodiscard]] virtual std::shared_ptr<gui::ListItemProvider> getAlarmsItemProvider() const = 0;
             virtual void loadData(std::shared_ptr<AlarmEventRecord> record)                            = 0;
             virtual void saveData(std::shared_ptr<AlarmEventRecord> record, AlarmAction action)        = 0;
+            virtual void clearData()                                                                   = 0;
             virtual void loadCustomRepeat()                                                            = 0;
         };
     };


@@ 37,6 38,7 @@ namespace app::alarmClock
         [[nodiscard]] std::shared_ptr<gui::ListItemProvider> getAlarmsItemProvider() const override;
         void loadData(std::shared_ptr<AlarmEventRecord> record) override;
         void saveData(std::shared_ptr<AlarmEventRecord> record, AlarmAction action) override;
+        void clearData() override;
         void loadCustomRepeat() override;
 
       private:

@@ 56,6 56,13 @@ namespace app::alarmClock
         }
     }
 
+    void NewEditAlarmWindow::onClose(gui::Window::CloseReason reason)
+    {
+        if (reason == Window::CloseReason::ApplicationClose) {
+            presenter->clearData();
+        }
+    }
+
     bool NewEditAlarmWindow::onInput(const gui::InputEvent &inputEvent)
     {
         if (AppWindow::onInput(inputEvent)) {

@@ 28,6 28,7 @@ namespace app::alarmClock
 
         bool handleSwitchData(gui::SwitchData *data) override;
         void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
+        void onClose(CloseReason reason) override;
         bool onInput(const gui::InputEvent &inputEvent) override;
         void buildInterface() override;
     };

@@ 112,11 112,13 @@ void NewContactModel::createData()
 void NewContactModel::clearData()
 {
     list->reset();
-
     eraseInternalData();
+}
 
+void NewContactModel::recreateData()
+{
+    clearData();
     createData();
-
     list->rebuildList();
 }
 

@@ 23,6 23,7 @@ class NewContactModel : public app::InternalModel<gui::ContactListItem *>, publi
     explicit NewContactModel(app::ApplicationCommon *app);
 
     void clearData();
+    void recreateData();
     void saveData(std::shared_ptr<ContactRecord> contactRecord);
     void loadData(std::shared_ptr<ContactRecord> contactRecord, gui::SwitchData *data);
     void createData();

@@ 52,7 52,7 @@ namespace gui
     void PhonebookNewContact::onBeforeShow(ShowMode mode, SwitchData *data)
     {
         if (mode != ShowMode::GUI_SHOW_RETURN) {
-            newContactModel->clearData();
+            newContactModel->recreateData();
             newContactModel->loadData(contact, data);
         }
 


@@ 75,6 75,13 @@ namespace gui
         !newContactModel->emptyData() ? setSaveButtonVisible(true) : setSaveButtonVisible(false);
     }
 
+    void PhonebookNewContact::onClose(Window::CloseReason reason)
+    {
+        if (reason == Window::CloseReason::ApplicationClose) {
+            newContactModel->clearData();
+        }
+    }
+
     auto PhonebookNewContact::handleSwitchData(SwitchData *data) -> bool
     {
         if (data == nullptr) {


@@ 247,5 254,4 @@ namespace gui
             }});
         application->switchWindow(gui::window::name::dialog_yes_no_icon_txt, std::move(metaData));
     }
-
 } // namespace gui

@@ 20,6 20,7 @@ namespace gui
         auto onInput(const InputEvent &inputEvent) -> bool override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         auto handleSwitchData(SwitchData *data) -> bool override;
+        void onClose(CloseReason reason) override;
         void rebuild() override;
         void buildInterface() override;
         void destroyInterface() override;

@@ 67,8 67,8 @@ void SoundsModel::createData(app::ApplicationCommon *app, audio_settings::Abstra
 
 void SoundsModel::clearData()
 {
-    list->clear();
-    list->rebuildList();
+    list->reset();
+    eraseInternalData();
 }
 
 std::filesystem::path SoundsModel::getSoundPath(audio_settings::AbstractAudioSettingsModel *model)

@@ 59,4 59,11 @@ namespace gui
         setTitle(info->get().windowTitle);
         mSoundsModel->createData(application, info->get().audioModel);
     }
+
+    void SoundSelectWindow::onClose(Window::CloseReason reason)
+    {
+        if (reason == Window::CloseReason::ApplicationClose) {
+            mSoundsModel->clearData();
+        }
+    }
 } // namespace gui

@@ 26,6 26,7 @@ namespace gui
         ///  @param mode show mode
         ///  @param data user switch data
         void onBeforeShow([[maybe_unused]] ShowMode mode, SwitchData *data) override;
+        void onClose(CloseReason reason) override;
 
         void rebuild() override;
         void buildInterface() override;