Browse Source

Merge nfc_playlist from https://github.com/xMasterX/all-the-plugins

# Conflicts:
#	nfc_playlist/application.fam
#	nfc_playlist/nfc_playlist.h
#	nfc_playlist/scenes/nfc_playlist_scene_nfc_remove.c
#	nfc_playlist/scenes/nfc_playlist_scene_playlist_rename.c
#	nfc_playlist/scenes/nfc_playlist_scene_settings.c
Willy-JL 1 year ago
parent
commit
8d2d345c4f

+ 2 - 1
nfc_playlist/application.fam

@@ -9,7 +9,8 @@ App(
     fap_author="@acegoal07",
     fap_weburl="https://github.com/acegoal07/FlipperZero_NFC_Playlist/tree/main",
     fap_version="2.1",
-    fap_icon="assets/icon.png",
+    fap_icon_assets="assets",
+    fap_icon="icon.png",
     fap_private_libs=[
         Lib(
             name="worker",

+ 0 - 0
nfc_playlist/assets/icon.png → nfc_playlist/assets/Nfc_10px.png


BIN
nfc_playlist/assets/unknown_10px.png


BIN
nfc_playlist/icon.png


+ 1 - 1
nfc_playlist/nfc_playlist.h

@@ -4,7 +4,7 @@
 
 #include <string.h>
 
-#include <assets_icons.h>
+#include "nfc_playlist_icons.h"
 
 #include <gui/gui.h>
 #include <gui/view_dispatcher.h>