Revert some of the previous work from the other PR.

camera_suite.h

@@ -12,11 +12,13 @@
 #include <notification/notification_messages.h>
 #include <stdlib.h>
 
-#include "helpers/camera_suite_storage.h"
 #include "scenes/camera_suite_scene.h"
-#include "views/camera_suite_view_camera.h"
 #include "views/camera_suite_view_guide.h"
 #include "views/camera_suite_view_start.h"
+#include "views/camera_suite_view_camera.h"
+#include "views/camera_suite_view_wifi_camera.h"
+
+#include "helpers/camera_suite_storage.h"
 
 #define TAG "Camera Suite"
 

helpers/camera_suite_haptic.c

@@ -1,5 +1,5 @@
-#include "../camera_suite.h"
 #include "camera_suite_haptic.h"
+#include "../camera_suite.h"
 
 void camera_suite_play_happy_bump(void* context) {
     CameraSuite* app = context;

helpers/camera_suite_haptic.h

@@ -1,7 +1,7 @@
-#pragma once
-
 #include <notification/notification_messages.h>
 
 void camera_suite_play_happy_bump(void* context);
+
 void camera_suite_play_bad_bump(void* context);
+
 void camera_suite_play_long_bump(void* context);

helpers/camera_suite_led.c

@@ -1,5 +1,5 @@
-#include "../camera_suite.h"
 #include "camera_suite_led.h"
+#include "../camera_suite.h"
 
 void camera_suite_led_set_rgb(void* context, int red, int green, int blue) {
     CameraSuite* app = context;

helpers/camera_suite_speaker.c

@@ -1,5 +1,5 @@
-#include "../camera_suite.h"
 #include "camera_suite_speaker.h"
+#include "../camera_suite.h"
 
 #define NOTE_INPUT 587.33f
 

helpers/camera_suite_speaker.h

@@ -1,5 +1,3 @@
-#pragma once
-
 void camera_suite_play_input_sound(void* context);
 
 void camera_suite_stop_all_sound(void* context);

helpers/camera_suite_storage.h

@@ -1,5 +1,3 @@
-#pragma once
-
 #include <stdlib.h>
 #include <string.h>
 #include <storage/storage.h>
@@ -7,6 +5,9 @@
 
 #include "../camera_suite.h"
 
+#ifndef CAMERA_SUITE_STORAGE_H
+#define CAMERA_SUITE_STORAGE_H
+
 #define BOILERPLATE_SETTINGS_FILE_VERSION 1
 #define CONFIG_FILE_DIRECTORY_PATH EXT_PATH("apps_data/camera_suite")
 #define BOILERPLATE_SETTINGS_SAVE_PATH CONFIG_FILE_DIRECTORY_PATH "/camera_suite.conf"
@@ -24,3 +25,5 @@
 void camera_suite_save_settings(void* context);
 
 void camera_suite_read_settings(void* context);
+
+#endif

views/camera_suite_view_guide.c

@@ -1,5 +1,9 @@
 #include "../camera_suite.h"
-#include "camera_suite_view_guide.h"
+#include <furi.h>
+#include <furi_hal.h>
+#include <input/input.h>
+#include <gui/elements.h>
+#include <dolphin/dolphin.h>
 
 struct CameraSuiteViewGuide {
     View* view;
@@ -39,10 +43,9 @@ static void camera_suite_view_guide_model_init(CameraSuiteViewGuideModel* const
     model->some_value = 1;
 }
 
-bool camera_suite_view_guide_input(InputEvent* event, void* grid_view_instance) {
-    furi_assert(grid_view_instance);
-
-    CameraSuiteViewGuide* instance = grid_view_instance;
+bool camera_suite_view_guide_input(InputEvent* event, void* context) {
+    furi_assert(context);
+    CameraSuiteViewGuide* instance = context;
 
     if(event->type == InputTypeRelease) {
         switch(event->key) {

views/camera_suite_view_guide.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <gui/view.h>
 #include "../helpers/camera_suite_custom_event.h"
 
 typedef struct CameraSuiteViewGuide CameraSuiteViewGuide;

views/camera_suite_view_start.c

@@ -1,5 +1,8 @@
 #include "../camera_suite.h"
-#include "camera_suite_view_start.h"
+#include <furi.h>
+#include <furi_hal.h>
+#include <input/input.h>
+#include <gui/elements.h>
 
 void camera_suite_view_start_set_callback(
     CameraSuiteViewStart* instance,

views/camera_suite_view_start.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <gui/view.h>
 #include "../helpers/camera_suite_custom_event.h"
 
 typedef void (*CameraSuiteViewStartCallback)(CameraSuiteCustomEvent event, void* context);