Skip to content

Commit

Permalink
fix: minor UI cleanup, screenshot cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
xtruan committed May 21, 2024
1 parent 206e84b commit cf969fa
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ App(
fap_category="Tools",
fap_author="Struan Clark (xtruan)",
fap_weburl="https://github.com/xtruan/FlipBIP",
fap_version=(1, 15),
fap_version=(1, 16),
fap_description="Crypto wallet for Flipper",
)
4 changes: 2 additions & 2 deletions catalog/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ sourcecode:
origin: https://github.com/xtruan/FlipBIP.git
commit_sha: a9b4eadaa2ad775ead09cec8eb0987704640acc2
description: "Cryptocurrency wallet with support for BTC, ETH, DOGE, and ZEC (t-addr)"
changelog: "v1.15 - Update to support new FW"
changelog: "v1.16 - Minor UI cleanup"
author: "@xtruan"
screenshots:
- "./catalog/startscreen.png"
- "./catalog/menu1.png"
- "./catalog/menu2.png"
- "./catalog/input_mnemonic.png"
- "./catalog/btc_loading.png"
- "./catalog/wallet_info.png"
- "./catalog/wallet_mnemonic.png"
- "./catalog/btc_receive.png"
- "./catalog/settings.png"
Binary file modified catalog/settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added catalog/settings_old.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion flipbip.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ FlipBip* flipbip_app_alloc() {
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);
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));

Expand Down
2 changes: 1 addition & 1 deletion flipbip.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "scenes/flipbip_scene.h"
#include "views/flipbip_scene_1.h"

#define FLIPBIP_VERSION "v1.15"
#define FLIPBIP_VERSION "v1.16"

#define COIN_BTC 0
#define COIN_DOGE 3
Expand Down
16 changes: 8 additions & 8 deletions scenes/flipbip_scene_menu.c
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -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)) {
Expand Down
3 changes: 2 additions & 1 deletion views/flipbip_scene_1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit cf969fa

Please sign in to comment.