Remodeled after RFID reading app

Only the menu works so far Signed-off-by: Markus Birth <markus@birth-online.de>
2026-01-26 01:31:04 +00:00
parent 64b4bb3c52
commit c0148f2912
8 changed files with 278 additions and 80 deletions
@@ -1,89 +1,83 @@
 #include "uk_mbirth_sonicare.h"
-#include <furi.h>
-#include <gui/gui.h>
-#include <input/input.h>
+#include <dolphin/dolphin.h>

 /* generated by fbt from .png files in images folder */
 #include <uk_mbirth_sonicare_icons.h>


-void draw_callback(Canvas* canvas, void* context) {
-    UNUSED(context);
-    
-    canvas_clear(canvas);
-    canvas_set_color(canvas, ColorBlack);
-    canvas_set_font(canvas, FontPrimary);
-    
-    canvas_draw_str_aligned(canvas, 1, 0, AlignLeft, AlignTop, "Sonicare");
-
-    canvas_set_font(canvas, FontSecondary);
-    canvas_draw_str_aligned(canvas, 1, 14, AlignLeft, AlignTop, "Hello world!");
-    
-    canvas_set_font(canvas, FontKeyboard);
-    canvas_draw_str_aligned(canvas, 1, 28, AlignLeft, AlignTop, "by mbirth.uk");
-
-    canvas_set_font(canvas, FontBigNumbers);
-    canvas_draw_str_aligned(canvas, 1, 42, AlignLeft, AlignTop, "123abc");
-    
-    canvas_draw_icon(canvas, 50, 0, &I_brush_10px);
-}
-
-void input_callback(InputEvent* event, void* context) {
+static bool sonicare_debug_custom_event_callback(void* context, uint32_t event) {
+    furi_assert(context);
    Sonicare* app = context;
-    furi_message_queue_put(app->input_queue, event, 0);
+    return scene_manager_handle_custom_event(app->scene_manager, event);
 }

-int32_t uk_mbirth_sonicare_app(void* p) {
-    UNUSED(p);
-    FURI_LOG_I("TEST", "Hello world");
-    FURI_LOG_I("TEST", "I'm uk_mbirth_sonicare!");
-    Sonicare app;
-    
-    // Alloc
-    app.view_port = view_port_alloc();
-    app.input_queue = furi_message_queue_alloc(8, sizeof(InputEvent));
+static bool sonicare_debug_back_event_callback(void* context) {
+    furi_assert(context);
+    Sonicare* app = context;
+    return scene_manager_handle_back_event(app->scene_manager);
+}

-    // Callbacks    
-    view_port_draw_callback_set(app.view_port, draw_callback, &app);
-    view_port_input_callback_set(app.view_port, input_callback, &app);
+static Sonicare* sonicare_alloc(void) {
+    Sonicare* sonicare = malloc(sizeof(Sonicare));
    
-    // GUI
-    app.gui = furi_record_open("gui");
-    gui_add_view_port(app.gui, app.view_port, GuiLayerFullscreen);
+    sonicare->storage = furi_record_open(RECORD_STORAGE);
+    sonicare->dialogs = furi_record_open(RECORD_DIALOGS);
    
-    // Input handling
-    InputEvent input;
-    uint8_t exit_loop = 0;
+    sonicare->view_dispatcher = view_dispatcher_alloc();
+    sonicare->scene_manager = scene_manager_alloc(&sonicare_scene_handlers, sonicare);
+    view_dispatcher_set_event_callback_context(sonicare->view_dispatcher, sonicare);
+    view_dispatcher_set_custom_event_callback(sonicare->view_dispatcher, sonicare_debug_custom_event_callback);
+    view_dispatcher_set_navigation_event_callback(sonicare->view_dispatcher, sonicare_debug_back_event_callback);
    
-    while (1) {
-        furi_check(furi_message_queue_get(app.input_queue, &input, FuriWaitForever) == FuriStatusOk);
-        
-        switch (input.key) {
-            case InputKeyLeft:
-            case InputKeyRight:
-            case InputKeyOk:
-            case InputKeyUp:
-            case InputKeyDown:
-            case InputKeyBack:
-                exit_loop = 1;
-                break;
-            default:
-                break;
-        }
-        
-        if (exit_loop) {
-            break;
-        }
-        
-        view_port_update(app.view_port);
-    }
+    // Open GUI record
+    sonicare->gui = furi_record_open(RECORD_GUI);
    
-    // Free structs
-    view_port_enabled_set(app.view_port, false);
-    gui_remove_view_port(app.gui, app.view_port);
-    furi_record_close("gui");
-    view_port_free(app.view_port);
+    // Open Notification record
+    sonicare->notifications = furi_record_open(RECORD_NOTIFICATION);
+    
+    // Submenu
+    sonicare->submenu = submenu_alloc();
+    view_dispatcher_add_view(
+        sonicare->view_dispatcher, SonicareViewSubmenu, submenu_get_view(sonicare->submenu));
+    
+    return sonicare;
+}
+
+static void sonicare_free(Sonicare* sonicare) {
+    furi_assert(sonicare);
+    
+    // Submenu
+    view_dispatcher_remove_view(sonicare->view_dispatcher, SonicareViewSubmenu);
+    submenu_free(sonicare->submenu);
+    
+    view_dispatcher_free(sonicare->view_dispatcher);
+    
+    scene_manager_free(sonicare->scene_manager);
+    
+    furi_record_close(RECORD_GUI);
+    sonicare->gui = NULL;
+    
+    furi_record_close(RECORD_NOTIFICATION);
+    sonicare->notifications = NULL;
+    
+    furi_record_close(RECORD_STORAGE);
+    furi_record_close(RECORD_DIALOGS);
+    
+    free(sonicare);
+}
+
+int32_t sonicare_app(void* p) {
+    Sonicare* app = sonicare_alloc();
+    UNUSED(p);
+    //char* args = p;
+    
+    view_dispatcher_attach_to_gui(
+        app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
+    scene_manager_next_scene(app->scene_manager, SonicareSceneStart);
+
+    view_dispatcher_run(app->view_dispatcher);
+    
+    sonicare_free(app);
    
    return 0;
 }
-