From 2324112963e3b0c9febf338115870a6d35218add Mon Sep 17 00:00:00 2001 From: Tomasz Rybarski Date: Mon, 18 Oct 2021 16:13:47 +0200 Subject: [PATCH] [BH-999] Background Sounds Application UI Fixes Fixed Background Sounds App UI according to specification --- image/assets/lang/English.json | 4 +-- image/assets/lang/Polski.json | 36 +++++++++---------- .../data/BGSoundsStyle.hpp | 2 +- .../windows/BGSoundsPausedWindow.cpp | 3 +- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json index 4f314733a4abb1f7e087468e22a53d0d3fdef0b7..3283909fba5ea39ef4df8bde545b5cf26319a106 100644 --- a/image/assets/lang/English.json +++ b/image/assets/lang/English.json @@ -585,7 +585,7 @@ "app_bell_bedtime_notification": "It is Your bedtime", "app_bellmain_power_nap": "Power nap", "app_bellmain_meditation_timer": "Meditation timer", - "app_bellmain_background_sounds": "Background sounds", + "app_bellmain_background_sounds": "Library", "app_bellmain_settings": "Settings", "app_bellmain_main_window_title": "Bell Hybrid+", "app_bell_onboarding_welcome_message": "Mudita Harmony", @@ -705,4 +705,4 @@ "app_bell_settings_advanced_factory_reset": "Factory reset", "app_bell_settings_display_factory_reset_confirmation": "Reset to factory

settings ?", "app_bell_settings_factory_reset_finished": "Factory settings\nrestored" -} +} \ No newline at end of file diff --git a/image/assets/lang/Polski.json b/image/assets/lang/Polski.json index d549972ca9d7466f0c1bf12b3612a3c926bcc1d2..2057b0e01bd55192d7cbacf6b159270ca46e2c1f 100644 --- a/image/assets/lang/Polski.json +++ b/image/assets/lang/Polski.json @@ -592,7 +592,7 @@ "app_bell_bedtime_notification": "Pora na sen", "app_bellmain_power_nap": "Drzemka", "app_bellmain_meditation_timer": "Medytacja", - "app_bellmain_background_sounds": "Dźwięki otoczenia", + "app_bellmain_background_sounds": "Biblioteka", "app_bellmain_settings": "Ustawienia", "app_bellmain_main_window_title": "Bell Hybrid+", "app_bell_onboarding_finalize": "Dobra robota!
Obudź się z radością", @@ -625,20 +625,20 @@ "app_bell_greeting_msg": [ "Dzień dobry!
Pobudka" ], -"app_bell_alarm_set_not_active": "Ustawiono alarm.
Naciśnij głęboko, aby aktywować.", -"app_bell_background_sounds_timer_title": "Licznik czasu", -"app_bell_background_sounds_timer_off": "Wyłączony", -"app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Dzwonek wstępnego budzenia", -"app_bell_settings_alarm_settings_prewake_up_chime_bottom_description": "przed alarmem", -"app_bell_settings_alarm_settings_prewake_up_chime_tone": "Dźwięk dzwonka wstępnego budzenia", -"app_bell_settings_alarm_settings_prewake_up_chime_volume": "Głośność dzwonka wstępnego budzenia", -"app_bell_settings_alarm_settings_prewake_up_light_top_description": "Światło wstępnego budzenia", -"app_bell_settings_alarm_settings_prewake_up_finished": "Ustawiono wstępne budzenie", -"app_bell_settings_alarm_settings_tone": "Dźwięk alarmu", -"app_bell_settings_alarm_settings_volume": "Głośność alarmu", -"app_bell_settings_alarm_settings_light": "Światło alarmu", -"app_bell_settings_alarm_settings_alarm_tone_and_light_finished": "Ustawiono dźwięk i światło alarmu", -"app_bell_settings_advanced_factory_reset": "Ustawienia fabryczne", -"app_bell_settings_display_factory_reset_confirmation": "Przywrócić ustawienia

fabryczne ?", -"app_bell_settings_factory_reset_finished": "Ustawienia fabryczne\nprzywrócone" -} + "app_bell_alarm_set_not_active": "Ustawiono alarm.
Naciśnij głęboko, aby aktywować.", + "app_bell_background_sounds_timer_title": "Licznik czasu", + "app_bell_background_sounds_timer_off": "Wyłączony", + "app_bell_settings_alarm_settings_prewake_up_chime_top_description": "Dzwonek wstępnego budzenia", + "app_bell_settings_alarm_settings_prewake_up_chime_bottom_description": "przed alarmem", + "app_bell_settings_alarm_settings_prewake_up_chime_tone": "Dźwięk dzwonka wstępnego budzenia", + "app_bell_settings_alarm_settings_prewake_up_chime_volume": "Głośność dzwonka wstępnego budzenia", + "app_bell_settings_alarm_settings_prewake_up_light_top_description": "Światło wstępnego budzenia", + "app_bell_settings_alarm_settings_prewake_up_finished": "Ustawiono wstępne budzenie", + "app_bell_settings_alarm_settings_tone": "Dźwięk alarmu", + "app_bell_settings_alarm_settings_volume": "Głośność alarmu", + "app_bell_settings_alarm_settings_light": "Światło alarmu", + "app_bell_settings_alarm_settings_alarm_tone_and_light_finished": "Ustawiono dźwięk i światło alarmu", + "app_bell_settings_advanced_factory_reset": "Ustawienia fabryczne", + "app_bell_settings_display_factory_reset_confirmation": "Przywrócić ustawienia

fabryczne ?", + "app_bell_settings_factory_reset_finished": "Ustawienia fabryczne\nprzywrócone" +} \ No newline at end of file diff --git a/products/BellHybrid/apps/application-bell-background-sounds/data/BGSoundsStyle.hpp b/products/BellHybrid/apps/application-bell-background-sounds/data/BGSoundsStyle.hpp index fa9235a002a5a4a8dbb477b080e56bc381c992f4..ad5914f302cb6af59c3fc7bdc05f08269e0c3779 100644 --- a/products/BellHybrid/apps/application-bell-background-sounds/data/BGSoundsStyle.hpp +++ b/products/BellHybrid/apps/application-bell-background-sounds/data/BGSoundsStyle.hpp @@ -7,7 +7,7 @@ namespace gui::bgSoundsStyle { - inline constexpr auto descriptionFont = style::window::font::verybiglight; + inline constexpr auto descriptionFont = style::window::font::verybig; inline constexpr auto titleFont = style::window::font::largelight; inline constexpr auto timerValueFont = style::window::font::supersizemelight; inline constexpr auto valumeValueFont = style::window::font::supersizemelight; diff --git a/products/BellHybrid/apps/application-bell-background-sounds/windows/BGSoundsPausedWindow.cpp b/products/BellHybrid/apps/application-bell-background-sounds/windows/BGSoundsPausedWindow.cpp index b7e8634041541e44455293acbd0b2439668ce504..1c2ef4d36f9fdee4490d4df6f2f6cd36761b8d21 100644 --- a/products/BellHybrid/apps/application-bell-background-sounds/windows/BGSoundsPausedWindow.cpp +++ b/products/BellHybrid/apps/application-bell-background-sounds/windows/BGSoundsPausedWindow.cpp @@ -23,8 +23,9 @@ namespace gui { AppWindow::buildInterface(); + statusBar->setVisible(false); auto body = new gui::VBox(this, 0, 0, style::window_width, style::window_height); - body->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center)); + body->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Bottom)); new gui::Image(body, "big_pause_W_G");