Merge pull request #2 from leedave/feature/color_guess_dev2

Feature/color guess dev2

Author: leedave

Games/color_guess/application.fam

@@ -11,5 +11,5 @@ App(
     order=10,
     fap_icon="color_guess_10px.png",
     fap_icon_assets="icons",
-    fap_category="Games",
+    fap_category="Leed\Games",
 )

Games/color_guess/color_guess.c

@@ -1,4 +1,5 @@
 #include "color_guess.h"
+#include "digits.h"
 
 bool color_guess_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
@@ -21,9 +22,15 @@ bool color_guess_navigation_event_callback(void* context) {
 
 ColorGuess* color_guess_app_alloc() {
     ColorGuess* app = malloc(sizeof(ColorGuess));
+    //app->event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
     app->gui = furi_record_open(RECORD_GUI);
     app->notification = furi_record_open(RECORD_NOTIFICATION);
+    //app->plugin_state = malloc(sizeof(PluginState));
+    //app->view_port = view_port_alloc();
     app->error = false;
+    
+    NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
+    notification_message(notification, &sequence_display_backlight_on);
 
     //Scene additions
     app->view_dispatcher = view_dispatcher_alloc();
@@ -43,7 +50,7 @@ ColorGuess* color_guess_app_alloc() {
     view_dispatcher_add_view(app->view_dispatcher, ColorGuessViewIdPlay, color_guess_play_get_view(app->color_guess_play));
 
     //End Scene Additions
-    
+
     return app;
 }
 
@@ -68,6 +75,7 @@ void color_guess_app_free(ColorGuess* app) {
     app->view_port = NULL;
 
     app->gui = NULL;
+    //furi_record_close(RECORD_NOTIFICATION);
     app->notification = NULL;
 
     //Remove whatever is left
@@ -85,9 +93,9 @@ int32_t color_guess_app(void* p) {
         color_guess_app_free(app);
         return 1;
     }
-
+    
     view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
-
+    
     scene_manager_next_scene(app->scene_manager, ColorGuessSceneStart);
 
     furi_hal_power_suppress_charge_enter();

Games/color_guess/digits.h

@@ -1,4 +1,4 @@
-#pragma once
+//#pragma once
 
 #include <stdint.h>
 #include "color_guess_icons.h"

Games/color_guess/helpers/color_guess_custom_event.h

@@ -7,4 +7,10 @@ typedef enum {
     ColorGuessCustomEventColorSetRight,
     ColorGuessCustomEventColorSetOk,
     ColorGuessCustomEventColorSetBack,
+    ColorGuessCustomEventPlayUp,
+    ColorGuessCustomEventPlayDown,
+    ColorGuessCustomEventPlayLeft,
+    ColorGuessCustomEventPlayRight,
+    ColorGuessCustomEventPlayOk,
+    ColorGuessCustomEventPlayBack,
 } ColorGuessCustomEvent;

Games/color_guess/scenes/color_guess_scene_color_set.c

@@ -17,7 +17,6 @@ void color_guess_scene_color_set_on_enter(void* context) {
 
 bool color_guess_scene_color_set_on_event(void* context, SceneManagerEvent event) {
     ColorGuess* app = context;
-    UNUSED(app);
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {

Games/color_guess/scenes/color_guess_scene_play.c

@@ -1,18 +1,50 @@
 #include "../color_guess.h"
+#include "../helpers/color_guess_custom_event.h"
+#include "../views/color_guess_play.h"
+
+void color_guess_play_callback(ColorGuessCustomEvent event, void* context) {
+    furi_assert(context);
+    ColorGuess* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, event);
+}
 
 void color_guess_scene_play_on_enter(void* context) {
+    furi_assert(context);
     ColorGuess* app = context;
-    //UNUSED(app);
+    color_guess_play_set_callback(app->color_guess_play, color_guess_play_callback, app);
     view_dispatcher_switch_to_view(app->view_dispatcher, ColorGuessViewIdPlay);
 }
 
 bool color_guess_scene_play_on_event(void* context, SceneManagerEvent event) {
-    UNUSED(context);
-    UNUSED(event);
-    return false;
+    ColorGuess* app = context;
+    bool consumed = false;
+    
+    if(event.type == SceneManagerEventTypeCustom) {
+        switch(event.event) {
+            case ColorGuessCustomEventPlayLeft:
+            case ColorGuessCustomEventPlayRight:
+                break;
+            case ColorGuessCustomEventPlayUp:
+            case ColorGuessCustomEventPlayDown:
+                break;
+            case ColorGuessCustomEventPlayBack:
+                notification_message(app->notification, &sequence_reset_red);
+                notification_message(app->notification, &sequence_reset_green);
+                notification_message(app->notification, &sequence_reset_blue);
+                if(!scene_manager_search_and_switch_to_previous_scene(
+                    app->scene_manager, ColorGuessSceneStart)) {
+                        scene_manager_stop(app->scene_manager);
+                        view_dispatcher_stop(app->view_dispatcher);
+                    }
+                consumed = true;
+                break;
+        }
+    }
+    
+    return consumed;
 }
 
 void color_guess_scene_play_on_exit(void* context) {
-    UNUSED(context);
-    
+    ColorGuess* app = context;
+    UNUSED(app);
 }

Games/color_guess/views/color_guess_color_set.c

@@ -1,12 +1,13 @@
 #include "../color_guess.h"
 #include "color_guess_icons.h"
-#include "../digits.h"
 #include <furi.h>
 #include <furi_hal.h>
 #include <input/input.h>
 #include <gui/elements.h>
 #include <dolphin/dolphin.h>
 
+extern const Icon* digits[17];
+
 struct ColorGuessColorSet {
     View* view;
     ColorGuessColorSetCallback callback;
@@ -17,9 +18,6 @@ typedef struct {
     ColorGuessColorSetStatus status;
     int cursorpos;
     int digit[6];
-    int red;
-    int green;
-    int blue;
 } ColorGuessColorSetModel;
 
 void color_guess_color_set_set_callback(
@@ -33,7 +31,6 @@ void color_guess_color_set_set_callback(
 }
 
 void color_guess_color_set_draw(Canvas* canvas, ColorGuessColorSetModel* model) {
-    //UNUSED(model);
     const int cursorOffset = 30;
     const int newCursorPos = (model->cursorpos * 12) + cursorOffset;
 
@@ -57,12 +54,9 @@ void color_guess_color_set_draw(Canvas* canvas, ColorGuessColorSetModel* model)
 
 static void color_guess_color_set_model_init(ColorGuessColorSetModel* const model) {
     model->cursorpos = 0;
-    model->red = 0;
     for (int i = 0;i < 6; i++) {
         model->digit[i] = 0;
     }
-    model->green = 0;
-    model->blue = 0;
 }
 
 void color_guess_color_set_set_led(void* context, ColorGuessColorSetModel* model) {
@@ -113,7 +107,6 @@ bool color_guess_color_set_input(InputEvent* event, void* context) {
                         {
                             model->cursorpos = 5;
                         }
-                        
                     },
                     true);
                 break;
@@ -163,9 +156,7 @@ bool color_guess_color_set_input(InputEvent* event, void* context) {
                 break;
         }
     }
-    //ColorGuessColorSet* instance = context;
-
-
+    
     return true;
 }