WS: GUI fixes and improvements

applications/plugins/weather_station/protocols/ws_generic.c

@@ -105,8 +105,8 @@ bool ws_block_generic_serialize(
         uint32_t curr_ts = furi_hal_rtc_datetime_to_timestamp(&curr_dt);
 
         temp_data = curr_ts;
-        if(!flipper_format_write_uint32(flipper_format, "Old", &temp_data, 1)) {
+        if(!flipper_format_write_uint32(flipper_format, "Ts", &temp_data, 1)) {
-            FURI_LOG_E(TAG, "Unable to add agedata");
+            FURI_LOG_E(TAG, "Unable to add timestamp");
             break;
         }
 
@@ -179,11 +179,11 @@ bool ws_block_generic_deserialize(WSBlockGeneric* instance, FlipperFormat* flipp
         }
         instance->humidity = (uint8_t)temp_data;
 
-        if(!flipper_format_read_uint32(flipper_format, "Old", (uint32_t*)&temp_data, 1)) {
+        if(!flipper_format_read_uint32(flipper_format, "Ts", (uint32_t*)&temp_data, 1)) {
-            FURI_LOG_E(TAG, "Missing agedata");
+            FURI_LOG_E(TAG, "Missing timestamp");
             break;
         }
-        instance->agedata = (uint32_t)temp_data;
+        instance->timestamp = (uint32_t)temp_data;
 
         if(!flipper_format_read_uint32(flipper_format, "Ch", (uint32_t*)&temp_data, 1)) {
             FURI_LOG_E(TAG, "Missing Channel");

applications/plugins/weather_station/protocols/ws_generic.h

@@ -29,7 +29,7 @@ struct WSBlockGeneric {
     uint8_t data_count_bit;
     uint8_t battery_low;
     uint8_t humidity;
-    uint32_t agedata;
+    uint32_t timestamp;
     uint8_t channel;
     uint8_t btn;
     float temp;

applications/plugins/weather_station/views/weather_station_receiver.c

@@ -8,7 +8,7 @@
 #include <m-array.h>
 
 #define FRAME_HEIGHT 12
-#define MAX_LEN_PX 100
+#define MAX_LEN_PX 112
 #define MENU_ITEMS 4u
 #define UNLOCK_CNT 3
 
@@ -189,7 +189,7 @@ void ws_view_receiver_draw(Canvas* canvas, WSReceiverModel* model) {
             canvas_set_color(canvas, ColorBlack);
         }
         canvas_draw_icon(canvas, 4, 2 + i * FRAME_HEIGHT, ReceiverItemIcons[item_menu->type]);
-        canvas_draw_str(canvas, 15, 9 + i * FRAME_HEIGHT, furi_string_get_cstr(str_buff));
+        canvas_draw_str(canvas, 14, 9 + i * FRAME_HEIGHT, furi_string_get_cstr(str_buff));
         furi_string_reset(str_buff);
     }
     if(scrollbar) {

applications/plugins/weather_station/views/weather_station_receiver_info.c

@@ -44,16 +44,16 @@ void ws_view_receiver_info_draw(Canvas* canvas, WSReceiverInfoModel* model) {
         "%s %db",
         furi_string_get_cstr(model->protocol_name),
         model->generic->data_count_bit);
-    canvas_draw_str(canvas, 5, 8, buffer);
+    canvas_draw_str(canvas, 0, 8, buffer);
 
     if(model->generic->channel != WS_NO_CHANNEL) {
         snprintf(buffer, sizeof(buffer), "Ch: %01d", model->generic->channel);
-        canvas_draw_str(canvas, 105, 8, buffer);
+        canvas_draw_str(canvas, 106, 8, buffer);
     }
 
     if(model->generic->id != WS_NO_ID) {
         snprintf(buffer, sizeof(buffer), "Sn: 0x%02lX", model->generic->id);
-        canvas_draw_str(canvas, 5, 20, buffer);
+        canvas_draw_str(canvas, 0, 20, buffer);
     }
 
     if(model->generic->btn != WS_NO_BTN) {
@@ -64,45 +64,39 @@ void ws_view_receiver_info_draw(Canvas* canvas, WSReceiverInfoModel* model) {
     if(model->generic->battery_low != WS_NO_BATT) {
         snprintf(
             buffer, sizeof(buffer), "Batt: %s", (!model->generic->battery_low ? "ok" : "low"));
-        canvas_draw_str(canvas, 90, 20, buffer);
+        canvas_draw_str_aligned(canvas, 126, 17, AlignRight, AlignCenter, buffer);
     }
 
     snprintf(buffer, sizeof(buffer), "Data: 0x%llX", model->generic->data);
-    canvas_draw_str(canvas, 5, 32, buffer);
+    canvas_draw_str(canvas, 0, 32, buffer);
 
-    //DATA AGE
+    elements_bold_rounded_frame(canvas, 0, 38, 127, 25);
-    if((int)model->generic->agedata > 0) {
+    canvas_set_font(canvas, FontPrimary);
+
+    if(model->generic->temp != WS_NO_TEMPERATURE) {
+        canvas_draw_icon(canvas, 6, 43, &I_Therm_7x16);
+        snprintf(buffer, sizeof(buffer), "%3.1f C", (double)model->generic->temp);
+        canvas_draw_str_aligned(canvas, 47, 47, AlignRight, AlignTop, buffer);
+        canvas_draw_circle(canvas, 38, 46, 1);
+    }
+
+    if(model->generic->humidity != WS_NO_HUMIDITY) {
+        canvas_draw_icon(canvas, 53, 44, &I_Humid_8x13);
+        snprintf(buffer, sizeof(buffer), "%d%%", model->generic->humidity);
+        canvas_draw_str(canvas, 64, 55, buffer);
+    }
+
+    if((int)model->generic->timestamp > 0) {
         FuriHalRtcDateTime curr_dt;
         furi_hal_rtc_get_datetime(&curr_dt);
         uint32_t curr_ts = furi_hal_rtc_datetime_to_timestamp(&curr_dt);
 
-        int diffold = (int)curr_ts - (int)model->generic->agedata;
+        int ts_diff = (int)curr_ts - (int)model->generic->timestamp;
 
-        uint8_t tmp_x_frame = 101;
+        canvas_draw_icon(canvas, 91, 46, &I_Timer_11x11);
-        uint8_t tmp_y_frame = 23;
 
-        uint8_t tmp_x_text = 113;
+        if(ts_diff > 60) {
-        uint8_t tmp_y_text = 29;
+            int tmp_sec = ts_diff;
-        if(model->generic->data_count_bit >= 41) {
-            tmp_x_frame = 78;
-            tmp_y_frame = 0;
-
-            tmp_x_text = 91;
-            tmp_y_text = 6;
-
-            if(model->generic->btn == WS_NO_BTN) {
-                if(furi_string_size(model->protocol_name) > (size_t)10) {
-                    tmp_x_frame = 61;
-                    tmp_y_frame = 11;
-
-                    tmp_x_text = 74;
-                    tmp_y_text = 17;
-                }
-            }
-        }
-
-        if(diffold > 60) {
-            int tmp_sec = diffold;
             int cnt_min = 1;
             for(int i = 1; tmp_sec > 60; i++) {
                 tmp_sec = tmp_sec - 60;
@@ -110,55 +104,21 @@ void ws_view_receiver_info_draw(Canvas* canvas, WSReceiverInfoModel* model) {
             }
 
             if(curr_ts % 2 == 0) {
-                canvas_set_color(canvas, ColorBlack);
+                canvas_draw_str_aligned(canvas, 105, 51, AlignLeft, AlignCenter, "Old");
-                canvas_draw_rframe(canvas, tmp_x_frame, tmp_y_frame, 26, 11, 1);
-                canvas_set_color(canvas, ColorBlack);
-                canvas_draw_str_aligned(
-                    canvas, tmp_x_text, tmp_y_text, AlignCenter, AlignCenter, "OLD");
             } else {
                 if(cnt_min >= 59) {
-                    canvas_set_color(canvas, ColorBlack);
+                    canvas_draw_str_aligned(canvas, 105, 51, AlignLeft, AlignCenter, "Old");
-                    canvas_draw_rframe(canvas, tmp_x_frame, tmp_y_frame, 26, 11, 1);
-                    canvas_set_color(canvas, ColorBlack);
-                    canvas_draw_str_aligned(
-                        canvas, tmp_x_text, tmp_y_text, AlignCenter, AlignCenter, "OLD");
                 } else {
-                    canvas_set_color(canvas, ColorBlack);
-                    canvas_draw_rframe(canvas, tmp_x_frame, tmp_y_frame, 26, 11, 1);
-                    canvas_draw_box(canvas, tmp_x_frame, tmp_y_frame, 26, 11);
-                    canvas_set_color(canvas, ColorWhite);
                     snprintf(buffer, sizeof(buffer), "%dm", cnt_min);
-                    canvas_draw_str_aligned(
+                    canvas_draw_str_aligned(canvas, 114, 51, AlignCenter, AlignCenter, buffer);
-                        canvas, tmp_x_text, tmp_y_text, AlignCenter, AlignCenter, buffer);
                 }
             }
 
         } else {
-            canvas_set_color(canvas, ColorBlack);
+            snprintf(buffer, sizeof(buffer), "%d", ts_diff);
-            canvas_draw_rframe(canvas, tmp_x_frame, tmp_y_frame, 26, 11, 1);
+            canvas_draw_str_aligned(canvas, 112, 51, AlignCenter, AlignCenter, buffer);
-            canvas_set_color(canvas, ColorBlack);
-            snprintf(buffer, sizeof(buffer), "%d", diffold);
-            canvas_draw_str_aligned(
-                canvas, tmp_x_text, tmp_y_text, AlignCenter, AlignCenter, buffer);
         }
     }
-    //DATA AGE end
-
-    elements_bold_rounded_frame(canvas, 2, 37, 123, 25);
-    canvas_set_font(canvas, FontPrimary);
-
-    if(model->generic->temp != WS_NO_TEMPERATURE) {
-        canvas_draw_icon(canvas, 18, 42, &I_Therm_7x16);
-        snprintf(buffer, sizeof(buffer), "%3.1f C", (double)model->generic->temp);
-        canvas_draw_str_aligned(canvas, 63, 46, AlignRight, AlignTop, buffer);
-        canvas_draw_circle(canvas, 55, 45, 1);
-    }
-
-    if(model->generic->humidity != WS_NO_HUMIDITY) {
-        canvas_draw_icon(canvas, 75, 42, &I_Humid_10x15);
-        snprintf(buffer, sizeof(buffer), "%d%%", model->generic->humidity);
-        canvas_draw_str(canvas, 91, 54, buffer);
-    }
 }
 
 bool ws_view_receiver_info_input(InputEvent* event, void* context) {