Merge pull request #12 from tixlegeek/tixlegeek-check_bmp_size_editor

- Rework BMP Editor events
- Add width check for editing bitmaps on flipper

Author: tixlegeek

401lightMessengerApp/401LightMsg_bmp_editor.c

@@ -32,21 +32,24 @@ static uint8_t bmp_editor_move(AppBmpEditor* BmpEditor, int8_t x, int8_t y) {
 }
 
 static uint8_t bmp_editor_resize(AppBmpEditor* BmpEditor, int8_t w, int8_t h) {
+    // Compute the new dimensions given increments/decrements in size. Usually only height
     int dh = BmpEditor->model_data->bmp_h + h;
     int dw = BmpEditor->model_data->bmp_w + w;
-    if(dh < PARAM_BMP_EDITOR_MIN_RES_H)
+    if(dh < PARAM_BMP_EDITOR_MIN_RES_H) {
         BmpEditor->model_data->bmp_h = PARAM_BMP_EDITOR_MIN_RES_H;
-    else if(dh > PARAM_BMP_EDITOR_MAX_RES_H)
+    } else if(dh > PARAM_BMP_EDITOR_MAX_RES_H) {
         BmpEditor->model_data->bmp_h = PARAM_BMP_EDITOR_MAX_RES_H;
-    else
+    } else {
         BmpEditor->model_data->bmp_h = dh;
+    }
 
-    if(dw < PARAM_BMP_EDITOR_MIN_RES_W)
+    if(dw < PARAM_BMP_EDITOR_MIN_RES_W) {
         BmpEditor->model_data->bmp_w = PARAM_BMP_EDITOR_MIN_RES_W;
-    else if(dw > PARAM_BMP_EDITOR_MAX_RES_W)
+    } else if(dw > PARAM_BMP_EDITOR_MAX_RES_W) {
         BmpEditor->model_data->bmp_w = PARAM_BMP_EDITOR_MAX_RES_W;
-    else
+    } else {
         BmpEditor->model_data->bmp_w = dw;
+    }
 
     BmpEditor->model_data->cursor.x = (BmpEditor->model_data->bmp_w / 2);
     BmpEditor->model_data->cursor.y = (BmpEditor->model_data->bmp_h / 2);
@@ -84,7 +87,7 @@ static void bmp_editor_text_input_callback(void* ctx) {
         LIGHTMSGCONF_SAVE_FOLDER,
         BmpEditor->bitmapName,
         ".bmp");
-    view_dispatcher_send_custom_event(app->view_dispatcher, SetTextInputSaveEvent);
+    view_dispatcher_send_custom_event(app->view_dispatcher, AppBmpEditorEventSaveText);
 }
 
 static void bmp_editor_select_name(void* ctx) {
@@ -114,6 +117,7 @@ static void bmp_editor_select_file(void* ctx) {
     AppContext* app = (AppContext*)ctx; // Main app struct
     AppData* appData = (AppData*)app->data;
     AppBmpEditor* BmpEditor = app->sceneBmpEditor;
+
     bmpEditorData* BmpEditorData = BmpEditor->model_data;
     Configuration* light_msg_data = (Configuration*)appData->config;
     DialogsFileBrowserOptions browser_options;
@@ -129,16 +133,24 @@ static void bmp_editor_select_file(void* ctx) {
     if(dialog_file_browser_show(BmpEditor->dialogs, bitmapPath, bitmapPath, &browser_options)) {
         if(BmpEditorData->bitmap) bitmapMatrix_free(BmpEditorData->bitmap);
         BmpEditorData->bitmap = bmp_to_bitmapMatrix(furi_string_get_cstr(bitmapPath));
-        BmpEditorData->bmp_w = BmpEditorData->bitmap->width;
-        BmpEditorData->bmp_h = BmpEditorData->bitmap->height;
-        BmpEditorData->state = BmpEditorStateDrawing;
-
-        memcpy(
-            BmpEditor->bitmapPath,
-            furi_string_get_cstr(bitmapPath),
-            strlen(furi_string_get_cstr(bitmapPath)));
-        bmp_compute_model(BmpEditor, BmpEditor->model_data);
-        view_dispatcher_switch_to_view(app->view_dispatcher, AppViewBmpEditor);
+        if(BmpEditorData->bitmap->width > PARAM_BMP_EDITOR_MAX_RES_W) {
+            //if(BmpEditorData->bitmap) bitmapMatrix_free(BmpEditorData->bitmap);
+            //furi_string_free(bitmapPath);
+            BmpEditorData->state = BmpEditorStateSizeError;
+            BmpEditorData->error = L401_ERR_WIDTH;
+            view_dispatcher_switch_to_view(app->view_dispatcher, AppViewBmpEditor);
+            return;
+        } else {
+            BmpEditorData->bmp_w = BmpEditorData->bitmap->width;
+            BmpEditorData->bmp_h = BmpEditorData->bitmap->height;
+            BmpEditorData->state = BmpEditorStateDrawing;
+            memcpy(
+                BmpEditor->bitmapPath,
+                furi_string_get_cstr(bitmapPath),
+                strlen(furi_string_get_cstr(bitmapPath)));
+            bmp_compute_model(BmpEditor, BmpEditor->model_data);
+            view_dispatcher_switch_to_view(app->view_dispatcher, AppViewBmpEditor);
+        }
     }
     furi_string_free(bitmapPath);
 }
@@ -149,6 +161,17 @@ static bool bmp_editor_mainmenu_input_callback(InputEvent* input_event, void* ct
     return false;
 }
 
+static bool bmp_editor_error_input_callback(InputEvent* input_event, void* ctx) {
+    AppContext* app = (AppContext*)ctx;
+    bool consumed = false;
+
+    if((input_event->type == InputTypePress) || (input_event->type == InputTypeRepeat)) {
+        view_dispatcher_send_custom_event(app->view_dispatcher, AppBmpEditorEventQuit);
+        consumed = true;
+    }
+    return consumed;
+}
+
 static bool bmp_editor_select_size_input_callback(InputEvent* input_event, void* ctx) {
     AppContext* app = (AppContext*)ctx;
     AppBmpEditor* BmpEditor = app->sceneBmpEditor;
@@ -214,7 +237,6 @@ static bool bmp_editor_draw_input_callback(InputEvent* input_event, void* ctx) {
             break;
         case InputKeyOk:
             bmp_editor_toggle(BmpEditor);
-            view_dispatcher_send_custom_event(app->view_dispatcher, AppBmpEditorEventToggle);
             consumed = false;
             break;
         case InputKeyBack:
@@ -261,6 +283,9 @@ static bool app_scene_bmp_editor_input_callback(InputEvent* input_event, void* c
     case BmpEditorStateDrawing:
         consumed = bmp_editor_draw_input_callback(input_event, ctx);
         break;
+    case BmpEditorStateSizeError:
+        consumed = bmp_editor_error_input_callback(input_event, ctx);
+        break;
     default:
         break;
     }
@@ -290,6 +315,27 @@ static void bmp_editor_drawSizePicker(Canvas* canvas, void* ctx) {
     canvas_draw_str(canvas, 25 + 45, 62, "OK");
 }
 
+static void bmp_editor_drawError(Canvas* canvas, void* ctx) {
+    // UNUSED(ctx);
+    bmpEditorModel* BmpEditorModel = (bmpEditorModel*)ctx;
+    bmpEditorData* BmpEditorData = BmpEditorModel->data;
+
+    switch(BmpEditorData->error) {
+    case L401_ERR_WIDTH:
+        canvas_clear(canvas);
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str_aligned(canvas, 64, 20, AlignCenter, AlignCenter, "BMP File too large to");
+        canvas_draw_str_aligned(canvas, 64, 30, AlignCenter, AlignCenter, "be edited on flipper!");
+        break;
+    default:
+        canvas_clear(canvas);
+        canvas_set_font(canvas, FontPrimary);
+        canvas_draw_str_aligned(canvas, 64, 10, AlignCenter, AlignCenter, "Unknown error");
+        break;
+    }
+    elements_button_center(canvas, "Return");
+}
+
 static void bmp_editor_drawBoard(Canvas* canvas, void* ctx) {
     bmpEditorModel* BmpEditorModel = (bmpEditorModel*)ctx;
     bmpEditorData* BmpEditorData = BmpEditorModel->data;
@@ -365,6 +411,9 @@ static void app_scene_bmp_editor_render_callback(Canvas* canvas, void* _model) {
     case BmpEditorStateDrawing:
         bmp_editor_drawBoard(canvas, _model);
         break;
+    case BmpEditorStateSizeError:
+        bmp_editor_drawError(canvas, _model);
+        break;
     default:
         break;
     }
@@ -404,6 +453,7 @@ AppBmpEditor* app_bmp_editor_alloc(void* ctx) {
     appBmpEditor->model_data->bmp_pixel_spacing = 0;
     appBmpEditor->model_data->bmp_w = 32;
     appBmpEditor->model_data->bmp_h = 16;
+    appBmpEditor->model_data->error = L401_OK;
     appBmpEditor->mainmenu = submenu_alloc();
 
     submenu_add_item(
@@ -432,11 +482,9 @@ AppBmpEditor* app_bmp_editor_alloc(void* ctx) {
 
     appBmpEditor->view = view_alloc();
     view_allocate_model(appBmpEditor->view, ViewModelTypeLocking, sizeof(bmpEditorModel));
-
     view_set_context(appBmpEditor->view, app);
     view_set_draw_callback(appBmpEditor->view, app_scene_bmp_editor_render_callback);
     view_set_input_callback(appBmpEditor->view, app_scene_bmp_editor_input_callback);
-
     return appBmpEditor;
 }
 
@@ -536,11 +584,17 @@ bool app_scene_bmp_editor_on_event(void* ctx, SceneManagerEvent event) {
     // UNUSED(ctx);
     bool consumed = false;
     if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == SetTextInputSaveEvent) {
+        switch(event.event) {
+        case AppBmpEditorEventSaveText:
             bmp_editor_init_bitmap(ctx);
             BmpEditorData->state = BmpEditorStateDrawing;
             view_dispatcher_switch_to_view(app->view_dispatcher, AppViewBmpEditor);
             consumed = true;
+            break;
+        case AppBmpEditorEventQuit:
+            view_dispatcher_switch_to_view(app->view_dispatcher, BmpEditorViewMainMenu);
+            consumed = true;
+            break;
         }
     }
     // scene_manager_next_scene(app->scene_manager, AppSceneMainMenu);

401lightMessengerApp/401LightMsg_bmp_editor.h

@@ -12,12 +12,14 @@
 #include <stdlib.h>
 
 #include "bmp.h"
+#include "401_err.h"
 #include "drivers/sk6805.h"
 #include <401_light_msg_icons.h>
 #include <dialogs/dialogs.h>
 #include <gui/gui.h>
 #include <gui/modules/submenu.h>
 #include <gui/modules/text_input.h>
+#include <gui/elements.h>
 #include <gui/scene_manager.h>
 #include <gui/view_dispatcher.h>
 #include <lib/toolbox/name_generator.h>
@@ -30,6 +32,7 @@ typedef struct {
 typedef enum {
     BmpEditorStateDrawing,
     BmpEditorStateSelectSize,
+    BmpEditorStateSizeError,
     BmpEditorStateSelectName,
     BmpEditorStateSelectFile,
     BmpEditorStateSelectSource,
@@ -64,6 +67,7 @@ typedef struct {
     uint8_t* bmp_canvas;
     bitmapMatrix* bitmap;
     bmpEditorState state;
+    l401_err error;
 } bmpEditorData;
 
 typedef struct {
@@ -84,11 +88,7 @@ typedef struct AppBmpEditor {
 
 typedef enum {
     AppBmpEditorEventQuit,
-    AppBmpEditorEventUp,
-    AppBmpEditorEventDown,
-    AppBmpEditorEventLeft,
-    AppBmpEditorEventRight,
-    AppBmpEditorEventToggle,
+    AppBmpEditorEventSaveText,
 } AppBmpEditorCustomEvents;
 
 AppBmpEditor* app_bmp_editor_alloc();

401lightMessengerApp/401_err.h

@@ -18,6 +18,7 @@ typedef enum {
     L401_ERR_BMP_FILE,
     L401_ERR_NULLPTR,
     L401_ERR_HARDWARE,
+    L401_ERR_WIDTH,
 } l401_err;
 
 #endif /* end of include guard: L401_ERR_H */