~aleteoryx/muditaos

d94fa3e5335b01bb46ae44305365b9f99035e5b6 — lblach 4 years ago 00c7602
[EGD-6264] About Your Pure Main Window

Add window About Your Pure to help display Technical Information,
Certification and SAR.
M image/assets/lang/Deutsch.json => image/assets/lang/Deutsch.json +4 -0
@@ 114,6 114,10 @@
  "app_settings_phone_modes": "Phone Modes",
  "app_settings_security": "Security",
  "app_settings_language": "Language",
  "app_settings_about_your_pure": "About your Pure",
  "app_settings_technical_information": "Technical Information",
  "app_settings_certification": "Certification",
  "app_settings_sar": "SAR",
  "app_settings_about": "About Mudita Pure",
  "app_settings_title_languages": "Language Selection",
  "app_settings_language_english": "English",

M image/assets/lang/English.json => image/assets/lang/English.json +2 -0
@@ 404,7 404,9 @@
  "app_settings_language": "Language",
  "app_settings_factory_reset": "Factory reset",
  "app_settings_about_your_pure": "About your Pure",
  "app_settings_technical_information": "Technical Information",
  "app_settings_certification": "Certification",
  "app_settings_sar": "SAR",
  "app_settings_about": "About Mudita Pure",
  "app_settings_title_languages": "Language selection",
  "app_settings_language_english": "English",

M image/assets/lang/Espanol.json => image/assets/lang/Espanol.json +4 -0
@@ 116,6 116,10 @@
  "app_settings_phone_modes": "Phone Modes",
  "app_settings_security": "Security",
  "app_settings_language": "Language",
  "app_settings_about_your_pure": "About your Pure",
  "app_settings_technical_information": "Technical Information",
  "app_settings_certification": "Certification",
  "app_settings_sar": "SAR",
  "app_settings_about": "About Mudita Pure",
  "app_settings_title_languages": "Language Selection",
  "app_settings_language_english": "Inglesa",

M image/assets/lang/Francais.json => image/assets/lang/Francais.json +4 -0
@@ 114,6 114,10 @@
  "app_settings_phone_modes": "Phone Modes",
  "app_settings_security": "Security",
  "app_settings_language": "Language",
  "app_settings_about_your_pure": "About your Pure",
  "app_settings_technical_information": "Technical Information",
  "app_settings_certification": "Certification",
  "app_settings_sar": "SAR",
  "app_settings_about": "About Mudita Pure",
  "app_settings_title_languages": "Language Selection",
  "app_settings_language_english": "English",

M image/assets/lang/Polski.json => image/assets/lang/Polski.json +4 -0
@@ 117,6 117,10 @@
  "app_settings_phone_modes": "Tryby Pracy",
  "app_settings_security": "Bezpieczeństwo",
  "app_settings_language": "Język",
  "app_settings_about_your_pure": "O Twoim Pure",
  "app_settings_technical_information": "Informacja Techniczne",
  "app_settings_certification": "Certyfikacja",
  "app_settings_sar": "SAR",
  "app_settings_about": "O Mudita Pure",
  "app_settings_title_languages": "Wybór Języka",
  "app_settings_language_english": "Angielski",

M image/assets/lang/Svenska.json => image/assets/lang/Svenska.json +2 -0
@@ 372,7 372,9 @@
  "app_settings_language": "Språk",
  "app_settings_factory_reset": "Återställ fabriksinställningar",
  "app_settings_about_your_pure": "Om din Pure",
  "app_settings_technical_information": "Teknisk information",
  "app_settings_certification": "Certifiering",
  "app_settings_sar": "SAR",
  "app_settings_about": "Om Mudita Pure",
  "app_settings_title_languages": "Språkval",
  "app_settings_language_english": "Engelska",

M module-apps/application-settings-new/ApplicationSettings.cpp => module-apps/application-settings-new/ApplicationSettings.cpp +4 -0
@@ 41,6 41,7 @@
#include "windows/DoNotDisturbWindow.hpp"
#include "windows/OfflineWindow.hpp"
#include "windows/ConnectionFrequencyWindow.hpp"
#include "windows/AboutYourPureWindow.hpp"

#include "Dialog.hpp"
#include "DialogMetadataMessage.hpp"


@@ 442,6 443,9 @@ namespace app
        windowsFactory.attach(gui::window::name::date_and_time, [](Application *app, const std::string &name) {
            return std::make_unique<gui::DateAndTimeMainWindow>(app);
        });
        windowsFactory.attach(gui::window::name::about_your_pure, [](Application *app, const std::string &name) {
            return std::make_unique<gui::AboutYourPureWindow>(app);
        });
        windowsFactory.attach(gui::window::name::change_time_zone, [](Application *app, const std::string &name) {
            return std::make_unique<gui::ChangeTimeZone>(app);
        });

M module-apps/application-settings-new/ApplicationSettings.hpp => module-apps/application-settings-new/ApplicationSettings.hpp +7 -5
@@ 53,11 53,13 @@ namespace gui::window::name
    inline constexpr auto dialog_settings    = "DialogSettings";
    inline constexpr auto change_passcode    = "ChangePasscode";

    inline constexpr auto languages       = "Languages";
    inline constexpr auto date_and_time   = "DateAndTime";
    inline constexpr auto factory_reset   = "FactoryReset";
    inline constexpr auto about_your_pure = "AboutYourPure";
    inline constexpr auto certification   = "Certification";
    inline constexpr auto languages             = "Languages";
    inline constexpr auto date_and_time         = "DateAndTime";
    inline constexpr auto factory_reset         = "FactoryReset";
    inline constexpr auto about_your_pure       = "AboutYourPure";
    inline constexpr auto technical_information = "TechnicalInformation";
    inline constexpr auto certification         = "Certification";
    inline constexpr auto sar                   = "Sar";

    inline constexpr auto change_date_and_time = "ChangeDateAndTime";
    inline constexpr auto change_time_zone     = "ChangeTimeZone";

M module-apps/application-settings-new/CMakeLists.txt => module-apps/application-settings-new/CMakeLists.txt +2 -0
@@ 70,6 70,7 @@ target_sources( ${PROJECT_NAME}
        windows/DoNotDisturbWindow.cpp
        windows/OfflineWindow.cpp
        windows/PhoneModesWindow.cpp
        windows/AboutYourPureWindow.cpp

    PUBLIC
        ApplicationSettings.hpp


@@ 97,6 98,7 @@ target_sources( ${PROJECT_NAME}
        windows/ChangeDateAndTimeWindow.hpp
        windows/EditQuotesWindow.hpp
        windows/QuoteCategoriesWindow.hpp
        windows/AboutYourPureWindow.hpp
)

add_dependencies(${PROJECT_NAME} version)

A module-apps/application-settings-new/windows/AboutYourPureWindow.cpp => module-apps/application-settings-new/windows/AboutYourPureWindow.cpp +38 -0
@@ 0,0 1,38 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#include "application-settings-new/ApplicationSettings.hpp"
#include "OptionSetting.hpp"
#include "AboutYourPureWindow.hpp"

namespace gui
{
    AboutYourPureWindow::AboutYourPureWindow(app::Application *app)
        : BaseSettingsWindow(app, window::name::about_your_pure)
    {
        setTitle(utils::localize.get("app_settings_about_your_pure"));
    }

    auto AboutYourPureWindow::buildOptionsList() -> std::list<Option>
    {
        std::list<Option> optionList;
        auto addOption = [&](UTF8 name, const std::string &window) {
            optionList.emplace_back(std::make_unique<option::OptionSettings>(
                utils::translateI18(name),
                [=](Item &item) {
                    LOG_INFO("switching to %s page", window.c_str());
                    application->switchWindow(window, nullptr);
                    return true;
                },
                nullptr,
                nullptr,
                option::SettingRightItem::ArrowWhite));
        };

        addOption("app_settings_technical_information", gui::window::name::technical_information);
        addOption("app_settings_certification", gui::window::name::certification);
        addOption("app_settings_sar", gui::window::name::sar);

        return optionList;
    }
} // namespace gui

A module-apps/application-settings-new/windows/AboutYourPureWindow.hpp => module-apps/application-settings-new/windows/AboutYourPureWindow.hpp +18 -0
@@ 0,0 1,18 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#pragma once

#include "BaseSettingsWindow.hpp"

namespace gui
{
    class AboutYourPureWindow : public BaseSettingsWindow
    {
      public:
        explicit AboutYourPureWindow(app::Application *app);

      private:
        auto buildOptionsList() -> std::list<Option> override;
    };
} // namespace gui

M module-apps/application-settings-new/windows/SystemMainWindow.cpp => module-apps/application-settings-new/windows/SystemMainWindow.cpp +0 -1
@@ 30,7 30,6 @@ namespace gui
        addOption("app_settings_date_and_time", gui::window::name::date_and_time);
        addOption("app_settings_factory_reset", gui::window::name::factory_reset);
        addOption("app_settings_about_your_pure", gui::window::name::about_your_pure);
        addOption("app_settings_certification", gui::window::name::certification);

        return optionList;
    }