From 91483ab3a1238b61ba28c2646f11a6916c35ad8b Mon Sep 17 00:00:00 2001
From: Zachary Weiss <zachary.weiss.acct@gmail.com>
Date: Mon, 29 Apr 2024 17:46:11 -0400
Subject: [PATCH] Upd app.fam, fix cross-FW icon compatibility

---
 application.fam                   | 4 ++--
 helpers/mag_text_input.c          | 8 ++++----
 helpers/mag_text_input.h          | 1 +
 helpers/mag_types.h               | 2 +-
 scenes/mag_scene_delete_success.c | 2 +-
 scenes/mag_scene_save_success.c   | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/application.fam b/application.fam
index 6044ec4e343..be70ced6b46 100644
--- a/application.fam
+++ b/application.fam
@@ -18,8 +18,8 @@ App(
     fap_category="GPIO",
     fap_icon_assets="icons",
     fap_icon_assets_symbol="mag",
-    fap_version=(0, 5),  # major, minor
-    fap_description="WIP MagSpoof port using the RFID subsystem",
+    fap_version=(0, 7),  # major, minor
+    fap_description="Enables wireless transmission of magstripe data",
     fap_author="Zachary Weiss",
     fap_weburl="https://github.com/zacharyweiss/magspoof_flipper",
 )
diff --git a/helpers/mag_text_input.c b/helpers/mag_text_input.c
index 27c2ab45bce..e5daa74a027 100644
--- a/helpers/mag_text_input.c
+++ b/helpers/mag_text_input.c
@@ -203,13 +203,13 @@ static void mag_text_input_view_draw_callback(Canvas* canvas, void* _model) {
                         canvas,
                         keyboard_origin_x + keys[column].x,
                         keyboard_origin_y + keys[column].y,
-                        &I_KeySaveSelected_22x11);
+                        &I_KeySaveSelected_24x11);
                 } else {
                     canvas_draw_icon(
                         canvas,
                         keyboard_origin_x + keys[column].x,
                         keyboard_origin_y + keys[column].y,
-                        &I_KeySave_22x11);
+                        &I_KeySave_24x11);
                 }
             } else if(keys[column].text == BACKSPACE_KEY) {
                 canvas_set_color(canvas, ColorBlack);
@@ -218,13 +218,13 @@ static void mag_text_input_view_draw_callback(Canvas* canvas, void* _model) {
                         canvas,
                         keyboard_origin_x + keys[column].x,
                         keyboard_origin_y + keys[column].y,
-                        &I_KeyBackspaceSelected_17x11);
+                        &I_KeyBackspaceSelected_16x9);
                 } else {
                     canvas_draw_icon(
                         canvas,
                         keyboard_origin_x + keys[column].x,
                         keyboard_origin_y + keys[column].y,
-                        &I_KeyBackspace_17x11);
+                        &I_KeyBackspace_16x9);
                 }
             } else {
                 if(model->selected_row == row && model->selected_column == column) {
diff --git a/helpers/mag_text_input.h b/helpers/mag_text_input.h
index 1b3d1689a70..8f27cdd03c6 100644
--- a/helpers/mag_text_input.h
+++ b/helpers/mag_text_input.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <gui/view.h>
+#include "mag_icons.h"
 // #include "mag_validators.h"
 
 #ifdef __cplusplus
diff --git a/helpers/mag_types.h b/helpers/mag_types.h
index dd63c8fd1cd..898f876f82c 100644
--- a/helpers/mag_types.h
+++ b/helpers/mag_types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define MAG_VERSION_APP "0.07"
+#define MAG_VERSION_APP FAP_VERSION
 #define MAG_DEVELOPER "Zachary Weiss"
 #define MAG_GITHUB "github.com/zacharyweiss/magspoof_flipper"
 
diff --git a/scenes/mag_scene_delete_success.c b/scenes/mag_scene_delete_success.c
index ef932568944..ca7dbbbf7d9 100644
--- a/scenes/mag_scene_delete_success.c
+++ b/scenes/mag_scene_delete_success.c
@@ -4,7 +4,7 @@ void mag_scene_delete_success_on_enter(void* context) {
     Mag* mag = context;
     Popup* popup = mag->popup;
 
-    popup_set_icon(popup, 0, 2, &I_DolphinMafia_119x62);
+    popup_set_icon(popup, 0, 2, &I_DolphinMafia_115x62);
     popup_set_header(popup, "Deleted", 83, 19, AlignLeft, AlignBottom);
 
     popup_set_callback(popup, mag_popup_timeout_callback);
diff --git a/scenes/mag_scene_save_success.c b/scenes/mag_scene_save_success.c
index d2e58144d1d..8b5b26ff6f9 100644
--- a/scenes/mag_scene_save_success.c
+++ b/scenes/mag_scene_save_success.c
@@ -8,7 +8,7 @@ void mag_scene_save_success_on_enter(void* context) {
     //scene_manager_set_scene_state(mag->scene_manager, LfRfidSceneSaveData, 0);
     mag_text_store_clear(mag);
 
-    popup_set_icon(popup, 36, 5, &I_DolphinDone_80x58);
+    popup_set_icon(popup, 36, 5, &I_DolphinNice_96x59);
     popup_set_header(popup, "Saved!", 5, 7, AlignLeft, AlignTop);
     popup_set_context(popup, mag);
     popup_set_callback(popup, mag_popup_timeout_callback);