[FL-1854] NEC42ext displaying (#796)

* Add correct key-reading asset
* IRDA: correct NEC42ext displaying
* IRDA App: correct vibro

There are no double vibro, but 1 vibro for any successful
new signal read, and 1 for sending just read signal.

Co-authored-by: あく <alleteam@gmail.com>

applications/irda/irda-app.cpp

@@ -211,10 +211,12 @@ void IrdaApp::notify_red_blink() {
     notification_message(notification, &sequence_blink_red_10);
 }
 
-void IrdaApp::notify_space_blink() {
+void IrdaApp::notify_sent_just_learnt() {
     static const NotificationSequence sequence = {
         &message_green_0,
+        &message_vibro_on,
         &message_delay_50,
+        &message_vibro_off,
         &message_green_255,
         &message_do_not_reset,
         NULL,
@@ -261,10 +263,6 @@ void IrdaApp::notify_blink_green() {
     notification_message(notification, &sequence);
 }
 
-void IrdaApp::notify_double_vibro() {
-    notification_message(notification, &sequence_double_vibro);
-}
-
 void IrdaApp::notify_green_on() {
     notification_message(notification, &sequence_set_only_green_255);
 }

applications/irda/irda-app.h

@@ -77,8 +77,7 @@ public:
 
     void notify_success();
     void notify_red_blink();
-    void notify_space_blink();
-    void notify_double_vibro();
+    void notify_sent_just_learnt();
     void notify_green_on();
     void notify_green_off();
     void notify_click();

applications/irda/scene/irda-app-scene-learn-success.cpp

@@ -23,16 +23,24 @@ void IrdaAppSceneLearnSuccess::on_enter(IrdaApp* app) {
 
     if(!signal.is_raw()) {
         auto message = &signal.get_message();
+        uint8_t adr_digits = ROUND_UP_TO(irda_get_protocol_address_length(message->protocol), 4);
+        uint8_t cmd_digits = ROUND_UP_TO(irda_get_protocol_command_length(message->protocol), 4);
+        uint8_t max_digits = MAX(adr_digits, cmd_digits);
+        max_digits = MIN(max_digits, 7);
+        size_t label_x_offset = 63 + (7 - max_digits) * 3;
+
         app->set_text_store(0, "%s", irda_get_protocol_name(message->protocol));
         app->set_text_store(
             1,
             "A: 0x%0*lX\nC: 0x%0*lX\n",
-            ROUND_UP_TO(irda_get_protocol_address_length(message->protocol), 4),
+            adr_digits,
             message->address,
-            ROUND_UP_TO(irda_get_protocol_command_length(message->protocol), 4),
+            cmd_digits,
             message->command);
-        dialog_ex_set_header(dialog_ex, app->get_text_store(0), 95, 10, AlignCenter, AlignCenter);
-        dialog_ex_set_text(dialog_ex, app->get_text_store(1), 75, 23, AlignLeft, AlignTop);
+
+        dialog_ex_set_header(dialog_ex, app->get_text_store(0), 95, 7, AlignCenter, AlignCenter);
+        dialog_ex_set_text(
+            dialog_ex, app->get_text_store(1), label_x_offset, 34, AlignLeft, AlignCenter);
     } else {
         dialog_ex_set_header(dialog_ex, "Unknown", 95, 10, AlignCenter, AlignCenter);
         app->set_text_store(0, "%d samples", signal.get_raw_signal().timings_cnt);
@@ -42,7 +50,7 @@ void IrdaAppSceneLearnSuccess::on_enter(IrdaApp* app) {
     dialog_ex_set_left_button_text(dialog_ex, "Retry");
     dialog_ex_set_right_button_text(dialog_ex, "Save");
     dialog_ex_set_center_button_text(dialog_ex, "Send");
-    dialog_ex_set_icon(dialog_ex, 0, 1, &I_DolphinExcited_64x63);
+    dialog_ex_set_icon(dialog_ex, 0, 1, &I_DolphinReadingSuccess_59x63);
     dialog_ex_set_result_callback(dialog_ex, dialog_result_callback);
     dialog_ex_set_context(dialog_ex, app);
 
@@ -62,7 +70,7 @@ bool IrdaAppSceneLearnSuccess::on_event(IrdaApp* app, IrdaAppEvent* event) {
             app->switch_to_next_scene_without_saving(IrdaApp::Scene::Learn);
             break;
         case DialogExResultCenter: {
-            app->notify_space_blink();
+            app->notify_sent_just_learnt();
             auto signal = app->get_received_signal();
             signal.transmit();
             break;

applications/irda/scene/irda-app-scene-learn.cpp

@@ -39,10 +39,6 @@ void IrdaAppSceneLearn::on_enter(IrdaApp* app) {
         popup, "Point the remote at IR port\nand push the button", 5, 10, AlignLeft, AlignCenter);
     popup_set_callback(popup, NULL);
 
-    if(app->get_learn_new_remote()) {
-        app->notify_double_vibro();
-    }
-
     view_manager->switch_to(IrdaAppViewManager::ViewType::Popup);
 }
 

assets/compiled/assets_icons.h

@@ -1,69 +1,70 @@
 #pragma once
 #include <gui/icon.h>
 
-extern const Icon I_Certification1_103x23;
 extern const Icon I_Certification2_119x30;
+extern const Icon I_Certification1_103x23;
 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_sub1_10px;
 extern const Icon I_ir_10px;
-extern const Icon I_ibutt_10px;
 extern const Icon I_unknown_10px;
+extern const Icon I_ibutt_10px;
+extern const Icon I_Nfc_10px;
 extern const Icon I_ble_10px;
 extern const Icon I_125_10px;
+extern const Icon I_dir_10px;
 extern const Icon I_BLE_Pairing_128x64;
-extern const Icon I_ButtonRightSmall_3x5;
-extern const Icon I_ButtonLeft_4x7;
-extern const Icon I_ButtonLeftSmall_3x5;
-extern const Icon I_DFU_128x50;
-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_ButtonLeft_4x7;
 extern const Icon I_ButtonUp_7x4;
-extern const Icon I_DolphinOkay_41x43;
-extern const Icon I_DolphinFirstStart4_67x53;
+extern const Icon I_DFU_128x50;
+extern const Icon I_ButtonLeftSmall_3x5;
+extern const Icon I_ButtonRightSmall_3x5;
+extern const Icon I_ButtonRight_4x7;
+extern const Icon I_Warning_30x23;
 extern const Icon I_DolphinFirstStart2_59x51;
 extern const Icon I_DolphinFirstStart5_54x49;
-extern const Icon I_DolphinFirstStart0_70x53;
 extern const Icon I_DolphinFirstStart6_58x54;
-extern const Icon I_DolphinFirstStart1_59x53;
-extern const Icon I_DolphinFirstStart8_56x51;
-extern const Icon I_DolphinFirstStart7_61x51;
 extern const Icon I_Flipper_young_80x60;
+extern const Icon I_DolphinFirstStart8_56x51;
+extern const Icon I_DolphinFirstStart1_59x53;
+extern const Icon I_DolphinOkay_41x43;
 extern const Icon I_DolphinFirstStart3_57x48;
+extern const Icon I_DolphinFirstStart7_61x51;
+extern const Icon I_DolphinFirstStart0_70x53;
+extern const Icon I_DolphinFirstStart4_67x53;
 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_DoorLocked_10x56;
+extern const Icon I_PassportLeft_6x47;
 extern const Icon I_LockPopup_100x49;
-extern const Icon I_Mute_25x27;
-extern const Icon I_IrdaArrowUp_4x8;
-extern const Icon I_Up_hvr_25x27;
-extern const Icon I_Mute_hvr_25x27;
-extern const Icon I_Vol_down_25x27;
-extern const Icon I_Down_25x27;
-extern const Icon I_Power_hvr_25x27;
-extern const Icon I_IrdaLearnShort_128x31;
-extern const Icon I_IrdaArrowDown_4x8;
-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_Vol_down_hvr_25x27;
+extern const Icon I_Down_25x27;
 extern const Icon I_Fill_marker_7x7;
-extern const Icon I_Power_25x27;
+extern const Icon I_Vol_down_25x27;
 extern const Icon I_Vol_up_25x27;
-extern const Icon I_Up_25x27;
-extern const Icon I_Back_15x10;
+extern const Icon I_Up_hvr_25x27;
+extern const Icon I_Vol_up_hvr_25x27;
+extern const Icon I_IrdaLearnShort_128x31;
 extern const Icon I_IrdaSend_128x64;
+extern const Icon I_DolphinReadingSuccess_59x63;
+extern const Icon I_Mute_hvr_25x27;
+extern const Icon I_Back_15x10;
+extern const Icon I_Up_25x27;
+extern const Icon I_IrdaArrowUp_4x8;
+extern const Icon I_Mute_25x27;
+extern const Icon I_Power_25x27;
 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_IrdaArrowDown_4x8;
+extern const Icon I_IrdaLearn_128x64;
+extern const Icon I_Power_hvr_25x27;
 extern const Icon I_KeySaveSelected_24x11;
 extern const Icon I_KeyBackspace_16x9;
+extern const Icon I_KeyBackspaceSelected_16x9;
+extern const Icon I_KeySave_24x11;
 extern const Icon A_125khz_14;
 extern const Icon A_Bluetooth_14;
 extern const Icon A_Debug_14;
@@ -82,44 +83,44 @@ extern const Icon A_U2F_14;
 extern const Icon A_iButton_14;
 extern const Icon I_Detailed_chip_17x13;
 extern const Icon I_Medium_chip_22x21;
-extern const Icon I_Health_16x16;
-extern const Icon I_FaceCharging_29x14;
 extern const Icon I_BatteryBody_52x28;
-extern const Icon I_Voltage_16x16;
+extern const Icon I_FaceCharging_29x14;
+extern const Icon I_Health_16x16;
 extern const Icon I_Temperature_16x16;
-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_FaceNormal_29x14;
+extern const Icon I_Voltage_16x16;
+extern const Icon I_FaceNopower_29x14;
 extern const Icon I_RFIDDolphinSend_97x61;
+extern const Icon I_RFIDDolphinSuccess_108x57;
 extern const Icon I_RFIDDolphinReceive_97x61;
+extern const Icon I_RFIDBigChip_37x36;
 extern const Icon I_SDQuestion_35x43;
 extern const Icon I_SDError_43x35;
 extern const Icon I_Cry_dolph_55x52;
-extern const Icon I_BadUsb_9x8;
-extern const Icon I_PlaceholderR_30x13;
-extern const Icon I_Background_128x8;
+extern const Icon I_Background_128x11;
 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_SDcardFail_11x8;
 extern const Icon I_USBConnected_15x8;
-extern const Icon I_Bluetooth_5x8;
+extern const Icon I_Background_128x8;
+extern const Icon I_BadUsb_9x8;
 extern const Icon I_BT_Pair_9x8;
-extern const Icon I_Background_128x11;
-extern const Icon I_Scanning_123x52;
+extern const Icon I_PlaceholderL_11x13;
+extern const Icon I_SDcardFail_11x8;
+extern const Icon I_Bluetooth_5x8;
+extern const Icon I_PlaceholderR_30x13;
+extern const Icon I_SDcardMounted_11x8;
 extern const Icon I_Quest_7x8;
-extern const Icon I_Unlock_7x8;
-extern const Icon I_MHz_25x11;
 extern const Icon I_Lock_7x8;
-extern const Icon I_DolphinMafia_115x62;
+extern const Icon I_Scanning_123x52;
+extern const Icon I_MHz_25x11;
+extern const Icon I_Unlock_7x8;
+extern const Icon I_iButtonKey_49x44;
 extern const Icon I_DolphinExcited_64x63;
-extern const Icon I_iButtonDolphinSuccess_109x60;
+extern const Icon I_DolphinWait_61x59;
 extern const Icon I_iButtonDolphinVerySuccess_108x52;
-extern const Icon I_iButtonKey_49x44;
+extern const Icon I_DolphinMafia_115x62;
 extern const Icon I_DolphinNice_96x59;
-extern const Icon I_DolphinWait_61x59;
+extern const Icon I_iButtonDolphinSuccess_109x60;