resolve conflicts merge

firmware/application/apps/ble_rx_app.cpp

@@ -200,6 +200,14 @@ void RecentEntriesTable<BleRecentEntries>::draw(
         hitsStr = to_string_dec_int(entry.numHits);
     }
 
+    std::string hitsStr;
+
+    if (!entry.informationString.empty()) {
+        hitsStr = entry.informationString;
+    } else {
+        hitsStr = to_string_dec_int(entry.numHits);
+    }
+
     // Pushing single digit values down right justified.
     int hitsDigits = hitsStr.length();
     uint8_t hits_spacing = 8 - hitsDigits;
@@ -1041,6 +1049,11 @@ bool BLERxView::updateEntry(const BlePacketData* packet, BleRecentEntry& entry,
         if (!success && !uniqueParsing) {
             success = parse_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString);
         }
+
+        if (!success && !uniqueParsing) {
+            success = parse_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString);
+        }
+
     } else if (pdu_type == ADV_DIRECT_IND || pdu_type == SCAN_REQ) {
         if (!uniqueParsing) {
             ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data;

firmware/application/apps/ble_rx_app.hpp

@@ -175,6 +175,13 @@ class BleRecentEntryDetailView : public View {
         {7 * 8, UI_POS_Y(2), 23 * 8, UI_POS_HEIGHT(1)},
         "-"};
 
+    Labels label_vendor{
+        {{0 * 8, 2 * 16}, "Vendor:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_vendor{
+        {7 * 8, 2 * 16, 23 * 8, 16},
+        "-"};
+
     Labels labels{
         {{UI_POS_X(0), UI_POS_Y(3)}, "Len", Theme::getInstance()->fg_light->foreground},
         {{5 * 8, UI_POS_Y(3)}, "Type", Theme::getInstance()->fg_light->foreground},

firmware/application/apps/ble_tx_app.hpp

@@ -293,7 +293,7 @@ class BLETxView : public View {
         {{UI_POS_X(0), 9 * 16}, "Packet Data:", Theme::getInstance()->fg_light->foreground}};
 
     TextViewer dataEditView{
-        {0, 9 * 18, 240, 240}};
+        {0, 9 * 18, screen_width, screen_height - 80}};
 
     Button button_clear_marked{
         {UI_POS_X(1), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(13), UI_POS_HEIGHT(1.5)},

firmware/application/external/tetris/ui_tetris.hpp

@@ -154,7 +154,7 @@ class TetrisView : public View {
     NavigationView& nav_;
 
     Button dummy{
-        {240, 0, 0, 0},
+        {screen_width, 0, 0, 0},
         ""};
 
     MessageHandlerRegistration message_handler_frame_sync{

firmware/common/ui_widget.hpp

@@ -994,6 +994,10 @@ class Waveform : public Widget {
     void set_paused(bool paused);
     bool is_clickable() const;
 
+    bool is_paused() const;
+    void set_paused(bool paused);
+    bool is_clickable() const;
+
     void paint(Painter& painter) override;
     bool on_key(const KeyEvent key) override;
     bool on_touch(const TouchEvent event) override;