瀏覽代碼

Merge color_guess from https://github.com/leedave/flipper-zero-color-guess

# Conflicts:
#	color_guess/LICENSE
#	color_guess/color_guess.c
Willy-JL 1 年之前
父節點
當前提交
8a49bcacfa

+ 4 - 1
color_guess/README.md

@@ -29,4 +29,7 @@ Then run the command:
 The application will be compiled and copied onto your device. 
 
 ## Licensing
-This code is open-source and may be used for whatever you want to do with it. 
+This code is open-source under the conditions of GNU GENERAL PUBLIC LICENSE. 
+
+## Credits
+Thanks to [Willy-JL](https://github.com/Willy-JL) for assisting in the fine-tuning of the app

+ 1 - 1
color_guess/application.fam

@@ -11,7 +11,7 @@ App(
     order=10,
     fap_icon="icons/color_guess_10px.png",
     fap_icon_assets="icons",
-    fap_version="1.4",
+    fap_version="1.5",
     fap_category="Games",
     fap_author="Leedave",
     fap_description="Color Guessing Game",

+ 0 - 6
color_guess/color_guess.c

@@ -117,12 +117,6 @@ 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);
 
     scene_manager_next_scene(app->scene_manager, ColorGuessSceneStartscreen);

+ 1 - 0
color_guess/color_guess.h

@@ -17,6 +17,7 @@
 #include "views/color_guess_startscreen.h"
 #include "helpers/color_guess_storage.h"
 
+#define COLOR_GUESS_VERSION "1.5"
 #define TAG "Color_Guess"
 
 typedef struct {

+ 6 - 0
color_guess/docs/changelog.md

@@ -1,3 +1,9 @@
+## 1.5
+- Additional Memory Management fixes by Willy-JL
+- Redraw Issue fixed by Willy-JL
+- Added GNU License
+- Added version number
+
 ## 1.4
 - Prevent value changing on win view
 - Fix issues with FW build 0.99.x

+ 3 - 1
color_guess/helpers/color_guess_storage.c

@@ -85,6 +85,7 @@ void color_guess_read_settings(void* context) {
         FURI_LOG_E(TAG, "Cannot open file %s", COLOR_GUESS_SETTINGS_SAVE_PATH);
         color_guess_close_config_file(fff_file);
         color_guess_close_storage();
+        furi_string_free(temp_str);
         return;
     }
 
@@ -95,14 +96,15 @@ void color_guess_read_settings(void* context) {
         furi_string_free(temp_str);
         return;
     }
-    furi_string_free(temp_str);
 
     if(file_version < COLOR_GUESS_SETTINGS_FILE_VERSION) {
         FURI_LOG_I(TAG, "old config version, will be removed.");
         color_guess_close_config_file(fff_file);
         color_guess_close_storage();
+        furi_string_free(temp_str);
         return;
     }
+    furi_string_free(temp_str);
 
     flipper_format_read_uint32(fff_file, COLOR_GUESS_SETTINGS_KEY_HAPTIC, &app->haptic, 1);
     flipper_format_read_uint32(fff_file, COLOR_GUESS_SETTINGS_KEY_LED, &app->led, 1);

+ 3 - 0
color_guess/views/color_guess_startscreen.c

@@ -28,6 +28,7 @@ void color_guess_startscreen_set_callback(
 
 void color_guess_startscreen_draw(Canvas* canvas, ColorGuessStartscreenModel* model) {
     UNUSED(model);
+    char buffer[64];
     canvas_clear(canvas);
     canvas_set_color(canvas, ColorBlack);
     canvas_set_font(canvas, FontPrimary);
@@ -36,6 +37,8 @@ void color_guess_startscreen_draw(Canvas* canvas, ColorGuessStartscreenModel* mo
     canvas_set_font(canvas, FontSecondary);
     canvas_draw_str_aligned(canvas, 54, 22, AlignLeft, AlignTop, "Guess the color");
     canvas_draw_str_aligned(canvas, 54, 32, AlignLeft, AlignTop, "on Flipper's LED");
+    snprintf(buffer, sizeof(buffer), "Ver. %s", COLOR_GUESS_VERSION);
+    canvas_draw_str_aligned(canvas, 92, 56, AlignLeft, AlignTop, buffer);
     elements_button_center(canvas, "Start");
 }