Skip to content

Commit 7444b87

Browse files
committed
fix: fmt
1 parent 1eae49b commit 7444b87

13 files changed

+50
-45
lines changed

flipbip.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ FlipBip* flipbip_app_alloc() {
116116

117117
// Scene additions
118118
app->view_dispatcher = view_dispatcher_alloc();
119-
view_dispatcher_enable_queue(app->view_dispatcher);
120119

121120
app->scene_manager = scene_manager_alloc(&flipbip_scene_handlers, app);
122121
view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
@@ -171,7 +170,12 @@ FlipBip* flipbip_app_alloc() {
171170
dialog_ex_set_left_button_text(app->renew_dialog, "No");
172171
dialog_ex_set_right_button_text(app->renew_dialog, "Yes");
173172
dialog_ex_set_header(
174-
app->renew_dialog, "Current wallet\nwill be deleted!\nProceed?", 16, 12, AlignLeft, AlignTop);
173+
app->renew_dialog,
174+
"Current wallet\nwill be deleted!\nProceed?",
175+
16,
176+
12,
177+
AlignLeft,
178+
AlignTop);
175179
view_dispatcher_add_view(
176180
app->view_dispatcher, FlipBipViewRenewConfirm, dialog_ex_get_view(app->renew_dialog));
177181

flipbip.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
#define FLIPBIP_VERSION "v1.16"
1919

20-
#define COIN_BTC 0
20+
#define COIN_BTC 0
2121
#define COIN_DOGE 3
22-
#define COIN_ETH 60
23-
#define COIN_ZEC 133
22+
#define COIN_ETH 60
23+
#define COIN_ZEC 133
2424

2525
#define TEXT_BUFFER_SIZE 256
2626

helpers/flipbip_custom_event.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ typedef enum {
77
FlipBipCustomEventScene1Right,
88
FlipBipCustomEventScene1Ok,
99
FlipBipCustomEventScene1Back,
10-
} FlipBipCustomEvent;
10+
} FlipBipCustomEvent;

helpers/flipbip_file.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
#include <rand.h>
88

99
// #define FLIPBIP_APP_BASE_FOLDER APP_DATA_PATH("flipbip")
10-
#define FLIPBIP_APP_BASE_FOLDER EXT_PATH("apps_data/flipbip")
10+
#define FLIPBIP_APP_BASE_FOLDER EXT_PATH("apps_data/flipbip")
1111
#define FLIPBIP_APP_BASE_FOLDER_PATH(path) FLIPBIP_APP_BASE_FOLDER "/" path
12-
#define FLIPBIP_DAT_FILE_NAME ".flipbip.dat"
12+
#define FLIPBIP_DAT_FILE_NAME ".flipbip.dat"
1313
// #define FLIPBIP_DAT_FILE_NAME ".flipbip.dat.txt"
14-
#define FLIPBIP_DAT_FILE_NAME_BAK ".flipbip.dat.bak"
15-
#define FLIPBIP_KEY_FILE_NAME ".flipbip.key"
14+
#define FLIPBIP_DAT_FILE_NAME_BAK ".flipbip.dat.bak"
15+
#define FLIPBIP_KEY_FILE_NAME ".flipbip.key"
1616
// #define FLIPBIP_KEY_FILE_NAME ".flipbip.key.txt"
17-
#define FLIPBIP_KEY_FILE_NAME_BAK ".flipbip.key.bak"
18-
#define FLIPBIP_DAT_PATH FLIPBIP_APP_BASE_FOLDER_PATH(FLIPBIP_DAT_FILE_NAME)
19-
#define FLIPBIP_DAT_PATH_BAK FLIPBIP_APP_BASE_FOLDER_PATH(FLIPBIP_DAT_FILE_NAME_BAK)
20-
#define FLIPBIP_KEY_PATH FLIPBIP_APP_BASE_FOLDER_PATH(FLIPBIP_KEY_FILE_NAME)
21-
#define FLIPBIP_KEY_PATH_BAK FLIPBIP_APP_BASE_FOLDER_PATH(FLIPBIP_KEY_FILE_NAME_BAK)
17+
#define FLIPBIP_KEY_FILE_NAME_BAK ".flipbip.key.bak"
18+
#define FLIPBIP_DAT_PATH FLIPBIP_APP_BASE_FOLDER_PATH(FLIPBIP_DAT_FILE_NAME)
19+
#define FLIPBIP_DAT_PATH_BAK FLIPBIP_APP_BASE_FOLDER_PATH(FLIPBIP_DAT_FILE_NAME_BAK)
20+
#define FLIPBIP_KEY_PATH FLIPBIP_APP_BASE_FOLDER_PATH(FLIPBIP_KEY_FILE_NAME)
21+
#define FLIPBIP_KEY_PATH_BAK FLIPBIP_APP_BASE_FOLDER_PATH(FLIPBIP_KEY_FILE_NAME_BAK)
2222

2323
const char* TEXT_QRFILE = "Filetype: QRCode\n"
2424
"Version: 0\n"
2525
"Message: "; // 37 chars + 1 null
26-
#define FILE_HLEN 4
27-
#define FILE_KLEN 256
28-
#define FILE_SLEN 512
29-
#define FILE_MAX_PATH_LEN 48
26+
#define FILE_HLEN 4
27+
#define FILE_KLEN 256
28+
#define FILE_SLEN 512
29+
#define FILE_MAX_PATH_LEN 48
3030
#define FILE_MAX_QRFILE_CONTENT 90
3131
const char* FILE_HSTR = "fb01";
3232
const char* FILE_K1 = "fb0131d5cf688221c109163908ebe51debb46227c6cc8b37641910833222772a"

helpers/flipbip_string.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,4 @@ void flipbip_cipher(
126126
flipbip_btox(buf, io_len / 2, out);
127127

128128
memzero(buf, 256);
129-
}
129+
}

helpers/flipbip_string.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ void flipbip_cipher(
99
const unsigned int key_len,
1010
const char* in,
1111
char* out,
12-
const unsigned int io_len);
12+
const unsigned int io_len);

lib/crypto/monero/base58.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote
3232
// developers
3333

34+
#include "options.h"
35+
3436
#if USE_MONERO
3537

3638
#ifndef __XMR_BASE58_H__

scenes/flipbip_scene_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
ADD_SCENE(flipbip, menu, Menu)
22
ADD_SCENE(flipbip, scene_1, Scene_1)
3-
ADD_SCENE(flipbip, settings, Settings)
3+
ADD_SCENE(flipbip, settings, Settings)

scenes/flipbip_scene_menu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,4 @@ bool flipbip_scene_menu_on_event(void* context, SceneManagerEvent event) {
148148
void flipbip_scene_menu_on_exit(void* context) {
149149
FlipBip* app = context;
150150
submenu_reset(app->submenu);
151-
}
151+
}

scenes/flipbip_scene_scene_1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ bool flipbip_scene_scene_1_on_event(void* context, SceneManagerEvent event) {
5757
void flipbip_scene_scene_1_on_exit(void* context) {
5858
FlipBip* app = context;
5959
UNUSED(app);
60-
}
60+
}

scenes/flipbip_scene_settings.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// From: lib/crypto
44
#include <memzero.h>
55

6-
#define TEXT_LABEL_ON "ON"
6+
#define TEXT_LABEL_ON "ON"
77
#define TEXT_LABEL_OFF "OFF"
88

99
const char* const bip39_strength_text[3] = {
@@ -92,4 +92,4 @@ void flipbip_scene_settings_on_exit(void* context) {
9292
FlipBip* app = context;
9393
variable_item_list_set_selected_item(app->variable_item_list, 0);
9494
variable_item_list_reset(app->variable_item_list);
95-
}
95+
}

views/flipbip_scene_1.c

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@
1717

1818
#define DERIV_PURPOSE 44
1919
#define DERIV_ACCOUNT 0
20-
#define DERIV_CHANGE 0
20+
#define DERIV_CHANGE 0
2121

2222
#define MAX_TEXT_LEN 30 // 30 = max length of text
2323
#define MAX_TEXT_BUF (MAX_TEXT_LEN + 1) // max length of text + null terminator
2424
#define MAX_ADDR_BUF (42 + 1) // 42 = max length of address + null terminator
25-
#define NUM_ADDRS 6
26-
27-
#define PAGE_LOADING 0
28-
#define PAGE_INFO 1
29-
#define PAGE_MNEMONIC 2
30-
#define PAGE_SEED 3
31-
#define PAGE_XPRV_ROOT 4
32-
#define PAGE_XPRV_ACCT 5
33-
#define PAGE_XPUB_ACCT 6
34-
#define PAGE_XPRV_EXTD 7
35-
#define PAGE_XPUB_EXTD 8
25+
#define NUM_ADDRS 6
26+
27+
#define PAGE_LOADING 0
28+
#define PAGE_INFO 1
29+
#define PAGE_MNEMONIC 2
30+
#define PAGE_SEED 3
31+
#define PAGE_XPRV_ROOT 4
32+
#define PAGE_XPRV_ACCT 5
33+
#define PAGE_XPUB_ACCT 6
34+
#define PAGE_XPRV_EXTD 7
35+
#define PAGE_XPUB_EXTD 8
3636
#define PAGE_ADDR_BEGIN 9
37-
#define PAGE_ADDR_END (PAGE_ADDR_BEGIN + NUM_ADDRS - 1)
37+
#define PAGE_ADDR_END (PAGE_ADDR_BEGIN + NUM_ADDRS - 1)
3838

39-
#define TEXT_LOADING "Loading..."
40-
#define TEXT_NEW_WALLET "New wallet"
41-
#define TEXT_DEFAULT_COIN "Coin"
39+
#define TEXT_LOADING "Loading..."
40+
#define TEXT_NEW_WALLET "New wallet"
41+
#define TEXT_DEFAULT_COIN "Coin"
4242
#define TEXT_RECEIVE_ADDRESS "receive address:"
4343
// #define TEXT_DEFAULT_DERIV "m/44'/X'/0'/0"
4444
const char* TEXT_INFO = "-Scroll pages with up/down-"
@@ -735,8 +735,7 @@ FlipBipScene1* flipbip_scene_1_alloc() {
735735
void flipbip_scene_1_free(FlipBipScene1* instance) {
736736
furi_assert(instance);
737737

738-
with_view_model(
739-
instance->view, FlipBipScene1Model * model, { UNUSED(model); }, true);
738+
with_view_model(instance->view, FlipBipScene1Model * model, { UNUSED(model); }, true);
740739

741740
// free the address node
742741
memzero(s_addr_node, sizeof(HDNode));

views/flipbip_scene_1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ View* flipbip_scene_1_get_view(FlipBipScene1* flipbip_static);
1616

1717
FlipBipScene1* flipbip_scene_1_alloc();
1818

19-
void flipbip_scene_1_free(FlipBipScene1* flipbip_static);
19+
void flipbip_scene_1_free(FlipBipScene1* flipbip_static);

0 commit comments

Comments
 (0)