[FL-1937] Bluetooth new assets (#774)

* assets: add new ble assets
* bt: update pairing screen with new icon
* bt: add bt status and update status bar
* bt: update statusbar width from thread
* Icons: new BT icon

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>

applications/bt/bt_service/bt.c

@@ -4,13 +4,20 @@
 #define BT_SERVICE_TAG "BT"
 
 static void bt_draw_statusbar_callback(Canvas* canvas, void* context) {
-    canvas_draw_icon(canvas, 0, 0, &I_Bluetooth_5x8);
+    furi_assert(context);
+
+    Bt* bt = context;
+    if(bt->status == BtStatusAdvertising) {
+        canvas_draw_icon(canvas, 0, 0, &I_Bluetooth_5x8);
+    } else if(bt->status == BtStatusConnected) {
+        canvas_draw_icon(canvas, 0, 0, &I_BT_Pair_9x8);
+    }
 }
 
-static ViewPort* bt_statusbar_view_port_alloc() {
+static ViewPort* bt_statusbar_view_port_alloc(Bt* bt) {
     ViewPort* statusbar_view_port = view_port_alloc();
     view_port_set_width(statusbar_view_port, 5);
-    view_port_draw_callback_set(statusbar_view_port, bt_draw_statusbar_callback, NULL);
+    view_port_draw_callback_set(statusbar_view_port, bt_draw_statusbar_callback, bt);
     view_port_enabled_set(statusbar_view_port, false);
     return statusbar_view_port;
 }
@@ -18,10 +25,11 @@ static ViewPort* bt_statusbar_view_port_alloc() {
 static void bt_pin_code_show_event_handler(Bt* bt, uint32_t pin) {
     furi_assert(bt);
     string_t pin_str;
-    string_init_printf(pin_str, "%06d", pin);
+    dialog_message_set_icon(bt->dialog_message, &I_BLE_Pairing_128x64, 0, 0);
+    string_init_printf(pin_str, "Pairing code\n%06d", pin);
     dialog_message_set_text(
-        bt->dialog_message, string_get_cstr(pin_str), 64, 32, AlignCenter, AlignCenter);
-    dialog_message_set_buttons(bt->dialog_message, "Back", NULL, NULL);
+        bt->dialog_message, string_get_cstr(pin_str), 64, 4, AlignCenter, AlignTop);
+    dialog_message_set_buttons(bt->dialog_message, "Quit", NULL, NULL);
     dialog_message_show(bt->dialogs, bt->dialog_message);
     string_clear(pin_str);
 }
@@ -50,7 +58,7 @@ Bt* bt_alloc() {
     bt->message_queue = osMessageQueueNew(8, sizeof(BtMessage), NULL);
 
     // Setup statusbar view port
-    bt->statusbar_view_port = bt_statusbar_view_port_alloc();
+    bt->statusbar_view_port = bt_statusbar_view_port_alloc(bt);
     // Gui
     bt->gui = furi_record_open("gui");
     gui_add_view_port(bt->gui, bt->statusbar_view_port, GuiLayerStatusBarLeft);
@@ -115,6 +123,11 @@ static void bt_on_gap_event_callback(BleEvent event, void* context) {
     Bt* bt = context;
 
     if(event.type == BleEventTypeConnected) {
+        // Update status bar
+        bt->status = BtStatusConnected;
+        BtMessage message = {.type = BtMessageTypeUpdateStatusbar};
+        furi_check(osMessageQueuePut(bt->message_queue, &message, 0, osWaitForever) == osOK);
+        // Open RPC session
         FURI_LOG_I(BT_SERVICE_TAG, "Open RPC connection");
         bt->rpc_session = rpc_open_session(bt->rpc);
         rpc_set_send_bytes_callback(bt->rpc_session, bt_rpc_send_bytes_callback, bt);
@@ -123,8 +136,8 @@ static void bt_on_gap_event_callback(BleEvent event, void* context) {
         // Update battery level
         PowerInfo info;
         power_get_info(bt->power, &info);
-        BtMessage message = {
-            .type = BtMessageTypeUpdateBatteryLevel, .data.battery_level = info.charge};
+        message.type = BtMessageTypeUpdateBatteryLevel;
+        message.data.battery_level = info.charge;
         furi_check(osMessageQueuePut(bt->message_queue, &message, 0, osWaitForever) == osOK);
     } else if(event.type == BleEventTypeDisconnected) {
         FURI_LOG_I(BT_SERVICE_TAG, "Close RPC connection");
@@ -132,7 +145,12 @@ static void bt_on_gap_event_callback(BleEvent event, void* context) {
             rpc_close_session(bt->rpc_session);
             bt->rpc_session = NULL;
         }
-    } else if(event.type == BleEventTypeStartAdvertising || event.type == BleEventTypeStopAdvertising) {
+    } else if(event.type == BleEventTypeStartAdvertising) {
+        bt->status = BtStatusAdvertising;
+        BtMessage message = {.type = BtMessageTypeUpdateStatusbar};
+        furi_check(osMessageQueuePut(bt->message_queue, &message, 0, osWaitForever) == osOK);
+    } else if(event.type == BleEventTypeStopAdvertising) {
+        bt->status = BtStatusOff;
         BtMessage message = {.type = BtMessageTypeUpdateStatusbar};
         furi_check(osMessageQueuePut(bt->message_queue, &message, 0, osWaitForever) == osOK);
     } else if(event.type == BleEventTypePinCodeShow) {
@@ -142,6 +160,18 @@ static void bt_on_gap_event_callback(BleEvent event, void* context) {
     }
 }
 
+static void bt_statusbar_update(Bt* bt) {
+    if(bt->status == BtStatusAdvertising) {
+        view_port_set_width(bt->statusbar_view_port, icon_get_width(&I_Bluetooth_5x8));
+        view_port_enabled_set(bt->statusbar_view_port, true);
+    } else if(bt->status == BtStatusConnected) {
+        view_port_set_width(bt->statusbar_view_port, icon_get_width(&I_BT_Pair_9x8));
+        view_port_enabled_set(bt->statusbar_view_port, true);
+    } else {
+        view_port_enabled_set(bt->statusbar_view_port, false);
+    }
+}
+
 int32_t bt_srv() {
     Bt* bt = bt_alloc();
     furi_record_create("bt", bt);
@@ -160,14 +190,14 @@ int32_t bt_srv() {
         }
     }
     // Update statusbar
-    view_port_enabled_set(bt->statusbar_view_port, furi_hal_bt_is_active());
+    bt_statusbar_update(bt);
 
     BtMessage message;
     while(1) {
         furi_check(osMessageQueueGet(bt->message_queue, &message, NULL, osWaitForever) == osOK);
         if(message.type == BtMessageTypeUpdateStatusbar) {
             // Update statusbar
-            view_port_enabled_set(bt->statusbar_view_port, furi_hal_bt_is_active());
+            bt_statusbar_update(bt);
         } else if(message.type == BtMessageTypeUpdateBatteryLevel) {
             // Update battery level
             if(furi_hal_bt_is_active()) {

applications/bt/bt_service/bt_i.h

@@ -15,6 +15,12 @@
 
 #include "../bt_settings.h"
 
+typedef enum {
+    BtStatusOff,
+    BtStatusAdvertising,
+    BtStatusConnected,
+} BtStatus;
+
 typedef enum {
     BtMessageTypeUpdateStatusbar,
     BtMessageTypeUpdateBatteryLevel,
@@ -33,6 +39,7 @@ typedef struct {
 
 struct Bt {
     BtSettings bt_settings;
+    BtStatus status;
     osMessageQueueId_t message_queue;
     Gui* gui;
     ViewPort* statusbar_view_port;

assets/compiled/assets_icons.h

@@ -5,62 +5,63 @@ extern const Icon I_Certification1_103x23;
 extern const Icon I_Certification2_119x30;
 extern const Icon A_WatchingTV_128x64;
 extern const Icon A_Wink_128x64;
+extern const Icon I_dir_10px;
 extern const Icon I_Nfc_10px;
-extern const Icon I_ir_10px;
-extern const Icon I_ble_10px;
 extern const Icon I_sub1_10px;
-extern const Icon I_dir_10px;
-extern const Icon I_unknown_10px;
+extern const Icon I_ir_10px;
 extern const Icon I_ibutt_10px;
+extern const Icon I_unknown_10px;
+extern const Icon I_ble_10px;
 extern const Icon I_125_10px;
+extern const Icon I_BLE_Pairing_128x64;
+extern const Icon I_ButtonRightSmall_3x5;
 extern const Icon I_ButtonLeft_4x7;
-extern const Icon I_ButtonRight_4x7;
-extern const Icon I_ButtonDown_7x4;
-extern const Icon I_ButtonUp_7x4;
-extern const Icon I_Warning_30x23;
+extern const Icon I_ButtonLeftSmall_3x5;
 extern const Icon I_DFU_128x50;
-extern const Icon I_ButtonRightSmall_3x5;
+extern const Icon I_Warning_30x23;
+extern const Icon I_ButtonDown_7x4;
+extern const Icon I_ButtonRight_4x7;
 extern const Icon I_ButtonCenter_7x7;
-extern const Icon I_ButtonLeftSmall_3x5;
+extern const Icon I_ButtonUp_7x4;
 extern const Icon I_DolphinOkay_41x43;
-extern const Icon I_DolphinFirstStart7_61x51;
 extern const Icon I_DolphinFirstStart4_67x53;
-extern const Icon I_DolphinFirstStart3_57x48;
-extern const Icon I_Flipper_young_80x60;
-extern const Icon I_DolphinFirstStart0_70x53;
 extern const Icon I_DolphinFirstStart2_59x51;
-extern const Icon I_DolphinFirstStart6_58x54;
 extern const Icon I_DolphinFirstStart5_54x49;
-extern const Icon I_DolphinFirstStart8_56x51;
+extern const Icon I_DolphinFirstStart0_70x53;
+extern const Icon I_DolphinFirstStart6_58x54;
 extern const Icon I_DolphinFirstStart1_59x53;
-extern const Icon I_DoorRight_70x55;
+extern const Icon I_DolphinFirstStart8_56x51;
+extern const Icon I_DolphinFirstStart7_61x51;
+extern const Icon I_Flipper_young_80x60;
+extern const Icon I_DolphinFirstStart3_57x48;
+extern const Icon I_PassportBottom_128x17;
 extern const Icon I_DoorLocked_10x56;
 extern const Icon I_DoorLeft_70x55;
 extern const Icon I_PassportLeft_6x47;
+extern const Icon I_DoorRight_70x55;
 extern const Icon I_LockPopup_100x49;
-extern const Icon I_PassportBottom_128x17;
-extern const Icon I_Vol_up_25x27;
-extern const Icon I_Fill_marker_7x7;
+extern const Icon I_Mute_25x27;
 extern const Icon I_IrdaArrowUp_4x8;
-extern const Icon I_Down_hvr_25x27;
-extern const Icon I_Vol_up_hvr_25x27;
-extern const Icon I_Power_25x27;
-extern const Icon I_Vol_down_25x27;
-extern const Icon I_IrdaSend_128x64;
 extern const Icon I_Up_hvr_25x27;
-extern const Icon I_Back_15x10;
-extern const Icon I_IrdaSendShort_128x34;
 extern const Icon I_Mute_hvr_25x27;
-extern const Icon I_IrdaLearnShort_128x31;
+extern const Icon I_Vol_down_25x27;
 extern const Icon I_Down_25x27;
-extern const Icon I_Up_25x27;
-extern const Icon I_Mute_25x27;
-extern const Icon I_Vol_down_hvr_25x27;
 extern const Icon I_Power_hvr_25x27;
-extern const Icon I_IrdaLearn_128x64;
+extern const Icon I_IrdaLearnShort_128x31;
 extern const Icon I_IrdaArrowDown_4x8;
-extern const Icon I_KeyBackspaceSelected_16x9;
+extern const Icon I_Vol_down_hvr_25x27;
+extern const Icon I_IrdaLearn_128x64;
+extern const Icon I_Down_hvr_25x27;
+extern const Icon I_Fill_marker_7x7;
+extern const Icon I_Power_25x27;
+extern const Icon I_Vol_up_25x27;
+extern const Icon I_Up_25x27;
+extern const Icon I_Back_15x10;
+extern const Icon I_IrdaSend_128x64;
+extern const Icon I_IrdaSendShort_128x34;
+extern const Icon I_Vol_up_hvr_25x27;
 extern const Icon I_KeySave_24x11;
+extern const Icon I_KeyBackspaceSelected_16x9;
 extern const Icon I_KeySaveSelected_24x11;
 extern const Icon I_KeyBackspace_16x9;
 extern const Icon A_125khz_14;
@@ -79,45 +80,46 @@ extern const Icon A_Sub1ghz_14;
 extern const Icon A_Tamagotchi_14;
 extern const Icon A_U2F_14;
 extern const Icon A_iButton_14;
-extern const Icon I_Medium_chip_22x21;
 extern const Icon I_Detailed_chip_17x13;
+extern const Icon I_Medium_chip_22x21;
 extern const Icon I_Health_16x16;
-extern const Icon I_FaceNopower_29x14;
-extern const Icon I_Battery_16x16;
-extern const Icon I_BatteryBody_52x28;
-extern const Icon I_FaceConfused_29x14;
 extern const Icon I_FaceCharging_29x14;
-extern const Icon I_FaceNormal_29x14;
+extern const Icon I_BatteryBody_52x28;
 extern const Icon I_Voltage_16x16;
 extern const Icon I_Temperature_16x16;
-extern const Icon I_RFIDDolphinReceive_97x61;
-extern const Icon I_RFIDDolphinSend_97x61;
-extern const Icon I_RFIDBigChip_37x36;
+extern const Icon I_FaceNopower_29x14;
+extern const Icon I_FaceNormal_29x14;
+extern const Icon I_Battery_16x16;
+extern const Icon I_FaceConfused_29x14;
 extern const Icon I_RFIDDolphinSuccess_108x57;
+extern const Icon I_RFIDBigChip_37x36;
+extern const Icon I_RFIDDolphinSend_97x61;
+extern const Icon I_RFIDDolphinReceive_97x61;
 extern const Icon I_SDQuestion_35x43;
 extern const Icon I_SDError_43x35;
 extern const Icon I_Cry_dolph_55x52;
-extern const Icon I_Battery_26x8;
-extern const Icon I_PlaceholderL_11x13;
-extern const Icon I_Bluetooth_5x8;
 extern const Icon I_BadUsb_9x8;
 extern const Icon I_PlaceholderR_30x13;
-extern const Icon I_USBConnected_15x8;
-extern const Icon I_Battery_19x8;
-extern const Icon I_Lock_8x8;
-extern const Icon I_Background_128x11;
 extern const Icon I_Background_128x8;
-extern const Icon I_SDcardFail_11x8;
+extern const Icon I_Lock_8x8;
+extern const Icon I_Battery_26x8;
+extern const Icon I_PlaceholderL_11x13;
+extern const Icon I_Battery_19x8;
 extern const Icon I_SDcardMounted_11x8;
-extern const Icon I_Lock_7x8;
-extern const Icon I_Quest_7x8;
+extern const Icon I_SDcardFail_11x8;
+extern const Icon I_USBConnected_15x8;
+extern const Icon I_Bluetooth_5x8;
+extern const Icon I_BT_Pair_9x8;
+extern const Icon I_Background_128x11;
 extern const Icon I_Scanning_123x52;
-extern const Icon I_MHz_25x11;
+extern const Icon I_Quest_7x8;
 extern const Icon I_Unlock_7x8;
-extern const Icon I_iButtonDolphinVerySuccess_108x52;
+extern const Icon I_MHz_25x11;
+extern const Icon I_Lock_7x8;
 extern const Icon I_DolphinMafia_115x62;
-extern const Icon I_iButtonDolphinSuccess_109x60;
 extern const Icon I_DolphinExcited_64x63;
-extern const Icon I_DolphinNice_96x59;
+extern const Icon I_iButtonDolphinSuccess_109x60;
+extern const Icon I_iButtonDolphinVerySuccess_108x52;
 extern const Icon I_iButtonKey_49x44;
+extern const Icon I_DolphinNice_96x59;
 extern const Icon I_DolphinWait_61x59;

assets/compiled/flipper.pb.h

@@ -30,8 +30,8 @@ typedef enum _PB_CommandStatus {
     PB_CommandStatus_ERROR_STORAGE_INTERNAL = 11, /* *< Internal error */
     PB_CommandStatus_ERROR_STORAGE_NOT_IMPLEMENTED = 12, /* *< Functon not implemented */
     PB_CommandStatus_ERROR_STORAGE_ALREADY_OPEN = 13, /* *< File/Dir already opened */
-    PB_CommandStatus_ERROR_APP_CANT_START = 16, /* *< Can't start app - either wrong name, or internal error */
-    PB_CommandStatus_ERROR_APP_SYSTEM_LOCKED = 17 /* *<  Another app is running */
+    PB_CommandStatus_ERROR_APP_CANT_START = 16, /* *< Can't start app - or internal error */
+    PB_CommandStatus_ERROR_APP_SYSTEM_LOCKED = 17 /* *< Another app is running */
 } PB_CommandStatus;
 
 /* Struct definitions */