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

Reformatted all the files according to clang-format style

Browse Source
This commit is contained in:
Avamander
2021-04-18 20:28:14 +03:00
parent e56ebb8bd6
commit 40d45d923b
179 changed files with 10119 additions and 10688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@
#include "Screen.h"
#include <array>
namespace Pinetime {
namespace Controllers {
class NavigationService;
@@ -32,20 +31,19 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class Navigation : public Screen {
public:
Navigation(DisplayApp *app, Pinetime::Controllers::NavigationService &nav);
public:
Navigation(DisplayApp* app, Pinetime::Controllers::NavigationService& nav);
~Navigation() override;
bool Refresh() override;
private:
lv_obj_t *imgFlag;
lv_obj_t *txtNarrative;
lv_obj_t *txtManDist;
lv_obj_t *barProgress;
private:
lv_obj_t* imgFlag;
lv_obj_t* txtNarrative;
lv_obj_t* txtManDist;
lv_obj_t* barProgress;
Pinetime::Controllers::NavigationService &navService;
Pinetime::Controllers::NavigationService& navService;
std::string m_flag;
std::string m_narrative;
@@ -53,97 +51,97 @@ namespace Pinetime {
int m_progress;
/** Watchapp */
const char* iconForName(std::string icon);
std::array<std::pair<std::string, const char*>, 89 > m_iconMap = { {
{"arrive-left" ,"\xEE\xA4\x81" },
{"arrive-right" ,"\xEE\xA4\x82" },
{"arrive-straight" ,"\xEE\xA4\x80" },
{"arrive" ,"\xEE\xA4\x80" },
{"close" ,"\xEE\xA4\x83" },
{"continue-left" ,"\xEE\xA4\x85" },
{"continue-right" ,"\xEE\xA4\x86" },
{"continue-slight-left" ,"\xEE\xA4\x87" },
{"continue-slight-right" ,"\xEE\xA4\x88" },
{"continue-straight" ,"\xEE\xA4\x84" },
{"continue-uturn" ,"\xEE\xA4\x89" },
{"continue" ,"\xEE\xA4\x84" },
{"depart-left" ,"\xEE\xA4\x8B" },
{"depart-right" ,"\xEE\xA4\x8C" },
{"depart-straight" ,"\xEE\xA4\x8A" },
{"end-of-road-left" ,"\xEE\xA4\x8D" },
{"end-of-road-right" ,"\xEE\xA4\x8E" },
{"ferry" ,"\xEE\xA4\x8F" },
{"flag" ,"\xEE\xA4\x90" },
{"fork-left" ,"\xEE\xA4\x92" },
{"fork-right" ,"\xEE\xA4\x93" },
{"fork-slight-left" ,"\xEE\xA4\x94" },
{"fork-slight-right" ,"\xEE\xA4\x95" },
{"fork-straight" ,"\xEE\xA4\x96" },
{"invalid" ,"\xEE\xA4\x84" },
{"invalid-left" ,"\xEE\xA4\x85" },
{"invalid-right" ,"\xEE\xA4\x86" },
{"invalid-slight-left" ,"\xEE\xA4\x87" },
{"invalid-slight-right" ,"\xEE\xA4\x88" },
{"invalid-straight" ,"\xEE\xA4\x84" },
{"invalid-uturn" ,"\xEE\xA4\x89" },
{"merge-left" ,"\xEE\xA4\x97" },
{"merge-right" ,"\xEE\xA4\x98" },
{"merge-slight-left" ,"\xEE\xA4\x99" },
{"merge-slight-right" ,"\xEE\xA4\x9A" },
{"merge-straight" ,"\xEE\xA4\x84" },
{"new-name-left" ,"\xEE\xA4\x85" },
{"new-name-right" ,"\xEE\xA4\x86" },
{"new-name-sharp-left" ,"\xEE\xA4\x9B" },
{"new-name-sharp-right" ,"\xEE\xA4\x9C" },
{"new-name-slight-left" ,"\xEE\xA4\x87" },
{"new-name-slight-right" ,"\xEE\xA4\x88" },
{"new-name-straight" ,"\xEE\xA4\x84" },
{"notification-left" ,"\xEE\xA4\x85" },
{"notification-right" ,"\xEE\xA4\x86" },
{"notification-sharp-left" ,"\xEE\xA4\x9B" },
{"notification-sharp-right" ,"\xEE\xA4\xA5" },
{"notification-slight-left" ,"\xEE\xA4\x87" },
{"notification-slight-right" ,"\xEE\xA4\x88" },
{"notification-straight" ,"\xEE\xA4\x84" },
{"off-ramp-left" ,"\xEE\xA4\x9D" },
{"off-ramp-right" ,"\xEE\xA4\x9E" },
{"off-ramp-slight-left" ,"\xEE\xA4\x9F" },
{"off-ramp-slight-right" ,"\xEE\xA4\xA0" },
{"on-ramp-left" ,"\xEE\xA4\x85" },
{"on-ramp-right" ,"\xEE\xA4\x86" },
{"on-ramp-sharp-left" ,"\xEE\xA4\x9B" },
{"on-ramp-sharp-right" ,"\xEE\xA4\xA5" },
{"on-ramp-slight-left" ,"\xEE\xA4\x87" },
{"on-ramp-slight-right" ,"\xEE\xA4\x88" },
{"on-ramp-straight" ,"\xEE\xA4\x84" },
{"rotary" ,"\xEE\xA4\xA1" },
{"rotary-left" ,"\xEE\xA4\xA2" },
{"rotary-right" ,"\xEE\xA4\xA3" },
{"rotary-sharp-left" ,"\xEE\xA4\xA4" },
{"rotary-sharp-right" ,"\xEE\xA4\xA5" },
{"rotary-slight-left" ,"\xEE\xA4\xA6" },
{"rotary-slight-right" ,"\xEE\xA4\xA7" },
{"rotary-straight" ,"\xEE\xA4\xA8" },
{"roundabout" ,"\xEE\xA4\xA1" },
{"roundabout-left" ,"\xEE\xA4\xA2" },
{"roundabout-right" ,"\xEE\xA4\xA3" },
{"roundabout-sharp-left" ,"\xEE\xA4\xA4" },
{"roundabout-sharp-right" ,"\xEE\xA4\xA5" },
{"roundabout-slight-left" ,"\xEE\xA4\xA6" },
{"roundabout-slight-right" ,"\xEE\xA4\xA7" },
{"roundabout-straight" ,"\xEE\xA4\xA8" },
{"turn-left" ,"\xEE\xA4\x85" },
{"turn-right" ,"\xEE\xA4\x86" },
{"turn-sharp-left" ,"\xEE\xA4\x9B" },
{"turn-sharp-right" ,"\xEE\xA4\xA5" },
{"turn-slight-left" ,"\xEE\xA4\x87" },
{"turn-slight-right" ,"\xEE\xA4\x88" },
{"turn-straight" ,"\xEE\xA4\x84" },
{"updown" ,"\xEE\xA4\xA9" },
{"uturn" ,"\xEE\xA4\x89" },
} };
std::array<std::pair<std::string, const char*>, 89> m_iconMap = {{
{"arrive-left", "\xEE\xA4\x81"},
{"arrive-right", "\xEE\xA4\x82"},
{"arrive-straight", "\xEE\xA4\x80"},
{"arrive", "\xEE\xA4\x80"},
{"close", "\xEE\xA4\x83"},
{"continue-left", "\xEE\xA4\x85"},
{"continue-right", "\xEE\xA4\x86"},
{"continue-slight-left", "\xEE\xA4\x87"},
{"continue-slight-right", "\xEE\xA4\x88"},
{"continue-straight", "\xEE\xA4\x84"},
{"continue-uturn", "\xEE\xA4\x89"},
{"continue", "\xEE\xA4\x84"},
{"depart-left", "\xEE\xA4\x8B"},
{"depart-right", "\xEE\xA4\x8C"},
{"depart-straight", "\xEE\xA4\x8A"},
{"end-of-road-left", "\xEE\xA4\x8D"},
{"end-of-road-right", "\xEE\xA4\x8E"},
{"ferry", "\xEE\xA4\x8F"},
{"flag", "\xEE\xA4\x90"},
{"fork-left", "\xEE\xA4\x92"},
{"fork-right", "\xEE\xA4\x93"},
{"fork-slight-left", "\xEE\xA4\x94"},
{"fork-slight-right", "\xEE\xA4\x95"},
{"fork-straight", "\xEE\xA4\x96"},
{"invalid", "\xEE\xA4\x84"},
{"invalid-left", "\xEE\xA4\x85"},
{"invalid-right", "\xEE\xA4\x86"},
{"invalid-slight-left", "\xEE\xA4\x87"},
{"invalid-slight-right", "\xEE\xA4\x88"},
{"invalid-straight", "\xEE\xA4\x84"},
{"invalid-uturn", "\xEE\xA4\x89"},
{"merge-left", "\xEE\xA4\x97"},
{"merge-right", "\xEE\xA4\x98"},
{"merge-slight-left", "\xEE\xA4\x99"},
{"merge-slight-right", "\xEE\xA4\x9A"},
{"merge-straight", "\xEE\xA4\x84"},
{"new-name-left", "\xEE\xA4\x85"},
{"new-name-right", "\xEE\xA4\x86"},
{"new-name-sharp-left", "\xEE\xA4\x9B"},
{"new-name-sharp-right", "\xEE\xA4\x9C"},
{"new-name-slight-left", "\xEE\xA4\x87"},
{"new-name-slight-right", "\xEE\xA4\x88"},
{"new-name-straight", "\xEE\xA4\x84"},
{"notification-left", "\xEE\xA4\x85"},
{"notification-right", "\xEE\xA4\x86"},
{"notification-sharp-left", "\xEE\xA4\x9B"},
{"notification-sharp-right", "\xEE\xA4\xA5"},
{"notification-slight-left", "\xEE\xA4\x87"},
{"notification-slight-right", "\xEE\xA4\x88"},
{"notification-straight", "\xEE\xA4\x84"},
{"off-ramp-left", "\xEE\xA4\x9D"},
{"off-ramp-right", "\xEE\xA4\x9E"},
{"off-ramp-slight-left", "\xEE\xA4\x9F"},
{"off-ramp-slight-right", "\xEE\xA4\xA0"},
{"on-ramp-left", "\xEE\xA4\x85"},
{"on-ramp-right", "\xEE\xA4\x86"},
{"on-ramp-sharp-left", "\xEE\xA4\x9B"},
{"on-ramp-sharp-right", "\xEE\xA4\xA5"},
{"on-ramp-slight-left", "\xEE\xA4\x87"},
{"on-ramp-slight-right", "\xEE\xA4\x88"},
{"on-ramp-straight", "\xEE\xA4\x84"},
{"rotary", "\xEE\xA4\xA1"},
{"rotary-left", "\xEE\xA4\xA2"},
{"rotary-right", "\xEE\xA4\xA3"},
{"rotary-sharp-left", "\xEE\xA4\xA4"},
{"rotary-sharp-right", "\xEE\xA4\xA5"},
{"rotary-slight-left", "\xEE\xA4\xA6"},
{"rotary-slight-right", "\xEE\xA4\xA7"},
{"rotary-straight", "\xEE\xA4\xA8"},
{"roundabout", "\xEE\xA4\xA1"},
{"roundabout-left", "\xEE\xA4\xA2"},
{"roundabout-right", "\xEE\xA4\xA3"},
{"roundabout-sharp-left", "\xEE\xA4\xA4"},
{"roundabout-sharp-right", "\xEE\xA4\xA5"},
{"roundabout-slight-left", "\xEE\xA4\xA6"},
{"roundabout-slight-right", "\xEE\xA4\xA7"},
{"roundabout-straight", "\xEE\xA4\xA8"},
{"turn-left", "\xEE\xA4\x85"},
{"turn-right", "\xEE\xA4\x86"},
{"turn-sharp-left", "\xEE\xA4\x9B"},
{"turn-sharp-right", "\xEE\xA4\xA5"},
{"turn-slight-left", "\xEE\xA4\x87"},
{"turn-slight-right", "\xEE\xA4\x88"},
{"turn-straight", "\xEE\xA4\x84"},
{"updown", "\xEE\xA4\xA9"},
{"uturn", "\xEE\xA4\x89"},
}};
};
}
}