From da39f402e5b91c78b724bfe568efc9339459f5a2 Mon Sep 17 00:00:00 2001 From: JF Date: Sat, 4 Jul 2020 13:58:15 +0200 Subject: Replace bitmap icons by font icons (provided by AwesomeFont and LVGL). These icons are smaller in memory and quicker to draw. BLE and battery icon replaced in Clock screen. Added heartbeat and step icons in Clock screen. Replace all labels in Menu by icons. Add doc to generate new font. --- src/DisplayApp/Screens/BatteryIcon.cpp | 69 +++++++--------------------------- 1 file changed, 14 insertions(+), 55 deletions(-) (limited to 'src/DisplayApp/Screens/BatteryIcon.cpp') diff --git a/src/DisplayApp/Screens/BatteryIcon.cpp b/src/DisplayApp/Screens/BatteryIcon.cpp index e20167d8..26939d18 100644 --- a/src/DisplayApp/Screens/BatteryIcon.cpp +++ b/src/DisplayApp/Screens/BatteryIcon.cpp @@ -1,62 +1,21 @@ #include "BatteryIcon.h" - +#include "Symbols.h" using namespace Pinetime::Applications::Screens; +const char* BatteryIcon::GetBatteryIcon(float batteryPercent) { + if(batteryPercent > 90.0f) return Symbols::batteryFull; + if(batteryPercent > 75.0f) return Symbols::batteryThreeQuarter; + if(batteryPercent > 50.0f) return Symbols::batteryHalf; + if(batteryPercent > 25.0f) return Symbols::batteryOneQuarter; + return Symbols::batteryEmpty; +} -extern lv_img_dsc_t ck_os_battery_error; -extern lv_img_dsc_t ck_os_batterycharging_100; -extern lv_img_dsc_t ck_os_batterycharging_090; -extern lv_img_dsc_t ck_os_batterycharging_080; -extern lv_img_dsc_t ck_os_batterycharging_070; -extern lv_img_dsc_t ck_os_batterycharging_060; -extern lv_img_dsc_t ck_os_batterycharging_050; -extern lv_img_dsc_t ck_os_batterycharging_040; -extern lv_img_dsc_t ck_os_batterycharging_030; -extern lv_img_dsc_t ck_os_batterycharging_020; -extern lv_img_dsc_t ck_os_batterycharging_010; -extern lv_img_dsc_t ck_os_batterycharging_005; - -extern lv_img_dsc_t ck_os_battery_100; -extern lv_img_dsc_t ck_os_battery_090; -extern lv_img_dsc_t ck_os_battery_080; -extern lv_img_dsc_t ck_os_battery_070; -extern lv_img_dsc_t ck_os_battery_060; -extern lv_img_dsc_t ck_os_battery_050; -extern lv_img_dsc_t ck_os_battery_040; -extern lv_img_dsc_t ck_os_battery_030; -extern lv_img_dsc_t ck_os_battery_020; -extern lv_img_dsc_t ck_os_battery_010; -extern lv_img_dsc_t ck_os_battery_005; - - -lv_img_dsc_t *BatteryIcon::GetIcon(bool isCharging, float batteryPercent) { - if(isCharging) { - if(batteryPercent > 90.0f) return &ck_os_batterycharging_100; - else if(batteryPercent > 80.0f) return &ck_os_batterycharging_090; - else if(batteryPercent > 70.0f) return &ck_os_batterycharging_080; - else if(batteryPercent > 60.0f) return &ck_os_batterycharging_070; - else if(batteryPercent > 50.0f) return &ck_os_batterycharging_060; - else if(batteryPercent > 40.0f) return &ck_os_batterycharging_050; - else if(batteryPercent > 30.0f) return &ck_os_batterycharging_040; - else if(batteryPercent > 20.0f) return &ck_os_batterycharging_030; - else if(batteryPercent > 10.0f) return &ck_os_batterycharging_020; - else if(batteryPercent > 5.0f) return &ck_os_batterycharging_010; - else return &ck_os_batterycharging_005; - } else { - if(batteryPercent > 90.0f) return &ck_os_battery_100; - else if(batteryPercent > 80.0f) return &ck_os_battery_090; - else if(batteryPercent > 70.0f) return &ck_os_battery_080; - else if(batteryPercent > 60.0f) return &ck_os_battery_070; - else if(batteryPercent > 50.0f) return &ck_os_battery_060; - else if(batteryPercent > 40.0f) return &ck_os_battery_050; - else if(batteryPercent > 30.0f) return &ck_os_battery_040; - else if(batteryPercent > 20.0f) return &ck_os_battery_030; - else if(batteryPercent > 10.0f) return &ck_os_battery_020; - else if(batteryPercent > 5.0f) return &ck_os_battery_010; - else return &ck_os_battery_005; - } +const char* BatteryIcon::GetUnknownIcon() { + return Symbols::batteryEmpty; } -lv_img_dsc_t *BatteryIcon::GetUnknownIcon() { - return &ck_os_battery_error; +const char *BatteryIcon::GetPlugIcon(bool isCharging) { + if(isCharging) + return Symbols::plug; + else return ""; } -- cgit v1.2.3