From 2e05489a8272602c36cdeba397a377e52e2ac318 Mon Sep 17 00:00:00 2001
From: Georgii Surkov <georgii.surkov@outlook.com>
Date: Tue, 6 Feb 2024 18:12:13 +0300
Subject: [PATCH] Show a different RPC icon for expansion modules

---
 applications/services/rpc/rpc_gui.c           |  38 ++++++++++++------
 .../StatusBar/Exp_module_connected_12x8.png   | Bin 0 -> 3612 bytes
 2 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 assets/icons/StatusBar/Exp_module_connected_12x8.png

diff --git a/applications/services/rpc/rpc_gui.c b/applications/services/rpc/rpc_gui.c
index 98860332d..ee3526590 100644
--- a/applications/services/rpc/rpc_gui.c
+++ b/applications/services/rpc/rpc_gui.c
@@ -54,6 +54,7 @@ typedef enum {
 typedef struct {
     RpcSession* session;
     Gui* gui;
+    const Icon* icon;
 
     // Receive part
     ViewPort* virtual_display_view_port;
@@ -380,10 +381,19 @@ static void rpc_system_gui_virtual_display_frame_process(const PB_Main* request,
     (void)session;
 }
 
+static const Icon* rpc_system_gui_get_owner_icon(RpcOwner owner) {
+    switch(owner) {
+    case RpcOwnerUart:
+        return &I_Exp_module_connected_12x8;
+    default:
+        return &I_Rpc_active_7x8;
+    }
+}
+
 static void rpc_active_session_icon_draw_callback(Canvas* canvas, void* context) {
-    UNUSED(context);
     furi_assert(canvas);
-    canvas_draw_icon(canvas, 0, 0, &I_Rpc_active_7x8);
+    RpcGuiSystem* rpc_gui = context;
+    canvas_draw_icon(canvas, 0, 0, rpc_gui->icon);
 }
 
 void* rpc_system_gui_alloc(RpcSession* session) {
@@ -394,16 +404,16 @@ void* rpc_system_gui_alloc(RpcSession* session) {
     rpc_gui->session = session;
 
     // Active session icon
-    rpc_gui->rpc_session_active_viewport = view_port_alloc();
-    view_port_set_width(rpc_gui->rpc_session_active_viewport, icon_get_width(&I_Rpc_active_7x8));
-    view_port_draw_callback_set(
-        rpc_gui->rpc_session_active_viewport, rpc_active_session_icon_draw_callback, session);
-    if(rpc_session_get_owner(rpc_gui->session) != RpcOwnerBle) {
-        view_port_enabled_set(rpc_gui->rpc_session_active_viewport, true);
-    } else {
-        view_port_enabled_set(rpc_gui->rpc_session_active_viewport, false);
+    const RpcOwner owner = rpc_session_get_owner(rpc_gui->session);
+    if(owner != RpcOwnerBle) {
+        rpc_gui->icon = rpc_system_gui_get_owner_icon(owner);
+        rpc_gui->rpc_session_active_viewport = view_port_alloc();
+        view_port_set_width(rpc_gui->rpc_session_active_viewport, icon_get_width(rpc_gui->icon));
+        view_port_draw_callback_set(
+            rpc_gui->rpc_session_active_viewport, rpc_active_session_icon_draw_callback, rpc_gui);
+        gui_add_view_port(
+            rpc_gui->gui, rpc_gui->rpc_session_active_viewport, GuiLayerStatusBarLeft);
     }
-    gui_add_view_port(rpc_gui->gui, rpc_gui->rpc_session_active_viewport, GuiLayerStatusBarLeft);
 
     RpcHandler rpc_handler = {
         .message_handler = NULL,
@@ -445,8 +455,10 @@ void rpc_system_gui_free(void* context) {
         rpc_gui->virtual_display_not_empty = false;
     }
 
-    gui_remove_view_port(rpc_gui->gui, rpc_gui->rpc_session_active_viewport);
-    view_port_free(rpc_gui->rpc_session_active_viewport);
+    if(rpc_gui->rpc_session_active_viewport) {
+        gui_remove_view_port(rpc_gui->gui, rpc_gui->rpc_session_active_viewport);
+        view_port_free(rpc_gui->rpc_session_active_viewport);
+    }
 
     if(rpc_gui->is_streaming) {
         rpc_gui->is_streaming = false;
diff --git a/assets/icons/StatusBar/Exp_module_connected_12x8.png b/assets/icons/StatusBar/Exp_module_connected_12x8.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5f09668267a55680aaa66355966bdaddcc173e1
GIT binary patch
literal 3612
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

literal 0
HcmV?d00001