From 00728b688b0d3bcbd979b5f6c197ff34bc414072 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Fri, 4 Aug 2023 20:55:55 +0200
Subject: [PATCH] Main apps in ext apps folders (use if not in menu)

---
 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 | 1 +
 scripts/fbt_tools/fbt_extapps.py             | 8 +-------
 10 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/applications/main/bad_kb/application.fam b/applications/main/bad_kb/application.fam
index 0665c5661..4591625ec 100644
--- a/applications/main/bad_kb/application.fam
+++ b/applications/main/bad_kb/application.fam
@@ -7,4 +7,5 @@ App(
     icon="A_BadKb_14",
     order=70,
     fap_icon="icon.png",
+    fap_category="Tools",
 )
diff --git a/applications/main/gpio/application.fam b/applications/main/gpio/application.fam
index c87fb5dbd..6eef678cf 100644
--- a/applications/main/gpio/application.fam
+++ b/applications/main/gpio/application.fam
@@ -7,4 +7,5 @@ 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 9ac40b46a..5df50fcf2 100644
--- a/applications/main/ibutton/application.fam
+++ b/applications/main/ibutton/application.fam
@@ -8,6 +8,7 @@ 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 6c770f9e9..d669e4298 100644
--- a/applications/main/infrared/application.fam
+++ b/applications/main/infrared/application.fam
@@ -8,6 +8,7 @@ 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 9489b1b1f..76eeaf9d8 100644
--- a/applications/main/lfrfid/application.fam
+++ b/applications/main/lfrfid/application.fam
@@ -8,6 +8,7 @@ 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 a22d64af5..0e7f74379 100644
--- a/applications/main/nfc/application.fam
+++ b/applications/main/nfc/application.fam
@@ -8,6 +8,7 @@ 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 edc86b38d..cc0da1533 100644
--- a/applications/main/subghz/application.fam
+++ b/applications/main/subghz/application.fam
@@ -19,6 +19,7 @@ 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 3bab607cd..a60f0721f 100644
--- a/applications/main/u2f/application.fam
+++ b/applications/main/u2f/application.fam
@@ -7,4 +7,5 @@ App(
     icon="A_U2F_14",
     order=80,
     fap_icon="icon.png",
+    fap_category="USB",
 )
diff --git a/applications/main/xtreme_app/application.fam b/applications/main/xtreme_app/application.fam
index 0fd447773..3266ecbac 100644
--- a/applications/main/xtreme_app/application.fam
+++ b/applications/main/xtreme_app/application.fam
@@ -7,4 +7,5 @@ App(
     icon="A_Xtreme_14",
     order=90,
     fap_icon="icon.png",
+    fap_category="assets"
 )
diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
index 51965681c..1766d4c44 100644
--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -176,13 +176,7 @@ class AppBuilder:
                         deployable = False
                 app_artifacts.dist_entries.append((deployable, fal_path))
         else:
-            category = (
-                "assets"
-                if self.app.apptype == FlipperAppType.MENUEXTERNAL
-                and not self.app.fap_category
-                else self.app.fap_category
-            )
-            fap_path = f"apps/{category}/{app_artifacts.compact.name}"
+            fap_path = f"apps/{self.app.fap_category}/{app_artifacts.compact.name}"
             app_artifacts.dist_entries.append(
                 (self.app.is_default_deployable, fap_path)
             )