From 88252eaa20a0bf86ac8dcbc9bf3947606998b68f Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Sun, 15 Jan 2023 23:56:29 +0000 Subject: [PATCH 1/2] Remove ugly box --- applications/services/gui/gui.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/applications/services/gui/gui.c b/applications/services/gui/gui.c index 37839c789..f6978ff4d 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 From 5802ea951def42b193438e45cb373684862c905f Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Sun, 15 Jan 2023 23:57:18 +0000 Subject: [PATCH 2/2] Add tiny battery border for readability --- .../services/power/power_service/power.c | 11 +++++++++-- assets/icons/StatusBar/Battery_25x8.png | Bin 0 -> 5992 bytes assets/icons/StatusBar/Battery_26x8.png | Bin 313 -> 0 bytes 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 assets/icons/StatusBar/Battery_25x8.png delete mode 100644 assets/icons/StatusBar/Battery_26x8.png 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 0000000000000000000000000000000000000000..03187dc1f3c0b270b387b402c8f312b1970cb721 GIT binary patch literal 5992 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 literal 0 HcmV?d00001 diff --git a/assets/icons/StatusBar/Battery_26x8.png b/assets/icons/StatusBar/Battery_26x8.png deleted file mode 100644 index 5fc1b0cd6d93a694ee460f7253bac4fa368285c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eX#0(^7S+So5QY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fIC7!;n>`$46IoXB1>;0Aig%mtp978y+ zCkybhHVLq?v9l>8v|MBih+^pFYgpao>z40R2Rbqy^;3@ofnEv-xpwG9lc3=G7b1=gZy$jwj5OsmAyU~B}@5No`9Do_K1 Mr>mdKI;Vst0P~nnl>h($