refactor: scene 3 deleted

RogueMaster · Nov 6, 2023 · 3d7a721 · 3d7a721
1 parent 3b797e0
commit 3d7a721
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 170 deletions.
diff --git a/hex_viewer.c b/hex_viewer.c
@@ -79,10 +79,6 @@ HexViewer* hex_viewer_app_alloc() {
         HexViewerViewIdScene2,
         hex_viewer_scene_2_get_view(app->hex_viewer_scene_2));
 
-    app->button_menu = button_menu_alloc();
-    view_dispatcher_add_view(
-        app->view_dispatcher, HexViewerViewIdScene3, button_menu_get_view(app->button_menu));
-
     app->variable_item_list = variable_item_list_alloc();
     view_dispatcher_add_view(
         app->view_dispatcher,

diff --git a/hex_viewer.h b/hex_viewer.h
@@ -43,41 +43,43 @@
 // typedef struct HexViewerModel HexViewerModel;
 // typedef struct HexViewer HexViewer;
 
-typedef struct {
+typedef struct
+{
     uint8_t file_bytes[HEX_VIEWER_LINES_ON_SCREEN][HEX_VIEWER_BYTES_PER_LINE];
     uint32_t file_offset;
     uint32_t file_read_bytes;
     uint32_t file_size;
 
-    Stream* stream;
+    Stream *stream;
 } HexViewerModel;
 
 // TODO Clean
-typedef struct {
-    HexViewerModel* model;
-
-    Gui* gui;
-    Storage* storage;
-    NotificationApp* notification;
-    ViewDispatcher* view_dispatcher;
-    Submenu* submenu;
-    TextInput* text_input;
-    SceneManager* scene_manager;
-    VariableItemList* variable_item_list;
-    HexViewerStartscreen* hex_viewer_startscreen;
-    HexViewerScene1* hex_viewer_scene_1;
-    HexViewerScene2* hex_viewer_scene_2;
-    DialogsApp* dialogs; // File Browser
-    FuriString* file_path; // File Browser
+typedef struct
+{
+    HexViewerModel *model;
+
+    Gui *gui;
+    Storage *storage;
+    NotificationApp *notification;
+    ViewDispatcher *view_dispatcher;
+    Submenu *submenu;
+    TextInput *text_input;
+    SceneManager *scene_manager;
+    VariableItemList *variable_item_list;
+    HexViewerStartscreen *hex_viewer_startscreen;
+    HexViewerScene1 *hex_viewer_scene_1;
+    HexViewerScene2 *hex_viewer_scene_2;
+    DialogsApp *dialogs;   // File Browser
+    FuriString *file_path; // File Browser
     uint32_t haptic;
     uint32_t speaker;
     uint32_t led;
     uint32_t save_settings;
-    ButtonMenu* button_menu; // Button Menu
     char percent_buf[HEX_VIEWER_PERCENT_INPUT];
 } HexViewer;
 
-typedef enum {
+typedef enum
+{
     HexViewerViewIdStartscreen,
     HexViewerViewIdMenu,
     HexViewerViewIdScene1,
@@ -88,22 +90,26 @@ typedef enum {
     HexViewerViewIdSettings,
 } HexViewerViewId;
 
-typedef enum {
+typedef enum
+{
     HexViewerHapticOff,
     HexViewerHapticOn,
 } HexViewerHapticState;
 
-typedef enum {
+typedef enum
+{
     HexViewerSpeakerOff,
     HexViewerSpeakerOn,
 } HexViewerSpeakerState;
 
-typedef enum {
+typedef enum
+{
     HexViewerLedOff,
     HexViewerLedOn,
 } HexViewerLedState;
 
-typedef enum {
+typedef enum
+{
     HexViewerSettingsOff,
     HexViewerSettingsOn,
 } HexViewerSettingsStoreState;
diff --git a/scenes/hex_viewer_scene_config.h b/scenes/hex_viewer_scene_config.h
@@ -2,6 +2,5 @@ ADD_SCENE(hex_viewer, startscreen, Startscreen)
 ADD_SCENE(hex_viewer, menu, Menu)
 ADD_SCENE(hex_viewer, scene_1, Scene_1)
 ADD_SCENE(hex_viewer, scene_2, Scene_2)
-ADD_SCENE(hex_viewer, scene_3, Scene_3)
 ADD_SCENE(hex_viewer, scene_4, Scene_4)
 ADD_SCENE(hex_viewer, settings, Settings)
diff --git a/scenes/hex_viewer_scene_scene_3.c b/scenes/hex_viewer_scene_scene_3.c