Fix merge

color_guess/.gitsubtree

@@ -1 +1,2 @@
 https://github.com/xMasterX/all-the-plugins dev apps_source_code/color_guess
+https://github.com/leedave/flipper-zero-color-guess main /

color_guess/application.fam

@@ -9,9 +9,9 @@ App(
     ],
     stack_size=2 * 1024,
     order=10,
-    fap_icon="color_guess_10px.png",
+    fap_icon="icons/color_guess_10px.png",
     fap_icon_assets="icons",
-    fap_version="1.2",
+    fap_version="1.4",
     fap_category="Games",
     fap_author="Leedave",
     fap_description="Color Guessing Game",

color_guess/color_guess.c

@@ -113,10 +113,11 @@ int32_t color_guess_app(void* p) {
         return 255;
     }
 
+    /* //This exits if run in RM FW
     if(!furi_hal_region_is_provisioned()) {
         color_guess_app_free(app);
         return 1;
-    }
+    }*/
 
     view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
 

color_guess/docs/changelog.md

@@ -1,3 +1,16 @@
+## 1.4
+- Prevent value changing on win view
+- Fix issues with FW build 0.99.x
+
+## 1.3
+- Patched Memory Leak in storage
+
+## v1.2
+- Updated compatibility to 0.95.0-rc
+
+## v1.1
+- Updated Launch Screen GFX
+
 ## v1.0
 
 First release to Application Catalog

color_guess/helpers/color_guess_haptic.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #include <notification/notification_messages.h>
 
 void color_guess_play_happy_bump(void* context);

color_guess/helpers/color_guess_led.h

@@ -1,4 +1,4 @@
-
+#pragma once
 
 void color_guess_led_set_rgb(void* context, int red, int green, int blue);
 

color_guess/views/color_guess_color_set.c

@@ -7,8 +7,6 @@
 #include <gui/elements.h>
 #include <dolphin/dolphin.h>
 
-//extern const Icon* digits[17];
-
 struct ColorGuessColorSet {
     View* view;
     ColorGuessColorSetCallback callback;

color_guess/views/color_guess_play.c

@@ -8,8 +8,7 @@
 #include <input/input.h>
 #include <gui/elements.h>
 #include <dolphin/dolphin.h>
-
-//extern const Icon* digits[17];
+#include <lib/datetime/datetime.h>
 
 struct ColorGuessPlay {
     View* view;
@@ -215,9 +214,11 @@ bool color_guess_play_input(InputEvent* event, void* context) {
                 instance->view,
                 ColorGuessPlayModel * model,
                 {
-                    model->cursorpos--;
-                    if(model->cursorpos < 0) {
-                        model->cursorpos = 5;
+                    if(model->success != 1) {
+                        model->cursorpos--;
+                        if(model->cursorpos < 0) {
+                            model->cursorpos = 5;
+                        }
                     }
                 },
                 true);
@@ -227,9 +228,11 @@ bool color_guess_play_input(InputEvent* event, void* context) {
                 instance->view,
                 ColorGuessPlayModel * model,
                 {
-                    model->cursorpos++;
-                    if(model->cursorpos > 5) {
-                        model->cursorpos = 0;
+                    if(model->success != 1) {
+                        model->cursorpos++;
+                        if(model->cursorpos > 5) {
+                            model->cursorpos = 0;
+                        }
                     }
                 },
                 true);
@@ -239,12 +242,14 @@ bool color_guess_play_input(InputEvent* event, void* context) {
                 instance->view,
                 ColorGuessPlayModel * model,
                 {
-                    model->digit[model->cursorpos]++;
-                    if(model->digit[model->cursorpos] > 15) {
-                        model->digit[model->cursorpos] = 0;
+                    if(model->success != 1) {
+                        model->digit[model->cursorpos]++;
+                        if(model->digit[model->cursorpos] > 15) {
+                            model->digit[model->cursorpos] = 0;
+                        }
+                        color_guess_play_calculate_closeness(instance, model);
+                        play_haptic(instance->context, model);
                     }
-                    color_guess_play_calculate_closeness(instance, model);
-                    play_haptic(instance->context, model);
                 },
                 true);
             break;
@@ -253,12 +258,14 @@ bool color_guess_play_input(InputEvent* event, void* context) {
                 instance->view,
                 ColorGuessPlayModel * model,
                 {
-                    model->digit[model->cursorpos]--;
-                    if(model->digit[model->cursorpos] < 0) {
-                        model->digit[model->cursorpos] = 15;
+                    if(model->success != 1) {
+                        model->digit[model->cursorpos]--;
+                        if(model->digit[model->cursorpos] < 0) {
+                            model->digit[model->cursorpos] = 15;
+                        }
+                        color_guess_play_calculate_closeness(instance, model);
+                        play_haptic(instance->context, model);
                     }
-                    color_guess_play_calculate_closeness(instance, model);
-                    play_haptic(instance->context, model);
                 },
                 true);
             break;
@@ -323,6 +330,8 @@ ColorGuessPlay* color_guess_play_alloc() {
 void color_guess_play_free(ColorGuessPlay* instance) {
     furi_assert(instance);
 
+    with_view_model(
+        instance->view, ColorGuessPlayModel * model, { free(model); }, true);
     view_free(instance->view);
     free(instance);
 }