CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged upstream

Browse Source
This commit is contained in:
panky-codes
2021-03-20 22:45:29 +01:00
parent 754ac23304 a3ff2e46ca
commit 5345650880
76 changed files with 4995 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/displayapp/screens/ApplicationList.cpp
View File

@@ -8,13 +8,18 @@
using namespace Pinetime::Applications::Screens;
ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp *app) :
ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp *app,
Pinetime::Controllers::Settings &settingsController) :
Screen(app),
screens{app, {
settingsController{settingsController},
screens{app,
settingsController.GetAppMenu(),
{
[this]() -> std::unique_ptr<Screen> { return CreateScreen1(); },
[this]() -> std::unique_ptr<Screen> { return CreateScreen2(); },
//[this]() -> std::unique_ptr<Screen> { return CreateScreen3(); }
}
},
Screens::ScreenListModes::UpDown
} {}
@@ -51,7 +56,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
};
return std::unique_ptr<Screen>(new Screens::Tile(app, applications));
return std::unique_ptr<Screen>(new Screens::Tile(0, app, settingsController, applications));
}
std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
@@ -65,7 +70,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
}
};
return std::unique_ptr<Screen>(new Screens::Tile(app, applications));
return std::unique_ptr<Screen>(new Screens::Tile(1, app, settingsController, applications));
}
std::unique_ptr<Screen> ApplicationList::CreateScreen3() {
@@ -79,6 +84,6 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen3() {
}
};
return std::unique_ptr<Screen>(new Screens::Tile(app, applications));
return std::unique_ptr<Screen>(new Screens::Tile(2, app, settingsController, applications));
}