From b4ceb55fd20e66709311a652a336286839c5d672 Mon Sep 17 00:00:00 2001
From: Astra <93453568+Astrrra@users.noreply.github.com>
Date: Thu, 6 Apr 2023 06:36:12 +0300
Subject: [PATCH] [FL-2524] Graphics cleanup and icon rotation (#2561)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Canvas with rotation
* Full icon rotation, cleanup of unused resources
* F18 API update
* Bitmap draw cleanup
* More cleaning up
* Migrate recovery and DFU to canvas
* Make the internal draw function static
* Remove all calls to u8g2_DrawXBM

Co-authored-by: あく <alleteam@gmail.com>
---
 .../dap_link/gui/views/dap_main_view.c        |   8 +-
 .../dap_link/icons/ArrowDownEmpty_12x18.png   | Bin 160 -> 0 bytes
 .../dap_link/icons/ArrowDownFilled_12x18.png  | Bin 168 -> 0 bytes
 applications/main/gpio/views/gpio_usb_uart.c  |   4 +-
 applications/services/desktop/desktop.c       |   4 +-
 .../desktop/views/desktop_view_pin_input.c    |  13 +-
 applications/services/gui/canvas.c            | 136 +++++++++++++++++-
 applications/services/gui/canvas.h            |  32 +++++
 applications/services/gui/canvas_i.h          |  19 +++
 assets/icons/GPIO/ArrowDownEmpty_14x15.png    | Bin 654 -> 0 bytes
 assets/icons/GPIO/ArrowDownFilled_14x15.png   | Bin 669 -> 0 bytes
 assets/icons/PIN/Pin_arrow_down_7x9.png       | Bin 3607 -> 0 bytes
 assets/icons/PIN/Pin_arrow_left_9x7.png       | Bin 3603 -> 0 bytes
 assets/icons/PIN/Pin_arrow_right_9x7.png      | Bin 3602 -> 0 bytes
 assets/icons/PIN/Pin_back_full_40x8.png       | Bin 3641 -> 0 bytes
 assets/icons/StatusBar/Lock_8x8.png           | Bin 303 -> 0 bytes
 firmware/targets/f18/api_symbols.csv          |   9 +-
 firmware/targets/f7/api_symbols.csv           |   3 +-
 firmware/targets/f7/src/dfu.c                 |  27 ++--
 firmware/targets/f7/src/recovery.c            |  47 +++---
 20 files changed, 236 insertions(+), 66 deletions(-)
 delete mode 100644 applications/external/dap_link/icons/ArrowDownEmpty_12x18.png
 delete mode 100644 applications/external/dap_link/icons/ArrowDownFilled_12x18.png
 delete mode 100644 assets/icons/GPIO/ArrowDownEmpty_14x15.png
 delete mode 100644 assets/icons/GPIO/ArrowDownFilled_14x15.png
 delete mode 100644 assets/icons/PIN/Pin_arrow_down_7x9.png
 delete mode 100644 assets/icons/PIN/Pin_arrow_left_9x7.png
 delete mode 100644 assets/icons/PIN/Pin_arrow_right_9x7.png
 delete mode 100644 assets/icons/PIN/Pin_back_full_40x8.png
 delete mode 100644 assets/icons/StatusBar/Lock_8x8.png

diff --git a/applications/external/dap_link/gui/views/dap_main_view.c b/applications/external/dap_link/gui/views/dap_main_view.c
index c5c8f9df..f54c5e3d 100644
--- a/applications/external/dap_link/gui/views/dap_main_view.c
+++ b/applications/external/dap_link/gui/views/dap_main_view.c
@@ -51,10 +51,10 @@ static void dap_main_view_draw_callback(Canvas* canvas, void* _model) {
     canvas_set_color(canvas, ColorBlack);
     if(model->dap_active) {
         canvas_draw_icon(canvas, 14, 16, &I_ArrowUpFilled_12x18);
-        canvas_draw_icon(canvas, 28, 16, &I_ArrowDownFilled_12x18);
+        canvas_draw_icon_ex(canvas, 28, 16, &I_ArrowUpFilled_12x18, IconRotation180);
     } else {
         canvas_draw_icon(canvas, 14, 16, &I_ArrowUpEmpty_12x18);
-        canvas_draw_icon(canvas, 28, 16, &I_ArrowDownEmpty_12x18);
+        canvas_draw_icon_ex(canvas, 28, 16, &I_ArrowUpEmpty_12x18, IconRotation180);
     }
 
     switch(model->mode) {
@@ -76,9 +76,9 @@ static void dap_main_view_draw_callback(Canvas* canvas, void* _model) {
     }
 
     if(model->rx_active) {
-        canvas_draw_icon(canvas, 101, 16, &I_ArrowDownFilled_12x18);
+        canvas_draw_icon_ex(canvas, 101, 16, &I_ArrowUpFilled_12x18, IconRotation180);
     } else {
-        canvas_draw_icon(canvas, 101, 16, &I_ArrowDownEmpty_12x18);
+        canvas_draw_icon_ex(canvas, 101, 16, &I_ArrowUpEmpty_12x18, IconRotation180);
     }
 
     canvas_draw_str_aligned(canvas, 100, 38, AlignCenter, AlignTop, "UART");
diff --git a/applications/external/dap_link/icons/ArrowDownEmpty_12x18.png b/applications/external/dap_link/icons/ArrowDownEmpty_12x18.png
deleted file mode 100644
index 6007f74ab0e89fc751f503a8a5e4e44021c0106c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eO!3HGrSK5O(jKx9jP7LeL$-D$|qC8z3Lo_D7
zo$SbWK!Jlr{PF+&Hnv;TJQ&v7?g&r!Fz9A{(LGbM+u3CI@thML?q)j=*|$VqJ$T$$
ztuvzCPsSl~7YFluKK0CllcIM`vf0BqQzUWaj&{}5`5zhLf9t51+<hbrw1vUb)z4*}
HQ$iB}N?tXR

diff --git a/applications/external/dap_link/icons/ArrowDownFilled_12x18.png b/applications/external/dap_link/icons/ArrowDownFilled_12x18.png
deleted file mode 100644
index 5541e772389ad2a8f3194b62ebfeb524fbe2a1d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eO!3HGrSK5O(jKx9jP7LeL$-D$|l001;Lo_Cy
zoovW=K!Jz({EGkoH(5{da`4^t=%R(?qK2H=dY&r0g6m!xm}ahAyhQh{v&WRfoEsNh
zY77@L`1s#!t@>o=lhbp(50(A=anC2ZSBvNHg_RnWm*uWGEIRgogS6BGwsp^g6qa`c
R{s7v>;OXk;vd$@?2>@rkKMeo?

diff --git a/applications/main/gpio/views/gpio_usb_uart.c b/applications/main/gpio/views/gpio_usb_uart.c
index 837f2e3e..3234309a 100644
--- a/applications/main/gpio/views/gpio_usb_uart.c
+++ b/applications/main/gpio/views/gpio_usb_uart.c
@@ -80,9 +80,9 @@ static void gpio_usb_uart_draw_callback(Canvas* canvas, void* _model) {
         canvas_draw_icon(canvas, 48, 14, &I_ArrowUpEmpty_14x15);
 
     if(model->rx_active)
-        canvas_draw_icon(canvas, 48, 34, &I_ArrowDownFilled_14x15);
+        canvas_draw_icon_ex(canvas, 48, 34, &I_ArrowUpFilled_14x15, IconRotation180);
     else
-        canvas_draw_icon(canvas, 48, 34, &I_ArrowDownEmpty_14x15);
+        canvas_draw_icon_ex(canvas, 48, 34, &I_ArrowUpEmpty_14x15, IconRotation180);
 }
 
 static bool gpio_usb_uart_input_callback(InputEvent* event, void* context) {
diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 556f4233..41470ed3 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -37,7 +37,7 @@ static void desktop_loader_callback(const void* message, void* context) {
 static void desktop_lock_icon_draw_callback(Canvas* canvas, void* context) {
     UNUSED(context);
     furi_assert(canvas);
-    canvas_draw_icon(canvas, 0, 0, &I_Lock_8x8);
+    canvas_draw_icon(canvas, 0, 0, &I_Lock_7x8);
 }
 
 static void desktop_dummy_mode_icon_draw_callback(Canvas* canvas, void* context) {
@@ -230,7 +230,7 @@ Desktop* desktop_alloc() {
 
     // Lock icon
     desktop->lock_icon_viewport = view_port_alloc();
-    view_port_set_width(desktop->lock_icon_viewport, icon_get_width(&I_Lock_8x8));
+    view_port_set_width(desktop->lock_icon_viewport, icon_get_width(&I_Lock_7x8));
     view_port_draw_callback_set(
         desktop->lock_icon_viewport, desktop_lock_icon_draw_callback, desktop);
     view_port_enabled_set(desktop->lock_icon_viewport, false);
diff --git a/applications/services/desktop/views/desktop_view_pin_input.c b/applications/services/desktop/views/desktop_view_pin_input.c
index b86bf292..d3dadd7d 100644
--- a/applications/services/desktop/views/desktop_view_pin_input.c
+++ b/applications/services/desktop/views/desktop_view_pin_input.c
@@ -115,16 +115,18 @@ static void desktop_view_pin_input_draw_cells(Canvas* canvas, DesktopViewPinInpu
             } else {
                 switch(model->pin.data[i]) {
                 case InputKeyDown:
-                    canvas_draw_icon(canvas, x + 3, y + 2, &I_Pin_arrow_down_7x9);
+                    canvas_draw_icon_ex(
+                        canvas, x + 3, y + 2, &I_Pin_arrow_up_7x9, IconRotation180);
                     break;
                 case InputKeyUp:
-                    canvas_draw_icon(canvas, x + 3, y + 2, &I_Pin_arrow_up_7x9);
+                    canvas_draw_icon_ex(canvas, x + 3, y + 2, &I_Pin_arrow_up_7x9, IconRotation0);
                     break;
                 case InputKeyLeft:
-                    canvas_draw_icon(canvas, x + 2, y + 3, &I_Pin_arrow_left_9x7);
+                    canvas_draw_icon_ex(
+                        canvas, x + 2, y + 3, &I_Pin_arrow_up_7x9, IconRotation270);
                     break;
                 case InputKeyRight:
-                    canvas_draw_icon(canvas, x + 2, y + 3, &I_Pin_arrow_right_9x7);
+                    canvas_draw_icon_ex(canvas, x + 2, y + 3, &I_Pin_arrow_up_7x9, IconRotation90);
                     break;
                 default:
                     furi_assert(0);
@@ -147,7 +149,8 @@ static void desktop_view_pin_input_draw(Canvas* canvas, void* context) {
     desktop_view_pin_input_draw_cells(canvas, model);
 
     if((model->pin.length > 0) && !model->locked_input) {
-        canvas_draw_icon(canvas, 4, 53, &I_Pin_back_full_40x8);
+        canvas_draw_icon(canvas, 4, 53, &I_Pin_back_arrow_10x8);
+        canvas_draw_str(canvas, 16, 60, "= clear");
     }
 
     if(model->button_label && ((model->pin.length >= MIN_PIN_SIZE) || model->locked_input)) {
diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c
index 40797c08..6e35dcff 100644
--- a/applications/services/gui/canvas.c
+++ b/applications/services/gui/canvas.c
@@ -221,7 +221,7 @@ void canvas_draw_bitmap(
     y += canvas->offset_y;
     uint8_t* bitmap_data = NULL;
     compress_icon_decode(canvas->compress_icon, compressed_bitmap_data, &bitmap_data);
-    u8g2_DrawXBM(&canvas->fb, x, y, width, height, bitmap_data);
+    canvas_draw_u8g2_bitmap(&canvas->fb, x, y, width, height, bitmap_data, IconRotation0);
 }
 
 void canvas_draw_icon_animation(
@@ -237,13 +237,138 @@ void canvas_draw_icon_animation(
     uint8_t* icon_data = NULL;
     compress_icon_decode(
         canvas->compress_icon, icon_animation_get_data(icon_animation), &icon_data);
-    u8g2_DrawXBM(
+    canvas_draw_u8g2_bitmap(
         &canvas->fb,
         x,
         y,
         icon_animation_get_width(icon_animation),
         icon_animation_get_height(icon_animation),
-        icon_data);
+        icon_data,
+        IconRotation0);
+}
+
+static void canvas_draw_u8g2_bitmap_int(
+    u8g2_t* u8g2,
+    u8g2_uint_t x,
+    u8g2_uint_t y,
+    u8g2_uint_t w,
+    u8g2_uint_t h,
+    bool mirror,
+    bool rotation,
+    const uint8_t* bitmap) {
+    u8g2_uint_t blen;
+    blen = w;
+    blen += 7;
+    blen >>= 3;
+
+    if(rotation && !mirror) {
+        x += w + 1;
+    } else if(mirror && !rotation) {
+        y += h - 1;
+    }
+
+    while(h > 0) {
+        const uint8_t* b = bitmap;
+        uint16_t len = w;
+        uint16_t x0 = x;
+        uint16_t y0 = y;
+        uint8_t mask;
+        uint8_t color = u8g2->draw_color;
+        uint8_t ncolor = (color == 0 ? 1 : 0);
+        mask = 1;
+
+        while(len > 0) {
+            if(u8x8_pgm_read(b) & mask) {
+                u8g2->draw_color = color;
+                u8g2_DrawHVLine(u8g2, x0, y0, 1, 0);
+            } else if(u8g2->bitmap_transparency == 0) {
+                u8g2->draw_color = ncolor;
+                u8g2_DrawHVLine(u8g2, x0, y0, 1, 0);
+            }
+
+            if(rotation) {
+                y0++;
+            } else {
+                x0++;
+            }
+
+            mask <<= 1;
+            if(mask == 0) {
+                mask = 1;
+                b++;
+            }
+            len--;
+        }
+
+        u8g2->draw_color = color;
+        bitmap += blen;
+
+        if(mirror) {
+            if(rotation) {
+                x++;
+            } else {
+                y--;
+            }
+        } else {
+            if(rotation) {
+                x--;
+            } else {
+                y++;
+            }
+        }
+        h--;
+    }
+}
+
+void canvas_draw_u8g2_bitmap(
+    u8g2_t* u8g2,
+    u8g2_uint_t x,
+    u8g2_uint_t y,
+    u8g2_uint_t w,
+    u8g2_uint_t h,
+    const uint8_t* bitmap,
+    IconRotation rotation) {
+    u8g2_uint_t blen;
+    blen = w;
+    blen += 7;
+    blen >>= 3;
+#ifdef U8G2_WITH_INTERSECTION
+    if(u8g2_IsIntersection(u8g2, x, y, x + w, y + h) == 0) return;
+#endif /* U8G2_WITH_INTERSECTION */
+
+    switch(rotation) {
+    case IconRotation0:
+        canvas_draw_u8g2_bitmap_int(u8g2, x, y, w, h, 0, 0, bitmap);
+        break;
+    case IconRotation90:
+        canvas_draw_u8g2_bitmap_int(u8g2, x, y, w, h, 0, 1, bitmap);
+        break;
+    case IconRotation180:
+        canvas_draw_u8g2_bitmap_int(u8g2, x, y, w, h, 1, 0, bitmap);
+        break;
+    case IconRotation270:
+        canvas_draw_u8g2_bitmap_int(u8g2, x, y, w, h, 1, 1, bitmap);
+        break;
+    default:
+        break;
+    }
+}
+
+void canvas_draw_icon_ex(
+    Canvas* canvas,
+    uint8_t x,
+    uint8_t y,
+    const Icon* icon,
+    IconRotation rotation) {
+    furi_assert(canvas);
+    furi_assert(icon);
+
+    x += canvas->offset_x;
+    y += canvas->offset_y;
+    uint8_t* icon_data = NULL;
+    compress_icon_decode(canvas->compress_icon, icon_get_data(icon), &icon_data);
+    canvas_draw_u8g2_bitmap(
+        &canvas->fb, x, y, icon_get_width(icon), icon_get_height(icon), icon_data, rotation);
 }
 
 void canvas_draw_icon(Canvas* canvas, uint8_t x, uint8_t y, const Icon* icon) {
@@ -254,7 +379,8 @@ void canvas_draw_icon(Canvas* canvas, uint8_t x, uint8_t y, const Icon* icon) {
     y += canvas->offset_y;
     uint8_t* icon_data = NULL;
     compress_icon_decode(canvas->compress_icon, icon_get_data(icon), &icon_data);
-    u8g2_DrawXBM(&canvas->fb, x, y, icon_get_width(icon), icon_get_height(icon), icon_data);
+    canvas_draw_u8g2_bitmap(
+        &canvas->fb, x, y, icon_get_width(icon), icon_get_height(icon), icon_data, IconRotation0);
 }
 
 void canvas_draw_dot(Canvas* canvas, uint8_t x, uint8_t y) {
@@ -364,7 +490,7 @@ void canvas_draw_xbm(
     furi_assert(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
-    u8g2_DrawXBM(&canvas->fb, x, y, w, h, bitmap);
+    canvas_draw_u8g2_bitmap(&canvas->fb, x, y, w, h, bitmap, IconRotation0);
 }
 
 void canvas_draw_glyph(Canvas* canvas, uint8_t x, uint8_t y, uint16_t ch) {
diff --git a/applications/services/gui/canvas.h b/applications/services/gui/canvas.h
index f8fe2c1d..f34d02bf 100644
--- a/applications/services/gui/canvas.h
+++ b/applications/services/gui/canvas.h
@@ -64,6 +64,22 @@ typedef struct {
     uint8_t descender;
 } CanvasFontParameters;
 
+/** Icon flip */
+typedef enum {
+    IconFlipNone,
+    IconFlipHorizontal,
+    IconFlipVertical,
+    IconFlipBoth,
+} IconFlip;
+
+/** Icon rotation */
+typedef enum {
+    IconRotation0,
+    IconRotation90,
+    IconRotation180,
+    IconRotation270,
+} IconRotation;
+
 /** Canvas anonymous structure */
 typedef struct Canvas Canvas;
 
@@ -217,6 +233,22 @@ void canvas_draw_bitmap(
     uint8_t height,
     const uint8_t* compressed_bitmap_data);
 
+/** Draw icon at position defined by x,y with rotation and flip.
+ *
+ * @param      canvas   Canvas instance
+ * @param      x        x coordinate
+ * @param      y        y coordinate
+ * @param      icon     Icon instance
+ * @param      flip     IconFlip
+ * @param      rotation IconRotation
+ */
+void canvas_draw_icon_ex(
+    Canvas* canvas,
+    uint8_t x,
+    uint8_t y,
+    const Icon* icon,
+    IconRotation rotation);
+
 /** Draw animation at position defined by x,y.
  *
  * @param      canvas          Canvas instance
diff --git a/applications/services/gui/canvas_i.h b/applications/services/gui/canvas_i.h
index 39e7021b..f3b8f17a 100644
--- a/applications/services/gui/canvas_i.h
+++ b/applications/services/gui/canvas_i.h
@@ -78,3 +78,22 @@ void canvas_set_orientation(Canvas* canvas, CanvasOrientation orientation);
  * @return     CanvasOrientation
  */
 CanvasOrientation canvas_get_orientation(const Canvas* canvas);
+
+/** Draw a u8g2 bitmap
+ *
+ * @param      canvas   Canvas instance
+ * @param      x        x coordinate
+ * @param      y        y coordinate
+ * @param      width    width
+ * @param      height   height
+ * @param      bitmap   bitmap
+ * @param      rotation rotation
+ */
+void canvas_draw_u8g2_bitmap(
+    u8g2_t* u8g2,
+    uint8_t x,
+    uint8_t y,
+    uint8_t width,
+    uint8_t height,
+    const uint8_t* bitmap,
+    uint8_t rotation);
diff --git a/assets/icons/GPIO/ArrowDownEmpty_14x15.png b/assets/icons/GPIO/ArrowDownEmpty_14x15.png
deleted file mode 100644
index 8c6d54f9cbee1fa08f30d7d8d309fcf0eae24dc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 654
zcmeAS@N?(olHy`uVBq!ia0vp^d_c_4!3-oHpW<@^QfvV}A+G=b{|7Qd4_&SUQk(@I
zk;M!QLM0%~crQ)90w^e1;u=vBoS#-wo>-L1;Fyx1l&avFo0y&&l$w}QS$HzlhJk_c
zLS{%rNrbPDRdRl=ULr`1UPW#J10zFdh?}kj1E!3|#M((0^KL7Mw8gVtob5Y{ciZEr
z1y!L*+oSYtLL-;F6-&Og;7UV-PF~zv@#-ae4;4hEUsjo}eeU6ZzUK$(OKl~Nl^<#j
zv+)W&bYFkJ!h~4P{m*&xd{no6I(@M#|M+_8x;urJ4!%DBAZvkhe$_)siC^kZUj#T^
zdl`0NgZyQVrpZU%d+m_nKhXb7F60(hz!A?QhQ}5t6dsQ{cKe&KN8v1mJq{<84$Vkw
z(Gz=+d$3^cTe%mz_SNpzaZ$Zfm9OE{ept~iW#hJf4aF9PIg3nso0N*qpW3V#^e$;t
z0Qd2=CUIG;$7XD;dhgA#T(YWIZ*@$~EcIu*+?kCvIt_oh-!OUa{rlgVvN~P4d*Qp!
zZWheYopUc*ujx-x3-8)B330c3ulZj#zL&rCdfsYYkINS9@>0i^N*T-hdtAO?{nREn
z=FU}Bo|zG+`X1?MbF2)%c{X*biuqNo^Q%`y=)T^w%crZyCui-?ed4G5bG}bsn|AXe
z-})^ZJ}rNdxAxt^%q*?v)rz0@?%8y=M*noASZmsa`g+@?O^wIi-rS{VF*|<6g9_<2
zf7vTDzg+!NYwQP10J@$ojv*W~lM{fTg^7(L!DZo!W3D$C(hg2JAY!oS!-O9_H#ACI
fU$`~sG+tm3J;R{=vM6pJP$Pq<tDnm{r-UW|Er%X2

diff --git a/assets/icons/GPIO/ArrowDownFilled_14x15.png b/assets/icons/GPIO/ArrowDownFilled_14x15.png
deleted file mode 100644
index 6cef0f4a79a671bd4e74e4e5babce060458ea1cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmeAS@N?(olHy`uVBq!ia0vp^d_c_4!3-oHpW<@^QfvV}A+G=b{|7Qd4_&SUQk(@I
zk;M!QLM0%~crQ)90w^e1;u=vBoS#-wo>-L1;Fyx1l&avFo0y&&l$w}QS$HzlhJk_c
zVrEE0NrbPDRdRl=ULr`1UPW#J10zFdh?}kj1E!3|#M((0^KL7Mw8gVtob5Y{@phrj
z;;PW>?NRzMp_xnGiY4D#aHXL^Coe8nyn4yrLj_UkmsO@~pL_V9@A-lHIzx$L+YdE|
z*?5K?x^G|asIXh8?zGgU8D2S0t~ZPFx9>K!&#An4uv`B@%>w8As)v#iztW$+2ynXg
zGVH<z`O6Ybi;v`cS6Iq5ygzHZVvDGPd*KmIMFstU<59<Me-rlb5K7*3;G>dK%QDtj
zoddU<9$MYDy%bvexh%57YsbfX0X^S;+umC4aa&zR+_llOX|f7e*NMFv=i5AXZeHo6
zE3^Gl#Y$0$<ZG|y>MPDkdvSK<nxYpL{Ev1WXEwHQWBIR~Gwb`(+WH{t{X+fkSKs}0
zlw*&O-+LW#$2zk^ZDC;s>)%Gbe*RMOz4@)|?HAcpI8PmDZ!27R?96fHOD12!EYFLG
zZ!hI^X7jumIB8jB;FZd%y=xx**tP4_rd6lb>%CqRb*wVVCui-?b>gS|bG}diYje7<
ztYT^FRC|~5<Wl~=;9$%9-e&htYu`Tmebb!O!VI?m->(O2No3raw??{Y^3PVTzU>EZ
z)icCw`?A5F(eXDh1z3B!IEHY{OiloT7A7{11eb*kCJ}ryPd6M&Rqzu_;!^IaOknJY
s?cqo_P+H?E(ff=iBs<YffpJDTgL)l9Xsne~KF}BjPgg&ebxsLQ04}W?<p2Nx

diff --git a/assets/icons/PIN/Pin_arrow_down_7x9.png b/assets/icons/PIN/Pin_arrow_down_7x9.png
deleted file mode 100644
index 9687397afa81c92fb727bd40542830392fabdccb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3607
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
QX&eA7&1_6djNPvM5BL~PlmGw#

diff --git a/assets/icons/PIN/Pin_arrow_left_9x7.png b/assets/icons/PIN/Pin_arrow_left_9x7.png
deleted file mode 100644
index fb4ded78fde8d1bf4f053ba0b353e7acf14f031a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3603
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
NTdTvCr4}BM{{j^lO6C9n

diff --git a/assets/icons/PIN/Pin_arrow_right_9x7.png b/assets/icons/PIN/Pin_arrow_right_9x7.png
deleted file mode 100644
index 97648d1761097c58bc2f468ee268db82f252e329..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3602
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

diff --git a/assets/icons/PIN/Pin_back_full_40x8.png b/assets/icons/PIN/Pin_back_full_40x8.png
deleted file mode 100644
index cd1301512db1c06700fec26d03231c63b9be75d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3641
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
Cv0zgG

diff --git a/assets/icons/StatusBar/Lock_8x8.png b/assets/icons/StatusBar/Lock_8x8.png
deleted file mode 100644
index 01fb0eb6bf7506d19f5c6e039df0ef0d3272e424..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^93afZ3?z3ZhDiV^mUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;8~T332`ZAIM?=k_T^V
zeFCx=OM?7@862M7NCR<_yxm<GI#^{rfE@M`PhVH|r_6#}oEm3#{J94d67zI%4B@z*
zoWPqPkifX`LVy65V5<RxVj6QlV|+m;P=#uVYeY#(Vo9o1a#1RfVlXl=GSoFN)-^N>
zF*LUVA`?Sx0|P4qgWh8dPf;}F=BH$)Rbpx|Hi2kZk~Z%-Py>UftDnm{r-UW|;$Ka1

diff --git a/firmware/targets/f18/api_symbols.csv b/firmware/targets/f18/api_symbols.csv
index 40e23a74..7713beb9 100644
--- a/firmware/targets/f18/api_symbols.csv
+++ b/firmware/targets/f18/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,20.0,,
+Version,+,20.1,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -539,6 +539,7 @@ Function,+,canvas_draw_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
 Function,+,canvas_draw_glyph,void,"Canvas*, uint8_t, uint8_t, uint16_t"
 Function,+,canvas_draw_icon,void,"Canvas*, uint8_t, uint8_t, const Icon*"
 Function,+,canvas_draw_icon_animation,void,"Canvas*, uint8_t, uint8_t, IconAnimation*"
+Function,+,canvas_draw_icon_ex,void,"Canvas*, uint8_t, uint8_t, const Icon*, IconRotation"
 Function,+,canvas_draw_line,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
 Function,+,canvas_draw_rbox,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t"
 Function,+,canvas_draw_rframe,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t"
@@ -875,12 +876,6 @@ Function,-,furi_hal_clock_resume_tick,void,
 Function,-,furi_hal_clock_suspend_tick,void,
 Function,-,furi_hal_clock_switch_to_hsi,void,
 Function,-,furi_hal_clock_switch_to_pll,void,
-Function,-,compress_alloc,Compress*,uint16_t
-Function,-,compress_decode,_Bool,"Compress*, uint8_t*, size_t, uint8_t*, size_t, size_t*"
-Function,-,compress_encode,_Bool,"Compress*, uint8_t*, size_t, uint8_t*, size_t, size_t*"
-Function,-,compress_free,void,Compress*
-Function,-,compress_icon_decode,void,"const uint8_t*, uint8_t**"
-Function,-,compress_icon_init,void,
 Function,+,furi_hal_console_disable,void,
 Function,+,furi_hal_console_enable,void,
 Function,+,furi_hal_console_init,void,
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 8b1d29b1..fea79268 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,20.0,,
+Version,+,20.1,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -621,6 +621,7 @@ Function,+,canvas_draw_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
 Function,+,canvas_draw_glyph,void,"Canvas*, uint8_t, uint8_t, uint16_t"
 Function,+,canvas_draw_icon,void,"Canvas*, uint8_t, uint8_t, const Icon*"
 Function,+,canvas_draw_icon_animation,void,"Canvas*, uint8_t, uint8_t, IconAnimation*"
+Function,+,canvas_draw_icon_ex,void,"Canvas*, uint8_t, uint8_t, const Icon*, IconRotation"
 Function,+,canvas_draw_line,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
 Function,+,canvas_draw_rbox,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t"
 Function,+,canvas_draw_rframe,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t"
diff --git a/firmware/targets/f7/src/dfu.c b/firmware/targets/f7/src/dfu.c
index b060bc8d..7e094b4c 100644
--- a/firmware/targets/f7/src/dfu.c
+++ b/firmware/targets/f7/src/dfu.c
@@ -2,29 +2,24 @@
 #include <furi_hal.h>
 #include <flipper.h>
 #include <alt_boot.h>
-#include <u8g2_glue.h>
 #include <assets_icons.h>
 #include <toolbox/compress.h>
+#include <gui/canvas.h>
+#include <gui/canvas_i.h>
 
 void flipper_boot_dfu_show_splash() {
     // Initialize
-    CompressIcon* compress_icon = compress_icon_alloc();
+    Canvas* canvas = canvas_init();
 
-    u8g2_t* fb = malloc(sizeof(u8g2_t));
-    memset(fb, 0, sizeof(u8g2_t));
-    u8g2_Setup_st756x_flipper(fb, U8G2_R0, u8x8_hw_spi_stm32, u8g2_gpio_and_delay_stm32);
-    u8g2_InitDisplay(fb);
-    u8g2_SetDrawColor(fb, 0x01);
-    uint8_t* splash_data = NULL;
-    compress_icon_decode(compress_icon, icon_get_data(&I_DFU_128x50), &splash_data);
-    u8g2_DrawXBM(fb, 0, 64 - 50, 128, 50, splash_data);
-    u8g2_SetFont(fb, u8g2_font_helvB08_tr);
-    u8g2_DrawStr(fb, 2, 8, "Update & Recovery Mode");
-    u8g2_DrawStr(fb, 2, 21, "DFU Started");
-    u8g2_SetPowerSave(fb, 0);
-    u8g2_SendBuffer(fb);
+    canvas_set_color(canvas, ColorBlack);
+    canvas_set_font(canvas, FontPrimary);
 
-    compress_icon_free(compress_icon);
+    canvas_draw_icon(canvas, 0, 64 - 50, &I_DFU_128x50);
+    canvas_draw_str(canvas, 2, 8, "Update & Recovery Mode");
+    canvas_draw_str(canvas, 2, 21, "DFU Started");
+    canvas_commit(canvas);
+
+    canvas_free(canvas);
 }
 
 void flipper_boot_dfu_exec() {
diff --git a/firmware/targets/f7/src/recovery.c b/firmware/targets/f7/src/recovery.c
index d037e811..49d780d4 100644
--- a/firmware/targets/f7/src/recovery.c
+++ b/firmware/targets/f7/src/recovery.c
@@ -2,44 +2,43 @@
 #include <furi_hal.h>
 #include <flipper.h>
 #include <alt_boot.h>
-#include <u8g2_glue.h>
 #include <assets_icons.h>
 #include <toolbox/compress.h>
+#include <gui/canvas.h>
+#include <gui/canvas_i.h>
 
 #define COUNTER_VALUE (136U)
 
-static void flipper_boot_recovery_draw_splash(u8g2_t* fb, size_t progress) {
+static void flipper_boot_recovery_draw_progress(Canvas* canvas, size_t progress) {
     if(progress < COUNTER_VALUE) {
         // Fill the progress bar while the progress is going down
-        u8g2_SetDrawColor(fb, 0x01);
-        u8g2_DrawRFrame(fb, 59, 41, 69, 8, 2);
+        canvas_draw_rframe(canvas, 59, 41, 69, 8, 2);
         size_t width = (COUNTER_VALUE - progress) * 68 / COUNTER_VALUE;
-        u8g2_DrawBox(fb, 60, 42, width, 6);
+        canvas_draw_box(canvas, 60, 42, width, 6);
     } else {
-        u8g2_SetDrawColor(fb, 0x00);
-        u8g2_DrawRBox(fb, 59, 41, 69, 8, 2);
+        canvas_draw_rframe(canvas, 59, 41, 69, 8, 2);
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_box(canvas, 60, 42, 67, 6);
+        canvas_set_color(canvas, ColorBlack);
     }
 
-    u8g2_SendBuffer(fb);
+    canvas_commit(canvas);
+}
+
+void flipper_boot_recovery_draw_splash(Canvas* canvas) {
+    canvas_set_color(canvas, ColorBlack);
+    canvas_set_font(canvas, FontPrimary);
+
+    canvas_draw_icon(canvas, 0, 0, &I_Erase_pin_128x64);
+
+    canvas_commit(canvas);
 }
 
 void flipper_boot_recovery_exec() {
-    u8g2_t* fb = malloc(sizeof(u8g2_t));
-    u8g2_Setup_st756x_flipper(fb, U8G2_R0, u8x8_hw_spi_stm32, u8g2_gpio_and_delay_stm32);
-    u8g2_InitDisplay(fb);
+    Canvas* canvas = canvas_init();
 
-    CompressIcon* compress_icon = compress_icon_alloc();
-    uint8_t* splash_data = NULL;
-    compress_icon_decode(compress_icon, icon_get_data(&I_Erase_pin_128x64), &splash_data);
-
-    u8g2_ClearBuffer(fb);
-    u8g2_SetDrawColor(fb, 0x01);
-
-    // Draw the recovery picture
-    u8g2_DrawXBM(fb, 0, 0, 128, 64, splash_data);
-    u8g2_SendBuffer(fb);
-    u8g2_SetPowerSave(fb, 0);
-    compress_icon_free(compress_icon);
+    // Show recovery splashscreen
+    flipper_boot_recovery_draw_splash(canvas);
 
     size_t counter = COUNTER_VALUE;
     while(counter) {
@@ -53,7 +52,7 @@ void flipper_boot_recovery_exec() {
             counter = COUNTER_VALUE;
         }
 
-        flipper_boot_recovery_draw_splash(fb, counter);
+        flipper_boot_recovery_draw_progress(canvas, counter);
     }
 
     if(!counter) {