From 276feac73f4fff01a961af4fd54ca864adbc987b Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sat, 18 May 2024 08:24:29 +0100
Subject: [PATCH 1/4] HID App: Update to scene based startscreen

---
 applications/system/hid_app/hid.c             | 127 ++-----------
 .../system/hid_app/scenes/hid_scene_config.h  |   3 +-
 .../system/hid_app/scenes/hid_scene_start.c   | 167 ++++++++++++++++++
 3 files changed, 180 insertions(+), 117 deletions(-)
 create mode 100644 applications/system/hid_app/scenes/hid_scene_start.c

diff --git a/applications/system/hid_app/hid.c b/applications/system/hid_app/hid.c
index a4502c0169..55c27bf3c3 100644
--- a/applications/system/hid_app/hid.c
+++ b/applications/system/hid_app/hid.c
@@ -8,23 +8,6 @@
 
 #define TAG "HidApp"
 
-enum HidDebugSubmenuIndex {
-    HidSubmenuIndexKeynote,
-    HidSubmenuIndexKeynoteVertical,
-    HidSubmenuIndexKeyboard,
-    HidSubmenuIndexNumpad,
-    HidSubmenuIndexMedia,
-    HidSubmenuIndexMusicMacOs,
-    HidSubmenuIndexMovie,
-    HidSubmenuIndexTikTok,
-    HidSubmenuIndexMouse,
-    HidSubmenuIndexMouseClicker,
-    HidSubmenuIndexMouseJiggler,
-    HidSubmenuIndexMouseJigglerStealth,
-    HidSubmenuIndexPushToTalk,
-    HidSubmenuIndexRemovePairing,
-};
-
 bool hid_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
     Hid* app = context;
@@ -34,9 +17,7 @@ bool hid_custom_event_callback(void* context, uint32_t event) {
 bool hid_back_event_callback(void* context) {
     furi_assert(context);
     Hid* app = context;
-    FURI_LOG_D("HID", "Back event");
-    view_dispatcher_switch_to_view(app->view_dispatcher, HidViewSubmenu);
-    return true;
+    return scene_manager_handle_back_event(app->scene_manager);
 }
 
 void bt_hid_remove_pairing(Hid* app) {
@@ -53,53 +34,12 @@ void bt_hid_remove_pairing(Hid* app) {
     furi_hal_bt_start_advertising();
 }
 
-static void hid_submenu_callback(void* context, uint32_t index) {
-    furi_assert(context);
-    Hid* app = context;
-    if(index == HidSubmenuIndexKeynote) {
-        hid_keynote_set_orientation(app->hid_keynote, false);
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewKeynote);
-    } else if(index == HidSubmenuIndexKeynoteVertical) {
-        hid_keynote_set_orientation(app->hid_keynote, true);
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewKeynote);
-    } else if(index == HidSubmenuIndexKeyboard) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewKeyboard);
-    } else if(index == HidSubmenuIndexNumpad) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewNumpad);
-    } else if(index == HidSubmenuIndexMedia) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMedia);
-    } else if(index == HidSubmenuIndexMusicMacOs) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMusicMacOs);
-    } else if(index == HidSubmenuIndexMovie) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMovie);
-    } else if(index == HidSubmenuIndexMouse) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMouse);
-    } else if(index == HidSubmenuIndexTikTok) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, BtHidViewTikTok);
-    } else if(index == HidSubmenuIndexMouseClicker) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMouseClicker);
-    } else if(index == HidSubmenuIndexMouseJiggler) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMouseJiggler);
-    } else if(index == HidSubmenuIndexMouseJigglerStealth) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewMouseJigglerStealth);
-    } else if(index == HidSubmenuIndexPushToTalk) {
-        view_dispatcher_switch_to_view(app->view_dispatcher, HidViewPushToTalkMenu);
-    } else if(index == HidSubmenuIndexRemovePairing) {
-        scene_manager_next_scene(app->scene_manager, HidSceneUnpair);
-    }
-}
-
 static void bt_hid_connection_status_changed_callback(BtStatus status, void* context) {
     furi_assert(context);
     Hid* hid = context;
-    bool connected = (status == BtStatusConnected);
-#ifdef HID_TRANSPORT_BLE
-    if(connected) {
-        notification_internal_message(hid->notifications, &sequence_set_blue_255);
-    } else {
-        notification_internal_message(hid->notifications, &sequence_reset_blue);
-    }
-#endif
+    const bool connected = (status == BtStatusConnected);
+    notification_internal_message(
+        hid->notifications, connected ? &sequence_set_blue_255 : &sequence_reset_blue);
     hid_keynote_set_connected_status(hid->hid_keynote, connected);
     hid_keyboard_set_connected_status(hid->hid_keyboard, connected);
     hid_numpad_set_connected_status(hid->hid_numpad, connected);
@@ -114,11 +54,6 @@ static void bt_hid_connection_status_changed_callback(BtStatus status, void* con
     hid_tiktok_set_connected_status(hid->hid_tiktok, connected);
 }
 
-static uint32_t hid_exit(void* context) {
-    UNUSED(context);
-    return VIEW_NONE;
-}
-
 static uint32_t hid_ptt_menu_view(void* context) {
     UNUSED(context);
     return HidViewPushToTalkMenu;
@@ -139,55 +74,18 @@ Hid* hid_alloc(void) {
     // View dispatcher
     app->view_dispatcher = view_dispatcher_alloc();
     view_dispatcher_enable_queue(app->view_dispatcher);
-    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
-    view_dispatcher_set_navigation_event_callback(app->view_dispatcher, hid_back_event_callback);
     view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
+    view_dispatcher_set_custom_event_callback(app->view_dispatcher, hid_custom_event_callback);
+    view_dispatcher_set_navigation_event_callback(app->view_dispatcher, hid_back_event_callback);
+    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
 
     // Scene Manager
     app->scene_manager = scene_manager_alloc(&hid_scene_handlers, app);
 
     // Device Type Submenu view
     app->submenu = submenu_alloc();
-    submenu_add_item(app->submenu, "Keynote", HidSubmenuIndexKeynote, hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu,
-        "Keynote Vertical",
-        HidSubmenuIndexKeynoteVertical,
-        hid_submenu_callback,
-        app);
-    submenu_add_item(app->submenu, "Keyboard", HidSubmenuIndexKeyboard, hid_submenu_callback, app);
-    submenu_add_item(app->submenu, "Numpad", HidSubmenuIndexNumpad, hid_submenu_callback, app);
-    submenu_add_item(app->submenu, "Media", HidSubmenuIndexMedia, hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu, "Apple Music macOS", HidSubmenuIndexMusicMacOs, hid_submenu_callback, app);
-    submenu_add_item(app->submenu, "Movie", HidSubmenuIndexMovie, hid_submenu_callback, app);
-    submenu_add_item(app->submenu, "Mouse", HidSubmenuIndexMouse, hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu, "TikTok / YT Shorts", HidSubmenuIndexTikTok, hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu, "Mouse Clicker", HidSubmenuIndexMouseClicker, hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu, "Mouse Jiggler", HidSubmenuIndexMouseJiggler, hid_submenu_callback, app);
-    submenu_add_item(
-        app->submenu,
-        "Mouse Jiggler Stealth",
-        HidSubmenuIndexMouseJigglerStealth,
-        hid_submenu_callback,
-        app);
-    submenu_add_item(
-        app->submenu, "PushToTalk", HidSubmenuIndexPushToTalk, hid_submenu_callback, app);
-#ifdef HID_TRANSPORT_BLE
-    submenu_add_item(
-        app->submenu, "Remove Pairing", HidSubmenuIndexRemovePairing, hid_submenu_callback, app);
-#endif
-    view_set_previous_callback(submenu_get_view(app->submenu), hid_exit);
-    view_dispatcher_add_view(app->view_dispatcher, HidViewSubmenu, submenu_get_view(app->submenu));
-    return app;
-}
 
-Hid* hid_app_alloc_view(void* context) {
-    furi_assert(context);
-    Hid* app = context;
+    view_dispatcher_add_view(app->view_dispatcher, HidViewSubmenu, submenu_get_view(app->submenu));
 
     // Dialog view
     app->dialog = dialog_ex_alloc();
@@ -327,18 +225,16 @@ void hid_free(Hid* app) {
 int32_t hid_usb_app(void* p) {
     UNUSED(p);
     Hid* app = hid_alloc();
-    app = hid_app_alloc_view(app);
+
     FURI_LOG_D("HID", "Starting as USB app");
 
     FuriHalUsbInterface* usb_mode_prev = furi_hal_usb_get_config();
     furi_hal_usb_unlock();
     furi_check(furi_hal_usb_set_config(&usb_hid, NULL) == true);
 
-    bt_hid_connection_status_changed_callback(BtStatusConnected, app);
-
     dolphin_deed(DolphinDeedPluginStart);
 
-    scene_manager_next_scene(app->scene_manager, HidSceneMain);
+    scene_manager_next_scene(app->scene_manager, HidSceneStart);
 
     view_dispatcher_run(app->view_dispatcher);
 
@@ -352,7 +248,6 @@ int32_t hid_usb_app(void* p) {
 int32_t hid_ble_app(void* p) {
     UNUSED(p);
     Hid* app = hid_alloc();
-    app = hid_app_alloc_view(app);
 
     FURI_LOG_D("HID", "Starting as BLE app");
 
@@ -382,7 +277,7 @@ int32_t hid_ble_app(void* p) {
 
     dolphin_deed(DolphinDeedPluginStart);
 
-    scene_manager_next_scene(app->scene_manager, HidSceneMain);
+    scene_manager_next_scene(app->scene_manager, HidSceneStart);
 
     view_dispatcher_run(app->view_dispatcher);
 
diff --git a/applications/system/hid_app/scenes/hid_scene_config.h b/applications/system/hid_app/scenes/hid_scene_config.h
index 1228ead4f0..d18b155582 100644
--- a/applications/system/hid_app/scenes/hid_scene_config.h
+++ b/applications/system/hid_app/scenes/hid_scene_config.h
@@ -1,2 +1,3 @@
+ADD_SCENE(hid, start, Start)
 ADD_SCENE(hid, main, Main)
-ADD_SCENE(hid, unpair, Unpair)
\ No newline at end of file
+ADD_SCENE(hid, unpair, Unpair)
diff --git a/applications/system/hid_app/scenes/hid_scene_start.c b/applications/system/hid_app/scenes/hid_scene_start.c
new file mode 100644
index 0000000000..61d340eec7
--- /dev/null
+++ b/applications/system/hid_app/scenes/hid_scene_start.c
@@ -0,0 +1,167 @@
+#include "../hid.h"
+#include "../views.h"
+
+enum HidSubmenuIndex {
+    HidSubmenuIndexKeynote,
+    HidSubmenuIndexKeynoteVertical,
+    HidSubmenuIndexKeyboard,
+    HidSubmenuIndexNumpad,
+    HidSubmenuIndexMedia,
+    HidSubmenuIndexMusicMacOs,
+    HidSubmenuIndexMovie,
+    HidSubmenuIndexTikTok,
+    HidSubmenuIndexMouse,
+    HidSubmenuIndexMouseClicker,
+    HidSubmenuIndexMouseJiggler,
+    HidSubmenuIndexMouseJigglerStealth,
+    HidSubmenuIndexPushToTalk,
+    HidSubmenuIndexRemovePairing,
+};
+
+static void hid_scene_start_submenu_callback(void* context, uint32_t index) {
+    furi_assert(context);
+    Hid* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, index);
+}
+
+void hid_scene_start_on_enter(void* context) {
+    Hid* app = context;
+    submenu_add_item(
+        app->submenu, "Keynote", HidSubmenuIndexKeynote, hid_scene_start_submenu_callback, app);
+    submenu_add_item(
+        app->submenu,
+        "Keynote Vertical",
+        HidSubmenuIndexKeynoteVertical,
+        hid_scene_start_submenu_callback,
+        app);
+    submenu_add_item(
+        app->submenu, "Keyboard", HidSubmenuIndexKeyboard, hid_scene_start_submenu_callback, app);
+    submenu_add_item(
+        app->submenu, "Numpad", HidSubmenuIndexNumpad, hid_scene_start_submenu_callback, app);
+    submenu_add_item(
+        app->submenu, "Media", HidSubmenuIndexMedia, hid_scene_start_submenu_callback, app);
+    submenu_add_item(
+        app->submenu,
+        "Apple Music macOS",
+        HidSubmenuIndexMusicMacOs,
+        hid_scene_start_submenu_callback,
+        app);
+    submenu_add_item(
+        app->submenu, "Movie", HidSubmenuIndexMovie, hid_scene_start_submenu_callback, app);
+    submenu_add_item(
+        app->submenu, "Mouse", HidSubmenuIndexMouse, hid_scene_start_submenu_callback, app);
+    submenu_add_item(
+        app->submenu,
+        "TikTok / YT Shorts",
+        HidSubmenuIndexTikTok,
+        hid_scene_start_submenu_callback,
+        app);
+    submenu_add_item(
+        app->submenu,
+        "Mouse Clicker",
+        HidSubmenuIndexMouseClicker,
+        hid_scene_start_submenu_callback,
+        app);
+    submenu_add_item(
+        app->submenu,
+        "Mouse Jiggler",
+        HidSubmenuIndexMouseJiggler,
+        hid_scene_start_submenu_callback,
+        app);
+    submenu_add_item(
+        app->submenu,
+        "Mouse Jiggler Stealth",
+        HidSubmenuIndexMouseJigglerStealth,
+        hid_scene_start_submenu_callback,
+        app);
+    submenu_add_item(
+        app->submenu,
+        "PushToTalk",
+        HidSubmenuIndexPushToTalk,
+        hid_scene_start_submenu_callback,
+        app);
+#ifdef HID_TRANSPORT_BLE
+    submenu_add_item(
+        app->submenu,
+        "Bluetooth Unpairing",
+        HidSubmenuIndexRemovePairing,
+        hid_scene_start_submenu_callback,
+        app);
+#endif
+
+    submenu_set_selected_item(
+        app->submenu, scene_manager_get_scene_state(app->scene_manager, HidSceneStart));
+    view_dispatcher_switch_to_view(app->view_dispatcher, HidViewSubmenu);
+}
+
+bool hid_scene_start_on_event(void* context, SceneManagerEvent event) {
+    Hid* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == HidSubmenuIndexRemovePairing) {
+            scene_manager_next_scene(app->scene_manager, HidSceneUnpair);
+        } else {
+            HidView view_id;
+
+            switch(event.event) {
+            case HidSubmenuIndexKeynote:
+                view_id = HidViewKeynote;
+                hid_keynote_set_orientation(app->hid_keynote, false);
+                break;
+            case HidSubmenuIndexKeynoteVertical:
+                view_id = HidViewKeynote;
+                hid_keynote_set_orientation(app->hid_keynote, true);
+                break;
+            case HidSubmenuIndexKeyboard:
+                view_id = HidViewKeyboard;
+                break;
+            case HidSubmenuIndexNumpad:
+                view_id = HidViewNumpad;
+                break;
+            case HidSubmenuIndexMedia:
+                view_id = HidViewMedia;
+                break;
+            case HidSubmenuIndexMusicMacOs:
+                view_id = HidViewMusicMacOs;
+                break;
+            case HidSubmenuIndexMovie:
+                view_id = HidViewMovie;
+                break;
+            case HidSubmenuIndexTikTok:
+                view_id = BtHidViewTikTok;
+                break;
+            case HidSubmenuIndexMouse:
+                view_id = HidViewMouse;
+                break;
+            case HidSubmenuIndexMouseClicker:
+                view_id = HidViewMouseClicker;
+                break;
+            case HidSubmenuIndexMouseJiggler:
+                view_id = HidViewMouseJiggler;
+                break;
+            case HidSubmenuIndexMouseJigglerStealth:
+                view_id = HidViewMouseJigglerStealth;
+                break;
+            case HidSubmenuIndexPushToTalk:
+                view_id = HidViewPushToTalkMenu;
+                break;
+            default:
+                furi_crash();
+            }
+
+            scene_manager_set_scene_state(app->scene_manager, HidSceneMain, view_id);
+            scene_manager_next_scene(app->scene_manager, HidSceneMain);
+        }
+
+        scene_manager_set_scene_state(app->scene_manager, HidSceneStart, event.event);
+        consumed = true;
+    }
+
+    return consumed;
+}
+
+void hid_scene_start_on_exit(void* context) {
+    Hid* app = context;
+    submenu_reset(app->submenu);
+}

From c4709a5b6b5c2ea867bc628bd90ff6960b6a853c Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sat, 18 May 2024 08:26:36 +0100
Subject: [PATCH 2/4] HID App: Update icons

---
 .../system/hid_app/assets/Circles_47x47.png      | Bin 3712 -> 0 bytes
 .../system/hid_app/assets/DolphinDone_80x58.png  | Bin 0 -> 1664 bytes
 .../system/hid_app/assets/DolphinNice_96x59.png  | Bin 2459 -> 0 bytes
 .../hid_app/assets/Ok_btn_pressed_13x13.png      | Bin 3625 -> 0 bytes
 .../system/hid_app/scenes/hid_scene_unpair.c     |   2 +-
 5 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 applications/system/hid_app/assets/Circles_47x47.png
 create mode 100644 applications/system/hid_app/assets/DolphinDone_80x58.png
 delete mode 100644 applications/system/hid_app/assets/DolphinNice_96x59.png
 delete mode 100644 applications/system/hid_app/assets/Ok_btn_pressed_13x13.png

diff --git a/applications/system/hid_app/assets/Circles_47x47.png b/applications/system/hid_app/assets/Circles_47x47.png
deleted file mode 100644
index 6a16ebf7bbe999fa143c683bef713a6e2f466cbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3712
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
biU<_Yn+9Io=xs3K`2!qm58ISjpSt)z2v?8|

diff --git a/applications/system/hid_app/assets/DolphinDone_80x58.png b/applications/system/hid_app/assets/DolphinDone_80x58.png
new file mode 100644
index 0000000000000000000000000000000000000000..594d62d5294997399bc3b256fbe7685ce10b146d
GIT binary patch
literal 1664
zcmbVNc~BE)6wheY2!uK<P!ZH^sKqPUBNrQp6bONU91{T}AhOwPU?s`M%|Z^98IQqp
z6smY2TBV8{;)zy^#aggT9qJUp3vFxVw5@>FLY*phgJAoI;~(9b-S2(h_kQpF-Zi@^
zF+PgtHqDL0;qcVaN)5Xvvag&wj{R2ntG{IzUnWw^ETRmI4WkK8n4Z!RfZBv*5gG#1
zJ63#0gm5_H9b}T0(Z(&5<CIB=xpahflZ8cdI3b~S3x?+q44@;jNV9_9Uw4TQka`7w
zu_O+PvqTWtWVDke7CGaSaAyvV>iMAyfDpT!HDDqb46vJwW~<z;;E&jqv$E?L<O3rr
zOpb#8ij+1k5s08@0zieZ0EZwLkg<|jiUgskOeUKTAP^z~At{JR1c*p3k;!2(F#7OW
zkF?$(*C<t^{@9&@pUp59ISATpHla-<r06UVMo|=m5D-BGtcJkqFf*84V73N~Sx^#I
zoF**{NtpqcMNCKKG73J+_Ei`rOI+M*!)EJfve>kNcFY38LI^aOT(OO4TNw@UFO4^9
zTaz3X0@M&zDwoFDnivAcz-<2B?#QLcvXLjyBwHBFsHE^*6Jci5N(G<25$Z|3oFF79
zt{0&K1d|yAVyOrc=nxShkm0BVg>_OwC(@1Cc@tix3X)1BkVqB;1;KD+Br265;Soxe
zN-Rdg!lmdKR&BO2m>DO=e3Pv2Q7rOStUQ7yFovR&D9Sk235nShLs_#a3xG(35HLFq
z!%4I2WR9y!uYy(*G?_=}RWxM+M$#-N-#`HpAu<?)B?1&ebOJFVh6O>80Tmd;G97`!
zdI?Mr{87CA|E3RQNrA3j`A_eR9kC7R5?@aPyLmlNgqa;8nw^%VblFu7XWV|ZGAzm7
z-ns8C-3V|CWLx`RUVV5?e=~JLXGNd*gA2VSy}M^liFW=t^rC%5`mI^MKJ^z*yC+9$
zK8y8opgw0i#OZbK-@bIOr+sL3X*0ny?F_5$?^u;L5LsJ%K{s=fe|&Jv>M52PH5+{E
zciwC+?Q1wXec-Dn?aE=B+ip?UBV`Bm*T(s!wWZ~plEuod;*9$(j?$d6^(EcKbW!X<
z&nIP6%$5Z)#Sc{zYqC;eHfJr#r`xJt{34$f<9D)}sVN9J6SzfMQhTpr?kB2_2ge#4
zPMiznH%5_<QYtmU<8SyK;iYwX1#kbu=2l~SoN3rT9Xx#h*}jAbkEyGWi__QiMf5K7
z<fXRHzEW75mK43q^ZB}{TY{D!?l?4E#c)`4>{H{8XZyCE8Z^qt3(nNamZCKd_dTt1
zybD4vFW|RcM-rOAUY>VP`H4R@hUX>mS_}#FURP5QO}9;kzD&7Mf0X!18#*Cy#s=lb
zo<R-PJUCVhY#Pv3hV_-T_H3S*abT4^bE)Fq-bvFMj1v?kr&Nv<z2o+;>G<iYwVylp
z&kNul?7k{)oRd`WY}nuZy2tVz{odxNf!LyBPli_-C%1W7eMKwPcPzi>CF8teZgFA$
z+RoI3!Q}^!<oRfg<jy0?vr!q}ySqI-PzZMo;%B}IZ{?BiwRvsaoRK-Zx2|x;Z|gt2
zU6Y*P<&*c(qUw;qyt`fgCciyfs}x^2HJ7?EKf|F1H?Le27gaaCyX{4D<nW=~rswJ0
z*5)PjpjX=5%gN>2oJhss<8vOJLqi_j*V;@D?$qOzS!qAdI~fh>f!$Rlk&;`Vf`4<%
z;twaDuf~1bzjhOXb@_XjZ49oi7<idnG%vlZw5eQs&ar*h`JSBiQ}GK=547~>zcZBs
XY(V!OcIS4x{t4>Hc;)f%%(edjvT}hx

literal 0
HcmV?d00001

diff --git a/applications/system/hid_app/assets/DolphinNice_96x59.png b/applications/system/hid_app/assets/DolphinNice_96x59.png
deleted file mode 100644
index a299d3630239b4486e249cc501872bed5996df3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2459
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
Zfq!wOp!Q<j;n3fwoUA<4?#z<Fe*vr2iU9xs

diff --git a/applications/system/hid_app/assets/Ok_btn_pressed_13x13.png b/applications/system/hid_app/assets/Ok_btn_pressed_13x13.png
deleted file mode 100644
index 6b46ba3a8243811986234686c4289f23d5de535c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3625
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

diff --git a/applications/system/hid_app/scenes/hid_scene_unpair.c b/applications/system/hid_app/scenes/hid_scene_unpair.c
index 7b0bbd9e62..0f9387fcf3 100644
--- a/applications/system/hid_app/scenes/hid_scene_unpair.c
+++ b/applications/system/hid_app/scenes/hid_scene_unpair.c
@@ -36,7 +36,7 @@ void hid_scene_unpair_on_enter(void* context) {
     dialog_ex_set_right_button_text(app->dialog, "Unpair");
 
     // Un-pair success popup view
-    popup_set_icon(app->popup, 32, 5, &I_DolphinNice_96x59);
+    popup_set_icon(app->popup, 48, 6, &I_DolphinDone_80x58);
     popup_set_header(app->popup, "Done", 14, 15, AlignLeft, AlignTop);
     popup_set_timeout(app->popup, 1500);
     popup_set_context(app->popup, app);

From 23ca7e7b48dc12ef2fa2e08ab96593364aa4b7e9 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sat, 18 May 2024 08:28:45 +0100
Subject: [PATCH 3/4] Some formatting to match upstream

---
 applications/system/hid_app/hid.c             |  3 +--
 applications/system/hid_app/hid.h             |  3 ++-
 .../system/hid_app/scenes/hid_scene_main.c    |  1 -
 .../system/hid_app/views/hid_keyboard.c       |  4 +--
 .../system/hid_app/views/hid_keynote.c        |  5 ++--
 applications/system/hid_app/views/hid_media.c |  4 +--
 applications/system/hid_app/views/hid_media.h |  1 -
 applications/system/hid_app/views/hid_mouse.c | 27 +++++++++----------
 .../system/hid_app/views/hid_mouse_clicker.c  |  2 +-
 .../system/hid_app/views/hid_mouse_jiggler.c  |  2 +-
 applications/system/hid_app/views/hid_movie.c | 24 ++++++++---------
 .../system/hid_app/views/hid_music_macos.c    | 24 ++++++++---------
 .../system/hid_app/views/hid_tiktok.c         | 24 ++++++++---------
 13 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/applications/system/hid_app/hid.c b/applications/system/hid_app/hid.c
index 55c27bf3c3..586d198a9b 100644
--- a/applications/system/hid_app/hid.c
+++ b/applications/system/hid_app/hid.c
@@ -4,7 +4,6 @@
 #include "views.h"
 #include <notification/notification_messages.h>
 #include <dolphin/dolphin.h>
-#include "hid_icons.h"
 
 #define TAG "HidApp"
 
@@ -59,7 +58,7 @@ static uint32_t hid_ptt_menu_view(void* context) {
     return HidViewPushToTalkMenu;
 }
 
-Hid* hid_alloc(void) {
+Hid* hid_alloc() {
     Hid* app = malloc(sizeof(Hid));
 
     // Gui
diff --git a/applications/system/hid_app/hid.h b/applications/system/hid_app/hid.h
index b15ab58ff7..ac565217a8 100644
--- a/applications/system/hid_app/hid.h
+++ b/applications/system/hid_app/hid.h
@@ -62,6 +62,7 @@ struct Hid {
     HidPushToTalk* hid_ptt;
     HidPushToTalkMenu* hid_ptt_menu;
 };
+
 void bt_hid_remove_pairing(Hid* app);
 
 void hid_hal_keyboard_press(Hid* instance, uint16_t event);
@@ -76,4 +77,4 @@ void hid_hal_mouse_move(Hid* instance, int8_t dx, int8_t dy);
 void hid_hal_mouse_scroll(Hid* instance, int8_t delta);
 void hid_hal_mouse_press(Hid* instance, uint16_t event);
 void hid_hal_mouse_release(Hid* instance, uint16_t event);
-void hid_hal_mouse_release_all(Hid* instance);
\ No newline at end of file
+void hid_hal_mouse_release_all(Hid* instance);
diff --git a/applications/system/hid_app/scenes/hid_scene_main.c b/applications/system/hid_app/scenes/hid_scene_main.c
index cd1051ac7c..1d0ca5ef4b 100644
--- a/applications/system/hid_app/scenes/hid_scene_main.c
+++ b/applications/system/hid_app/scenes/hid_scene_main.c
@@ -3,7 +3,6 @@
 
 void hid_scene_main_on_enter(void* context) {
     Hid* app = context;
-
     view_dispatcher_switch_to_view(
         app->view_dispatcher, scene_manager_get_scene_state(app->scene_manager, HidSceneMain));
 }
diff --git a/applications/system/hid_app/views/hid_keyboard.c b/applications/system/hid_app/views/hid_keyboard.c
index 9c62650f34..9dd2ad6552 100644
--- a/applications/system/hid_app/views/hid_keyboard.c
+++ b/applications/system/hid_app/views/hid_keyboard.c
@@ -228,9 +228,9 @@ static void hid_keyboard_draw_callback(Canvas* canvas, void* context) {
     furi_assert(context);
     HidKeyboardModel* model = context;
 
-// Header
+    // Header
 #ifdef HID_TRANSPORT_BLE
-    if((!model->connected)) {
+    if(!model->connected) {
         canvas_draw_icon(canvas, 0, 0, &I_Ble_disconnected_15x15);
         canvas_set_font(canvas, FontPrimary);
         elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Keyboard");
diff --git a/applications/system/hid_app/views/hid_keynote.c b/applications/system/hid_app/views/hid_keynote.c
index 3c966e20c3..793f6e5d35 100644
--- a/applications/system/hid_app/views/hid_keynote.c
+++ b/applications/system/hid_app/views/hid_keynote.c
@@ -38,7 +38,7 @@ static void hid_keynote_draw_callback(Canvas* canvas, void* context) {
     furi_assert(context);
     HidKeynoteModel* model = context;
 
-// Header
+    // Header
 #ifdef HID_TRANSPORT_BLE
     if(model->connected) {
         canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
@@ -114,7 +114,7 @@ static void hid_keynote_draw_vertical_callback(Canvas* canvas, void* context) {
     furi_assert(context);
     HidKeynoteModel* model = context;
 
-// Header
+    // Header
 #ifdef HID_TRANSPORT_BLE
     if(model->connected) {
         canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
@@ -273,7 +273,6 @@ HidKeynote* hid_keynote_alloc(Hid* hid) {
     view_allocate_model(hid_keynote->view, ViewModelTypeLocking, sizeof(HidKeynoteModel));
     view_set_draw_callback(hid_keynote->view, hid_keynote_draw_callback);
     view_set_input_callback(hid_keynote->view, hid_keynote_input_callback);
-
     return hid_keynote;
 }
 
diff --git a/applications/system/hid_app/views/hid_media.c b/applications/system/hid_app/views/hid_media.c
index 104e8a6c68..10109b3a36 100644
--- a/applications/system/hid_app/views/hid_media.c
+++ b/applications/system/hid_app/views/hid_media.c
@@ -41,7 +41,7 @@ static void hid_media_draw_callback(Canvas* canvas, void* context) {
     furi_assert(context);
     HidMediaModel* model = context;
 
-// Header
+    // Header
 #ifdef HID_TRANSPORT_BLE
     if(model->connected) {
         canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
@@ -197,6 +197,7 @@ static bool hid_media_input_callback(InputEvent* event, void* context) {
             hid_media_process_release(hid_media, event);
         }
     }
+
     return consumed;
 }
 
@@ -208,7 +209,6 @@ HidMedia* hid_media_alloc(Hid* hid) {
     view_allocate_model(hid_media->view, ViewModelTypeLocking, sizeof(HidMediaModel));
     view_set_draw_callback(hid_media->view, hid_media_draw_callback);
     view_set_input_callback(hid_media->view, hid_media_input_callback);
-
     return hid_media;
 }
 
diff --git a/applications/system/hid_app/views/hid_media.h b/applications/system/hid_app/views/hid_media.h
index 2356734b3e..faf88301f4 100644
--- a/applications/system/hid_app/views/hid_media.h
+++ b/applications/system/hid_app/views/hid_media.h
@@ -3,7 +3,6 @@
 #include <gui/view.h>
 
 typedef struct Hid Hid;
-
 typedef struct HidMedia HidMedia;
 
 HidMedia* hid_media_alloc(Hid* hid);
diff --git a/applications/system/hid_app/views/hid_mouse.c b/applications/system/hid_app/views/hid_mouse.c
index 1816a48b4e..c4024f10e3 100644
--- a/applications/system/hid_app/views/hid_mouse.c
+++ b/applications/system/hid_app/views/hid_mouse.c
@@ -27,7 +27,7 @@ static void hid_mouse_draw_callback(Canvas* canvas, void* context) {
     furi_assert(context);
     HidMouseModel* model = context;
 
-// Header
+    // Header
 #ifdef HID_TRANSPORT_BLE
     if(model->connected) {
         canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
@@ -53,9 +53,9 @@ static void hid_mouse_draw_callback(Canvas* canvas, void* context) {
 
     // Up
     if(model->up_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 68, 6, &I_S_UP_31x15);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 80, 8, &I_Pin_arrow_up_7x9);
@@ -63,9 +63,9 @@ static void hid_mouse_draw_callback(Canvas* canvas, void* context) {
 
     // Down
     if(model->down_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 68, 36, &I_S_DOWN_31x15);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 80, 40, &I_Pin_arrow_down_7x9);
@@ -73,9 +73,9 @@ static void hid_mouse_draw_callback(Canvas* canvas, void* context) {
 
     // Left
     if(model->left_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 61, 13, &I_S_LEFT_15x31);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 63, 25, &I_Pin_arrow_left_9x7);
@@ -83,9 +83,9 @@ static void hid_mouse_draw_callback(Canvas* canvas, void* context) {
 
     // Right
     if(model->right_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT_15x31);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 95, 25, &I_Pin_arrow_right_9x7);
@@ -93,9 +93,9 @@ static void hid_mouse_draw_callback(Canvas* canvas, void* context) {
 
     // Ok
     if(model->left_mouse_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 79, 24, &I_Left_mouse_icon_9x9);
@@ -103,9 +103,9 @@ static void hid_mouse_draw_callback(Canvas* canvas, void* context) {
 
     // Back
     if(model->right_mouse_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 112, 38, &I_Right_mouse_icon_9x9);
@@ -217,7 +217,6 @@ HidMouse* hid_mouse_alloc(Hid* hid) {
     view_allocate_model(hid_mouse->view, ViewModelTypeLocking, sizeof(HidMouseModel));
     view_set_draw_callback(hid_mouse->view, hid_mouse_draw_callback);
     view_set_input_callback(hid_mouse->view, hid_mouse_input_callback);
-
     return hid_mouse;
 }
 
diff --git a/applications/system/hid_app/views/hid_mouse_clicker.c b/applications/system/hid_app/views/hid_mouse_clicker.c
index 79922d05fb..bc0abe56f3 100644
--- a/applications/system/hid_app/views/hid_mouse_clicker.c
+++ b/applications/system/hid_app/views/hid_mouse_clicker.c
@@ -42,7 +42,7 @@ static void hid_mouse_clicker_draw_callback(Canvas* canvas, void* context) {
     furi_assert(context);
     HidMouseClickerModel* model = context;
 
-// Header
+    // Header
 #ifdef HID_TRANSPORT_BLE
     if(model->connected) {
         canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
diff --git a/applications/system/hid_app/views/hid_mouse_jiggler.c b/applications/system/hid_app/views/hid_mouse_jiggler.c
index 3040753b66..41743b0432 100644
--- a/applications/system/hid_app/views/hid_mouse_jiggler.c
+++ b/applications/system/hid_app/views/hid_mouse_jiggler.c
@@ -25,7 +25,7 @@ static void hid_mouse_jiggler_draw_callback(Canvas* canvas, void* context) {
     furi_assert(context);
     HidMouseJigglerModel* model = context;
 
-// Header
+    // Header
 #ifdef HID_TRANSPORT_BLE
     if(model->connected) {
         canvas_draw_icon(canvas, 0, 0, &I_Ble_connected_15x15);
diff --git a/applications/system/hid_app/views/hid_movie.c b/applications/system/hid_app/views/hid_movie.c
index 90af5d6906..2ee7b08388 100644
--- a/applications/system/hid_app/views/hid_movie.c
+++ b/applications/system/hid_app/views/hid_movie.c
@@ -59,9 +59,9 @@ static void hid_movie_draw_callback(Canvas* canvas, void* context) {
 
     // Up
     if(model->up_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 68, 6, &I_S_UP_31x15);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 79, 9, &I_Volup_8x6);
@@ -69,9 +69,9 @@ static void hid_movie_draw_callback(Canvas* canvas, void* context) {
 
     // Down
     if(model->down_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 68, 36, &I_S_DOWN_31x15);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 80, 41, &I_Voldwn_6x6);
@@ -79,9 +79,9 @@ static void hid_movie_draw_callback(Canvas* canvas, void* context) {
 
     // Left
     if(model->left_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 61, 13, &I_S_LEFT_15x31);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     hid_movie_draw_arrow(canvas, 65, 28, CanvasDirectionRightToLeft);
@@ -90,9 +90,9 @@ static void hid_movie_draw_callback(Canvas* canvas, void* context) {
 
     // Right
     if(model->right_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT_15x31);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     hid_movie_draw_arrow(canvas, 96, 28, CanvasDirectionLeftToRight);
@@ -101,9 +101,9 @@ static void hid_movie_draw_callback(Canvas* canvas, void* context) {
 
     // Ok
     if(model->ok_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     hid_movie_draw_arrow(canvas, 80, 28, CanvasDirectionLeftToRight);
@@ -113,9 +113,9 @@ static void hid_movie_draw_callback(Canvas* canvas, void* context) {
 
     // Exit
     if(model->back_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 111, 38, &I_Pin_back_arrow_10x10);
diff --git a/applications/system/hid_app/views/hid_music_macos.c b/applications/system/hid_app/views/hid_music_macos.c
index 637e6850be..1675b6dd52 100644
--- a/applications/system/hid_app/views/hid_music_macos.c
+++ b/applications/system/hid_app/views/hid_music_macos.c
@@ -59,9 +59,9 @@ static void hid_music_macos_draw_callback(Canvas* canvas, void* context) {
 
     // Up
     if(model->up_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 68, 6, &I_S_UP_31x15);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 79, 9, &I_Volup_8x6);
@@ -69,9 +69,9 @@ static void hid_music_macos_draw_callback(Canvas* canvas, void* context) {
 
     // Down
     if(model->down_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 68, 36, &I_S_DOWN_31x15);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 80, 41, &I_Voldwn_6x6);
@@ -79,9 +79,9 @@ static void hid_music_macos_draw_callback(Canvas* canvas, void* context) {
 
     // Left
     if(model->left_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 61, 13, &I_S_LEFT_15x31);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     hid_music_macos_draw_arrow(canvas, 67, 28, CanvasDirectionRightToLeft);
@@ -91,9 +91,9 @@ static void hid_music_macos_draw_callback(Canvas* canvas, void* context) {
 
     // Right
     if(model->right_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT_15x31);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     hid_music_macos_draw_arrow(canvas, 96, 28, CanvasDirectionLeftToRight);
@@ -103,9 +103,9 @@ static void hid_music_macos_draw_callback(Canvas* canvas, void* context) {
 
     // Ok
     if(model->ok_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     hid_music_macos_draw_arrow(canvas, 80, 28, CanvasDirectionLeftToRight);
@@ -115,9 +115,9 @@ static void hid_music_macos_draw_callback(Canvas* canvas, void* context) {
 
     // Exit
     if(model->back_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 111, 38, &I_Pin_back_arrow_10x10);
diff --git a/applications/system/hid_app/views/hid_tiktok.c b/applications/system/hid_app/views/hid_tiktok.c
index 5f4e8057db..7e8e287226 100644
--- a/applications/system/hid_app/views/hid_tiktok.c
+++ b/applications/system/hid_app/views/hid_tiktok.c
@@ -45,9 +45,9 @@ static void hid_tiktok_draw_callback(Canvas* canvas, void* context) {
 
     // Pause
     if(model->back_mouse_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 113, 37, &I_Pause_icon_9x9);
@@ -55,9 +55,9 @@ static void hid_tiktok_draw_callback(Canvas* canvas, void* context) {
 
     // Up
     if(model->up_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 68, 6, &I_S_UP_31x15);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 80, 8, &I_Arr_up_7x9);
@@ -65,9 +65,9 @@ static void hid_tiktok_draw_callback(Canvas* canvas, void* context) {
 
     // Down
     if(model->down_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 68, 36, &I_S_DOWN_31x15);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 80, 40, &I_Arr_dwn_7x9);
@@ -75,9 +75,9 @@ static void hid_tiktok_draw_callback(Canvas* canvas, void* context) {
 
     // Left
     if(model->left_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 61, 13, &I_S_LEFT_15x31);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 64, 25, &I_Voldwn_6x6);
@@ -85,9 +85,9 @@ static void hid_tiktok_draw_callback(Canvas* canvas, void* context) {
 
     // Right
     if(model->right_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT_15x31);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 95, 25, &I_Volup_8x6);
@@ -95,9 +95,9 @@ static void hid_tiktok_draw_callback(Canvas* canvas, void* context) {
 
     // Ok
     if(model->ok_pressed) {
-        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_bitmap_mode(canvas, true);
         canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19);
-        canvas_set_bitmap_mode(canvas, 0);
+        canvas_set_bitmap_mode(canvas, false);
         canvas_set_color(canvas, ColorWhite);
     }
     canvas_draw_icon(canvas, 78, 25, &I_Like_def_11x9);

From 7c013c0534381989d3220e2b0f6efca217357734 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sat, 18 May 2024 08:31:36 +0100
Subject: [PATCH 4/4] HID App: Add few missing things from last merge

---
 applications/system/hid_app/views/hid_mouse.c |  9 ++++
 .../system/hid_app/views/hid_mouse_clicker.c  | 43 ++++++++++---------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/applications/system/hid_app/views/hid_mouse.c b/applications/system/hid_app/views/hid_mouse.c
index c4024f10e3..4f568b26c7 100644
--- a/applications/system/hid_app/views/hid_mouse.c
+++ b/applications/system/hid_app/views/hid_mouse.c
@@ -201,6 +201,15 @@ static bool hid_mouse_input_callback(InputEvent* event, void* context) {
 
     if(event->type == InputTypeLong && event->key == InputKeyBack) {
         hid_hal_mouse_release_all(hid_mouse->hid);
+
+        with_view_model(
+            hid_mouse->view,
+            HidMouseModel * model,
+            {
+                model->left_mouse_held = false;
+                model->left_mouse_pressed = false;
+            },
+            false);
     } else {
         hid_mouse_process(hid_mouse, event);
         consumed = true;
diff --git a/applications/system/hid_app/views/hid_mouse_clicker.c b/applications/system/hid_app/views/hid_mouse_clicker.c
index bc0abe56f3..3a2a064cbb 100644
--- a/applications/system/hid_app/views/hid_mouse_clicker.c
+++ b/applications/system/hid_app/views/hid_mouse_clicker.c
@@ -52,37 +52,37 @@ static void hid_mouse_clicker_draw_callback(Canvas* canvas, void* context) {
 #endif
 
     canvas_set_font(canvas, FontPrimary);
-    elements_multiline_text_aligned(canvas, 27, 3, AlignLeft, AlignTop, "Mouse Clicker");
+    elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Mouse Clicker");
+    canvas_set_font(canvas, FontSecondary);
 
     // Ok
-    canvas_draw_icon(canvas, 63, 25, &I_Space_65x18);
-    if(model->running) {
-        canvas_set_font(canvas, FontPrimary);
-
-        FuriString* rate_label = furi_string_alloc();
-        furi_string_printf(rate_label, "%d clicks/s\n\nUp / Down", model->rate);
-        elements_multiline_text(canvas, AlignLeft, 35, furi_string_get_cstr(rate_label));
-        canvas_set_font(canvas, FontSecondary);
-        furi_string_free(rate_label);
+    canvas_draw_icon(canvas, 58, 25, &I_Space_65x18);
 
-        elements_slightly_rounded_box(canvas, 66, 27, 60, 13);
+    if(model->running) {
+        elements_slightly_rounded_box(canvas, 61, 27, 60, 13);
         canvas_set_color(canvas, ColorWhite);
-    } else {
-        canvas_set_font(canvas, FontPrimary);
-        elements_multiline_text(canvas, AlignLeft, 35, "Press Start\nto start\nclicking");
-        canvas_set_font(canvas, FontSecondary);
     }
-    canvas_draw_icon(canvas, 74, 29, &I_Ok_btn_9x9);
+
+    canvas_draw_icon(canvas, 69, 29, &I_Ok_btn_9x9);
+
     if(model->running) {
-        elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, "Stop");
+        elements_multiline_text_aligned(canvas, 86, 37, AlignLeft, AlignBottom, "Stop");
     } else {
-        elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, "Start");
+        elements_multiline_text_aligned(canvas, 86, 37, AlignLeft, AlignBottom, "Start");
     }
     canvas_set_color(canvas, ColorBlack);
 
+    // Clicks/s
+    char label[20];
+    snprintf(label, sizeof(label), "%d clicks/s", model->rate);
+    elements_multiline_text_aligned(canvas, 28, 37, AlignCenter, AlignBottom, label);
+
+    canvas_draw_icon(canvas, 25, 20, &I_ButtonUp_7x4);
+    canvas_draw_icon(canvas, 25, 44, &I_ButtonDown_7x4);
+
     // Back
-    canvas_draw_icon(canvas, 74, 49, &I_Pin_back_arrow_10x8);
-    elements_multiline_text_aligned(canvas, 91, 57, AlignLeft, AlignBottom, "Quit");
+    canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
+    elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Exit");
 }
 
 static void hid_mouse_clicker_timer_callback(void* context) {
@@ -144,6 +144,9 @@ static bool hid_mouse_clicker_input_callback(InputEvent* event, void* context) {
                 rate_changed = true;
                 consumed = true;
                 break;
+            case InputKeyBack:
+                model->running = false;
+                break;
             default:
                 consumed = true;
                 break;