[FL-2133, FL-2151] charging icon, fix gui buttons size (#925)

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

applications/gui/elements.c

@@ -117,13 +117,14 @@ void elements_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t
 }
 
 void elements_button_left(Canvas* canvas, const char* str) {
-    const uint8_t button_height = 13;
+    const uint8_t button_height = 12;
     const uint8_t vertical_offset = 3;
     const uint8_t horizontal_offset = 3;
     const uint8_t string_width = canvas_string_width(canvas, str);
     const Icon* icon = &I_ButtonLeft_4x7;
-    const uint8_t icon_offset = 3;
-    const uint8_t icon_width_with_offset = icon->width + icon_offset;
+    const uint8_t icon_h_offset = 3;
+    const uint8_t icon_width_with_offset = icon->width + icon_h_offset;
+    const uint8_t icon_v_offset = icon->height + vertical_offset;
     const uint8_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset;
 
     const uint8_t x = 0;
@@ -135,21 +136,21 @@ void elements_button_left(Canvas* canvas, const char* str) {
     canvas_draw_line(canvas, x + button_width + 2, y, x + button_width + 2, y - button_height + 2);
 
     canvas_invert_color(canvas);
-    canvas_draw_icon(
-        canvas, x + horizontal_offset, y - button_height + vertical_offset, &I_ButtonLeft_4x7);
+    canvas_draw_icon(canvas, x + horizontal_offset, y - icon_v_offset, &I_ButtonLeft_4x7);
     canvas_draw_str(
         canvas, x + horizontal_offset + icon_width_with_offset, y - vertical_offset, str);
     canvas_invert_color(canvas);
 }
 
 void elements_button_right(Canvas* canvas, const char* str) {
-    const uint8_t button_height = 13;
+    const uint8_t button_height = 12;
     const uint8_t vertical_offset = 3;
     const uint8_t horizontal_offset = 3;
     const uint8_t string_width = canvas_string_width(canvas, str);
     const Icon* icon = &I_ButtonRight_4x7;
-    const uint8_t icon_offset = 3;
-    const uint8_t icon_width_with_offset = icon->width + icon_offset;
+    const uint8_t icon_h_offset = 3;
+    const uint8_t icon_width_with_offset = icon->width + icon_h_offset;
+    const uint8_t icon_v_offset = icon->height + vertical_offset;
     const uint8_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset;
 
     const uint8_t x = canvas_width(canvas);
@@ -163,21 +164,19 @@ void elements_button_right(Canvas* canvas, const char* str) {
     canvas_invert_color(canvas);
     canvas_draw_str(canvas, x - button_width + horizontal_offset, y - vertical_offset, str);
     canvas_draw_icon(
-        canvas,
-        x - horizontal_offset - icon->width,
-        y - button_height + vertical_offset,
-        &I_ButtonRight_4x7);
+        canvas, x - horizontal_offset - icon->width, y - icon_v_offset, &I_ButtonRight_4x7);
     canvas_invert_color(canvas);
 }
 
 void elements_button_center(Canvas* canvas, const char* str) {
-    const uint8_t button_height = 13;
+    const uint8_t button_height = 12;
     const uint8_t vertical_offset = 3;
     const uint8_t horizontal_offset = 1;
     const uint8_t string_width = canvas_string_width(canvas, str);
     const Icon* icon = &I_ButtonCenter_7x7;
-    const uint8_t icon_offset = 3;
-    const uint8_t icon_width_with_offset = icon->width + icon_offset;
+    const uint8_t icon_h_offset = 3;
+    const uint8_t icon_width_with_offset = icon->width + icon_h_offset;
+    const uint8_t icon_v_offset = icon->height + vertical_offset;
     const uint8_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset;
 
     const uint8_t x = (canvas_width(canvas) - button_width) / 2;
@@ -194,8 +193,7 @@ void elements_button_center(Canvas* canvas, const char* str) {
     canvas_draw_line(canvas, x + button_width + 2, y, x + button_width + 2, y - button_height + 2);
 
     canvas_invert_color(canvas);
-    canvas_draw_icon(
-        canvas, x + horizontal_offset, y - button_height + vertical_offset, &I_ButtonCenter_7x7);
+    canvas_draw_icon(canvas, x + horizontal_offset, y - icon_v_offset, &I_ButtonCenter_7x7);
     canvas_draw_str(
         canvas, x + horizontal_offset + icon_width_with_offset, y - vertical_offset, str);
     canvas_invert_color(canvas);

applications/gui/gui.c

@@ -97,7 +97,7 @@ void gui_redraw_status_bar(Gui* gui) {
                 canvas_height(gui->canvas) - 2);
 
             canvas_frame_set(
-                gui->canvas, x, GUI_STATUS_BAR_Y + 2, width, GUI_STATUS_BAR_WORKAREA_HEIGHT);
+                gui->canvas, x, GUI_STATUS_BAR_Y + 1, width, GUI_STATUS_BAR_WORKAREA_HEIGHT);
 
             view_port_draw(view_port, gui->canvas);
         }

applications/power/power_service/power.c

@@ -16,8 +16,16 @@ bool power_is_battery_well(PowerInfo* info) {
 void power_draw_battery_callback(Canvas* canvas, void* context) {
     furi_assert(context);
     Power* power = context;
-    canvas_draw_icon(canvas, 0, 0, &I_Battery_26x8);
-    canvas_draw_box(canvas, 2, 2, (power->info.charge + 4) / 5, 4);
+    canvas_draw_icon(canvas, 0, 1, &I_Battery_26x8);
+    canvas_draw_box(canvas, 2, 3, (power->info.charge + 4) / 5, 4);
+    if(power->state == PowerStateCharging) {
+        canvas_set_bitmap_mode(canvas, 1);
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_icon(canvas, 8, 0, &I_Charging_lightning_mask_9x10);
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_icon(canvas, 8, 0, &I_Charging_lightning_9x10);
+        canvas_set_bitmap_mode(canvas, 0);
+    }
 }
 
 static ViewPort* power_battery_view_port_alloc(Power* power) {

assets/compiled/assets_icons.h

@@ -36,20 +36,20 @@ extern const Icon A_Level3HijackActive_128x51;
 extern const Icon A_Level3Hijack_128x51;
 extern const Icon A_Level3LabActive_128x51;
 extern const Icon A_Level3Lab_128x51;
-extern const Icon I_LevelUp2_04;
 extern const Icon I_LevelUp2_03;
-extern const Icon I_LevelUp2_07;
-extern const Icon I_LevelUp2_05;
 extern const Icon I_LevelUp2_02;
-extern const Icon I_LevelUp2_06;
+extern const Icon I_LevelUp2_05;
+extern const Icon I_LevelUp2_04;
 extern const Icon I_LevelUp2_01;
-extern const Icon I_LevelUp3_07;
+extern const Icon I_LevelUp2_06;
+extern const Icon I_LevelUp2_07;
+extern const Icon I_LevelUp3_05;
+extern const Icon I_LevelUp3_06;
 extern const Icon I_LevelUp3_02;
+extern const Icon I_LevelUp3_07;
 extern const Icon I_LevelUp3_04;
-extern const Icon I_LevelUp3_05;
-extern const Icon I_LevelUp3_01;
 extern const Icon I_LevelUp3_03;
-extern const Icon I_LevelUp3_06;
+extern const Icon I_LevelUp3_01;
 extern const Icon A_LevelUpPending_128x51;
 extern const Icon A_NoSdCard_128x51;
 extern const Icon A_SleepActive_128x52;
@@ -58,88 +58,88 @@ extern const Icon A_TvActive_128x52;
 extern const Icon A_Tv_128x52;
 extern const Icon A_WavesActive_128x52;
 extern const Icon A_Waves_128x52;
-extern const Icon I_sub1_10px;
-extern const Icon I_ir_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_ibutt_10px;
 extern const Icon I_125_10px;
+extern const Icon I_sub1_10px;
 extern const Icon I_dir_10px;
+extern const Icon I_ir_10px;
+extern const Icon I_Nfc_10px;
+extern const Icon I_unknown_10px;
 extern const Icon I_BLE_Pairing_128x64;
-extern const Icon I_Button_18x18;
-extern const Icon I_Ble_connected_38x34;
-extern const Icon I_Ok_btn_9x9;
-extern const Icon I_Space_65x18;
 extern const Icon I_Volup_8x6;
-extern const Icon I_Voldwn_6x6;
 extern const Icon I_Circles_47x47;
 extern const Icon I_Ble_disconnected_24x34;
+extern const Icon I_Space_65x18;
+extern const Icon I_Ok_btn_9x9;
 extern const Icon I_Pressed_Button_13x13;
-extern const Icon I_EviWaiting1_18x21;
+extern const Icon I_Voldwn_6x6;
+extern const Icon I_Ble_connected_38x34;
+extern const Icon I_Button_18x18;
 extern const Icon I_EviSmile2_18x21;
-extern const Icon I_Error_18x18;
-extern const Icon I_Percent_10x14;
 extern const Icon I_EviSmile1_18x21;
-extern const Icon I_EviWaiting2_18x21;
 extern const Icon I_UsbTree_48x22;
+extern const Icon I_EviWaiting1_18x21;
+extern const Icon I_EviWaiting2_18x21;
+extern const Icon I_Percent_10x14;
 extern const Icon I_Smile_18x18;
+extern const Icon I_Error_18x18;
 extern const Icon I_Clock_18x18;
-extern const Icon I_ButtonDown_7x4;
-extern const Icon I_ButtonCenter_7x7;
-extern const Icon I_ButtonLeft_4x7;
-extern const Icon I_ButtonUp_7x4;
-extern const Icon I_DFU_128x50;
-extern const Icon I_ButtonLeftSmall_3x5;
 extern const Icon I_ButtonRightSmall_3x5;
+extern const Icon I_ButtonLeftSmall_3x5;
+extern const Icon I_ButtonCenter_7x7;
+extern const Icon I_ButtonDown_7x4;
 extern const Icon I_ButtonRight_4x7;
+extern const Icon I_DFU_128x50;
+extern const Icon I_ButtonUp_7x4;
 extern const Icon I_Warning_30x23;
-extern const Icon I_DolphinFirstStart2_59x51;
+extern const Icon I_ButtonLeft_4x7;
+extern const Icon I_DolphinFirstStart7_61x51;
+extern const Icon I_DolphinOkay_41x43;
 extern const Icon I_DolphinFirstStart5_54x49;
-extern const Icon I_DolphinFirstStart6_58x54;
 extern const Icon I_Flipper_young_80x60;
+extern const Icon I_DolphinFirstStart2_59x51;
 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_DolphinFirstStart6_58x54;
+extern const Icon I_DolphinFirstStart1_59x53;
+extern const Icon I_ArrowDownFilled_14x15;
 extern const Icon I_ArrowUpEmpty_14x15;
 extern const Icon I_ArrowUpFilled_14x15;
-extern const Icon I_ArrowDownFilled_14x15;
 extern const Icon I_ArrowDownEmpty_14x15;
-extern const Icon I_PassportBottom_128x17;
-extern const Icon I_DoorLeft_70x55;
-extern const Icon I_DoorRight_70x55;
 extern const Icon I_DoorLocked_10x56;
+extern const Icon I_PassportBottom_128x17;
 extern const Icon I_PassportLeft_6x47;
+extern const Icon I_DoorLeft_70x55;
 extern const Icon I_LockPopup_100x49;
+extern const Icon I_DoorRight_70x55;
+extern const Icon I_IrdaArrowDown_4x8;
+extern const Icon I_Power_25x27;
+extern const Icon I_Mute_25x27;
 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_Vol_down_25x27;
 extern const Icon I_Vol_up_25x27;
-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_Vol_down_hvr_25x27;
+extern const Icon I_Vol_down_25x27;
+extern const Icon I_Vol_up_hvr_25x27;
+extern const Icon I_Fill_marker_7x7;
+extern const Icon I_Up_hvr_25x27;
 extern const Icon I_IrdaArrowUp_4x8;
-extern const Icon I_Mute_25x27;
-extern const Icon I_Power_25x27;
+extern const Icon I_Down_25x27;
+extern const Icon I_DolphinReadingSuccess_59x63;
 extern const Icon I_IrdaSendShort_128x34;
-extern const Icon I_IrdaArrowDown_4x8;
 extern const Icon I_IrdaLearn_128x64;
+extern const Icon I_Mute_hvr_25x27;
+extern const Icon I_IrdaSend_128x64;
 extern const Icon I_Power_hvr_25x27;
+extern const Icon I_Back_15x10;
 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 I_KeyBackspaceSelected_16x9;
+extern const Icon I_KeyBackspace_16x9;
 extern const Icon A_125khz_14;
 extern const Icon A_BadUsb_14;
 extern const Icon A_Bluetooth_14;
@@ -157,56 +157,58 @@ extern const Icon A_Sub1ghz_14;
 extern const Icon A_Tamagotchi_14;
 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_passport_okay2_46x49;
-extern const Icon I_passport_happy2_46x49;
-extern const Icon I_passport_bottom_128x18;
-extern const Icon I_passport_happy1_46x49;
+extern const Icon I_Detailed_chip_17x13;
+extern const Icon I_passport_happy3_46x49;
 extern const Icon I_passport_bad1_46x49;
 extern const Icon I_passport_left_6x46;
-extern const Icon I_passport_bad3_46x49;
-extern const Icon I_passport_okay1_46x49;
 extern const Icon I_passport_bad2_46x49;
+extern const Icon I_passport_happy1_46x49;
+extern const Icon I_passport_bottom_128x18;
 extern const Icon I_passport_okay3_46x49;
-extern const Icon I_passport_happy3_46x49;
+extern const Icon I_passport_okay2_46x49;
+extern const Icon I_passport_bad3_46x49;
+extern const Icon I_passport_okay1_46x49;
+extern const Icon I_passport_happy2_46x49;
+extern const Icon I_Health_16x16;
+extern const Icon I_Voltage_16x16;
 extern const Icon I_BatteryBody_52x28;
+extern const Icon I_FaceNormal_29x14;
 extern const Icon I_FaceCharging_29x14;
-extern const Icon I_Health_16x16;
-extern const Icon I_Temperature_16x16;
 extern const Icon I_Battery_16x16;
 extern const Icon I_FaceConfused_29x14;
-extern const Icon I_FaceNormal_29x14;
-extern const Icon I_Voltage_16x16;
+extern const Icon I_Temperature_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_RFIDDolphinReceive_97x61;
+extern const Icon I_RFIDDolphinSend_97x61;
 extern const Icon I_SDError_43x35;
+extern const Icon I_SDQuestion_35x43;
 extern const Icon I_Cry_dolph_55x52;
-extern const Icon I_Background_128x11;
-extern const Icon I_Lock_8x8;
-extern const Icon I_Battery_26x8;
 extern const Icon I_Battery_19x8;
-extern const Icon I_USBConnected_15x8;
-extern const Icon I_BadUsb_9x8;
-extern const Icon I_BT_Pair_9x8;
-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_Battery_26x8;
+extern const Icon I_Lock_8x8;
 extern const Icon I_SDcardMounted_11x8;
+extern const Icon I_Charging_lightning_9x10;
+extern const Icon I_BadUsb_9x8;
+extern const Icon I_BT_Pair_9x8;
+extern const Icon I_Charging_lightning_mask_9x10;
+extern const Icon I_PlaceholderL_11x13;
+extern const Icon I_Background_128x11;
+extern const Icon I_USBConnected_15x8;
 extern const Icon I_Quest_7x8;
-extern const Icon I_Lock_7x8;
-extern const Icon I_Scanning_123x52;
 extern const Icon I_MHz_25x11;
+extern const Icon I_Scanning_123x52;
 extern const Icon I_Unlock_7x8;
-extern const Icon I_iButtonKey_49x44;
+extern const Icon I_Lock_7x8;
+extern const Icon I_DolphinNice_96x59;
+extern const Icon I_iButtonDolphinSuccess_109x60;
 extern const Icon I_DolphinExcited_64x63;
-extern const Icon I_DolphinWait_61x59;
+extern const Icon I_iButtonKey_49x44;
 extern const Icon I_iButtonDolphinVerySuccess_108x52;
+extern const Icon I_DolphinWait_61x59;
 extern const Icon I_DolphinMafia_115x62;
-extern const Icon I_DolphinNice_96x59;
-extern const Icon I_iButtonDolphinSuccess_109x60;