From 22d72dc990a161aff6af3dd89a9b7bf319780b94 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Thu, 13 Jul 2023 22:08:45 +0200
Subject: [PATCH] Fix main apps paths and manifests

---
 applications/main/bad_kb/application.fam     |   1 -
 applications/main/gpio/application.fam       |   1 -
 applications/main/ibutton/application.fam    |   1 -
 applications/main/infrared/application.fam   |   1 -
 applications/main/lfrfid/application.fam     |   1 -
 applications/main/nfc/application.fam        |   1 -
 applications/main/subghz/application.fam     |   1 -
 applications/main/u2f/application.fam        |   1 -
 applications/main/xtreme_app/application.fam |   3 +--
 applications/main/xtreme_app/icon.png        | Bin 0 -> 620 bytes
 scripts/fbt_tools/fbt_extapps.py             |   2 +-
 11 files changed, 2 insertions(+), 11 deletions(-)
 create mode 100644 applications/main/xtreme_app/icon.png

diff --git a/applications/main/bad_kb/application.fam b/applications/main/bad_kb/application.fam
index 873767b66..0665c5661 100644
--- a/applications/main/bad_kb/application.fam
+++ b/applications/main/bad_kb/application.fam
@@ -7,5 +7,4 @@ App(
     icon="A_BadKb_14",
     order=70,
     fap_icon="icon.png",
-    fap_category="USB",
 )
diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam
index 6eef678cf..c87fb5dbd 100644
--- a/applications/main/gpio/application.fam
+++ b/applications/main/gpio/application.fam
@@ -7,5 +7,4 @@ App(
     icon="A_GPIO_14",
     order=50,
     fap_icon="icon.png",
-    fap_category="GPIO",
 )
diff --git a/applications/main/ibutton/application.fam b/applications/main/ibutton/application.fam
index 5df50fcf2..9ac40b46a 100644
--- a/applications/main/ibutton/application.fam
+++ b/applications/main/ibutton/application.fam
@@ -8,7 +8,6 @@ App(
     stack_size=2 * 1024,
     order=60,
     fap_icon="icon.png",
-    fap_category="iButton",
 )
 
 App(
diff --git a/applications/main/infrared/application.fam b/applications/main/infrared/application.fam
index d669e4298..6c770f9e9 100644
--- a/applications/main/infrared/application.fam
+++ b/applications/main/infrared/application.fam
@@ -8,7 +8,6 @@ App(
     stack_size=3 * 1024,
     order=40,
     fap_icon="icon.png",
-    fap_category="Infrared",
 )
 
 App(
diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam
index 88af98631..285badba7 100644
--- a/applications/main/lfrfid/application.fam
+++ b/applications/main/lfrfid/application.fam
@@ -8,7 +8,6 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="icon.png",
-    fap_category="RFID",
 )
 
 App(
diff --git a/applications/main/nfc/application.fam b/applications/main/nfc/application.fam
index 0e7f74379..a22d64af5 100644
--- a/applications/main/nfc/application.fam
+++ b/applications/main/nfc/application.fam
@@ -8,7 +8,6 @@ App(
     stack_size=5 * 1024,
     order=30,
     fap_icon="icon.png",
-    fap_category="NFC",
 )
 
 App(
diff --git a/applications/main/subghz/application.fam b/applications/main/subghz/application.fam
index 6492690a3..7da1b9081 100644
--- a/applications/main/subghz/application.fam
+++ b/applications/main/subghz/application.fam
@@ -21,7 +21,6 @@ App(
     order=10,
     fap_libs=["hwdrivers"],
     fap_icon="icon.png",
-    fap_category="Sub-GHz",
 )
 
 App(
diff --git a/applications/main/u2f/application.fam b/applications/main/u2f/application.fam
index 042634c6a..3bab607cd 100644
--- a/applications/main/u2f/application.fam
+++ b/applications/main/u2f/application.fam
@@ -6,6 +6,5 @@ App(
     stack_size=2 * 1024,
     icon="A_U2F_14",
     order=80,
-    fap_category="USB",
     fap_icon="icon.png",
 )
diff --git a/applications/main/xtreme_app/application.fam b/applications/main/xtreme_app/application.fam
index bd2ec5149..0fd447773 100644
--- a/applications/main/xtreme_app/application.fam
+++ b/applications/main/xtreme_app/application.fam
@@ -6,6 +6,5 @@ App(
     stack_size=2 * 1024,
     icon="A_Xtreme_14",
     order=90,
-    # fap_icon="",
-    # fap_category="",
+    fap_icon="icon.png",
 )
diff --git a/applications/main/xtreme_app/icon.png b/applications/main/xtreme_app/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..606a6d13c38162d11a36444f6788d853825a31ec
GIT binary patch
literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$>-Ag9Sw$f>bBFsEA{&LJ=y2TA@`3lS{v#Nkfw2
z;wZQl9Q;_UI=DFN>fkB}f*&BRE>4OrQsV!TLW>v=j{EWM-sA2aAk@oDvpQmcrrTyJ
z5f?MrRk7<8K@4L6QH;vWGUg;H3E%N`j{slqqCCt0+@GUY%~=cxh{Q2wm^SeS@yw=e
zaNZ{lv!bjLpA%1*bV1@rt}7nDaW1$l@XWB8PR$dCiN!)2D{ah*rbawX98oo$@`a4Y
zD(5ZETDi)a_v9}O<@A+huG1Vr0*hFJ1Q80VD4`6S`YJ&u#X^eq<39c&*DsMvAy)~E
z91EyGgY5dj|KNAGR(@*IOA5t-&KJk|7z4U?fkw@7zK<QJaRLONfh)b`uhfCrPtt2G
zEpi0(Z37qAElt@2E_Z;zCqp)6R|?V;@_FF>jJ_!g^xpzKYhG{7eVjf3Y3eF@0~{Oz
z;|0oI_jz}BdvE`qY4-O6<p^@rlL%iG00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru=K~uTFBbTW6CD5m02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{002ZuL_t&-)18h%3IH$&!=nHHv%5^_bPSmnX(??iA_Bn7
z0N9f1Im2tgY{}n(w@LMnMh#c}$5^>k`-@BcHl3l$J7!#N4<8UgVk+MN0000<MNUMn
GLSTY4yZr(H

literal 0
HcmV?d00001

diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
index a0beb1402..65143af0b 100644
--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -179,7 +179,7 @@ class AppBuilder:
                         deployable = False
                 app_artifacts.dist_entries.append((deployable, fal_path))
         else:
-            fap_path = f"apps/{self.app.fap_category}/{app_artifacts.compact.name}"
+            fap_path = f"apps/{'assets' if self.app.apptype == FlipperAppType.MENUEXTERNAL else self.app.fap_category}/{app_artifacts.compact.name}"
             app_artifacts.dist_entries.append(
                 (self.app.is_default_deployable, fap_path)
             )