MX 1 год назад
Родитель
Сommit
73d586d327
5 измененных файлов с 21 добавлено и 17 удалено
  1. 1 1
      application.fam
  2. 8 3
      flipbip.c
  3. 2 4
      flipbip.h
  4. 8 8
      scenes/flipbip_scene_menu.c
  5. 2 1
      views/flipbip_scene_1.c

+ 1 - 1
application.fam

@@ -17,6 +17,6 @@ App(
     fap_category="Tools",
     fap_author="Struan Clark (xtruan)",
     fap_weburl="https://github.com/xtruan/FlipBIP",
-    fap_version=(1, 14),
+    fap_version=(1, 16),
     fap_description="Crypto wallet for Flipper",
 )

+ 8 - 3
flipbip.c

@@ -102,8 +102,7 @@ static void flipbip_scene_renew_dialog_callback(DialogExResult result, void* con
 static void flipbip_wallet_create(void* context) {
     FlipBip* app = context;
     furi_assert(app);
-    scene_manager_set_scene_state(
-        app->scene_manager, FlipBipSceneMenu, SubmenuIndexScene1New);
+    scene_manager_set_scene_state(app->scene_manager, FlipBipSceneMenu, SubmenuIndexScene1New);
     scene_manager_next_scene(app->scene_manager, FlipBipSceneScene_1);
 }
 
@@ -171,7 +170,13 @@ FlipBip* flipbip_app_alloc() {
     dialog_ex_set_context(app->renew_dialog, app);
     dialog_ex_set_left_button_text(app->renew_dialog, "No");
     dialog_ex_set_right_button_text(app->renew_dialog, "Yes");
-    dialog_ex_set_header(app->renew_dialog, "Current wallet\nWill be lost.\nProceed?", 16, 12, AlignLeft, AlignTop);
+    dialog_ex_set_header(
+        app->renew_dialog,
+        "Current wallet\nwill be deleted!\nProceed?",
+        16,
+        12,
+        AlignLeft,
+        AlignTop);
     view_dispatcher_add_view(
         app->view_dispatcher, FlipBipViewRenewConfirm, dialog_ex_get_view(app->renew_dialog));
 

+ 2 - 4
flipbip.h

@@ -15,7 +15,7 @@
 #include "scenes/flipbip_scene.h"
 #include "views/flipbip_scene_1.h"
 
-#define FLIPBIP_VERSION "v1.14"
+#define FLIPBIP_VERSION "v1.16"
 
 #define COIN_BTC 0
 #define COIN_DOGE 3
@@ -24,8 +24,6 @@
 
 #define TEXT_BUFFER_SIZE 256
 
-
-
 typedef struct {
     Gui* gui;
     // NotificationApp* notification;
@@ -50,7 +48,7 @@ typedef struct {
     char import_mnemonic_text[TEXT_BUFFER_SIZE];
     char input_text[TEXT_BUFFER_SIZE];
 
-    void (* wallet_create)(void* context);
+    void (*wallet_create)(void* context);
 } FlipBip;
 
 typedef enum {

+ 8 - 8
scenes/flipbip_scene_menu.c

@@ -1,7 +1,7 @@
 #include "../flipbip.h"
 #include "../helpers/flipbip_file.h"
 
-#define FLIPBIP_SUBMENU_TEXT "** FlipBIP wallet " FLIPBIP_VERSION " **"
+// #define FLIPBIP_SUBMENU_TEXT "** FlipBIP wallet " FLIPBIP_VERSION " **"
 
 void flipbip_scene_menu_submenu_callback(void* context, uint32_t index) {
     furi_assert(context);
@@ -12,13 +12,13 @@ void flipbip_scene_menu_submenu_callback(void* context, uint32_t index) {
 void flipbip_scene_menu_on_enter(void* context) {
     FlipBip* app = context;
 
-    // FlipBIP header with version
-    submenu_add_item(
-        app->submenu,
-        FLIPBIP_SUBMENU_TEXT,
-        SubmenuIndexNOP,
-        flipbip_scene_menu_submenu_callback,
-        app);
+    // // FlipBIP header with version
+    // submenu_add_item(
+    //     app->submenu,
+    //     FLIPBIP_SUBMENU_TEXT,
+    //     SubmenuIndexNOP,
+    //     flipbip_scene_menu_submenu_callback,
+    //     app);
 
     if(flipbip_has_file(FlipBipFileKey, NULL, false) &&
        flipbip_has_file(FlipBipFileDat, NULL, false)) {

+ 2 - 1
views/flipbip_scene_1.c

@@ -317,8 +317,9 @@ void flipbip_scene_1_draw(Canvas* canvas, FlipBipScene1Model* model) {
         canvas_draw_str(canvas, 2, 10, TEXT_LOADING);
         canvas_draw_str(canvas, 7, 30, s_derivation_text);
         // canvas_draw_icon(canvas, 86, 22, &I_Keychain_39x36);
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str_aligned(canvas, 125, 2, AlignRight, AlignTop, FLIPBIP_VERSION);
         if(s_warn_insecure) {
-            canvas_set_font(canvas, FontSecondary);
             canvas_draw_str(canvas, 2, 50, WARN_INSECURE_TEXT_1);
             canvas_draw_str(canvas, 2, 60, WARN_INSECURE_TEXT_2);
         }