Fix merge issues, adjust font size and initial screen

2024-12-05 17:19:34 -08:00
parent a550d64789
commit d8c86882da
19 changed files with 18 additions and 2016 deletions
--- a/src/displayapp/screens/settings/SettingTimeFormat.cpp
+++ b/src/displayapp/screens/settings/SettingTimeFormat.cpp
@@ -16,7 +16,7 @@ namespace {
  constexpr std::array<Option, 3> options = {{
    {Pinetime::Controllers::Settings::ClockType::H12, "12-hour"},
    {Pinetime::Controllers::Settings::ClockType::H24, "24-hour"},
-    {Pinetime::Controllers::Settings::ClockType::Fuzzy, "Fuzzy"},
+    {Pinetime::Controllers::Settings::ClockType::FUZZY, "Fuzzy"},
  }};

  std::array<CheckboxList::Item, CheckboxList::MaxItems> CreateOptionArray() {