test combiner tout

src/CMakeLists.txt

@@ -371,11 +371,15 @@ list(APPEND SOURCE_FILES
         displayapp/screens/StopWatch.cpp
         displayapp/screens/BatteryIcon.cpp
         displayapp/screens/BleIcon.cpp
+<<<<<<< HEAD
 <<<<<<< HEAD
         displayapp/screens/AlarmIcon.cpp
 =======
 	displayapp/screens/AlarmIcon.cpp
 >>>>>>> f5dfbc44 (added symbols for alarm states, added alarm state and hour to watchface meow, changed steps to paw. Need to align everythign nicely and find where to change release number)
+=======
+	displayapp/screens/AlarmIcon.cpp
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
         displayapp/screens/NotificationIcon.cpp
         displayapp/screens/SystemInfo.cpp
         displayapp/screens/Label.cpp

src/components/settings/Settings.h

@@ -55,12 +55,20 @@ namespace Pinetime {
         bool showSideCover = true;
         int colorIndex = 0;
       };
+<<<<<<< HEAD
            
+=======
+
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
       struct WatchFaceMeow {
         bool showSideCover = true;
         int colorIndex = 0;
       };
+<<<<<<< HEAD
  
+=======
+
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
       Settings(Pinetime::Controllers::FS& fs);
 
       Settings(const Settings&) = delete;
@@ -328,6 +336,8 @@ namespace Pinetime {
 	WatchFaceInfineatColors watchFaceInfineatColors;
 	WatchFaceMeow watchFaceMeow;
 
+        WatchFaceMeow watchFaceMeow;
+
         std::bitset<5> wakeUpMode {0};
         uint16_t shakeWakeThreshold = 150;
 

src/displayapp/UserApps.h

@@ -12,7 +12,10 @@
 #include "displayapp/screens/WatchFaceAnalog.h"
 #include "displayapp/screens/WatchFaceCasioStyleG7710.h"
 #include "displayapp/screens/WatchFaceInfineat.h"
+<<<<<<< HEAD
 #include "displayapp/screens/WatchFaceInfineatColors.h"
+=======
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
 #include "displayapp/screens/WatchFaceMeow.h"
 #include "displayapp/screens/WatchFacePineTimeStyle.h"
 #include "displayapp/screens/WatchFaceTerminal.h"

src/displayapp/fonts/fonts.json

@@ -7,11 +7,15 @@
          },
          {
             "file": "FontAwesome5-Solid+Brands+Regular.woff",
+<<<<<<< HEAD
 <<<<<<< HEAD
             "range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743, 0xf0f3, 0xf1f6"
 =======
             "range": "0xf294, 0xf242, 0xf54b, 0xf1b0, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743, 0xf4ba, 0xf236"
 >>>>>>> f5dfbc44 (added symbols for alarm states, added alarm state and hour to watchface meow, changed steps to paw. Need to align everythign nicely and find where to change release number)
+=======
+            "range": "0xf294, 0xf242, 0xf54b, 0xf1b0, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743, 0xf4ba, 0xf236"
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
          }
       ],
       "bpp": 1,

src/displayapp/screens/AlarmIcon.cpp

@@ -4,15 +4,21 @@ using namespace Pinetime::Applications::Screens;
 
 const char* AlarmIcon::GetIcon(bool isSet) {
   if (isSet) {
+<<<<<<< HEAD
 <<<<<<< HEAD
     return Symbols::bell;
   }
 
   return Symbols::notbell;
 =======
+=======
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
     return Symbols::bird;
   }
 
   return Symbols::zzz;
+<<<<<<< HEAD
 >>>>>>> f5dfbc44 (added symbols for alarm states, added alarm state and hour to watchface meow, changed steps to paw. Need to align everythign nicely and find where to change release number)
+=======
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
 }

src/displayapp/screens/Symbols.h

@@ -10,6 +10,7 @@ namespace Pinetime {
         static constexpr const char* bluetooth = "\xEF\x8A\x94";
         static constexpr const char* plug = "\xEF\x87\xA6";
         static constexpr const char* shoe = "\xEF\x95\x8B";
+<<<<<<< HEAD
 <<<<<<< HEAD
         static constexpr const char* paw = "\xEF\x86\xB0";
         static constexpr const char* clock = "\xEF\x80\x97";
@@ -23,6 +24,13 @@ namespace Pinetime {
         static constexpr const char* notbell = "\xEF\x87\xB6";
 	static constexpr const char* info = "\xEF\x84\xA9";
 >>>>>>> 504f5774 (copy :( files from gitlab repo)
+=======
+        static constexpr const char* paw = "\xEF\x86\xB0";
+        static constexpr const char* clock = "\xEF\x80\x97";
+        static constexpr const char* bell = "\xEF\x83\xB3";
+        static constexpr const char* notbell = "\xEF\x87\xB6";
+        static constexpr const char* info = "\xEF\x84\xA9";
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
         static constexpr const char* list = "\xEF\x80\xBA";
         static constexpr const char* sun = "\xEF\x86\x85";
         static constexpr const char* check = "\xEF\x95\xA0";
@@ -49,6 +57,7 @@ namespace Pinetime {
         static constexpr const char* eye = "\xEF\x81\xAE";
         static constexpr const char* home = "\xEF\x80\x95";
         static constexpr const char* sleep = "\xEE\xBD\x84";
+<<<<<<< HEAD
 <<<<<<< HEAD
         static constexpr const char* bird = "\xEF\x92\xBA";
         static constexpr const char* zzz = "\xEF\x88\xB6";
@@ -56,6 +65,10 @@ namespace Pinetime {
 	static constexpr const char* bird = "\xEF\x92\xBA";
 	static constexpr const char* zzz = "\xEF\x88\xB6";
 >>>>>>> 504f5774 (copy :( files from gitlab repo)
+=======
+        static constexpr const char* bird = "\xEF\x92\xBA";
+        static constexpr const char* zzz = "\xEF\x88\xB6";
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
 
         // fontawesome_weathericons.c
         // static constexpr const char* sun = "\xEF\x86\x85";

src/displayapp/screens/WatchFaceInfineat.cpp

@@ -259,7 +259,11 @@ WatchFaceInfineat::WatchFaceInfineat(Controllers::DateTime& dateTimeController,
     lv_obj_set_hidden(alarmIcon, true);
     lv_obj_set_hidden(labelTimeAmPmAlarm, true);
   }
+<<<<<<< HEAD
   
+=======
+
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
   stepValue = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, grayColor);
   lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_teko);

src/displayapp/screens/WatchFaceMeow.cpp

@@ -199,7 +199,6 @@ WatchFaceMeow::WatchFaceMeow(Controllers::DateTime& dateTimeController,
   lineBattery = lv_line_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_line_width(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 24);
   lv_obj_set_style_local_line_color(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, (*colors)[4]);
-  lv_obj_set_style_local_line_color(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, (*colors)[4]);
   lv_obj_set_style_local_line_opa(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 190);
   lineBatteryPoints[0] = {27, 105};
   lineBatteryPoints[1] = {27, 106};
@@ -534,6 +533,7 @@ void WatchFaceMeow::Refresh() {
 }
 
 void WatchFaceMeow::SetBatteryLevel(uint8_t batteryPercent) {
+  // starting point (y) + Pine64 logo height * (100 - batteryPercent) / 100
   lineBatteryPoints[1] = {27, static_cast<lv_coord_t>(105 + 32 * (100 - batteryPercent) / 100)};
   lv_line_set_points(lineBattery, lineBatteryPoints, 2);
 }

src/displayapp/screens/settings/SettingWatchFace.h

@@ -10,7 +10,10 @@
 #include "displayapp/screens/Symbols.h"
 #include "displayapp/screens/CheckboxList.h"
 #include "displayapp/screens/WatchFaceInfineat.h"
+<<<<<<< HEAD
 #include "displayapp/screens/WatchFaceInfineatColors.h"
+=======
+>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
 #include "displayapp/screens/WatchFaceMeow.h"
 #include "displayapp/screens/WatchFaceCasioStyleG7710.h"