will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aod: simplify AOD disablement based on notification status

Browse Source
This commit is contained in:
mark9064 2024-07-21 15:52:35 +01:00 committed by JF
parent a407902b06
commit 53dc9dafe7
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/components/settings/Settings.h
View File

@ -196,14 +196,6 @@ namespace Pinetime {
if (status != settings.notificationStatus) { if (status != settings.notificationStatus) {
settingsChanged = true; settingsChanged = true;
} }
// Disable always on screen while sleep mode is enabled
if (settings.alwaysOnDisplay.enabled) {
if (status == Notification::Sleep) {
settings.alwaysOnDisplay.state = false;
} else {
settings.alwaysOnDisplay.state = true;
}
}
settings.notificationStatus = status; settings.notificationStatus = status;
}; };
@ -222,31 +214,19 @@ namespace Pinetime {
return settings.screenTimeOut; return settings.screenTimeOut;
}; };
void SetAlwaysOnDisplay(bool state) {
if (state != settings.alwaysOnDisplay.state) {
settingsChanged = true;
}
settings.alwaysOnDisplay.state = state;
};
bool GetAlwaysOnDisplay() const { bool GetAlwaysOnDisplay() const {
return settings.alwaysOnDisplay.state; return settings.alwaysOnDisplay && GetNotificationStatus() != Notification::Sleep;
}; };
void SetAlwaysOnDisplaySetting(bool state) { void SetAlwaysOnDisplaySetting(bool state) {
if (state != settings.alwaysOnDisplay.enabled) { if (state != settings.alwaysOnDisplay) {
settingsChanged = true; settingsChanged = true;
} }
settings.alwaysOnDisplay.enabled = state; settings.alwaysOnDisplay = state;
// Don't enable always on if we are currently in notification sleep
if (GetNotificationStatus() != Notification::Sleep) {
SetAlwaysOnDisplay(state);
}
} }
bool GetAlwaysOnDisplaySetting() const { bool GetAlwaysOnDisplaySetting() const {
return settings.alwaysOnDisplay.enabled; return settings.alwaysOnDisplay;
} }
void SetShakeThreshold(uint16_t thresh) { void SetShakeThreshold(uint16_t thresh) {
@ -323,19 +303,12 @@ namespace Pinetime {
static constexpr uint32_t settingsVersion = 0x0008; static constexpr uint32_t settingsVersion = 0x0008;
// To enable disabling it during notification sleep, differentiate between
// the setting being on, and the setting being set by the user
struct alwaysOnDisplayData {
bool enabled = false;
bool state = false;
};
struct SettingsData { struct SettingsData {
uint32_t version = settingsVersion; uint32_t version = settingsVersion;
uint32_t stepsGoal = 10000; uint32_t stepsGoal = 10000;
uint32_t screenTimeOut = 15000; uint32_t screenTimeOut = 15000;
alwaysOnDisplayData alwaysOnDisplay; bool alwaysOnDisplay = false;
ClockType clockType = ClockType::H24; ClockType clockType = ClockType::H24;
WeatherFormat weatherFormat = WeatherFormat::Metric; WeatherFormat weatherFormat = WeatherFormat::Metric;