From 07fb74f1712d2610d8ee891b0234825f846143e8 Mon Sep 17 00:00:00 2001 From: Dawid Wojtas Date: Wed, 14 Dec 2022 09:02:40 +0100 Subject: [PATCH] [BH-1618] Fix the wrong front light on the back action If the user changes the front light intensity in pre-wake up or main alarm and then going back the front light value and intensity are the same. --- harmony_changelog.md | 1 + .../models/alarm_settings/AlarmSettingsListItemProvider.cpp | 5 ++--- .../models/alarm_settings/PrewakeUpListItemProvider.cpp | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/harmony_changelog.md b/harmony_changelog.md index fa6aee060a9dfcc108791ae88b1124cf0791e00d..3e8517e3941a0baa4c0a053995a6e011bf071b14 100644 --- a/harmony_changelog.md +++ b/harmony_changelog.md @@ -4,6 +4,7 @@ ### Fixed * Fixed displayed device name when connected to Windows +* Fixed the wrong front light on back action in alarms ### Added diff --git a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.cpp b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.cpp index a6ab86c9ecdc4c2294cb5a45088a5d3ff8abaf4d..92e21020663b0c5be88c910ab8e944063847b62c 100644 --- a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.cpp +++ b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/AlarmSettingsListItemProvider.cpp @@ -97,10 +97,9 @@ namespace app::bell_settings } }); - brightness->onEnter = [this]() { - auto brightness = settingsModel.getBrightness().getValue(); + brightness->onEnter = [this, brightness]() { if (onFrontlightEnter) { - onFrontlightEnter(brightness); + onFrontlightEnter(brightness->value()); } }; diff --git a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/PrewakeUpListItemProvider.cpp b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/PrewakeUpListItemProvider.cpp index 39b729f8c0e0dfd5118c41d67ca6ed08cc08f4cd..46254fbab8a8059e1835ac7cf980ca279fba67eb 100644 --- a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/PrewakeUpListItemProvider.cpp +++ b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/PrewakeUpListItemProvider.cpp @@ -130,10 +130,9 @@ namespace app::bell_settings } }); - brightness->onEnter = [this]() { - auto brightness = settingsModel.getBrightness().getValue(); + brightness->onEnter = [this, brightness]() { if (onFrontlightEnter) { - onFrontlightEnter(brightness); + onFrontlightEnter(brightness->value()); } };