consistent header includes

replaced <> with "" for non-system headers

components/nanobake/src/applications/services/desktop/desktop.c

@@ -1,6 +1,6 @@
 #include "desktop.h"
 #include "nb_hardware.h"
-#include <core_defines.h>
+#include "core_defines.h"
 
 static int32_t prv_desktop_main(void* param) {
     UNUSED(param);

components/nanobake/src/applications/services/gui/gui.c

@@ -1,19 +1,19 @@
 #include "gui_i.h"
 #include "core_defines.h"
-#include <record.h>
-#include <check.h>
+#include "record.h"
+#include "check.h"
 
-static ScreenId screen_counter = 0;
+static NbScreenId screen_counter = 0;
 
 NbGuiHandle gui_alloc() {
     struct NbGui* gui = malloc(sizeof(struct NbGui));
-    screen_dict_init(gui->screens);
+    ScreenDict_init(gui->screens);
     gui->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
     return gui;
 }
 
 void gui_free(NbGuiHandle gui) {
-    screen_dict_clear(gui->screens);
+    ScreenDict_clear(gui->screens);
     furi_mutex_free(gui->mutex);
     free(gui);
 }
@@ -28,15 +28,15 @@ void gui_unlock(NbGuiHandle gui) {
     furi_check(furi_mutex_release(gui->mutex) == FuriStatusOk);
 }
 
-ScreenId gui_screen_create(NbGuiHandle gui, InitScreen callback) {
-    ScreenId id = screen_counter++;
+NbScreenId gui_screen_create(NbGuiHandle gui, InitScreen callback) {
+    NbScreenId id = screen_counter++;
     NbScreen screen = {
         .id = id,
         .parent = NULL,
         .callback = callback
     };
 
-    screen_dict_set_at(gui->screens, id, screen);
+    ScreenDict_set_at(gui->screens, id, screen);
 
     // TODO: notify desktop of change
     // TODO: have desktop update views
@@ -49,26 +49,26 @@ ScreenId gui_screen_create(NbGuiHandle gui, InitScreen callback) {
     return id;
 }
 
-lv_obj_t* gui_screen_get_parent(NbGuiHandle gui, ScreenId id) {
-    NbScreen* screen = screen_dict_get(gui->screens, id);
+lv_obj_t* gui_screen_get_parent(NbGuiHandle gui, NbScreenId id) {
+    NbScreen* screen = ScreenDict_get(gui->screens, id);
     furi_check(screen != NULL);
     return screen->parent;
 }
 
-void gui_screen_set_parent(NbGuiHandle gui, ScreenId id, lv_obj_t* parent) {
-    NbScreen* screen = screen_dict_get(gui->screens, id);
+void gui_screen_set_parent(NbGuiHandle gui, NbScreenId id, lv_obj_t* parent) {
+    NbScreen* screen = ScreenDict_get(gui->screens, id);
     furi_check(screen != NULL);
     screen->parent = parent;
 }
 
-void gui_screen_free(NbGuiHandle gui, ScreenId id) {
-    NbScreen* screen = screen_dict_get(gui->screens, id);
+void gui_screen_free(NbGuiHandle gui, NbScreenId id) {
+    NbScreen* screen = ScreenDict_get(gui->screens, id);
     furi_check(screen != NULL);
 
     // TODO: notify? use callback? (done from desktop service)
     lv_obj_clean(screen->parent);
 
-    screen_dict_erase(gui->screens, id);
+    ScreenDict_erase(gui->screens, id);
 }
 
 static int32_t prv_gui_main(void* param) {

components/nanobake/src/applications/services/gui/gui.h

@@ -8,16 +8,16 @@ extern "C" {
 
 #define RECORD_GUI "gui"
 
-typedef uint16_t ScreenId;
+typedef uint16_t NbScreenId;
 
 typedef struct NbGui* NbGuiHandle;
-typedef void (*InitScreen)(lv_obj_t*, ScreenId);
+typedef void (*InitScreen)(lv_obj_t*, NbScreenId);
 
-ScreenId gui_screen_create(NbGuiHandle _Nonnull gui, InitScreen callback);
-void gui_screen_free(NbGuiHandle _Nonnull gui, ScreenId id);
+NbScreenId gui_screen_create(NbGuiHandle _Nonnull gui, InitScreen callback);
+void gui_screen_free(NbGuiHandle _Nonnull gui, NbScreenId id);
 // TODO make internal
-void gui_screen_set_parent(NbGuiHandle _Nonnull gui, ScreenId id, lv_obj_t* parent);
-lv_obj_t* gui_screen_get_parent(NbGuiHandle _Nonnull gui, ScreenId id);
+void gui_screen_set_parent(NbGuiHandle _Nonnull gui, NbScreenId id, lv_obj_t* parent);
+lv_obj_t* gui_screen_get_parent(NbGuiHandle _Nonnull gui, NbScreenId id);
 
 extern const NbApp gui_app;
 

components/nanobake/src/applications/services/gui/gui_i.h

@@ -1,20 +1,20 @@
 #pragma once
 
 #include "gui.h"
-#include <mutex.h>
-#include <m-dict.h>
-#include <m-core.h>
+#include "mutex.h"
+#include "m-dict.h"
+#include "m-core.h"
 
 typedef struct {
-    ScreenId id;
+    NbScreenId id;
     lv_obj_t* parent;
     InitScreen _Nonnull callback;
 } NbScreen;
 
-DICT_DEF2(screen_dict, ScreenId, M_BASIC_OPLIST, NbScreen, M_POD_OPLIST)
+DICT_DEF2(ScreenDict, NbScreenId, M_BASIC_OPLIST, NbScreen, M_POD_OPLIST)
 
 struct NbGui {
     // TODO: use mutex
     FuriMutex* mutex;
-    screen_dict_t screens;
+    ScreenDict_t screens;
 };