Просмотр исходного кода

Merge pull request #10 from xtruan/develop

Add header labels to input text
Struan Clark 2 лет назад
Родитель
Сommit
40541083c6
3 измененных файлов с 12 добавлено и 7 удалено
  1. 1 1
      flipbip.h
  2. 1 0
      scenes/flipbip_scene_menu.c
  3. 10 6
      scenes/flipbip_scene_settings.c

+ 1 - 1
flipbip.h

@@ -15,7 +15,7 @@
 #include "views/flipbip_startscreen.h"
 #include "views/flipbip_scene_1.h"
 
-#define FLIPBIP_VERSION "v0.0.8"
+#define FLIPBIP_VERSION "v0.0.9"
 
 #define COIN_BTC 0
 #define COIN_DOGE 3

+ 1 - 0
scenes/flipbip_scene_menu.c

@@ -111,6 +111,7 @@ bool flipbip_scene_menu_on_event(void* context, SceneManagerEvent event) {
         } else if(event.event == SubmenuIndexScene1Import) {
             app->import_from_mnemonic = 1;
             app->input_state = FlipBipTextInputMnemonic;
+            text_input_set_header_text(app->text_input, "Enter mnemonic phrase");
             view_dispatcher_switch_to_view(app->view_dispatcher, FlipBipViewIdTextInput);
             return true;
         } else if(event.event == SubmenuIndexSettings) {

+ 10 - 6
scenes/flipbip_scene_settings.c

@@ -3,9 +3,12 @@
 // From: lib/crypto
 #include <memzero.h>
 
+#define TEXT_LABEL_ON "ON"
+#define TEXT_LABEL_OFF "OFF"
+
 const char* const haptic_text[2] = {
-    "OFF",
-    "ON",
+    TEXT_LABEL_OFF,
+    TEXT_LABEL_ON,
 };
 const uint32_t haptic_value[2] = {
     FlipBipHapticOff,
@@ -13,8 +16,8 @@ const uint32_t haptic_value[2] = {
 };
 
 const char* const led_text[2] = {
-    "OFF",
-    "ON",
+    TEXT_LABEL_OFF,
+    TEXT_LABEL_ON,
 };
 const uint32_t led_value[2] = {
     FlipBipLedOff,
@@ -33,8 +36,8 @@ const uint32_t bip39_strength_value[3] = {
 };
 
 const char* const passphrase_text[2] = {
-    "OFF",
-    "ON",
+    TEXT_LABEL_OFF,
+    TEXT_LABEL_ON,
 };
 const uint32_t passphrase_value[2] = {
     FlipBipPassphraseOff,
@@ -70,6 +73,7 @@ static void flipbip_scene_settings_set_passphrase(VariableItem* item) {
 
     if(app->passphrase == FlipBipPassphraseOn) {
         app->input_state = FlipBipTextInputPassphrase;
+        text_input_set_header_text(app->text_input, "Enter BIP39 passphrase");
         view_dispatcher_switch_to_view(app->view_dispatcher, FlipBipViewIdTextInput);
     } else {
         memzero(app->passphrase_text, TEXT_BUFFER_SIZE);