summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/settings/Settings.h
diff options
context:
space:
mode:
authordavidpkj <davidpenkow1@gmail.com>2023-01-24 21:24:28 +0100
committerdavidpkj <davidpenkow1@gmail.com>2023-01-24 21:24:28 +0100
commitc95a80f4e46e2942bf295ae17f4c7eae27e8495b (patch)
tree5fc23d3be1352c048cf39bcfeca33e5cef498e75 /src/displayapp/screens/settings/Settings.h
parenta3e14c012d76fc8f7ad4c16ad9dc67e8995ce10e (diff)
parent52f3310d0077a352ade7e1f9df6a1d201ee0c631 (diff)
merged ui-cleaning into develop
Diffstat (limited to 'src/displayapp/screens/settings/Settings.h')
-rw-r--r--src/displayapp/screens/settings/Settings.h15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h
index b88c13b7..101e81fb 100644
--- a/src/displayapp/screens/settings/Settings.h
+++ b/src/displayapp/screens/settings/Settings.h
@@ -28,29 +28,18 @@ namespace Pinetime {
static constexpr int entriesPerScreen = 4;
// Increment this when more space is needed
- static constexpr int nScreens = 3;
+ static constexpr int nScreens = 2;
static constexpr std::array<List::Applications, entriesPerScreen * nScreens> entries {{
{Symbols::sun, "Display", Apps::SettingDisplay},
{Symbols::eye, "Wake Up", Apps::SettingWakeUp},
- {Symbols::clock, "Time format", Apps::SettingTimeFormat},
+ {Symbols::clock, "Date & Time", Apps::SettingSetDateTime},
{Symbols::home, "Watch face", Apps::SettingWatchFace},
{Symbols::shoe, "Steps", Apps::SettingSteps},
- {Symbols::clock, "Date&Time", Apps::SettingSetDateTime},
{Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
- {Symbols::clock, "Chimes", Apps::SettingChimes},
-
- {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
{Symbols::check, "Firmware", Apps::FirmwareValidation},
{Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth},
- {Symbols::list, "About", Apps::SysInfo},
-
- // {Symbols::none, "None", Apps::None},
- // {Symbols::none, "None", Apps::None},
- // {Symbols::none, "None", Apps::None},
- // {Symbols::none, "None", Apps::None},
-
}};
ScreenList<nScreens> screens;
};