settings: Add settings item for weather format
This commit is contained in:
parent
c04813b6d3
commit
d889f3e444
|
@ -405,6 +405,7 @@ list(APPEND SOURCE_FILES
|
||||||
displayapp/screens/settings/Settings.cpp
|
displayapp/screens/settings/Settings.cpp
|
||||||
displayapp/screens/settings/SettingWatchFace.cpp
|
displayapp/screens/settings/SettingWatchFace.cpp
|
||||||
displayapp/screens/settings/SettingTimeFormat.cpp
|
displayapp/screens/settings/SettingTimeFormat.cpp
|
||||||
|
displayapp/screens/settings/SettingWeatherFormat.cpp
|
||||||
displayapp/screens/settings/SettingWakeUp.cpp
|
displayapp/screens/settings/SettingWakeUp.cpp
|
||||||
displayapp/screens/settings/SettingDisplay.cpp
|
displayapp/screens/settings/SettingDisplay.cpp
|
||||||
displayapp/screens/settings/SettingSteps.cpp
|
displayapp/screens/settings/SettingSteps.cpp
|
||||||
|
|
|
@ -10,6 +10,7 @@ namespace Pinetime {
|
||||||
class Settings {
|
class Settings {
|
||||||
public:
|
public:
|
||||||
enum class ClockType : uint8_t { H24, H12 };
|
enum class ClockType : uint8_t { H24, H12 };
|
||||||
|
enum class WeatherFormat : uint8_t { Metric, Imperial };
|
||||||
enum class Notification : uint8_t { On, Off, Sleep };
|
enum class Notification : uint8_t { On, Off, Sleep };
|
||||||
enum class ChimesOption : uint8_t { None, Hours, HalfHours };
|
enum class ChimesOption : uint8_t { None, Hours, HalfHours };
|
||||||
enum class WakeUpMode : uint8_t { SingleTap = 0, DoubleTap = 1, RaiseWrist = 2, Shake = 3, LowerWrist = 4 };
|
enum class WakeUpMode : uint8_t { SingleTap = 0, DoubleTap = 1, RaiseWrist = 2, Shake = 3, LowerWrist = 4 };
|
||||||
|
@ -180,6 +181,17 @@ namespace Pinetime {
|
||||||
return settings.clockType;
|
return settings.clockType;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void SetWeatherFormat(WeatherFormat weatherFormat) {
|
||||||
|
if (weatherFormat != settings.weatherFormat) {
|
||||||
|
settingsChanged = true;
|
||||||
|
}
|
||||||
|
settings.weatherFormat = weatherFormat;
|
||||||
|
};
|
||||||
|
|
||||||
|
WeatherFormat GetWeatherFormat() const {
|
||||||
|
return settings.weatherFormat;
|
||||||
|
};
|
||||||
|
|
||||||
void SetNotificationStatus(Notification status) {
|
void SetNotificationStatus(Notification status) {
|
||||||
if (status != settings.notificationStatus) {
|
if (status != settings.notificationStatus) {
|
||||||
settingsChanged = true;
|
settingsChanged = true;
|
||||||
|
@ -274,7 +286,7 @@ namespace Pinetime {
|
||||||
private:
|
private:
|
||||||
Pinetime::Controllers::FS& fs;
|
Pinetime::Controllers::FS& fs;
|
||||||
|
|
||||||
static constexpr uint32_t settingsVersion = 0x0006;
|
static constexpr uint32_t settingsVersion = 0x0007;
|
||||||
|
|
||||||
struct SettingsData {
|
struct SettingsData {
|
||||||
uint32_t version = settingsVersion;
|
uint32_t version = settingsVersion;
|
||||||
|
@ -282,6 +294,7 @@ namespace Pinetime {
|
||||||
uint32_t screenTimeOut = 15000;
|
uint32_t screenTimeOut = 15000;
|
||||||
|
|
||||||
ClockType clockType = ClockType::H24;
|
ClockType clockType = ClockType::H24;
|
||||||
|
WeatherFormat weatherFormat = WeatherFormat::Metric;
|
||||||
Notification notificationStatus = Notification::On;
|
Notification notificationStatus = Notification::On;
|
||||||
|
|
||||||
Pinetime::Applications::WatchFace watchFace = Pinetime::Applications::WatchFace::Digital;
|
Pinetime::Applications::WatchFace watchFace = Pinetime::Applications::WatchFace::Digital;
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
#include "displayapp/screens/settings/Settings.h"
|
#include "displayapp/screens/settings/Settings.h"
|
||||||
#include "displayapp/screens/settings/SettingWatchFace.h"
|
#include "displayapp/screens/settings/SettingWatchFace.h"
|
||||||
#include "displayapp/screens/settings/SettingTimeFormat.h"
|
#include "displayapp/screens/settings/SettingTimeFormat.h"
|
||||||
|
#include "displayapp/screens/settings/SettingWeatherFormat.h"
|
||||||
#include "displayapp/screens/settings/SettingWakeUp.h"
|
#include "displayapp/screens/settings/SettingWakeUp.h"
|
||||||
#include "displayapp/screens/settings/SettingDisplay.h"
|
#include "displayapp/screens/settings/SettingDisplay.h"
|
||||||
#include "displayapp/screens/settings/SettingSteps.h"
|
#include "displayapp/screens/settings/SettingSteps.h"
|
||||||
|
@ -498,6 +499,9 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
|
||||||
case Apps::SettingTimeFormat:
|
case Apps::SettingTimeFormat:
|
||||||
currentScreen = std::make_unique<Screens::SettingTimeFormat>(settingsController);
|
currentScreen = std::make_unique<Screens::SettingTimeFormat>(settingsController);
|
||||||
break;
|
break;
|
||||||
|
case Apps::SettingWeatherFormat:
|
||||||
|
currentScreen = std::make_unique<Screens::SettingWeatherFormat>(settingsController);
|
||||||
|
break;
|
||||||
case Apps::SettingWakeUp:
|
case Apps::SettingWakeUp:
|
||||||
currentScreen = std::make_unique<Screens::SettingWakeUp>(settingsController);
|
currentScreen = std::make_unique<Screens::SettingWakeUp>(settingsController);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -32,6 +32,7 @@ namespace Pinetime {
|
||||||
Settings,
|
Settings,
|
||||||
SettingWatchFace,
|
SettingWatchFace,
|
||||||
SettingTimeFormat,
|
SettingTimeFormat,
|
||||||
|
SettingWeatherFormat,
|
||||||
SettingDisplay,
|
SettingDisplay,
|
||||||
SettingWakeUp,
|
SettingWakeUp,
|
||||||
SettingSteps,
|
SettingSteps,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"file": "FontAwesome5-Solid+Brands+Regular.woff",
|
"file": "FontAwesome5-Solid+Brands+Regular.woff",
|
||||||
"range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c"
|
"range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf743"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"bpp": 1,
|
"bpp": 1,
|
||||||
|
|
63
src/displayapp/screens/settings/SettingWeatherFormat.cpp
Normal file
63
src/displayapp/screens/settings/SettingWeatherFormat.cpp
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
#include "displayapp/screens/settings/SettingWeatherFormat.h"
|
||||||
|
|
||||||
|
#include <lvgl/lvgl.h>
|
||||||
|
|
||||||
|
#include "displayapp/DisplayApp.h"
|
||||||
|
#include "displayapp/screens/Styles.h"
|
||||||
|
#include "displayapp/screens/Screen.h"
|
||||||
|
#include "displayapp/screens/Symbols.h"
|
||||||
|
|
||||||
|
using namespace Pinetime::Applications::Screens;
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
struct Option {
|
||||||
|
Pinetime::Controllers::Settings::WeatherFormat weatherFormat;
|
||||||
|
const char* name;
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr std::array<Option, 2> options = {{
|
||||||
|
{Pinetime::Controllers::Settings::WeatherFormat::Metric, "Metric"},
|
||||||
|
{Pinetime::Controllers::Settings::WeatherFormat::Imperial, "Imperial"},
|
||||||
|
}};
|
||||||
|
|
||||||
|
std::array<CheckboxList::Item, CheckboxList::MaxItems> CreateOptionArray() {
|
||||||
|
std::array<Pinetime::Applications::Screens::CheckboxList::Item, CheckboxList::MaxItems> optionArray;
|
||||||
|
for (size_t i = 0; i < CheckboxList::MaxItems; i++) {
|
||||||
|
if (i >= options.size()) {
|
||||||
|
optionArray[i].name = "";
|
||||||
|
optionArray[i].enabled = false;
|
||||||
|
} else {
|
||||||
|
optionArray[i].name = options[i].name;
|
||||||
|
optionArray[i].enabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return optionArray;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t GetDefaultOption(Pinetime::Controllers::Settings::WeatherFormat currentOption) {
|
||||||
|
for (size_t i = 0; i < options.size(); i++) {
|
||||||
|
if (options[i].weatherFormat == currentOption) {
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
SettingWeatherFormat::SettingWeatherFormat(Pinetime::Controllers::Settings& settingsController)
|
||||||
|
: checkboxList(
|
||||||
|
0,
|
||||||
|
1,
|
||||||
|
"Weather format",
|
||||||
|
Symbols::clock,
|
||||||
|
GetDefaultOption(settingsController.GetWeatherFormat()),
|
||||||
|
[&settings = settingsController](uint32_t index) {
|
||||||
|
settings.SetWeatherFormat(options[index].weatherFormat);
|
||||||
|
settings.SaveSettings();
|
||||||
|
},
|
||||||
|
CreateOptionArray()) {
|
||||||
|
}
|
||||||
|
|
||||||
|
SettingWeatherFormat::~SettingWeatherFormat() {
|
||||||
|
lv_obj_clean(lv_scr_act());
|
||||||
|
}
|
26
src/displayapp/screens/settings/SettingWeatherFormat.h
Normal file
26
src/displayapp/screens/settings/SettingWeatherFormat.h
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
#include <cstdint>
|
||||||
|
#include <lvgl/lvgl.h>
|
||||||
|
|
||||||
|
#include "components/settings/Settings.h"
|
||||||
|
#include "displayapp/screens/Screen.h"
|
||||||
|
#include "displayapp/screens/CheckboxList.h"
|
||||||
|
|
||||||
|
namespace Pinetime {
|
||||||
|
|
||||||
|
namespace Applications {
|
||||||
|
namespace Screens {
|
||||||
|
|
||||||
|
class SettingWeatherFormat : public Screen {
|
||||||
|
public:
|
||||||
|
explicit SettingWeatherFormat(Pinetime::Controllers::Settings& settingsController);
|
||||||
|
~SettingWeatherFormat() override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
CheckboxList checkboxList;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -29,7 +29,7 @@ namespace Pinetime {
|
||||||
static constexpr int entriesPerScreen = 4;
|
static constexpr int entriesPerScreen = 4;
|
||||||
|
|
||||||
// Increment this when more space is needed
|
// Increment this when more space is needed
|
||||||
static constexpr int nScreens = 3;
|
static constexpr int nScreens = 4;
|
||||||
|
|
||||||
static constexpr std::array<List::Applications, entriesPerScreen * nScreens> entries {{
|
static constexpr std::array<List::Applications, entriesPerScreen * nScreens> entries {{
|
||||||
{Symbols::sun, "Display", Apps::SettingDisplay},
|
{Symbols::sun, "Display", Apps::SettingDisplay},
|
||||||
|
@ -39,12 +39,14 @@ namespace Pinetime {
|
||||||
|
|
||||||
{Symbols::shoe, "Steps", Apps::SettingSteps},
|
{Symbols::shoe, "Steps", Apps::SettingSteps},
|
||||||
{Symbols::clock, "Date&Time", Apps::SettingSetDateTime},
|
{Symbols::clock, "Date&Time", Apps::SettingSetDateTime},
|
||||||
|
{Symbols::cloudSunRain, "Weather", Apps::SettingWeatherFormat},
|
||||||
{Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
|
{Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
|
||||||
{Symbols::clock, "Chimes", Apps::SettingChimes},
|
|
||||||
|
|
||||||
|
{Symbols::clock, "Chimes", Apps::SettingChimes},
|
||||||
{Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
|
{Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
|
||||||
{Symbols::check, "Firmware", Apps::FirmwareValidation},
|
{Symbols::check, "Firmware", Apps::FirmwareValidation},
|
||||||
{Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth},
|
{Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth},
|
||||||
|
|
||||||
{Symbols::list, "About", Apps::SysInfo},
|
{Symbols::list, "About", Apps::SysInfo},
|
||||||
|
|
||||||
// {Symbols::none, "None", Apps::None},
|
// {Symbols::none, "None", Apps::None},
|
||||||
|
|
Loading…
Reference in New Issue
Block a user