seperate menu items for coin instead of preference, remove scene_2

flipbip.c

@@ -49,8 +49,6 @@ FlipBip* flipbip_app_alloc() {
     view_dispatcher_add_view(app->view_dispatcher, FlipBipViewIdStartscreen, flipbip_startscreen_get_view(app->flipbip_startscreen));
     app->flipbip_scene_1 = flipbip_scene_1_alloc();
     view_dispatcher_add_view(app->view_dispatcher, FlipBipViewIdScene1, flipbip_scene_1_get_view(app->flipbip_scene_1));
-    // app->flipbip_scene_2 = flipbip_scene_2_alloc();
-    // view_dispatcher_add_view(app->view_dispatcher, FlipBipViewIdScene2, flipbip_scene_2_get_view(app->flipbip_scene_2));
     app->variable_item_list = variable_item_list_alloc();
     view_dispatcher_add_view(app->view_dispatcher, FlipBipViewIdSettings, variable_item_list_get_view(app->variable_item_list));
 

flipbip.h

@@ -13,7 +13,6 @@
 #include "scenes/flipbip_scene.h"
 #include "views/flipbip_startscreen.h"
 #include "views/flipbip_scene_1.h"
-// #include "views/flipbip_scene_2.h"
 
 typedef struct {
     Gui* gui;
@@ -24,7 +23,6 @@ typedef struct {
     VariableItemList* variable_item_list;
     FlipBipStartscreen* flipbip_startscreen;
     FlipBipScene1* flipbip_scene_1;
-    // FlipBipScene2* flipbip_scene_2;
     int haptic; 
     int led;
     int bip39_strength;

scenes/flipbip_scene_config.h

@@ -1,5 +1,4 @@
 ADD_SCENE(flipbip, startscreen, Startscreen)
 ADD_SCENE(flipbip, menu, Menu)
 ADD_SCENE(flipbip, scene_1, Scene_1)
-// ADD_SCENE(flipbip, scene_2, Scene_2)
 ADD_SCENE(flipbip, settings, Settings)

scenes/flipbip_scene_menu.c

@@ -1,8 +1,8 @@
 #include "../flipbip.h"
 
 enum SubmenuIndex {
-    SubmenuIndexScene1 = 10,
-    // SubmenuIndexScene2,
+    SubmenuIndexScene1BTC = 10,
+    SubmenuIndexScene1ETH,
     SubmenuIndexSettings,
 };
 
@@ -14,12 +14,12 @@ void flipbip_scene_menu_submenu_callback(void* context, uint32_t index) {
 void flipbip_scene_menu_on_enter(void* context) {
     FlipBip* app = context;
 
-    if (app->bip44_coin == FlipBipCoinBTC0) { // BTC
-        submenu_add_item(app->submenu, "Generate BTC wallet", SubmenuIndexScene1, flipbip_scene_menu_submenu_callback, app);
-    }
-    if (app->bip44_coin == FlipBipCoinETH60) { // ETH
-        submenu_add_item(app->submenu, "Generate ETH wallet", SubmenuIndexScene1, flipbip_scene_menu_submenu_callback, app);
-    }
+    // if (app->bip44_coin == FlipBipCoinBTC0) { // BTC
+        submenu_add_item(app->submenu, "Generate BTC wallet", SubmenuIndexScene1BTC, flipbip_scene_menu_submenu_callback, app);
+    // }
+    // if (app->bip44_coin == FlipBipCoinETH60) { // ETH
+        submenu_add_item(app->submenu, "Generate ETH wallet", SubmenuIndexScene1ETH, flipbip_scene_menu_submenu_callback, app);
+    // }
     //submenu_add_item(app->submenu, "Scene 2", SubmenuIndexScene2, flipbip_scene_menu_submenu_callback, app);
     submenu_add_item(app->submenu, "Settings", SubmenuIndexSettings, flipbip_scene_menu_submenu_callback, app);
 
@@ -30,23 +30,25 @@ void flipbip_scene_menu_on_enter(void* context) {
 
 bool flipbip_scene_menu_on_event(void* context, SceneManagerEvent event) {
     FlipBip* app = context;
-    UNUSED(app);
+    //UNUSED(app);
     if(event.type == SceneManagerEventTypeBack) {
         //exit app
         scene_manager_stop(app->scene_manager);
         view_dispatcher_stop(app->view_dispatcher);
         return true;
     } else if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == SubmenuIndexScene1) {
+        if(event.event == SubmenuIndexScene1BTC) {
+            app->bip44_coin = FlipBipCoinBTC0;
+            scene_manager_set_scene_state(
+                app->scene_manager, FlipBipSceneMenu, SubmenuIndexScene1BTC);
+            scene_manager_next_scene(app->scene_manager, FlipBipSceneScene_1);
+            return true;
+        } else if (event.event == SubmenuIndexScene1ETH) {
+            app->bip44_coin = FlipBipCoinETH60;
             scene_manager_set_scene_state(
-                app->scene_manager, FlipBipSceneMenu, SubmenuIndexScene1);
+                app->scene_manager, FlipBipSceneMenu, SubmenuIndexScene1ETH);
             scene_manager_next_scene(app->scene_manager, FlipBipSceneScene_1);
             return true;
-        // } else if (event.event == SubmenuIndexScene2) {
-        //     scene_manager_set_scene_state(
-        //         app->scene_manager, FlipBipSceneMenu, SubmenuIndexScene2);
-        //     scene_manager_next_scene(app->scene_manager, FlipBipSceneScene_2);
-        //     return true;
         } else if (event.event == SubmenuIndexSettings) {
             scene_manager_set_scene_state(
                 app->scene_manager, FlipBipSceneMenu, SubmenuIndexSettings);

scenes/flipbip_scene_scene_2.c

@@ -1,53 +0,0 @@
-// #include "../flipbip.h"
-// #include "../helpers/flipbip_custom_event.h"
-// #include "../helpers/flipbip_haptic.h"
-// #include "../helpers/flipbip_led.h"
-// #include "../views/flipbip_scene_2.h"
-
-// void flipbip_scene_2_callback(FlipBipCustomEvent event, void* context) {
-//     furi_assert(context);
-//     FlipBip* app = context;
-//     view_dispatcher_send_custom_event(app->view_dispatcher, event);
-// }
-
-// void flipbip_scene_scene_2_on_enter(void* context) {
-//     furi_assert(context);
-//     FlipBip* app = context;
-//     flipbip_scene_2_set_callback(app->flipbip_scene_2, flipbip_scene_2_callback, app);
-//     view_dispatcher_switch_to_view(app->view_dispatcher, FlipBipViewIdScene2);
-// }
-
-// bool flipbip_scene_scene_2_on_event(void* context, SceneManagerEvent event) {
-//     FlipBip* app = context;
-//     bool consumed = false;
-
-//     if(event.type == SceneManagerEventTypeCustom) {
-//         switch(event.event) {
-//             case FlipBipCustomEventScene2Left:
-//             case FlipBipCustomEventScene2Right:
-//                 break;
-//             case FlipBipCustomEventScene2Up:
-//             case FlipBipCustomEventScene2Down:
-//                 break;
-//             case FlipBipCustomEventScene2Back:
-//                 notification_message(app->notification, &sequence_reset_red);
-//                 notification_message(app->notification, &sequence_reset_green);
-//                 notification_message(app->notification, &sequence_reset_blue);
-//                 if(!scene_manager_search_and_switch_to_previous_scene(
-//                     app->scene_manager, FlipBipSceneMenu)) {
-//                         scene_manager_stop(app->scene_manager);
-//                         view_dispatcher_stop(app->view_dispatcher);
-//                     }
-//                 consumed = true;
-//                 break;
-//         }
-//     }
-
-//     return consumed;
-// }
-
-// void flipbip_scene_scene_2_on_exit(void* context) {
-//     FlipBip* app = context;
-//     UNUSED(app);
-// }
-

scenes/flipbip_scene_settings.c

@@ -67,12 +67,12 @@ static void flipbip_scene_settings_set_bip39_strength(VariableItem* item) {
     app->bip39_strength = bip39_strength_value[index];
 }
 
-static void flipbip_scene_settings_set_bip44_coin(VariableItem* item) {
-    FlipBip* app = variable_item_get_context(item);
-    uint8_t index = variable_item_get_current_value_index(item);
-    variable_item_set_current_value_text(item, bip44_coin_text[index]);
-    app->bip44_coin = bip44_coin_value[index];
-}
+// static void flipbip_scene_settings_set_bip44_coin(VariableItem* item) {
+//     FlipBip* app = variable_item_get_context(item);
+//     uint8_t index = variable_item_get_current_value_index(item);
+//     variable_item_set_current_value_text(item, bip44_coin_text[index]);
+//     app->bip44_coin = bip44_coin_value[index];
+// }
 
 void flipbip_scene_settings_submenu_callback(void* context, uint32_t index) {
     FlipBip* app = context;
@@ -95,16 +95,16 @@ void flipbip_scene_settings_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, bip39_strength_text[value_index]);
 
-    // BIP44 Coin
-    item = variable_item_list_add(
-        app->variable_item_list,
-        "BIP44 Coin:",
-        2,
-        flipbip_scene_settings_set_bip44_coin,
-        app);
-    value_index = value_index_uint32(app->bip44_coin, bip44_coin_value, 2);
-    variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, bip44_coin_text[value_index]);
+    // // BIP44 Coin
+    // item = variable_item_list_add(
+    //     app->variable_item_list,
+    //     "BIP44 Coin:",
+    //     2,
+    //     flipbip_scene_settings_set_bip44_coin,
+    //     app);
+    // value_index = value_index_uint32(app->bip44_coin, bip44_coin_value, 2);
+    // variable_item_set_current_value_index(item, value_index);
+    // variable_item_set_current_value_text(item, bip44_coin_text[value_index]);
 
     // Vibro on/off
     item = variable_item_list_add(

views/flipbip_scene_2.c

@@ -1,254 +0,0 @@
-// #include "../flipbip.h"
-// #include <furi.h>
-// #include <furi_hal.h>
-// #include <input/input.h>
-// #include <gui/elements.h>
-// #include <dolphin/dolphin.h>
-// #include "../helpers/flipbip_haptic.h"
-// //#include "../helpers/flipbip_speaker.h"
-// #include "../helpers/flipbip_led.h"
-
-// struct FlipBipScene2 {
-//     View* view;
-//     FlipBipScene2Callback callback;
-//     void* context;
-// };
-
-// typedef struct {
-//     int screen_text;
-// } FlipBipScene2Model;
-
-// char buttonText[11][14] = {
-//     "",
-//     "Press Up",
-//     "Press Down",
-//     "Press Left",
-//     "Press Right",
-//     "Press Ok",
-//     "Release Up",
-//     "Release Down",
-//     "Release Left",
-//     "Release Right",
-//     "Release Ok",
-// };
-
-// void flipbip_scene_2_set_callback(
-//     FlipBipScene2* instance,
-//     FlipBipScene2Callback callback,
-//     void* context) {
-//     furi_assert(instance);
-//     furi_assert(callback);
-//     instance->callback = callback;
-//     instance->context = context;
-// }
-
-// void flipbip_scene_2_draw(Canvas* canvas, FlipBipScene2Model* model) {
-//     canvas_clear(canvas);
-//     canvas_set_color(canvas, ColorBlack);
-//     canvas_set_font(canvas, FontPrimary);
-//     canvas_draw_str_aligned(canvas, 0, 10, AlignLeft, AlignTop, "Scene 2: Input Examples"); 
-//     canvas_set_font(canvas, FontSecondary);
-//     char *strInput = malloc(15);
-//     strcpy(strInput, buttonText[model->screen_text]);
-//     canvas_draw_str_aligned(canvas, 0, 22, AlignLeft, AlignTop, strInput); 
-//     free(strInput);
-// }
-
-// static void flipbip_scene_2_model_init(FlipBipScene2Model* const model) {
-//     model->screen_text = 0;
-// }
-
-// bool flipbip_scene_2_input(InputEvent* event, void* context) {
-//     furi_assert(context);
-//     FlipBipScene2* instance = context;
-//     if (event->type == InputTypeRelease) {
-//         switch(event->key) {
-//             case InputKeyBack:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         UNUSED(model);
-//                         //flipbip_stop_all_sound(instance->context);
-//                         instance->callback(FlipBipCustomEventScene2Back, instance->context);
-//                         flipbip_play_long_bump(instance->context);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyUp:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         model->screen_text = 6;
-//                         flipbip_play_bad_bump(instance->context);
-//                         //flipbip_stop_all_sound(instance->context);
-//                         flipbip_led_set_rgb(instance->context, 255, 0, 255);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyDown:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         model->screen_text = 7;
-//                         flipbip_play_bad_bump(instance->context);
-//                         //flipbip_stop_all_sound(instance->context);
-//                         flipbip_led_set_rgb(instance->context, 255, 255, 0);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyLeft:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         model->screen_text = 8;
-//                         flipbip_play_bad_bump(instance->context);
-//                         //flipbip_stop_all_sound(instance->context);
-//                         flipbip_led_set_rgb(instance->context, 0, 255, 255);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyRight:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         model->screen_text = 9;
-//                         flipbip_play_bad_bump(instance->context);
-//                         //flipbip_stop_all_sound(instance->context);
-//                         flipbip_led_set_rgb(instance->context, 255, 0, 0);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyOk:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         model->screen_text = 10;
-//                         flipbip_play_bad_bump(instance->context);
-//                         //flipbip_stop_all_sound(instance->context);
-//                         flipbip_led_set_rgb(instance->context, 255, 255, 255);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyMAX:
-//                 break;
-//         }
-//     } else if (event->type == InputTypePress) {
-//          switch(event->key) {
-//             case InputKeyUp:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         model->screen_text = 1;
-//                         flipbip_play_happy_bump(instance->context);
-//                         //flipbip_play_input_sound(instance->context);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyDown:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         model->screen_text = 2;
-//                         flipbip_play_happy_bump(instance->context);
-//                         //flipbip_play_input_sound(instance->context);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyLeft:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         model->screen_text = 3;
-//                         flipbip_play_happy_bump(instance->context);
-//                         //flipbip_play_input_sound(instance->context);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyRight:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         model->screen_text = 4;
-//                         flipbip_play_happy_bump(instance->context);
-//                         //flipbip_play_input_sound(instance->context);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyOk:
-//                 with_view_model(
-//                     instance->view,
-//                     FlipBipScene2Model * model,
-//                     {
-//                         model->screen_text = 5;
-//                         flipbip_play_happy_bump(instance->context);
-//                         //flipbip_play_input_sound(instance->context);
-//                     },
-//                     true);
-//                 break;
-//             case InputKeyBack:
-//             case InputKeyMAX:
-//                 break;
-//         }
-//     }
-    
-//     return true;
-// }
-
-// void flipbip_scene_2_exit(void* context) {
-//     furi_assert(context);
-//     //FlipBip* app = context;
-//     //flipbip_stop_all_sound(app);
-//     //flipbip_led_reset(app);
-// }
-
-// void flipbip_scene_2_enter(void* context) {
-//     furi_assert(context);
-//     DOLPHIN_DEED(DolphinDeedPluginStart);
-// }
-
-// FlipBipScene2* flipbip_scene_2_alloc() {
-//     FlipBipScene2* instance = malloc(sizeof(FlipBipScene2));
-//     instance->view = view_alloc();
-//     view_allocate_model(instance->view, ViewModelTypeLocking, sizeof(FlipBipScene2Model));
-//     view_set_context(instance->view, instance);
-//     view_set_draw_callback(instance->view, (ViewDrawCallback)flipbip_scene_2_draw);
-//     view_set_input_callback(instance->view, flipbip_scene_2_input);
-//     //view_set_enter_callback(instance->view, flipbip_scene_2_enter);
-//     view_set_exit_callback(instance->view, flipbip_scene_2_exit);
-
-//     with_view_model(
-//         instance->view,
-//         FlipBipScene2Model * model,
-//         {
-//             flipbip_scene_2_model_init(model);
-//         },
-//         true);
-    
-//     return instance;
-// }
-
-// void flipbip_scene_2_free(FlipBipScene2* instance) {
-//     furi_assert(instance);
-
-
-//     view_free(instance->view);
-//     free(instance);
-// }
-
-// View* flipbip_scene_2_get_view(FlipBipScene2* instance) {
-//     furi_assert(instance);
-
-
-//     return instance->view;
-// }
-

views/flipbip_scene_2.h

@@ -1,19 +0,0 @@
-// #pragma once
-
-// #include <gui/view.h>
-// #include "../helpers/flipbip_custom_event.h"
-
-// typedef struct FlipBipScene2 FlipBipScene2;
-
-// typedef void (*FlipBipScene2Callback)(FlipBipCustomEvent event, void* context);
-
-// void flipbip_scene_2_set_callback(
-//     FlipBipScene2* instance,
-//     FlipBipScene2Callback callback,
-//     void * context);
-
-// FlipBipScene2* flipbip_scene_2_alloc();
-
-// void flipbip_scene_2_free(FlipBipScene2* flipbip_static);
-
-// View* flipbip_scene_2_get_view(FlipBipScene2* boilerpate_static);