From ac7b2da611fa5ef4cc989a9feb027f66c0ebfc6c Mon Sep 17 00:00:00 2001
From: Reinhold Gschweicher <pyro4hell@gmail.com>
Date: Wed, 13 Oct 2021 22:08:35 +0200
Subject: Update includes to to be relative to src directory

Don't use relative imports like `../foo.h` as those depend on the
relative position of both files. Rather than that use imports relative
to the `src` directory, which explicitly is part of the include
directories.
---
 src/displayapp/screens/WatchFaceAnalog.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/displayapp/screens/WatchFaceAnalog.cpp')

diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index 53e7faf7..510d1139 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -1,9 +1,9 @@
 #include <libs/lvgl/lvgl.h>
-#include "WatchFaceAnalog.h"
-#include "BatteryIcon.h"
-#include "BleIcon.h"
-#include "Symbols.h"
-#include "NotificationIcon.h"
+#include "displayapp/screens/WatchFaceAnalog.h"
+#include "displayapp/screens/BatteryIcon.h"
+#include "displayapp/screens/BleIcon.h"
+#include "displayapp/screens/Symbols.h"
+#include "displayapp/screens/NotificationIcon.h"
 
 LV_IMG_DECLARE(bg_clock);
 
-- 
cgit v1.2.3-70-g09d2


From 1b937a77b981557015a614c7b806f8ddf62c614e Mon Sep 17 00:00:00 2001
From: Reinhold Gschweicher <pyro4hell@gmail.com>
Date: Wed, 3 Nov 2021 23:08:57 +0100
Subject: remove unused libs/ prefix from lvgl includes as not needed

---
 src/displayapp/DummyLittleVgl.h            | 6 +++---
 src/displayapp/screens/HeartRate.h         | 4 ++--
 src/displayapp/screens/Motion.cpp          | 2 +-
 src/displayapp/screens/Motion.h            | 4 ++--
 src/displayapp/screens/WatchFaceAnalog.cpp | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/displayapp/screens/WatchFaceAnalog.cpp')

diff --git a/src/displayapp/DummyLittleVgl.h b/src/displayapp/DummyLittleVgl.h
index 1db51343..47c9e021 100644
--- a/src/displayapp/DummyLittleVgl.h
+++ b/src/displayapp/DummyLittleVgl.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_themes/lv_theme.h>
-#include <libs/lvgl/src/lv_hal/lv_hal.h>
+#include <lvgl/src/lv_core/lv_style.h>
+#include <lvgl/src/lv_themes/lv_theme.h>
+#include <lvgl/src/lv_hal/lv_hal.h>
 #include <drivers/St7789.h>
 #include <drivers/Cst816s.h>
 
diff --git a/src/displayapp/screens/HeartRate.h b/src/displayapp/screens/HeartRate.h
index d06415ca..baa0ccdd 100644
--- a/src/displayapp/screens/HeartRate.h
+++ b/src/displayapp/screens/HeartRate.h
@@ -5,8 +5,8 @@
 #include "displayapp/screens/Screen.h"
 #include <bits/unique_ptr.h>
 #include "systemtask/SystemTask.h"
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <lvgl/src/lv_core/lv_style.h>
+#include <lvgl/src/lv_core/lv_obj.h>
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index 3641110e..8162e02f 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -1,4 +1,4 @@
-#include <libs/lvgl/lvgl.h>
+#include <lvgl/lvgl.h>
 #include "displayapp/screens/Motion.h"
 #include "displayapp/DisplayApp.h"
 
diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h
index f6202b5b..d6997409 100644
--- a/src/displayapp/screens/Motion.h
+++ b/src/displayapp/screens/Motion.h
@@ -4,8 +4,8 @@
 #include <chrono>
 #include "displayapp/screens/Screen.h"
 #include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <lvgl/src/lv_core/lv_style.h>
+#include <lvgl/src/lv_core/lv_obj.h>
 #include <components/motion/MotionController.h>
 
 namespace Pinetime {
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index 510d1139..470fc8e9 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -1,4 +1,4 @@
-#include <libs/lvgl/lvgl.h>
+#include <lvgl/lvgl.h>
 #include "displayapp/screens/WatchFaceAnalog.h"
 #include "displayapp/screens/BatteryIcon.h"
 #include "displayapp/screens/BleIcon.h"
-- 
cgit v1.2.3-70-g09d2


From 241d36471daaea03215c289f3dc2bdc2860b5053 Mon Sep 17 00:00:00 2001
From: Reinhold Gschweicher <pyro4hell@gmail.com>
Date: Fri, 5 Nov 2021 23:55:34 +0100
Subject: Move up file header include to top

---
 src/components/ble/BatteryInformationService.cpp | 2 +-
 src/components/heartrate/Ppg.cpp                 | 2 +-
 src/components/heartrate/Ptagc.cpp               | 2 +-
 src/displayapp/screens/BatteryIcon.cpp           | 2 +-
 src/displayapp/screens/HeartRate.cpp             | 2 +-
 src/displayapp/screens/Motion.cpp                | 2 +-
 src/displayapp/screens/WatchFaceAnalog.cpp       | 2 +-
 src/drivers/Bma421.cpp                           | 2 +-
 src/drivers/Hrs3300.cpp                          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/displayapp/screens/WatchFaceAnalog.cpp')

diff --git a/src/components/ble/BatteryInformationService.cpp b/src/components/ble/BatteryInformationService.cpp
index b95a88d9..9a3f86f5 100644
--- a/src/components/ble/BatteryInformationService.cpp
+++ b/src/components/ble/BatteryInformationService.cpp
@@ -1,5 +1,5 @@
-#include <nrf_log.h>
 #include "components/ble/BatteryInformationService.h"
+#include <nrf_log.h>
 #include "components/battery/BatteryController.h"
 
 using namespace Pinetime::Controllers;
diff --git a/src/components/heartrate/Ppg.cpp b/src/components/heartrate/Ppg.cpp
index c247d1f6..a5d83696 100644
--- a/src/components/heartrate/Ppg.cpp
+++ b/src/components/heartrate/Ppg.cpp
@@ -4,9 +4,9 @@
   C++ port Copyright (C) 2021 Jean-François Milants
 */
 
+#include "components/heartrate/Ppg.h"
 #include <vector>
 #include <nrf_log.h>
-#include "components/heartrate/Ppg.h"
 using namespace Pinetime::Controllers;
 
 /** Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/ppg.py */
diff --git a/src/components/heartrate/Ptagc.cpp b/src/components/heartrate/Ptagc.cpp
index db496a15..1c60bc23 100644
--- a/src/components/heartrate/Ptagc.cpp
+++ b/src/components/heartrate/Ptagc.cpp
@@ -4,8 +4,8 @@
   C++ port Copyright (C) 2021 Jean-François Milants
 */
 
-#include <cmath>
 #include "components/heartrate/Ptagc.h"
+#include <cmath>
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/displayapp/screens/BatteryIcon.cpp b/src/displayapp/screens/BatteryIcon.cpp
index 114b08fa..08aaab70 100644
--- a/src/displayapp/screens/BatteryIcon.cpp
+++ b/src/displayapp/screens/BatteryIcon.cpp
@@ -1,5 +1,5 @@
-#include <cstdint>
 #include "displayapp/screens/BatteryIcon.h"
+#include <cstdint>
 #include "displayapp/screens/Symbols.h"
 
 using namespace Pinetime::Applications::Screens;
diff --git a/src/displayapp/screens/HeartRate.cpp b/src/displayapp/screens/HeartRate.cpp
index 65d1aa2f..513c40bf 100644
--- a/src/displayapp/screens/HeartRate.cpp
+++ b/src/displayapp/screens/HeartRate.cpp
@@ -1,5 +1,5 @@
-#include <lvgl/lvgl.h>
 #include "displayapp/screens/HeartRate.h"
+#include <lvgl/lvgl.h>
 #include <components/heartrate/HeartRateController.h>
 
 #include "displayapp/DisplayApp.h"
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index 8162e02f..23eb2765 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -1,5 +1,5 @@
-#include <lvgl/lvgl.h>
 #include "displayapp/screens/Motion.h"
+#include <lvgl/lvgl.h>
 #include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index 470fc8e9..4540c1a8 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -1,5 +1,5 @@
-#include <lvgl/lvgl.h>
 #include "displayapp/screens/WatchFaceAnalog.h"
+#include <lvgl/lvgl.h>
 #include "displayapp/screens/BatteryIcon.h"
 #include "displayapp/screens/BleIcon.h"
 #include "displayapp/screens/Symbols.h"
diff --git a/src/drivers/Bma421.cpp b/src/drivers/Bma421.cpp
index 8db64ad8..2f60f42f 100644
--- a/src/drivers/Bma421.cpp
+++ b/src/drivers/Bma421.cpp
@@ -1,6 +1,6 @@
+#include "drivers/Bma421.h"
 #include <libraries/delay/nrf_delay.h>
 #include <libraries/log/nrf_log.h>
-#include "drivers/Bma421.h"
 #include "drivers/TwiMaster.h"
 #include <drivers/Bma421_C/bma423.h>
 
diff --git a/src/drivers/Hrs3300.cpp b/src/drivers/Hrs3300.cpp
index cecef145..c14fe7aa 100644
--- a/src/drivers/Hrs3300.cpp
+++ b/src/drivers/Hrs3300.cpp
@@ -4,9 +4,9 @@
   C++ port Copyright (C) 2021 Jean-François Milants
 */
 
+#include "drivers/Hrs3300.h"
 #include <algorithm>
 #include <nrf_gpio.h>
-#include "drivers/Hrs3300.h"
 
 #include <FreeRTOS.h>
 #include <task.h>
-- 
cgit v1.2.3-70-g09d2


From e8db73e0e71c3a0b48beb185949e64fcdc79c066 Mon Sep 17 00:00:00 2001
From: Reinhold Gschweicher <pyro4hell@gmail.com>
Date: Mon, 29 Nov 2021 22:39:33 +0100
Subject: WatchFaceAnalog: remove unused ScreenList, add needed includes

Remove unused `ScreenList.h` include.

For `std::abs()` add needed include `<cmath>`.

For the forward declared Settings-Controller add the `Settings.h`
include to the cpp file.
---
 src/displayapp/screens/WatchFaceAnalog.cpp | 2 ++
 src/displayapp/screens/WatchFaceAnalog.h   | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/displayapp/screens/WatchFaceAnalog.cpp')

diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index 4540c1a8..bc720ecb 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -1,9 +1,11 @@
 #include "displayapp/screens/WatchFaceAnalog.h"
+#include <cmath>
 #include <lvgl/lvgl.h>
 #include "displayapp/screens/BatteryIcon.h"
 #include "displayapp/screens/BleIcon.h"
 #include "displayapp/screens/Symbols.h"
 #include "displayapp/screens/NotificationIcon.h"
+#include "components/settings/Settings.h"
 
 LV_IMG_DECLARE(bg_clock);
 
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
index ca0462a6..a18eb299 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/screens/WatchFaceAnalog.h
@@ -5,7 +5,6 @@
 #include <cstdint>
 #include <memory>
 #include "displayapp/screens/Screen.h"
-#include "displayapp/screens/ScreenList.h"
 #include "components/datetime/DateTimeController.h"
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
-- 
cgit v1.2.3-70-g09d2


From b8dfad40bbdebea1bfde1fc267b245cfaf68be8a Mon Sep 17 00:00:00 2001
From: Steveis <SteveAmor@users.noreply.github.com>
Date: Sat, 23 Oct 2021 08:21:55 +0100
Subject: WatchFaceAnalog : move notification icon

Standardise notification icon to display in top left.
---
 src/displayapp/screens/WatchFaceAnalog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/displayapp/screens/WatchFaceAnalog.cpp')

diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index bc720ecb..f027a744 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -75,7 +75,7 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
   notificationIcon = lv_label_create(lv_scr_act(), NULL);
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
   lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
-  lv_obj_align(notificationIcon, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
+  lv_obj_align(notificationIcon, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 0);
 
   // Date - Day / Week day
 
-- 
cgit v1.2.3-70-g09d2