[FL-2524] Graphics cleanup and icon rotation (#2561)

* 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>

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,

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"

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() {

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) {