Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes

# Conflicts:
#	doc/contribute.md
#	src/displayapp/screens/BatteryInfo.h

src/components/ble/AlertNotificationClient.cpp

@@ -1,6 +1,6 @@
-#include "AlertNotificationClient.h"
+#include "components/ble/AlertNotificationClient.h"
 #include <algorithm>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;

src/components/ble/AlertNotificationClient.h

@@ -7,7 +7,7 @@
 #include <host/ble_gap.h>
 #undef max
 #undef min
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 
 namespace Pinetime {
 

src/components/ble/AlertNotificationService.cpp

@@ -1,8 +1,8 @@
-#include "AlertNotificationService.h"
+#include "components/ble/AlertNotificationService.h"
 #include <hal/nrf_rtc.h>
 #include <cstring>
 #include <algorithm>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;

src/components/ble/BatteryInformationService.cpp

@@ -1,5 +1,5 @@
+#include "components/ble/BatteryInformationService.h"
 #include <nrf_log.h>
-#include "BatteryInformationService.h"
 #include "components/battery/BatteryController.h"
 
 using namespace Pinetime::Controllers;

src/components/ble/BleController.cpp

@@ -1,4 +1,4 @@
-#include "BleController.h"
+#include "components/ble/BleController.h"
 
 using namespace Pinetime::Controllers;
 

src/components/ble/CurrentTimeClient.cpp

@@ -1,4 +1,4 @@
-#include "CurrentTimeClient.h"
+#include "components/ble/CurrentTimeClient.h"
 #include <hal/nrf_rtc.h>
 #include <nrf_log.h>
 #include "components/datetime/DateTimeController.h"

src/components/ble/CurrentTimeClient.h

@@ -5,7 +5,7 @@
 #undef max
 #undef min
 #include <cstdint>
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 
 namespace Pinetime {
   namespace Controllers {

src/components/ble/CurrentTimeService.cpp

@@ -1,4 +1,4 @@
-#include "CurrentTimeService.h"
+#include "components/ble/CurrentTimeService.h"
 #include <hal/nrf_rtc.h>
 #include <nrf_log.h>
 

src/components/ble/DeviceInformationService.cpp

@@ -1,4 +1,4 @@
-#include "DeviceInformationService.h"
+#include "components/ble/DeviceInformationService.h"
 
 using namespace Pinetime::Controllers;
 

src/components/ble/DeviceInformationService.h

@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max
 #include <host/ble_gap.h>

src/components/ble/DfuService.cpp

@@ -1,4 +1,4 @@
-#include "DfuService.h"
+#include "components/ble/DfuService.h"
 #include <cstring>
 #include "components/ble/BleController.h"
 #include "drivers/SpiNorFlash.h"

src/components/ble/HeartRateService.cpp

@@ -1,4 +1,4 @@
-#include "HeartRateService.h"
+#include "components/ble/HeartRateService.h"
 #include "components/heartrate/HeartRateController.h"
 #include "systemtask/SystemTask.h"
 

src/components/ble/ImmediateAlertService.cpp

@@ -1,6 +1,6 @@
-#include "ImmediateAlertService.h"
+#include "components/ble/ImmediateAlertService.h"
 #include <cstring>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;

src/components/ble/MotionService.cpp

@@ -1,4 +1,4 @@
-#include "MotionService.h"
+#include "components/ble/MotionService.h"
 #include "components/motion//MotionController.h"
 #include "systemtask/SystemTask.h"
 

src/components/ble/MusicService.cpp

@@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "MusicService.h"
+#include "components/ble/MusicService.h"
 #include "systemtask/SystemTask.h"
 
 namespace {

src/components/ble/NavigationService.cpp

@@ -16,7 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "NavigationService.h"
+#include "components/ble/NavigationService.h"
 
 #include "systemtask/SystemTask.h"
 

src/components/ble/NimbleController.cpp

@@ -1,4 +1,4 @@
-#include "NimbleController.h"
+#include "components/ble/NimbleController.h"
 #include <hal/nrf_rtc.h>
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max

src/components/ble/NimbleController.h

@@ -7,19 +7,19 @@
 #include <host/ble_gap.h>
 #undef max
 #undef min
-#include "AlertNotificationClient.h"
-#include "AlertNotificationService.h"
-#include "BatteryInformationService.h"
-#include "CurrentTimeClient.h"
-#include "CurrentTimeService.h"
-#include "DeviceInformationService.h"
-#include "DfuService.h"
-#include "ImmediateAlertService.h"
-#include "MusicService.h"
-#include "NavigationService.h"
-#include "ServiceDiscovery.h"
-#include "HeartRateService.h"
-#include "MotionService.h"
+#include "components/ble/AlertNotificationClient.h"
+#include "components/ble/AlertNotificationService.h"
+#include "components/ble/BatteryInformationService.h"
+#include "components/ble/CurrentTimeClient.h"
+#include "components/ble/CurrentTimeService.h"
+#include "components/ble/DeviceInformationService.h"
+#include "components/ble/DfuService.h"
+#include "components/ble/ImmediateAlertService.h"
+#include "components/ble/MusicService.h"
+#include "components/ble/NavigationService.h"
+#include "components/ble/ServiceDiscovery.h"
+#include "components/ble/HeartRateService.h"
+#include "components/ble/MotionService.h"
 
 namespace Pinetime {
   namespace Drivers {

src/components/ble/NotificationManager.cpp

@@ -1,4 +1,4 @@
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include <cstring>
 #include <algorithm>
 

src/components/ble/ServiceDiscovery.cpp

@@ -1,6 +1,6 @@
-#include "ServiceDiscovery.h"
+#include "components/ble/ServiceDiscovery.h"
 #include <libraries/log/nrf_log.h>
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 
 using namespace Pinetime::Controllers;