18 files changed, 44 insertions(+), 4 deletions(-)

M products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/windows/BellSettingsTimeUnitsWindow.hpp
M products/BellHybrid/apps/application-bell-settings/windows/AboutYourBellWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/AboutYourBellWindow.hpp
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.hpp
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlightWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlightWindow.hpp
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsLanguageWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsLanguageWindow.hpp
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTimeUnitsWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.hpp
M products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.hpp
M products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsPrewakeUpWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsPrewakeUpWindow.hpp
M products/BellHybrid/apps/application-bell-settings/windows/bedtime_settings/BellSettingsBedtimeToneSettingsWindow.cpp
M products/BellHybrid/apps/application-bell-settings/windows/bedtime_settings/BellSettingsBedtimeToneSettingsWindow.hpp

@@ 22,6 22,7 @@ namespace gui
             std::string name = gui::window::name::bellSettingsTimeUnits);
 
         void buildInterface() override;
+        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
         bool onInput(const InputEvent &inputEvent) override;
         void rebuild() override;
 

@@ 35,7 35,11 @@ namespace gui
                             listview::ScrollBarType::Fixed);
         list->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
 
-        setFocusItem(list);
         list->rebuildList();
     }
+
+    void AboutYourBellWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    {
+        setFocusItem(list);
+    }
 } // namespace gui

@@ 23,6 23,7 @@ namespace gui
         static constexpr auto top_margin = 41;
 
         void buildInterface() override;
+        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
 
         ListView *list{};
         std::shared_ptr<app::bell_settings::AboutYourBellWindowContract::Presenter> presenter;

@@ 38,7 38,10 @@ namespace gui
         sidelistview->rebuildList(listview::RebuildType::Full);
 
         presenter->loadData();
+    }
 
+    void BellSettingsBedtimeToneWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    {
         setFocusItem(sidelistview);
     }
 

@@ 21,6 21,7 @@ namespace gui
             std::unique_ptr<app::bell_settings::BedtimeSettingsPresenter::Presenter> presenter);
 
         void buildInterface() override;
+        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
         void onClose(CloseReason reason) override;
         bool onInput(const InputEvent &inputEvent) override;
         void rebuild() override;

@@ 38,7 38,10 @@ namespace gui
         listView->setEdges(RectangleEdge::None);
 
         listView->rebuildList(listview::RebuildType::Full);
+    }
 
+    void BellSettingsFrontlightWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    {
         setFocusItem(listView);
     }
 

@@ 19,6 19,7 @@ namespace gui
             app::ApplicationCommon *app, std::unique_ptr<app::bell_settings::FrontlightPresenter> &&windowPresenter);
 
         void buildInterface() override;
+        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
         bool onInput(const InputEvent &inputEvent) override;
         void onClose(CloseReason reason) override;
         void rebuild() override;

@@ 48,10 48,14 @@ namespace gui
         body->getCenterBox()->addWidget(spinner);
         body->setMinMaxArrowsVisibility(spinner->isAtMin(), spinner->isAtMax());
 
-        setFocusItem(spinner);
         body->resize();
     }
 
+    void BellSettingsLanguageWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    {
+        setFocusItem(spinner);
+    }
+
     bool BellSettingsLanguageWindow::onInput(const InputEvent &inputEvent)
     {
         if (spinner->onInput(inputEvent)) {

@@ 21,6 21,7 @@ namespace gui
                                    const std::string &name = gui::window::name::bellSettingsLanguage);
 
         void buildInterface() override;
+        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
         bool onInput(const gui::InputEvent &inputEvent) override;
 
       private:

@@ 50,7 50,10 @@ namespace gui
         sidelistview->rebuildList(listview::RebuildType::Full);
 
         presenter->loadData();
+    }
 
+    void BellSettingsTimeUnitsWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    {
         setFocusItem(sidelistview);
     }
 

@@ 37,7 37,10 @@ namespace gui
         listView->rebuildList(listview::RebuildType::Full);
 
         presenter->loadData();
+    }
 
+    void BellSettingsAlarmSettingsSnoozeWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    {
         setFocusItem(listView);
     }
 

@@ 20,6 20,7 @@ namespace gui
                                               std::unique_ptr<app::bell_settings::SnoozePresenter> presenter);
 
         void buildInterface() override;
+        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
         bool onInput(const InputEvent &inputEvent) override;
         void onClose(CloseReason reason) override;
         void rebuild() override;

@@ 43,8 43,6 @@ namespace gui
         sidelistview->rebuildList(listview::RebuildType::Full);
 
         presenter->loadData();
-
-        setFocusItem(sidelistview);
     }
 
     bool BellSettingsAlarmSettingsWindow::onInput(const gui::InputEvent &inputEvent)


@@ 80,4 78,9 @@ namespace gui
         }
     }
 
+    void BellSettingsAlarmSettingsWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    {
+        setFocusItem(sidelistview);
+    }
+
 } /* namespace gui */

@@ 22,6 22,7 @@ namespace gui
             std::unique_ptr<app::bell_settings::AlarmSettingsWindowContract::Presenter> presenter);
 
         void buildInterface() override;
+        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
         void onClose(CloseReason reason) override;
         bool onInput(const InputEvent &inputEvent) override;
         void rebuild() override;

@@ 41,7 41,10 @@ namespace gui
         sidelistview->rebuildList(listview::RebuildType::Full);
 
         presenter->loadData();
+    }
 
+    void BellSettingsPrewakeUpWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    {
         setFocusItem(sidelistview);
     }
 

@@ 21,6 21,7 @@ namespace gui
             std::unique_ptr<app::bell_settings::PrewakeUpWindowContract::Presenter> presenter);
 
         void buildInterface() override;
+        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
         void onClose(CloseReason reason) override;
         bool onInput(const InputEvent &inputEvent) override;
         void rebuild() override;

@@ 45,6 45,11 @@ namespace gui
         setFocusItem(sidelistview);
     }
 
+    void BellSettingsBedtimeToneSettingsWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
+    {
+        setFocusItem(sidelistview);
+    }
+
     bool BellSettingsBedtimeToneSettingsWindow::onInput(const gui::InputEvent &inputEvent)
     {
         if (sidelistview->onInput(inputEvent)) {

@@ 22,6 22,7 @@ namespace gui
             std::unique_ptr<app::bell_settings::AlarmSettingsWindowContract::Presenter> presenter);
 
         void buildInterface() override;
+        void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
         void onClose(CloseReason reason) override;
         bool onInput(const InputEvent &inputEvent) override;
         void rebuild() override;