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

Changed access modified indentation

Browse Source
This commit is contained in:
Avamander
2021-04-24 12:00:45 +03:00
parent 40d45d923b
commit 6989854519
84 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/displayapp/screens/ApplicationList.h
View File

@@ -12,7 +12,7 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class ApplicationList : public Screen {
public:
public:
explicit ApplicationList(DisplayApp* app,
Pinetime::Controllers::Settings& settingsController,
Pinetime::Controllers::Battery& batteryController,
@@ -21,7 +21,7 @@ namespace Pinetime {
bool Refresh() override;
bool OnTouchEvent(TouchEvents event) override;
private:
private:
Controllers::Settings& settingsController;
Pinetime::Controllers::Battery& batteryController;
Controllers::DateTime& dateTimeController;

2
src/displayapp/screens/BatteryIcon.h
View File

@@ -4,7 +4,7 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class BatteryIcon {
public:
public:
static const char* GetUnknownIcon();
static const char* GetBatteryIcon(int batteryPercent);
static const char* GetPlugIcon(bool isCharging);

4
src/displayapp/screens/BatteryInfo.h
View File

@@ -15,7 +15,7 @@ namespace Pinetime {
namespace Screens {
class BatteryInfo : public Screen {
public:
public:
BatteryInfo(DisplayApp* app, Pinetime::Controllers::Battery& batteryController);
~BatteryInfo() override;
@@ -24,7 +24,7 @@ namespace Pinetime {
void UpdateScreen();
void UpdateAnim();
private:
private:
Pinetime::Controllers::Battery& batteryController;
lv_obj_t* voltage;

2
src/displayapp/screens/BleIcon.h
View File

@@ -4,7 +4,7 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class BleIcon {
public:
public:
static const char* GetIcon(bool isConnected);
};
}

4
src/displayapp/screens/Brightness.h
View File

@@ -9,7 +9,7 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class Brightness : public Screen {
public:
public:
Brightness(DisplayApp* app, Controllers::BrightnessController& brightness);
~Brightness() override;
bool Refresh() override;
@@ -18,7 +18,7 @@ namespace Pinetime {
void OnValueChanged();
private:
private:
Controllers::BrightnessController& brightness;
lv_obj_t* slider_label;

4
src/displayapp/screens/Clock.h
View File

@@ -23,7 +23,7 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class Clock : public Screen {
public:
public:
Clock(DisplayApp* app,
Controllers::DateTime& dateTimeController,
Controllers::Battery& batteryController,
@@ -38,7 +38,7 @@ namespace Pinetime {
bool OnTouchEvent(TouchEvents event) override;
private:
private:
Controllers::DateTime& dateTimeController;
Controllers::Battery& batteryController;
Controllers::Ble& bleController;

4
src/displayapp/screens/DropDownDemo.h
View File

@@ -9,7 +9,7 @@ namespace Pinetime {
namespace Screens {
class DropDownDemo : public Screen {
public:
public:
DropDownDemo(DisplayApp* app);
~DropDownDemo() override;
@@ -17,7 +17,7 @@ namespace Pinetime {
bool OnTouchEvent(TouchEvents event) override;
private:
private:
lv_obj_t* ddlist;
bool isDropDownOpened = false;

2
src/displayapp/screens/FirmwareUpdate.cpp
View File

@@ -8,7 +8,7 @@ using namespace Pinetime::Applications::Screens;
FirmwareUpdate::FirmwareUpdate(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Ble& bleController)
: Screen(app), bleController {bleController} {
lv_obj_t * backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
lv_obj_t* backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
lv_obj_set_size(backgroundLabel, 240, 240);
lv_obj_set_pos(backgroundLabel, 0, 0);

4
src/displayapp/screens/FirmwareUpdate.h
View File

@@ -11,13 +11,13 @@ namespace Pinetime {
namespace Screens {
class FirmwareUpdate : public Screen {
public:
public:
FirmwareUpdate(DisplayApp* app, Pinetime::Controllers::Ble& bleController);
~FirmwareUpdate() override;
bool Refresh() override;
private:
private:
enum class States { Idle, Running, Validated, Error };
Pinetime::Controllers::Ble& bleController;
lv_obj_t* bar1;

4
src/displayapp/screens/FirmwareValidation.h
View File

@@ -12,7 +12,7 @@ namespace Pinetime {
namespace Screens {
class FirmwareValidation : public Screen {
public:
public:
FirmwareValidation(DisplayApp* app, Pinetime::Controllers::FirmwareValidator& validator);
~FirmwareValidation() override;
@@ -20,7 +20,7 @@ namespace Pinetime {
void OnButtonEvent(lv_obj_t* object, lv_event_t event);
private:
private:
Pinetime::Controllers::FirmwareValidator& validator;
lv_obj_t* labelVersionInfo;

4
src/displayapp/screens/FlashLight.h
View File

@@ -12,7 +12,7 @@ namespace Pinetime {
namespace Screens {
class FlashLight : public Screen {
public:
public:
FlashLight(DisplayApp* app, System::SystemTask& systemTask, Controllers::BrightnessController& brightness);
~FlashLight() override;
@@ -21,7 +21,7 @@ namespace Pinetime {
bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
void OnClickEvent(lv_obj_t* obj, lv_event_t event);
private:
private:
Pinetime::System::SystemTask& systemTask;
Controllers::BrightnessController& brightness;

4
src/displayapp/screens/HeartRate.h
View File

@@ -16,7 +16,7 @@ namespace Pinetime {
namespace Screens {
class HeartRate : public Screen {
public:
public:
HeartRate(DisplayApp* app, Controllers::HeartRateController& HeartRateController, System::SystemTask& systemTask);
~HeartRate() override;
@@ -24,7 +24,7 @@ namespace Pinetime {
void OnStartStopEvent(lv_event_t event);
private:
private:
Controllers::HeartRateController& heartRateController;
Pinetime::System::SystemTask& systemTask;
void UpdateStartStopButton(bool isRunning);

4
src/displayapp/screens/InfiniPaint.h
View File

@@ -12,7 +12,7 @@ namespace Pinetime {
namespace Screens {
class InfiniPaint : public Screen {
public:
public:
InfiniPaint(DisplayApp* app, Pinetime::Components::LittleVgl& lvgl);
~InfiniPaint() override;
@@ -23,7 +23,7 @@ namespace Pinetime {
bool OnTouchEvent(uint16_t x, uint16_t y) override;
private:
private:
Pinetime::Components::LittleVgl& lvgl;
static constexpr uint16_t width = 10;
static constexpr uint16_t height = 10;

4
src/displayapp/screens/Label.h
View File

@@ -8,13 +8,13 @@ namespace Pinetime {
namespace Screens {
class Label : public Screen {
public:
public:
Label(uint8_t screenID, uint8_t numScreens, DisplayApp* app, lv_obj_t* labelText);
~Label() override;
bool Refresh() override;
private:
private:
bool running = true;
lv_obj_t* labelText = nullptr;

4
src/displayapp/screens/List.h
View File

@@ -13,7 +13,7 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class List : public Screen {
public:
public:
struct Applications {
const char* icon;
const char* name;
@@ -31,7 +31,7 @@ namespace Pinetime {
void OnButtonEvent(lv_obj_t* object, lv_event_t event);
private:
private:
Controllers::Settings& settingsController;
Pinetime::Applications::Apps apps[MAXLISTITEMS];

4
src/displayapp/screens/Meter.h
View File

@@ -10,13 +10,13 @@ namespace Pinetime {
namespace Screens {
class Meter : public Screen {
public:
public:
Meter(DisplayApp* app);
~Meter() override;
bool Refresh() override;
private:
private:
lv_style_t style_lmeter;
lv_obj_t* lmeter;

4
src/displayapp/screens/Motion.h
View File

@@ -13,14 +13,14 @@ namespace Pinetime {
namespace Screens {
class Motion : public Screen {
public:
public:
Motion(DisplayApp* app, Controllers::MotionController& motionController);
~Motion() override;
bool Refresh() override;
bool OnButtonPushed() override;
private:
private:
Controllers::MotionController& motionController;
lv_obj_t* chart;
lv_chart_series_t* ser1;

4
src/displayapp/screens/Music.h
View File

@@ -30,7 +30,7 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class Music : public Screen {
public:
public:
Music(DisplayApp* app, Pinetime::Controllers::MusicService& music);
~Music() override;
@@ -39,7 +39,7 @@ namespace Pinetime {
void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
private:
private:
bool OnTouchEvent(TouchEvents event);
void UpdateLength();

4
src/displayapp/screens/Navigation.h
View File

@@ -31,13 +31,13 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class Navigation : public Screen {
public:
public:
Navigation(DisplayApp* app, Pinetime::Controllers::NavigationService& nav);
~Navigation() override;
bool Refresh() override;
private:
private:
lv_obj_t* imgFlag;
lv_obj_t* txtNarrative;
lv_obj_t* txtManDist;

2
src/displayapp/screens/NotificationIcon.h
View File

@@ -4,7 +4,7 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class NotificationIcon {
public:
public:
static const char* GetIcon(bool newNotificationAvailable);
};
}

8
src/displayapp/screens/Notifications.h
View File

@@ -14,7 +14,7 @@ namespace Pinetime {
namespace Screens {
class Notifications : public Screen {
public:
public:
enum class Modes { Normal, Preview };
explicit Notifications(DisplayApp* app,
Pinetime::Controllers::NotificationManager& notificationManager,
@@ -26,7 +26,7 @@ namespace Pinetime {
bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
class NotificationItem {
public:
public:
NotificationItem(const char* title,
const char* msg,
uint8_t notifNr,
@@ -42,7 +42,7 @@ namespace Pinetime {
void OnMuteIncomingCall(lv_event_t event);
void OnRejectIncomingCall(lv_event_t event);
private:
private:
uint8_t notifNr = 0;
uint8_t notifNb = 0;
char pageText[4];
@@ -62,7 +62,7 @@ namespace Pinetime {
Pinetime::Controllers::AlertNotificationService& alertNotificationService;
};
private:
private:
struct NotificationData {
const char* title;
const char* text;

4
src/displayapp/screens/Paddle.h
View File

@@ -12,7 +12,7 @@ namespace Pinetime {
namespace Screens {
class Paddle : public Screen {
public:
public:
Paddle(DisplayApp* app, Pinetime::Components::LittleVgl& lvgl);
~Paddle() override;
@@ -21,7 +21,7 @@ namespace Pinetime {
bool OnTouchEvent(TouchEvents event) override;
bool OnTouchEvent(uint16_t x, uint16_t y) override;
private:
private:
Pinetime::Components::LittleVgl& lvgl;
int paddleBottomY = 90; // bottom extreme of the paddle

8
src/displayapp/screens/Screen.h
View File

@@ -9,7 +9,7 @@ namespace Pinetime {
namespace Screens {
template <class T> class DirtyValue {
public:
public:
DirtyValue() = default; // Use NSDMI
explicit DirtyValue(T const& v) : value {v} {
} // Use MIL and const-lvalue-ref
@@ -28,13 +28,13 @@ namespace Pinetime {
return *this;
}
private:
private:
T value {}; // NSDMI - default initialise type
bool isUpdated {true}; // NSDMI - use brace initilisation
};
class Screen {
public:
public:
explicit Screen(DisplayApp* app) : app {app} {
}
virtual ~Screen() = default;
@@ -67,7 +67,7 @@ namespace Pinetime {
return false;
}
protected:
protected:
DisplayApp* app;
bool running = true;
};

4
src/displayapp/screens/ScreenList.h
View File

@@ -12,7 +12,7 @@ namespace Pinetime {
enum class ScreenListModes { UpDown, RightLeft, LongPress };
template <size_t N> class ScreenList : public Screen {
public:
public:
ScreenList(DisplayApp* app,
uint8_t initScreen,
std::array<std::function<std::unique_ptr<Screen>()>, N>&& screens,
@@ -95,7 +95,7 @@ namespace Pinetime {
return false;
}
private:
private:
uint8_t initScreen = 0;
std::array<std::function<std::unique_ptr<Screen>()>, N> screens;
ScreenListModes mode = ScreenListModes::UpDown;

6
src/displayapp/screens/StopWatch.h
View File

@@ -54,7 +54,7 @@ namespace Pinetime::Applications::Screens {
return nullptr;
}
private:
private:
std::array<TimeSeparated_t, N> buffer;
uint8_t currentSize;
uint8_t capacity;
@@ -62,7 +62,7 @@ namespace Pinetime::Applications::Screens {
};
class StopWatch : public Screen {
public:
public:
StopWatch(DisplayApp* app);
~StopWatch() override;
bool Refresh() override;
@@ -70,7 +70,7 @@ namespace Pinetime::Applications::Screens {
void playPauseBtnEventHandler(lv_event_t event);
void stopLapBtnEventHandler(lv_event_t event);
private:
private:
bool running;
States currentState;
Events currentEvent;

4
src/displayapp/screens/SystemInfo.h
View File

@@ -21,7 +21,7 @@ namespace Pinetime {
namespace Screens {
class SystemInfo : public Screen {
public:
public:
explicit SystemInfo(DisplayApp* app,
Pinetime::Controllers::DateTime& dateTimeController,
Pinetime::Controllers::Battery& batteryController,
@@ -33,7 +33,7 @@ namespace Pinetime {
bool OnButtonPushed() override;
bool OnTouchEvent(TouchEvents event) override;
private:
private:
bool running = true;
Pinetime::Controllers::DateTime& dateTimeController;

4
src/displayapp/screens/Tile.h
View File

@@ -14,7 +14,7 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class Tile : public Screen {
public:
public:
struct Applications {
const char* icon;
Pinetime::Applications::Apps application;
@@ -34,7 +34,7 @@ namespace Pinetime {
void UpdateScreen();
void OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId);
private:
private:
Pinetime::Controllers::Battery& batteryController;
Controllers::DateTime& dateTimeController;

4
src/displayapp/screens/Twos.h
View File

@@ -11,14 +11,14 @@ namespace Pinetime {
};
namespace Screens {
class Twos : public Screen {
public:
public:
Twos(DisplayApp* app);
~Twos() override;
bool Refresh() override;
bool OnTouchEvent(TouchEvents event) override;
private:
private:
lv_style_t style_cell1;
lv_style_t style_cell2;
lv_style_t style_cell3;

4
src/displayapp/screens/WatchFaceAnalog.h
View File

@@ -22,7 +22,7 @@ namespace Pinetime {
namespace Screens {
class WatchFaceAnalog : public Screen {
public:
public:
WatchFaceAnalog(DisplayApp* app,
Controllers::DateTime& dateTimeController,
Controllers::Battery& batteryController,
@@ -34,7 +34,7 @@ namespace Pinetime {
bool Refresh() override;
private:
private:
uint8_t sHour, sMinute, sSecond;
uint8_t hour;
uint8_t minute;

4
src/displayapp/screens/WatchFaceDigital.h
View File

@@ -22,7 +22,7 @@ namespace Pinetime {
namespace Screens {
class WatchFaceDigital : public Screen {
public:
public:
WatchFaceDigital(DisplayApp* app,
Controllers::DateTime& dateTimeController,
Controllers::Battery& batteryController,
@@ -37,7 +37,7 @@ namespace Pinetime {
void OnObjectEvent(lv_obj_t* pObj, lv_event_t i);
private:
private:
char displayedChar[5];
uint16_t currentYear = 1970;

4
src/displayapp/screens/settings/QuickSettings.h
View File

@@ -16,7 +16,7 @@ namespace Pinetime {
namespace Screens {
class QuickSettings : public Screen {
public:
public:
QuickSettings(DisplayApp* app,
Pinetime::Controllers::Battery& batteryController,
Controllers::DateTime& dateTimeController,
@@ -32,7 +32,7 @@ namespace Pinetime {
void UpdateScreen();
private:
private:
Pinetime::Controllers::Battery& batteryController;
Controllers::DateTime& dateTimeController;
Controllers::BrightnessController& brightness;

4
src/displayapp/screens/settings/SettingDisplay.h
View File

@@ -11,14 +11,14 @@ namespace Pinetime {
namespace Screens {
class SettingDisplay : public Screen {
public:
public:
SettingDisplay(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
~SettingDisplay() override;
bool Refresh() override;
void UpdateSelected(lv_obj_t* object, lv_event_t event);
private:
private:
Controllers::Settings& settingsController;
uint8_t optionsTotal;
lv_obj_t* cbOption[4];

4
src/displayapp/screens/settings/SettingTimeFormat.h
View File

@@ -11,14 +11,14 @@ namespace Pinetime {
namespace Screens {
class SettingTimeFormat : public Screen {
public:
public:
SettingTimeFormat(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
~SettingTimeFormat() override;
bool Refresh() override;
void UpdateSelected(lv_obj_t* object, lv_event_t event);
private:
private:
Controllers::Settings& settingsController;
uint8_t optionsTotal;
lv_obj_t* cbOption[2];

4
src/displayapp/screens/settings/SettingWakeUp.h
View File

@@ -11,14 +11,14 @@ namespace Pinetime {
namespace Screens {
class SettingWakeUp : public Screen {
public:
public:
SettingWakeUp(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
~SettingWakeUp() override;
bool Refresh() override;
void UpdateSelected(lv_obj_t* object, lv_event_t event);
private:
private:
Controllers::Settings& settingsController;
uint8_t optionsTotal;
lv_obj_t* cbOption[4];

4
src/displayapp/screens/settings/SettingWatchFace.h
View File

@@ -11,14 +11,14 @@ namespace Pinetime {
namespace Screens {
class SettingWatchFace : public Screen {
public:
public:
SettingWatchFace(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
~SettingWatchFace() override;
bool Refresh() override;
void UpdateSelected(lv_obj_t* object, lv_event_t event);
private:
private:
Controllers::Settings& settingsController;
uint8_t optionsTotal;
lv_obj_t* cbOption[2];

4
src/displayapp/screens/settings/Settings.h
View File

@@ -10,7 +10,7 @@ namespace Pinetime {
namespace Screens {
class Settings : public Screen {
public:
public:
Settings(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
~Settings() override;
@@ -19,7 +19,7 @@ namespace Pinetime {
void OnButtonEvent(lv_obj_t* object, lv_event_t event);
bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
private:
private:
Controllers::Settings& settingsController;
ScreenList<2> screens;