diff --git a/applications/services/gui/gui.c b/applications/services/gui/gui.c index 4d4ef33a2..e1b5f0200 100644 --- a/applications/services/gui/gui.c +++ b/applications/services/gui/gui.c @@ -86,9 +86,9 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { GUI_STATUS_BAR_Y + 1, width + 2, GUI_STATUS_BAR_WORKAREA_HEIGHT + 2); - canvas_set_color(gui->canvas, ColorWhite); - canvas_draw_box( - gui->canvas, 0, 0, canvas_width(gui->canvas), canvas_height(gui->canvas)); + // canvas_set_color(gui->canvas, ColorWhite); + // canvas_draw_box( + // gui->canvas, 0, 0, canvas_width(gui->canvas), canvas_height(gui->canvas)); canvas_set_color(gui->canvas, ColorBlack); // ViewPort draw canvas_frame_set( @@ -105,15 +105,15 @@ static void gui_redraw_status_bar(Gui* gui, bool need_attention) { GUI_STATUS_BAR_Y, right_used + 2, GUI_STATUS_BAR_HEIGHT); - canvas_set_color(gui->canvas, ColorBlack); - canvas_draw_rframe( - gui->canvas, 0, 0, canvas_width(gui->canvas), canvas_height(gui->canvas) - 1, 1); - canvas_draw_line( - gui->canvas, - canvas_width(gui->canvas) - 1, - 2, - canvas_width(gui->canvas) - 1, - canvas_height(gui->canvas) - 4); + // canvas_set_color(gui->canvas, ColorBlack); + // canvas_draw_rframe( + // gui->canvas, 0, 0, canvas_width(gui->canvas), canvas_height(gui->canvas) - 1, 1); + // canvas_draw_line( + // gui->canvas, + // canvas_width(gui->canvas) - 1, + // 2, + // canvas_width(gui->canvas) - 1, + // canvas_height(gui->canvas) - 4); } // Extra notification diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c index 92aefbe75..76be01806 100644 --- a/applications/services/power/power_service/power.c +++ b/applications/services/power/power_service/power.c @@ -9,7 +9,14 @@ 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_icon(canvas, 0, 0, &I_Battery_25x8); + canvas_set_color(canvas, ColorWhite); + canvas_draw_box(canvas, -1, 0, 1, 8); + canvas_draw_box(canvas, 0, -1, 24, 1); + canvas_draw_box(canvas, 0, 8, 24, 1); + canvas_draw_box(canvas, 25, 1, 2, 6); + canvas_set_color(canvas, ColorBlack); + canvas_draw_box(canvas, 25, 2, 1, 4); if(power->info.gauge_is_ok) { char batteryPercentile[4]; @@ -168,7 +175,7 @@ void power_draw_battery_callback(Canvas* canvas, void* context) { static ViewPort* power_battery_view_port_alloc(Power* power) { ViewPort* battery_view_port = view_port_alloc(); - view_port_set_width(battery_view_port, icon_get_width(&I_Battery_26x8)); + view_port_set_width(battery_view_port, icon_get_width(&I_Battery_25x8)); view_port_draw_callback_set(battery_view_port, power_draw_battery_callback, power); gui_add_view_port(power->gui, battery_view_port, GuiLayerStatusBarRight); return battery_view_port; diff --git a/assets/icons/StatusBar/Battery_25x8.png b/assets/icons/StatusBar/Battery_25x8.png new file mode 100644 index 000000000..03187dc1f Binary files /dev/null and b/assets/icons/StatusBar/Battery_25x8.png differ diff --git a/assets/icons/StatusBar/Battery_26x8.png b/assets/icons/StatusBar/Battery_26x8.png deleted file mode 100644 index 5fc1b0cd6..000000000 Binary files a/assets/icons/StatusBar/Battery_26x8.png and /dev/null differ