Skip to content

Commit bfedf47

Browse files
Riksu9000JF002
authored andcommitted
Optimize SettingWatchFace
1 parent 99b5b49 commit bfedf47

File tree

2 files changed

+41
-40
lines changed

2 files changed

+41
-40
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
#include "displayapp/screens/settings/SettingWatchFace.h"
22
#include <lvgl/lvgl.h>
33
#include "displayapp/DisplayApp.h"
4-
#include "displayapp/screens/CheckboxList.h"
54
#include "displayapp/screens/Screen.h"
65
#include "components/settings/Settings.h"
7-
#include "displayapp/screens/WatchFaceInfineat.h"
8-
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
96

107
using namespace Pinetime::Applications::Screens;
118

129
constexpr const char* SettingWatchFace::title;
1310
constexpr const char* SettingWatchFace::symbol;
1411

12+
auto SettingWatchFace::CreateScreenList() const {
13+
std::array<std::function<std::unique_ptr<Screen>()>, nScreens> screens;
14+
for (size_t i = 0; i < screens.size(); i++) {
15+
screens[i] = [this, i]() -> std::unique_ptr<Screen> {
16+
return CreateScreen(i);
17+
};
18+
}
19+
return screens;
20+
}
21+
1522
SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app,
1623
Pinetime::Controllers::Settings& settingsController,
1724
Pinetime::Controllers::FS& filesystem)
1825
: Screen(app),
1926
settingsController {settingsController},
2027
filesystem {filesystem},
21-
screens {app,
22-
0,
23-
{[this]() -> std::unique_ptr<Screen> {
24-
return CreateScreen1();
25-
},
26-
[this]() -> std::unique_ptr<Screen> {
27-
return CreateScreen2();
28-
}},
29-
Screens::ScreenListModes::UpDown} {
28+
screens {app, 0, CreateScreenList(), Screens::ScreenListModes::UpDown} {
3029
}
3130

3231
SettingWatchFace::~SettingWatchFace() {
@@ -37,32 +36,15 @@ bool SettingWatchFace::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
3736
return screens.OnTouchEvent(event);
3837
}
3938

40-
std::unique_ptr<Screen> SettingWatchFace::CreateScreen1() {
41-
std::array<Screens::CheckboxList::Item, 4> watchfaces {
42-
{{"Digital face", true}, {"Analog face", true}, {"PineTimeStyle", true}, {"Terminal", true}}};
43-
return std::make_unique<Screens::CheckboxList>(
44-
0,
45-
2,
46-
app,
47-
title,
48-
symbol,
49-
settingsController.GetClockFace(),
50-
[&settings = settingsController](uint32_t clockFace) {
51-
settings.SetClockFace(clockFace);
52-
settings.SaveSettings();
53-
},
54-
watchfaces);
55-
}
39+
std::unique_ptr<Screen> SettingWatchFace::CreateScreen(unsigned int screenNum) const {
40+
std::array<Screens::CheckboxList::Item, settingsPerScreen> watchfacesOnThisScreen;
41+
for (int i = 0; i < settingsPerScreen; i++) {
42+
watchfacesOnThisScreen[i] = watchfaces[screenNum * settingsPerScreen + i];
43+
}
5644

57-
std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() {
58-
std::array<Screens::CheckboxList::Item, 4> watchfaces {
59-
{{"Infineat face", Applications::Screens::WatchFaceInfineat::IsAvailable(filesystem)},
60-
{"Casio G7710", Applications::Screens::WatchFaceCasioStyleG7710::IsAvailable(filesystem)},
61-
{"", false},
62-
{"", false}}};
6345
return std::make_unique<Screens::CheckboxList>(
64-
1,
65-
2,
46+
screenNum,
47+
nScreens,
6648
app,
6749
title,
6850
symbol,
@@ -71,5 +53,5 @@ std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() {
7153
settings.SetClockFace(clockFace);
7254
settings.SaveSettings();
7355
},
74-
watchfaces);
56+
watchfacesOnThisScreen);
7557
}

src/displayapp/screens/settings/SettingWatchFace.h

+22-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
#include "components/settings/Settings.h"
99
#include "displayapp/screens/Screen.h"
1010
#include "displayapp/screens/Symbols.h"
11+
#include "displayapp/screens/CheckboxList.h"
12+
#include "displayapp/screens/WatchFaceInfineat.h"
13+
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
1114

1215
namespace Pinetime {
1316

@@ -22,14 +25,30 @@ namespace Pinetime {
2225
bool OnTouchEvent(TouchEvents event) override;
2326

2427
private:
28+
auto CreateScreenList() const;
29+
std::unique_ptr<Screen> CreateScreen(unsigned int screenNum) const;
30+
2531
Controllers::Settings& settingsController;
2632
Pinetime::Controllers::FS& filesystem;
27-
ScreenList<2> screens;
2833

2934
static constexpr const char* title = "Watch face";
3035
static constexpr const char* symbol = Symbols::home;
31-
std::unique_ptr<Screen> CreateScreen1();
32-
std::unique_ptr<Screen> CreateScreen2();
36+
37+
static constexpr int settingsPerScreen = 4;
38+
39+
// Increment this when more space is needed
40+
static constexpr int nScreens = 2;
41+
42+
std::array<Screens::CheckboxList::Item, settingsPerScreen * nScreens> watchfaces {
43+
{{"Digital face", true},
44+
{"Analog face", true},
45+
{"PineTimeStyle", true},
46+
{"Terminal", true},
47+
{"Infineat face", Applications::Screens::WatchFaceInfineat::IsAvailable(filesystem)},
48+
{"Casio G7710", Applications::Screens::WatchFaceCasioStyleG7710::IsAvailable(filesystem)},
49+
{"", false},
50+
{"", false}}};
51+
ScreenList<nScreens> screens;
3352
};
3453
}
3554
}

0 commit comments

Comments
 (0)