15b3b8e282
# Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/DisplayApp.h # src/displayapp/lv_pinetime_theme.c # src/displayapp/screens/ApplicationList.cpp # src/drivers/TwiMaster.cpp # src/systemtask/SystemTask.h
88 lines
2.9 KiB
C++
88 lines
2.9 KiB
C++
#include "ApplicationList.h"
|
|
#include <lvgl/lvgl.h>
|
|
#include <array>
|
|
#include "Symbols.h"
|
|
#include "Tile.h"
|
|
#include "displayapp/Apps.h"
|
|
#include "../DisplayApp.h"
|
|
|
|
using namespace Pinetime::Applications::Screens;
|
|
|
|
ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp *app,
|
|
Pinetime::Controllers::Settings &settingsController,
|
|
Pinetime::Controllers::Battery& batteryController,
|
|
Controllers::DateTime& dateTimeController) :
|
|
Screen(app),
|
|
settingsController{settingsController},
|
|
batteryController{batteryController},
|
|
dateTimeController{dateTimeController},
|
|
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
|
|
} {}
|
|
|
|
|
|
ApplicationList::~ApplicationList() {
|
|
lv_obj_clean(lv_scr_act());
|
|
}
|
|
|
|
bool ApplicationList::Refresh() {
|
|
if(running)
|
|
running = screens.Refresh();
|
|
return running;
|
|
}
|
|
|
|
bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
|
|
return screens.OnTouchEvent(event);
|
|
}
|
|
|
|
std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
|
|
std::array<Screens::Tile::Applications, 6> applications {
|
|
{
|
|
{Symbols::stopWatch, Apps::StopWatch},
|
|
{Symbols::music, Apps::Music},
|
|
{Symbols::map, Apps::Navigation},
|
|
{Symbols::shoe, Apps::Motion},
|
|
{Symbols::heartBeat, Apps::HeartRate},
|
|
{"", Apps::None},
|
|
}
|
|
};
|
|
|
|
return std::make_unique<Screens::Tile>(0, 2, app, settingsController, batteryController, dateTimeController, applications);
|
|
}
|
|
|
|
std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
|
|
std::array<Screens::Tile::Applications, 6> applications {
|
|
{
|
|
{Symbols::paintbrush, Apps::Paint},
|
|
{Symbols::paddle, Apps::Paddle},
|
|
{"2", Apps::Twos},
|
|
{"", Apps::None},
|
|
{"", Apps::None},
|
|
{"", Apps::None},
|
|
}
|
|
};
|
|
|
|
return std::make_unique<Screens::Tile>(1, 2, app, settingsController, batteryController, dateTimeController, applications);
|
|
}
|
|
|
|
/*std::unique_ptr<Screen> ApplicationList::CreateScreen3() {
|
|
std::array<Screens::Tile::Applications, 6> applications {
|
|
{{"A", Apps::Meter},
|
|
{"B", Apps::Navigation},
|
|
{"C", Apps::Clock},
|
|
{"D", Apps::Music},
|
|
{"E", Apps::SysInfo},
|
|
{"F", Apps::Brightness}
|
|
}
|
|
};
|
|
|
|
return std::make_unique<Screens::Tile>(2, 3, app, settingsController, batteryController, dateTimeController, applications);
|
|
}*/
|
|
|