Merge nfc_magic from https://github.com/flipperdevices/flipperzero-good-faps

nfc_magic/.catalog/changelog.md

@@ -1,3 +1,6 @@
+## 1.3
+ - Fix incorrect gen4 password usage
+
 ## 1.2
  - Minimal changes for recent API updates
 

nfc_magic/application.fam

@@ -10,7 +10,7 @@ App(
     ],
     stack_size=4 * 1024,
     fap_description="Application for writing to NFC tags with modifiable sector 0",
-    fap_version="1.2",
+    fap_version="1.3",
     fap_icon="125_10px.png",
     fap_category="NFC",
     fap_private_libs=[

nfc_magic/nfc_magic_app.c

@@ -23,6 +23,7 @@ void nfc_magic_app_tick_event_callback(void* context) {
 
 void nfc_magic_app_show_loading_popup(void* context, bool show) {
     NfcMagicApp* instance = context;
+
     if(show) {
         // Raise timer priority so that animations can play
         furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);

nfc_magic/scenes/nfc_magic_scene_not_magic.c

@@ -16,13 +16,7 @@ void nfc_magic_scene_not_magic_on_enter(void* context) {
     widget_add_string_element(
         widget, 3, 4, AlignLeft, AlignTop, FontPrimary, "This is wrong card");
     widget_add_string_multiline_element(
-        widget,
-        4,
-        17,
-        AlignLeft,
-        AlignTop,
-        FontSecondary,
-        "Not magic or unsupported\ncard. Only Gen1 and\nGen4 UMC cards supported.");
+        widget, 4, 17, AlignLeft, AlignTop, FontSecondary, "Not magic or unsupported\ncard. Only Gen1 and \nGen4 UMC cards supported.");
     widget_add_button_element(
         widget, GuiButtonTypeLeft, "Retry", nfc_magic_scene_not_magic_widget_callback, instance);