From b31fbb4adb0f895ff32b93fff492070e44716d54 Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Thu, 7 Apr 2022 17:28:04 +0300 Subject: [PATCH] New sharper batteryicon. Remove old unused batteryicons --- src/CMakeLists.txt | 25 +------- src/displayapp/icons/battery/battery.png | Bin 0 -> 193 bytes src/displayapp/icons/battery/batteryicon.c | 52 ++++++++++++++++ src/displayapp/icons/battery/os_battery_005.c | 56 ----------------- .../icons/battery/os_battery_005.png | Bin 1540 -> 0 bytes src/displayapp/icons/battery/os_battery_010.c | 58 ------------------ .../icons/battery/os_battery_010.png | Bin 1859 -> 0 bytes src/displayapp/icons/battery/os_battery_020.c | 58 ------------------ .../icons/battery/os_battery_020.png | Bin 1558 -> 0 bytes src/displayapp/icons/battery/os_battery_030.c | 58 ------------------ .../icons/battery/os_battery_030.png | Bin 1553 -> 0 bytes src/displayapp/icons/battery/os_battery_040.c | 56 ----------------- .../icons/battery/os_battery_040.png | Bin 1542 -> 0 bytes src/displayapp/icons/battery/os_battery_050.c | 56 ----------------- .../icons/battery/os_battery_050.png | Bin 1539 -> 0 bytes src/displayapp/icons/battery/os_battery_060.c | 56 ----------------- .../icons/battery/os_battery_060.png | Bin 1543 -> 0 bytes src/displayapp/icons/battery/os_battery_070.c | 56 ----------------- .../icons/battery/os_battery_070.png | Bin 1545 -> 0 bytes src/displayapp/icons/battery/os_battery_080.c | 56 ----------------- .../icons/battery/os_battery_080.png | Bin 1549 -> 0 bytes src/displayapp/icons/battery/os_battery_090.c | 56 ----------------- .../icons/battery/os_battery_090.png | Bin 1554 -> 0 bytes src/displayapp/icons/battery/os_battery_100.c | 58 ------------------ .../icons/battery/os_battery_100.png | Bin 1574 -> 0 bytes .../icons/battery/os_battery_error.c | 58 ------------------ .../icons/battery/os_battery_error.png | Bin 2128 -> 0 bytes .../icons/battery/os_batterycharging_005.c | 56 ----------------- .../icons/battery/os_batterycharging_005.png | Bin 1952 -> 0 bytes .../icons/battery/os_batterycharging_010.c | 58 ------------------ .../icons/battery/os_batterycharging_010.png | Bin 1983 -> 0 bytes .../icons/battery/os_batterycharging_020.c | 58 ------------------ .../icons/battery/os_batterycharging_020.png | Bin 1982 -> 0 bytes .../icons/battery/os_batterycharging_030.c | 58 ------------------ .../icons/battery/os_batterycharging_030.png | Bin 1997 -> 0 bytes .../icons/battery/os_batterycharging_040.c | 56 ----------------- .../icons/battery/os_batterycharging_040.png | Bin 1993 -> 0 bytes .../icons/battery/os_batterycharging_050.c | 56 ----------------- .../icons/battery/os_batterycharging_050.png | Bin 2036 -> 0 bytes .../icons/battery/os_batterycharging_060.c | 56 ----------------- .../icons/battery/os_batterycharging_060.png | Bin 2035 -> 0 bytes .../icons/battery/os_batterycharging_070.c | 56 ----------------- .../icons/battery/os_batterycharging_070.png | Bin 2035 -> 0 bytes .../icons/battery/os_batterycharging_080.c | 58 ------------------ .../icons/battery/os_batterycharging_080.png | Bin 2087 -> 0 bytes .../icons/battery/os_batterycharging_090.c | 58 ------------------ .../icons/battery/os_batterycharging_090.png | Bin 2100 -> 0 bytes .../icons/battery/os_batterycharging_100.c | 56 ----------------- .../icons/battery/os_batterycharging_100.png | Bin 1919 -> 0 bytes src/displayapp/screens/BatteryIcon.cpp | 35 +++++++---- src/displayapp/screens/BatteryIcon.h | 13 +++- src/displayapp/screens/Tile.cpp | 10 +-- src/displayapp/screens/Tile.h | 4 +- src/displayapp/screens/WatchFaceAnalog.cpp | 27 ++++---- src/displayapp/screens/WatchFaceAnalog.h | 5 +- src/displayapp/screens/WatchFaceDigital.cpp | 15 ++--- src/displayapp/screens/WatchFaceDigital.h | 4 +- .../screens/WatchFacePineTimeStyle.cpp | 20 +++--- .../screens/WatchFacePineTimeStyle.h | 5 +- .../screens/settings/QuickSettings.cpp | 10 +-- .../screens/settings/QuickSettings.h | 4 +- 61 files changed, 145 insertions(+), 1392 deletions(-) create mode 100644 src/displayapp/icons/battery/battery.png create mode 100644 src/displayapp/icons/battery/batteryicon.c delete mode 100644 src/displayapp/icons/battery/os_battery_005.c delete mode 100644 src/displayapp/icons/battery/os_battery_005.png delete mode 100644 src/displayapp/icons/battery/os_battery_010.c delete mode 100644 src/displayapp/icons/battery/os_battery_010.png delete mode 100644 src/displayapp/icons/battery/os_battery_020.c delete mode 100644 src/displayapp/icons/battery/os_battery_020.png delete mode 100644 src/displayapp/icons/battery/os_battery_030.c delete mode 100644 src/displayapp/icons/battery/os_battery_030.png delete mode 100644 src/displayapp/icons/battery/os_battery_040.c delete mode 100644 src/displayapp/icons/battery/os_battery_040.png delete mode 100644 src/displayapp/icons/battery/os_battery_050.c delete mode 100644 src/displayapp/icons/battery/os_battery_050.png delete mode 100644 src/displayapp/icons/battery/os_battery_060.c delete mode 100644 src/displayapp/icons/battery/os_battery_060.png delete mode 100644 src/displayapp/icons/battery/os_battery_070.c delete mode 100644 src/displayapp/icons/battery/os_battery_070.png delete mode 100644 src/displayapp/icons/battery/os_battery_080.c delete mode 100644 src/displayapp/icons/battery/os_battery_080.png delete mode 100644 src/displayapp/icons/battery/os_battery_090.c delete mode 100644 src/displayapp/icons/battery/os_battery_090.png delete mode 100644 src/displayapp/icons/battery/os_battery_100.c delete mode 100644 src/displayapp/icons/battery/os_battery_100.png delete mode 100644 src/displayapp/icons/battery/os_battery_error.c delete mode 100644 src/displayapp/icons/battery/os_battery_error.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_005.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_005.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_010.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_010.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_020.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_020.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_030.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_030.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_040.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_040.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_050.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_050.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_060.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_060.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_070.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_070.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_080.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_080.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_090.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_090.png delete mode 100644 src/displayapp/icons/battery/os_batterycharging_100.c delete mode 100644 src/displayapp/icons/battery/os_batterycharging_100.png diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b233f926..ba2d5616 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -367,30 +367,7 @@ set(QCBOR_SRC ) list(APPEND IMAGE_FILES - displayapp/icons/battery/os_battery_error.c - displayapp/icons/battery/os_battery_100.c - displayapp/icons/battery/os_battery_090.c - displayapp/icons/battery/os_battery_080.c - displayapp/icons/battery/os_battery_070.c - displayapp/icons/battery/os_battery_060.c - displayapp/icons/battery/os_battery_050.c - displayapp/icons/battery/os_battery_040.c - displayapp/icons/battery/os_battery_030.c - displayapp/icons/battery/os_battery_020.c - displayapp/icons/battery/os_battery_010.c - displayapp/icons/battery/os_battery_005.c - - displayapp/icons/battery/os_batterycharging_100.c - displayapp/icons/battery/os_batterycharging_090.c - displayapp/icons/battery/os_batterycharging_080.c - displayapp/icons/battery/os_batterycharging_070.c - displayapp/icons/battery/os_batterycharging_060.c - displayapp/icons/battery/os_batterycharging_050.c - displayapp/icons/battery/os_batterycharging_040.c - displayapp/icons/battery/os_batterycharging_030.c - displayapp/icons/battery/os_batterycharging_020.c - displayapp/icons/battery/os_batterycharging_010.c - displayapp/icons/battery/os_batterycharging_005.c + displayapp/icons/battery/batteryicon.c displayapp/icons/bluetooth/os_bt_connected.c displayapp/icons/bluetooth/os_bt_disconnected.c diff --git a/src/displayapp/icons/battery/battery.png b/src/displayapp/icons/battery/battery.png new file mode 100644 index 0000000000000000000000000000000000000000..0fca804851bf7c1f5d50d063ccebdf35b4b21365 GIT binary patch literal 193 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 s;*eHmj|Mh zaB^>EX>4U6ba`-PAZ2)IW&i+q+P#%+b}J_ghW~37T>_E-!E*RKr#tBK`@)PJ$8lrF zH>V~uFhWQ|k03Pu`Fqk|_;E5JA1uWjqr=Z1m7BLY31f`{=I&2o`=jf75B&Pb4uPusin&fO;H zQ`Mfcgij_#5#<&^7PF5|^ed_2M7aq@SHZyf76B8WdtV0ZD$cFt$cp5`3K?uw7d zXgn**(Iq=;4HQAc>s}Vo3{Sw=cFSnV71w~gBRLhVab^LPN$k0E;mKq7jT=JrGQ`k} zG|??fYLcaGVtzHAVw$yU0=XuGz|5;$W8v*LZ+{KPp}Wpd6^1d!lK*V<-Q-Ui&ABRp z*`*^-Z3C87SqNj1TW@Fq2+xyS*a^P06TiEuACxKxhMnew4Hj1q6E*NhZRzH$&LEIJr6tpa6F0uEr$Sr0r3l2pP1Q`|^>b!^np&u+^@|E2OxtF+6 zNH1}dXXI$1`wemgbYHnWpw`Pih`PD0Q@C>K6sK=`S0qu9I((a{tS|hz-H%*qnXaa7 z3|^yF+-*r`X;ZECh

{gHEe$NMAa^xm?sPU%<7{NIQ6FC`Gpa`ULdxX~=Pk}^slpof zaB^>EX>4U6ba`-PAZ2)IW&i+q+O?N$aw91WhW~SlJpz&th~w~CwKtgK?+e{_oQyYi z?3pIr&_YORJpxzU`1S8}|KK7s?}8?aIYy5w+G;~f}49fDny!G24A?HI*;WU)TF^JjHZK(AOwVjGP zl=HUW>vo>bDZIN|K}g6_S2z;pAtZi3!x4cTcfn0~vShwUf<%W-h0jQkkWZg?>Ak;A z(5ED~bIN_q{&n;v`CLx9e92|J7>f5NNbe_qr})OPoFfPErwOKuso#@4XSX@W@pUCc zWHg=?<=rJaYYh}ZBgkGB(GqUOIPI3v%opE)ydyaktx+ZhmFXx@r$Up)?i)3P78YEP*QskSccs$w4HtOKiM+V@;y1%gT|L z7-thes6|T#VIz++QEO9Xm^$N3(`KIKN{!BK`?dXm8lBX5lUjP|N)1w% z(!~U=<3txT5aU1~o)!TVG%se}CQ7Bin2n?e~u>SE(MEn+|z2C+`Mvil(S6gQ{# z6gPfE&MkC*f}8`o-?`nP*2~_Avbn8YxN_ZA5CyWf$O5yb2mdjGXY#CwDQW%PiNyQ}x8A2A+wvdG}=&fT~F?DCIk_g%O@iPAmi z@3A}g^K9H#cMt45ojv!QzsK&}yR`05d++ny^XdG)cdr%Wt6SuunT7wQW#3iyTW0)l zFD-jiknbekz2g0zbN4Rxi?(|g`$gNma%4Q%Yk%s5e6#-xh9-WN@$aGg55L2dPav0( zKL7v$g=s@WP)S2WAaHVTW@&6?004NLeUUpz!%!54|E5YsDuNaiQOHo8EQl{0wF*V3 z5Nd^19ZYVY(4-+rad8w}3l2UOs}3&Cx;nTDg5U$h$w5#F+kNUBN2;=sr0HCc!du`=s_Q*WM=Afk`#w$ece+x)m?;VdH4NUU74)O z0G~)a%XGsc-XNadv~t?1%Ws_X4huXpWF!;w#35oa-@-}@ zvx1=#PZEbSsz&)j%H<5_EzWAG!W#GFFAQe2m1VBe8bl0>Sb_u*3Mwd~1Pc+`HBw9@ z=sfD-A8`BB%YZTtJ!w(BQ= z{~5T_n*MSPnE52V+SI~FK=(FqaoyCEJ>YT&=zr2>Lv|!TEg_c!-p}Zp(m?Mm(7EQ$ zt#OXi2Ovqair)YShrmdlve!M{-O)O?e|sA9`vITVa=D*Zuo?gW010qNS#tmY9ftq_ z9ftvr)utyCVY$==6a*|&4+Gwo70RW619?4e>4*388002ovPDHLkV1k?3;p+eZ diff --git a/src/displayapp/icons/battery/os_battery_070.c b/src/displayapp/icons/battery/os_battery_070.c deleted file mode 100644 index 949c0b8b..00000000 --- a/src/displayapp/icons/battery/os_battery_070.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "lvgl/lvgl.h" - -#ifndef LV_ATTRIBUTE_MEM_ALIGN -#define LV_ATTRIBUTE_MEM_ALIGN -#endif - -#ifndef LV_ATTRIBUTE_IMG_CK_OS_BATTERY_070 -#define LV_ATTRIBUTE_IMG_CK_OS_BATTERY_070 -#endif - -const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_CK_OS_BATTERY_070 uint8_t ck_os_battery_070_map[] = { - 0x6c, 0xfe, 0x6c, 0xff, /*Color of index 0*/ - 0xe4, 0xe6, 0xe4, 0xff, /*Color of index 1*/ - - 0x03, 0xff, 0xc0, - 0x07, 0xff, 0xe0, - 0x0f, 0xff, 0xf0, - 0x0f, 0xff, 0xf0, - 0xff, 0x00, 0xff, - 0xff, 0x00, 0xff, - 0xff, 0x00, 0xff, - 0xff, 0x00, 0xff, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, -}; - -const lv_img_dsc_t ck_os_battery_070 = { - .header.always_zero = 0, - .header.w = 24, - .header.h = 32, - .data_size = 104, - .header.cf = LV_IMG_CF_INDEXED_1BIT, - .data = ck_os_battery_070_map, -}; diff --git a/src/displayapp/icons/battery/os_battery_070.png b/src/displayapp/icons/battery/os_battery_070.png deleted file mode 100644 index dee969b82cae5c02cc8ef1b33fa2eff223aaa501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1545 zcmV+k2KM=hP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O?Hkb|Wbah2OP`Spt#(!E*RLr*|;Rp9@uX9LL>u z;vSPKQ352PPY@da{+jd;ew`!ImfZP;v+H| z&x&$%$svw+GZ_T0JfWRSC>4 z9eHXSu&la97>nF`V-|q$Jh_FP;7dF4yPNt!se)kGX-?Q+arH1!1Ao+(ZqAB%0rEIP zOx8~WND+Jo1j7mfF0uxW>`cU%k;eo;1(Az-sUW~1NJo(3RiltelI0s~jQ3m#5@o4z zHvvS@s0KD!3t)L4P(S7qYN!MaK75;>T9U6T1_?A(ojClx6opZ1z z>|%n~brKdc5EIWJZi@g4S{5^x*n3&z7BiOxhaw1q42unQUc`XV50)_b%I<^QOWY`= zm$=C@a4RQo@U%5S?*2_MKy1A`WxN_!BvFw%e4DAPFZ{VJM=rHYSJO5I zuTd-RwxqMPsaAVLyafl!2M*JVb@Im-AU=`YTIbL;7+_893HzP6B-i%y#5IyygXOldN}Wy95Ehtvg(lSjvm{8b@|6I{VCk4}|}vq!J_d+v_jrS*W?d)uRXe?KgOK|eC{z&ZWI`y=P{6YqbaAb-Dg z`q{FtlHN9RuA+CbU!2ps*e|Q-UF;X<FC`Gpa`ULdxX~=Pk}^slpof`{Y84I-4+NG&JnRj-Z48XN!sLtq}sFVye300000NkvXXu0mjfay8#- diff --git a/src/displayapp/icons/battery/os_battery_080.c b/src/displayapp/icons/battery/os_battery_080.c deleted file mode 100644 index f447370e..00000000 --- a/src/displayapp/icons/battery/os_battery_080.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "lvgl/lvgl.h" - -#ifndef LV_ATTRIBUTE_MEM_ALIGN -#define LV_ATTRIBUTE_MEM_ALIGN -#endif - -#ifndef LV_ATTRIBUTE_IMG_CK_OS_BATTERY_080 -#define LV_ATTRIBUTE_IMG_CK_OS_BATTERY_080 -#endif - -const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_CK_OS_BATTERY_080 uint8_t ck_os_battery_080_map[] = { - 0x6c, 0xfe, 0x6c, 0xff, /*Color of index 0*/ - 0xe4, 0xe6, 0xe4, 0xff, /*Color of index 1*/ - - 0x03, 0xff, 0xc0, - 0x07, 0xff, 0xe0, - 0x0f, 0xff, 0xf0, - 0x0f, 0xff, 0xf0, - 0xff, 0x00, 0xff, - 0xff, 0x00, 0xff, - 0xff, 0x00, 0xff, - 0xff, 0x00, 0xff, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, -}; - -const lv_img_dsc_t ck_os_battery_080 = { - .header.always_zero = 0, - .header.w = 24, - .header.h = 32, - .data_size = 104, - .header.cf = LV_IMG_CF_INDEXED_1BIT, - .data = ck_os_battery_080_map, -}; diff --git a/src/displayapp/icons/battery/os_battery_080.png b/src/displayapp/icons/battery/os_battery_080.png deleted file mode 100644 index 3b13fbb26d2a308369e55a70dad38e12355b046a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1549 zcmV+o2J-odP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+QpY|a`Pw*#=molJpz&diR18hW^b^^-v{iZNt=C> zw4GT~8!SMQ^%Kg}jeq{0?k`+qIk*tjQclU^3OQsh7??kz$m7R`tDbr(SKGO8 zyK>$ZeBH+NoWi@i6$C|;dW0ci9zx>xGaMesaTnZ#CrjpwB#1h6B6fO$fZToFrT6|e zKzBiI=al;#{p;vc@VT6F`4r1^QIsA}P<$Nx9pW3qa*iCtcN07>s=fw!&Tey#Npc}H+6TBA%1D$`M*PK73o-8X7*G4NnT z&)itH%tSeJ+r+|ZG+8A}7X!J*!+}{4zWPGjZr=79jzjmIu#^eP2wVQMxj#+5)7+dZ z6NtPWacUbdue^pEi`;r*6@bt@xy2peOFQxVoBTnlf?(WXHhf_5^-xhGedLyG&VqFj z{c(iIX+ISpM6ey<3<(JML=q{HS7s$b91Va9JZA}9L4ac94ktN?BzDTi%Qp5X?X?^^ z@e-pp0YsD}3N~2^V1*EoKN<`kA~6tJF|qO;xMaTuVdxw9sNpO`EmcO6M*e zWum99-Foh2kQ=BJBaArG&|xEwGLdUjW|(oNsncejZZY$jaVR3rIK{=rby~!LFbv{2>B{bd+)LbC zw3oQ?GjeXB`wemq=)Q7$K&_X35M^^)r*Os83r^n*zOcE%b%ZvptT+7m-H%*qnZDXq z2CGRbYMaR{ZHm^O;BUc!3X$Rrtlfp<4G^F7)LN(5B`RP|>4xu}D3a^*^F$f3)@b%v zv-VN@nB8yB$_Qe1488x{!{a@IgED%+$UR*5tRE>Ida}siZO%Q`|LXRSY4<00-|^DD zX79N<_kJ`UFLzJ$yc|9En!V@d-21d1d+FZInOB4T;EX>4Tx0C=2zkvmAkP!xv$rbu?Dk!1^ z3lZ8iQcNW1JnG>eaQqUv6mk{8$gzMjRLG7W{11N5*33nDK!8MxA#{&EeN`6RvC)WSzV_cm~G-PDvl;Bp7(f6`?`b|gP7A(sQ*&*+=d zK<_Qkx#rHTagNgmAW5@|-v9@Pz(}65*FE0d(K@$(dm8im0iV}$xt~|C8UO$Q32;bR za{vGxhX4Q_hXIe}@nrx200(qQO+^Rf0UZ-BCwFAU=>Px#Ur9tkR7l5T%=weWfC{Q! z)i4kOZDK8GB1~kMf>jw48Kz)W%)~$?!1(OhGa^F)zpJU{qQPenN*Lh^7h)oA7>5xH z@hOG0yf%!&Xw;xlgGNm5C$*fUSG_hGYj6Mn`jZ~XEejD{00000NkvXXu0mjf3tHF- diff --git a/src/displayapp/icons/battery/os_battery_090.c b/src/displayapp/icons/battery/os_battery_090.c deleted file mode 100644 index 6fa41b20..00000000 --- a/src/displayapp/icons/battery/os_battery_090.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "lvgl/lvgl.h" - -#ifndef LV_ATTRIBUTE_MEM_ALIGN -#define LV_ATTRIBUTE_MEM_ALIGN -#endif - -#ifndef LV_ATTRIBUTE_IMG_CK_OS_BATTERY_090 -#define LV_ATTRIBUTE_IMG_CK_OS_BATTERY_090 -#endif - -const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_CK_OS_BATTERY_090 uint8_t ck_os_battery_090_map[] = { - 0x6c, 0xfe, 0x6c, 0xff, /*Color of index 0*/ - 0xe4, 0xe6, 0xe4, 0xff, /*Color of index 1*/ - - 0x03, 0xff, 0xc0, - 0x07, 0xff, 0xe0, - 0x0f, 0xff, 0xf0, - 0x0f, 0xff, 0xf0, - 0xff, 0x00, 0xff, - 0xff, 0x00, 0xff, - 0xff, 0x00, 0xff, - 0xff, 0x00, 0xff, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf3, 0xff, 0xcf, - 0xf0, 0x00, 0x0f, - 0xf0, 0x00, 0x0f, - 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, -}; - -const lv_img_dsc_t ck_os_battery_090 = { - .header.always_zero = 0, - .header.w = 24, - .header.h = 32, - .data_size = 104, - .header.cf = LV_IMG_CF_INDEXED_1BIT, - .data = ck_os_battery_090_map, -}; diff --git a/src/displayapp/icons/battery/os_battery_090.png b/src/displayapp/icons/battery/os_battery_090.png deleted file mode 100644 index d79f396bf594a51e54d5307e90519f26ccb4a21e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1554 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 diff --git a/src/displayapp/icons/battery/os_batterycharging_010.c b/src/displayapp/icons/battery/os_batterycharging_010.c deleted file mode 100644 index 304c0184..00000000 --- a/src/displayapp/icons/battery/os_batterycharging_010.c +++ /dev/null @@ -1,58 +0,0 @@ -#include "lvgl/lvgl.h" - -#ifndef LV_ATTRIBUTE_MEM_ALIGN -#define LV_ATTRIBUTE_MEM_ALIGN -#endif - -#ifndef LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_010 -#define LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_010 -#endif - -const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_010 uint8_t ck_os_batterycharging_010_map[] = { - 0x04, 0x02, 0xcc, 0xff, /*Color of index 0*/ - 0x6c, 0xfe, 0x6c, 0xff, /*Color of index 1*/ - 0xe4, 0xe6, 0xe4, 0xff, /*Color of index 2*/ - 0xff, 0xff, 0xff, 0xff, /*Color of index 3*/ - - 0x55, 0x5a, 0xaa, 0xaa, 0xa5, 0x55, 0x55, - 0x55, 0x6a, 0xaa, 0xaa, 0xa9, 0x55, 0x55, - 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0x55, 0x55, - 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0x55, 0x55, - 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, - 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, - 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, - 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0xaa, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0xaa, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0xaa, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0xaa, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0xaa, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0xaa, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0x6a, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0xaa, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x56, 0xaa, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x5a, 0xa9, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0x6a, 0xa9, 0x55, - 0xaa, 0x55, 0x55, 0x55, 0xaa, 0xa5, 0x55, - 0xaa, 0x55, 0x55, 0x56, 0xaa, 0xaa, 0xaa, - 0xaa, 0x55, 0x55, 0x5a, 0xaa, 0xaa, 0xaa, - 0xaa, 0x50, 0x00, 0x5a, 0xaa, 0xaa, 0xaa, - 0xaa, 0x50, 0x00, 0x5a, 0xaa, 0xaa, 0xa9, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0xaa, 0xa5, - 0xaa, 0x55, 0x55, 0x55, 0x56, 0xaa, 0x95, - 0xaa, 0xaa, 0xaa, 0xaa, 0x5a, 0xaa, 0x55, - 0xaa, 0xaa, 0xaa, 0xaa, 0x5a, 0xa9, 0x55, - 0xaa, 0xaa, 0xaa, 0xaa, 0x5a, 0xa5, 0x55, - 0xaa, 0xaa, 0xaa, 0xaa, 0x5a, 0x95, 0x55, -}; - -const lv_img_dsc_t ck_os_batterycharging_010 = { - .header.always_zero = 0, - .header.w = 28, - .header.h = 32, - .data_size = 240, - .header.cf = LV_IMG_CF_INDEXED_2BIT, - .data = ck_os_batterycharging_010_map, -}; diff --git a/src/displayapp/icons/battery/os_batterycharging_010.png b/src/displayapp/icons/battery/os_batterycharging_010.png deleted file mode 100644 index 04d5f820d60833816e79b846bd5c99df727ad3bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1983 zcmV;w2SE6VP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b@Rs^XI{m&|92_z5_mc!>cvxB$%xj?nH+G^{w zu?h%O5^^sA-T2?X)BS@VvqTp~E#;Ivelf?)1r77(m-m}|-0#zA*BHH(JHF(eAquF& z>1w&=7s%!HgPRSiZ{^Oe5w=UwHE>fHmgQxw-#ZC8A34QKQ68s}vgy66^>Vdc6SphZ zW6{@bT(2SY-Mt_xqSOV30`mwI{C>ydK{!vrLwIw@e3QhG-4@a12?FwFdAHj8`vAQO z^0grE-beqX^)C2aE_rwt%XCwe9uJT_4*m}Do#Ak`9K>%1vU&Zmoa>ph+nnR9uEd0h zri)SD-J-L;!9<`D!~QIxC?4@k^(q;~eDMvCci(_qMLQD%mFXx_r$Up)t{XMD7D)s{ zn&_!(x1M_$zzoFYx#L1jaX|m zyVR_G)IMhS+p{uaFgs1}zpF=fWjEn*7(G7w-3L7>xuYkCFxWn~_q{oH^!@+p+`W5` z)IH}Rr z?rZmOpd#&V^|%!cLMoLhwYOQU(eQJW-jHx)%rtCgtCjq5P9jyEUdwsn0x2&J*WbrEFMbRb*PE*^ULnfLqBs;Ebtu%gx6y#A4cu-KXp==A=zNWOnyy%0Cgp z5fMyInjbsO3ofTumajX@_kK$wV;zUDh~c`kksl3*dhIAUD{;DMO9^bKq17>Z={m0X zD^rW^R}eiw#61Pc*NE&>)!iMhPt@V8`*u2qq3!gmvpMp|`NP7QU~$5gaF~wotDjXK znQ@=me~v==Mi$rCmFP*Xd{w(!L)TqL4`mcfNR@g$j7ho~Bc=)$SE)PzKQE-cK-pT%vO!7kcsU8 z00D(*LqkwWLqi~Na&Km7Y-Iodc$|HaJ4nM&6o&t%N<}Jy78Fs)P@OD@FC4WBMW_&J zg;pI*ZlBPkAxUv@6kH1qJ{GGEF3!3-xC(;c1H{SENzp}0JU1z{i1EPXe*E|RKlh#s z2(=PZ&9*T>)hr_si;AiAsu*~M4@2ldAEsnx>T{A5hi84=Q#aLJglBp8{aIa^tjPeM zNIc7Q!y?`wp5C-{&ilk6R**Bq=ftB1U6A;Z>x#>7obwI~JTqh@6Z6C&Vlm&sN(-}s zp%PCLhcl{1`9jL&4CgJ*YN^5+_v9}OX0?@NuG1Ps42xKT1Q7}fs-7{1UkoauvbIv4ApE$c`WU4}Q-4{$kr7!$4pcs8?&HgIv>)RaBoatG*t(q%(-BtI=7mjm9<=$q0&?=8@|=FY8g zj?)JqNwbRI00)P_NS?CSJ>K2XI=6p&8uR-BpVxA^pI5LN00009a7bBm0013_0013_ z0gvVJWdHyG2XskIMF->o9TPDZh5X8z00024Nkl%MGvVe Rm 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 diff --git a/src/displayapp/icons/battery/os_batterycharging_040.c b/src/displayapp/icons/battery/os_batterycharging_040.c deleted file mode 100644 index 02af00e5..00000000 --- a/src/displayapp/icons/battery/os_batterycharging_040.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "lvgl/lvgl.h" - -#ifndef LV_ATTRIBUTE_MEM_ALIGN -#define LV_ATTRIBUTE_MEM_ALIGN -#endif - -#ifndef LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_040 -#define LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_040 -#endif - -const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_040 uint8_t ck_os_batterycharging_040_map[] = { - 0x6c, 0xfe, 0x6c, 0xff, /*Color of index 0*/ - 0xe4, 0xe6, 0xe4, 0xff, /*Color of index 1*/ - - 0x03, 0xff, 0xc0, 0x00, - 0x07, 0xff, 0xe0, 0x00, - 0x0f, 0xff, 0xf0, 0x00, - 0x0f, 0xff, 0xf0, 0x00, - 0xff, 0x00, 0xff, 0x00, - 0xff, 0x00, 0xff, 0x00, - 0xff, 0x00, 0xff, 0x00, - 0xff, 0x00, 0xff, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x00, 0x00, - 0xf0, 0x00, 0x00, 0x00, - 0xf0, 0x00, 0x07, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x1f, 0x00, - 0xf0, 0x00, 0x3e, 0x00, - 0xf3, 0xf8, 0x7e, 0x00, - 0xf3, 0xf0, 0xfc, 0x00, - 0xf3, 0xf1, 0xff, 0xf0, - 0xf3, 0xf3, 0xff, 0xf0, - 0xf3, 0xf3, 0xff, 0xf0, - 0xf3, 0xf3, 0xff, 0xe0, - 0xf0, 0x00, 0x0f, 0xc0, - 0xf0, 0x00, 0x1f, 0x80, - 0xff, 0xff, 0x3f, 0x00, - 0xff, 0xff, 0x3e, 0x00, - 0xff, 0xff, 0x3c, 0x00, - 0xff, 0xff, 0x38, 0x00, -}; - -const lv_img_dsc_t ck_os_batterycharging_040 = { - .header.always_zero = 0, - .header.w = 28, - .header.h = 32, - .data_size = 136, - .header.cf = LV_IMG_CF_INDEXED_1BIT, - .data = ck_os_batterycharging_040_map, -}; diff --git a/src/displayapp/icons/battery/os_batterycharging_040.png b/src/displayapp/icons/battery/os_batterycharging_040.png deleted file mode 100644 index 5a42caf2e36cafb9ed0c96ad397bea5318779f86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1993 zcmV;)2R8VLP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bxmIJE_{dW{+2nr%P9G`2Q8QkHY?IY=QlI~9W zc1)EeQh;m(%k=;KJIp`$5k+sjXbdR?i=R(EQN}~G`PfPAw|74wH#CHVO*x1 zD|%a&ay?TRn_Gfcc&P~#F;Qp7cHRB9fcKSgIoyd8T`0oVEK)d@z#*TOcj>LYb#YXMDh37&PegcfbK6_7Vufn33Jas*U{ao#nT-Ee*N)m512sgt57 zs>F*HSt(Ini22#vAmzl3BfzTE4Kv7ewZ$#HY3ZvjLUVIqB?n;+uYB3eca!flGsfJ7 z&e^#A)EB@s;~Hj6`;z zEpZ8h*1!e1E%L~9u$C5JZ^nl5;$(QzX8axj#2@KjfpkS7Hu0V1Ra2M)jYen+7fV`8t`2|1|pAXM%OV!j7aFCPUdPA|DYwXM}4M|;w zqM(%_$8*Vcx>P^j`cV{%9r#*UiEYwx>e}>GEFaizYUd-jo%PhLF~0d$QN_{#Aa{I| zt*TmdR#p73Rkh7y#Hd;w z`aJwx_NV#9M!)Z81a(t(_#o1yNbGG#PvI3kxqU=WvxtdLJ8*`O(vF^L2;qaB=faMj zu%ZY1?ixK^an#Zu0^%A+j}zZU&J(fb50004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkvmAkP!xv$rbu?Dk!1^3lZ8iQcNW1JnG>eaQqUv6mk{8$gzMjRLG7W{11N5*33nDK!8MxA#{&EeN`6RvC)WSzV_cm~G-PDvl;Bp7(f6`?`b|gP7 zA(sQ*&*+=dK<_Qkx#rHTagNgmAW5@|-v9@Pz(}65*FE0d(K@$(dm8im0iV}$xt~|C z8UO$Q32;bRa{vGxhX4Q_hXIe}@nrx200(qQO+^Rf0UZ-E9619((EtDdr%6OXR7l5T z%=weWfC{Q!)i4kOZDK8WWSPh?k)SdrGE5|>n2CV~fbrS0XC#FhE(ap3r-@64j-f2X zr#?(IxWadYhv^WFeNq9g)H3*7ikwubmiMWj_^Dr>qM3*mV=P2EftV~$noIGUh?%fh zC=W+WK_;ri%+SpHZDK7bwJ9+rKmGuLm_W_M4|fyJdLMuC!k@61s1=S>jwsBSV4}K- b3=9kaYT-sN8Q=B+00000NkvXXu0mjfHLtJw diff --git a/src/displayapp/icons/battery/os_batterycharging_050.c b/src/displayapp/icons/battery/os_batterycharging_050.c deleted file mode 100644 index d2eea829..00000000 --- a/src/displayapp/icons/battery/os_batterycharging_050.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "lvgl/lvgl.h" - -#ifndef LV_ATTRIBUTE_MEM_ALIGN -#define LV_ATTRIBUTE_MEM_ALIGN -#endif - -#ifndef LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_050 -#define LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_050 -#endif - -const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_050 uint8_t ck_os_batterycharging_050_map[] = { - 0x6c, 0xfe, 0x6c, 0xff, /*Color of index 0*/ - 0xe4, 0xe6, 0xe4, 0xff, /*Color of index 1*/ - - 0x03, 0xff, 0xc0, 0x00, - 0x07, 0xff, 0xe0, 0x00, - 0x0f, 0xff, 0xf0, 0x00, - 0x0f, 0xff, 0xf0, 0x00, - 0xff, 0x00, 0xff, 0x00, - 0xff, 0x00, 0xff, 0x00, - 0xff, 0x00, 0xff, 0x00, - 0xff, 0x00, 0xff, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf0, 0x00, 0x00, 0x00, - 0xf0, 0x00, 0x00, 0x00, - 0xf0, 0x00, 0x07, 0x00, - 0xf0, 0x00, 0x0f, 0x00, - 0xf3, 0xfe, 0x1f, 0x00, - 0xf3, 0xfc, 0x3e, 0x00, - 0xf3, 0xf8, 0x7e, 0x00, - 0xf3, 0xf0, 0xfc, 0x00, - 0xf3, 0xf1, 0xff, 0xf0, - 0xf3, 0xf3, 0xff, 0xf0, - 0xf3, 0xf3, 0xff, 0xf0, - 0xf3, 0xf3, 0xff, 0xe0, - 0xf0, 0x00, 0x0f, 0xc0, - 0xf0, 0x00, 0x1f, 0x80, - 0xff, 0xff, 0x3f, 0x00, - 0xff, 0xff, 0x3e, 0x00, - 0xff, 0xff, 0x3c, 0x00, - 0xff, 0xff, 0x38, 0x00, -}; - -const lv_img_dsc_t ck_os_batterycharging_050 = { - .header.always_zero = 0, - .header.w = 28, - .header.h = 32, - .data_size = 136, - .header.cf = LV_IMG_CF_INDEXED_1BIT, - .data = ck_os_batterycharging_050_map, -}; diff --git a/src/displayapp/icons/battery/os_batterycharging_050.png b/src/displayapp/icons/battery/os_batterycharging_050.png deleted file mode 100644 index ca0e04ddaf6caacf5e6cf7a8cbca704ca1c55205..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2036 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bxcEhR;{bv+s2uL6V!{NEsnZX_Y**uaaY0@^m zjbmdASrXcMVAKEi?=b)1$IeFMMPo=ISp0nQi8F4Z-M_T1Wc|AChkEAdo^JTiEraAR zy8Wp6@MqBF!5IkKVuDJvg89p}PlPhKr!^e1hb;^OuWn6uWb0K)#!(&FZJ+oO6s8$LM=?*#~$u zoQSgK;+^>p7=ea&>$QMGaSHBr9SKLY*;YW_Yz1-!_lX#&3`3q8Wg67iSgFE9&z%(` zb7i+^(J3dc3o$LV}^VJqwdehQZDME82urfgy;gy$%`D*f=!;CSr zkjTdEr@jE@8P_mlA~&z#0w6RFZn7MFIS%~xCVmjAKv0&OBNmu#*&>S2M{K!;vjd-C z+$lsx+Yta4LASsdazMZaazcTuGAj}M7y(d*U6xbw}0hafI_)#AbLs^`75ecFajU>sz1s^1YpkWrdtWLd(233ukG)EVG zlo+DM7*ouNlS2)Z6q2TxQp%Z4hN28v8T=WP!o?L|q=cd+mQ->@_*7q|hN?BzRCD9z z8p=cqOVS2%6Mb2OPt_jSZPpYXS9>?xN# zY>7)4v<6pD+oBt}4yUCB*qf11UPy*#ZN~2>fcVWwwKkIGL;==tEn>X`MRG1b4U~~s zD~%>4Y3rr+(d@D;ckg1{x7L0)_GI$9g~hHn|I_zA$qB)1Imx-s@wLA1)tN2t{}*R& z&3h*9C)P|h^B304(fq=ir`+Zj5Iq%d{=%B6#QcRdFXQN4Yu@zH*W%4zSn~@Xy_>W@ zOq$!#Je?>gyGuNFMV(MeWk_jt-s`gV&X8&?33iN=|ouf1)br~8As_&3puS>F>ZQi(* zj!%kJv#~VPZP&50Uq!pAi*`d7GjUmoGF;KDs_3l3301fXYH-k9gWIaX2aA!= zb)-JTi}?ny@9Iavo@Q~IUeUT?W}6)mJxpr|5K$a_0B9F{c0o2{}yQ4($PtB z>wUJPV29Nqp~De*Xi89gfrE7MX)qnOx=xn|;o1WrqwptBbO`V_)4-u%|btJC@ZQ+qFB+UBp`n zXYSkF8-P7?rGOnG7 z?C^oA+>mgg@8C&jkcb}S+ckQ6^azCe%~A*@xg9=)@Im6mvZJTy3?Ag&Fqh~VZYFek z9ydSOLz%B4hrST|nCIpfiT)H}^WJvqb(|UhDI#76#3=)Hey#KeU=6?w5#F+kNUBN2;=sr0HCc!du`=s_Q*WM=Afk`#w$ece+x)m?;VdH4NU zU74)O0G~)a%XGsc-XNadv~t?1%Ws_X4huXpWF!;w#35oa z-@-}@vx1=#PZEbSsz&)j%H<5_EzWAG!W#GFFAQe2m1VBe8bl0>Sb_u*3Mwd~1Pc+` zHBw9@=sfD-A8`BB%YZTtJ! zw(BQ={~5T_n*MSPnE52V+SI~FK=(FqaoyCEJ>YT&=zr2>Lv|!TEg_c!-p}Zp(m?Mm z(7EQ$t#OXi2Ovqair)YShrmdlve!M{-O)O?e|sA9`vITVa=D*Zuo?gW010qNS#tmY z9ftq_9ftvrkSk{_^NS6L**0uI%r+woDCNDc zQjH=Q_77n?52!9rU)n?I`*Tevb-%W#w0w_g7*(;^r^2tR7G=pe)iGrdUyflvVk1)? zF%6dPcP4$rey^vUeP?WRO-nXEFUXC6g5&gXBJVyQFFsf(rK7M>sS_xU2mlvb9!PH| Sm)98p0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bvmg^`C{bv=u1SAlGy{#m^_7IO8JP{Y&di*01xvsplDerW-zV%OE+- zZr^G?>oe%`@xnz0mCtk&&l8S^(RpxT=%(Z;t=%dKI&V7p!zlHA5mMA!Rm)Meo`p-5 zb3|{;60YYF?#(U1E3DK6f*f;q(!m{IUl;avt_t23eO*qJU9L_@r_`2t_;YZ9(1w#u$^;^(c&0=?=JfQ zi-zM-)?BPJ-@!tl;oW*IU?>j3wXTscqRqAf@@6ZLE4WU?KxG*6)F{)SzUE35Dthj$ zn3*fPMT<^3ab1Y{IcTuDu5vfP%sam7LQ8I1@+w70ZiJ;wU`BZ5%VEBI_|7n6 z%qS$XaoedcfO+~g)R@T4Ggbi*8V5I72EL2~zrFDvxGE5oW#)(tW?MFkBJ|-~ZsF{( zPB8BfBBSjvfQcYmpbR-6U;{a!KvtQR2zHDBC_{60o(m8l5pGbDy>o$$a^xu+?AK^n;oOlrlq7scH$-xC5B!r-0Cb_Imy^01^jhZw^ z7k!i%qQ)3g%!!jj4wMvrS;M5(kyrHV%(S3zM6Y7d0j$d*PH+8dk=gt z=2pFD?0%xnTxNbln>m|5(B|oC^9K+;Wp92%n<>QnhBjaN(YxBbX`}Dio8Qpp4{Y>q z(B8@aX{=od1vPWM-YY6YX&6YjNRe7Y0L$WP>AmHqJ+CAs%2fTzQfA&Y+evNd$W*!Y zt_`i>usS4k^jRVA&WV* zAc4e&ii%=cI=*DEjbva0McFFj*smnp+2-v!rQ_Rc6*q#2q0rpz>Q;1CH~cTv&7kI@ z-d}6jR`t{^0qzB@K$#sA%2oh3bONmv$>ZXfr)-&bBJ4X4e^y1xcA0?>3K$zLf(!vL zfW1<;V*&$Iq>s?!0Y+vM@nG2>&R4(|Ugi~GpO=5V+Ps!Np;z9pR|f2eMhYACus}yJ z4kOnfn(_EWpgly^<7^%uyx$wm*2sMHK(p_uX}b^Fo`k@wvb|?DJ#95T2Xy2t#B=>{ z2=lk?%*Aoc3rBkv=uhL^{5;UVpUo>rd*(UM9Kt+$#3c=MooW9bX*bX+C#2T@0levp zp}&%S@c;k;g=s@WP)S2WAaHVTW@&6?004NLeUUpz!%!54|E5YsDuNaiQOHo8EQl{0 zwF*V35Nd^19ZYVY(4-+rad8w}3l2UOs}3&Cx;nTDg5U$h$w5#F+kNUBN2;=sr0HCc!du`=s_Q*WM=Afk`#w$ece+x)m?;VdH4NU zU74)O0G~)a%XGsc-XNadv~t?1%Ws_X4huXpWF!;w#35oa z-@-}@vx1=#PZEbSsz&)j%H<5_EzWAG!W#GFFAQe2m1VBe8bl0>Sb_u*3Mwd~1Pc+` zHBw9@=sfD-A8`BB%YZTtJ! zw(BQ={~5T_n*MSPnE52V+SI~FK=(FqaoyCEJ>YT&=zr2>Lv|!TEg_c!-p}Zp(m?Mm z(7EQ$t#OXi2Ovqair)YShrmdlve!M{-O)O?e|sA9`vITVa=D*Zuo?gW010qNS#tmY z9ftq_9ftvr-!VTJ!SLhFpYpr9=#h|2`crI#{UXqw=8ANuW9r08X*WO06dn R zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1dFb;Gz0{bvP&tpka% z^1ju4_%rD8@xnz1m0P-r=ZT9)(0OnX$W!yw);=2vy4!T}M^NhfBBZFFO)baNdKi}} z=ZxN#rCiS=+?&q?ukcb6C}QV26WjIcw*|bdyHtA3ERpGF$|O=MPApJAb+OlVUzs2IQLuy;^qt1F&9(yaW-E{@xK8AN$}r@qQKmtCt(7WF^sYO_ z>RffaXpz+=R~KS_9yFYC;>HokRo4wO$nI(jExl>!s}!NR5m+5T7~z#K5A)r_pB!e4 znT13)Za?(}u$yrWGbVEL7hC{@#=%XNgD=N{-+qc8genk}<>rVDW?Qz1BJ>ekyl`gl z3D%uLWV9Uta1nG1j3EXBHV_L1vg(`?!H*FDWmxXmy8;AA#5EY{JaceHU3617-cee- zPF!%4jM@Ysgaa$ENt^+e_k#FQ9}z=YSiFb?QHe&9oyky?AuEGFgHl}K;)|3}w8WB1t_Yv%tJF}n#+qtw zu5m+|XrXC~Ew$XqbX1D&yY$et$DVo~h_%7P4;f+Th$D@BMU76{-XA|ejSgyVAvO8* ziW;a!^&*01IgyDO5Obb@xK0ER&~9R8BYE#8auYL~&^uThjFgFuX*3Z7guauLL09ZP zkb4U^Bk?WV+$-eFgzhhpGl1?9wvMb%!5%avm*RHjv zT=K9bE@99bxS+O09=Q(I(gN(wNGLBP!#i!p?>m6_Vx?LeNn=rfHMm9Wcc4hl?Wch< z5^JT=q$F*%F2+l!gQ47X?#m2oPDgmfl-#+B11G%a%H-eif~G(`+ZT zrK4`;*1I+gio@!V&`~Y((4u~qQ`GX_c>F6uFW&`-S_F%Y4-7n|1r8 zbS)&(%jXH}mDm@mUB@}fuEl-TV!;G?N^x1GxLr%} zY+1`H7~8$sj*J3Fw%XnHV{XfjeJnpN&(%3w^nHUrVN36HXrK`$kJ)sLwwpbrLH?0# zaa~uL4P^<35hT#qvXPA5SvoUe9|=BCG_f*{mrJtU*}Oxibo>)rt&X5#C@kmQ>x!~L zv%~k=?Aq-9*N(O=JzY$Id%<8(=KO>v79b6CL2E_wK!beJ#eNgv#=pv|vO{Lz?**KV zfkB1<7rf@~zjo|&kJ zg*viv$Tf*(K7NsCj|sI4n|=D=r<0QT7?o}(r8x!Fw8IBOP(tEW+0nB`pteS!gE?xJ zK|k3@f(=jIoQ{ydIeLH;_FC`Gpa`ULdxX~=Pk}^slpofh-!RT5|LAhFpYtrA!Ty?>=8IzF4T`qjFF*2~;NnzzJ(aOU)$E RDyRSe002ovPDHLkV1ft2+N%Hn diff --git a/src/displayapp/icons/battery/os_batterycharging_080.c b/src/displayapp/icons/battery/os_batterycharging_080.c deleted file mode 100644 index cc1c1d23..00000000 --- a/src/displayapp/icons/battery/os_batterycharging_080.c +++ /dev/null @@ -1,58 +0,0 @@ -#include "lvgl/lvgl.h" - -#ifndef LV_ATTRIBUTE_MEM_ALIGN -#define LV_ATTRIBUTE_MEM_ALIGN -#endif - -#ifndef LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_080 -#define LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_080 -#endif - -const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_CK_OS_BATTERYCHARGING_080 uint8_t ck_os_batterycharging_080_map[] = { - 0x7c, 0xd2, 0x34, 0xff, /*Color of index 0*/ - 0xe4, 0xe6, 0xe4, 0xff, /*Color of index 1*/ - 0x6c, 0xfe, 0x6c, 0xff, /*Color of index 2*/ - 0xff, 0xff, 0xff, 0xff, /*Color of index 3*/ - - 0xaa, 0xa5, 0x55, 0x55, 0x5a, 0xaa, 0xaa, - 0xaa, 0x95, 0x55, 0x55, 0x56, 0xaa, 0xaa, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0xaa, 0xaa, - 0xaa, 0x55, 0x55, 0x55, 0x55, 0xaa, 0xaa, - 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, - 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, - 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, - 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, - 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0x55, 0xaa, - 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0x55, 0xaa, - 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0x55, 0xaa, - 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0x55, 0xaa, - 0x55, 0xa0, 0x00, 0x00, 0x0a, 0x55, 0xaa, - 0x55, 0xa0, 0x00, 0x00, 0x0a, 0x55, 0xaa, - 0x55, 0xa0, 0x00, 0x00, 0x0a, 0xaa, 0xaa, - 0x55, 0xa0, 0x00, 0x00, 0x0a, 0xaa, 0xaa, - 0x55, 0xa0, 0x00, 0x00, 0x2a, 0x95, 0xaa, - 0x55, 0xa0, 0x00, 0x00, 0xaa, 0x55, 0xaa, - 0x55, 0xa0, 0x00, 0x02, 0xa9, 0x55, 0xaa, - 0x55, 0xa0, 0x00, 0x0a, 0xa5, 0x56, 0xaa, - 0x55, 0xa0, 0x00, 0x2a, 0x95, 0x56, 0xaa, - 0x55, 0xa0, 0x00, 0xaa, 0x55, 0x5a, 0xaa, - 0x55, 0xa0, 0x00, 0xa9, 0x55, 0x55, 0x55, - 0x55, 0xa0, 0x00, 0xa5, 0x55, 0x55, 0x55, - 0x55, 0xa0, 0x00, 0xa5, 0x55, 0x55, 0x55, - 0x55, 0xa0, 0x00, 0xa5, 0x55, 0x55, 0x56, - 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0x55, 0x5a, - 0x55, 0xaa, 0xaa, 0xaa, 0xa9, 0x55, 0x6a, - 0x55, 0x55, 0x55, 0x55, 0xa5, 0x55, 0xaa, - 0x55, 0x55, 0x55, 0x55, 0xa5, 0x56, 0xaa, - 0x55, 0x55, 0x55, 0x55, 0xa5, 0x5a, 0xaa, - 0x55, 0x55, 0x55, 0x55, 0xa5, 0x6a, 0xaa, -}; - -const lv_img_dsc_t ck_os_batterycharging_080 = { - .header.always_zero = 0, - .header.w = 28, - .header.h = 32, - .data_size = 240, - .header.cf = LV_IMG_CF_INDEXED_2BIT, - .data = ck_os_batterycharging_080_map, -}; diff --git a/src/displayapp/icons/battery/os_batterycharging_080.png b/src/displayapp/icons/battery/os_batterycharging_080.png deleted file mode 100644 index cce5052fcf4e01406bbf6cb84dfac0d0692f3477..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2087 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 FV1kj1p)vpf diff --git a/src/displayapp/screens/BatteryIcon.cpp b/src/displayapp/screens/BatteryIcon.cpp index 08aaab70..2fe7c251 100644 --- a/src/displayapp/screens/BatteryIcon.cpp +++ b/src/displayapp/screens/BatteryIcon.cpp @@ -1,23 +1,34 @@ #include "displayapp/screens/BatteryIcon.h" #include #include "displayapp/screens/Symbols.h" +#include "displayapp/icons/battery/batteryicon.c" using namespace Pinetime::Applications::Screens; -const char* BatteryIcon::GetBatteryIcon(uint8_t batteryPercent) { - if (batteryPercent > 87) - return Symbols::batteryFull; - if (batteryPercent > 62) - return Symbols::batteryThreeQuarter; - if (batteryPercent > 37) - return Symbols::batteryHalf; - if (batteryPercent > 12) - return Symbols::batteryOneQuarter; - return Symbols::batteryEmpty; +void BatteryIcon::Create(lv_obj_t* parent) { + batteryImg = lv_img_create(parent, nullptr); + lv_img_set_src(batteryImg, &batteryicon); + lv_obj_set_style_local_image_recolor(batteryImg, LV_IMG_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); + + batteryJuice = lv_obj_create(batteryImg, nullptr); + lv_obj_set_width(batteryJuice, 8); + lv_obj_align(batteryJuice, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, -2, -2); + lv_obj_set_style_local_radius(batteryJuice, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, 0); } -const char* BatteryIcon::GetUnknownIcon() { - return Symbols::batteryEmpty; +lv_obj_t* BatteryIcon::GetObject() { + return batteryImg; +} + +void BatteryIcon::SetBatteryPercentage(uint8_t percentage) { + lv_obj_set_height(batteryJuice, percentage * 14 / 100); + lv_obj_realign(batteryJuice); +} + +void BatteryIcon::SetColor(lv_color_t color) { + lv_obj_set_style_local_image_recolor(batteryImg, LV_IMG_PART_MAIN, LV_STATE_DEFAULT, color); + lv_obj_set_style_local_image_recolor_opa(batteryImg, LV_IMG_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_COVER); + lv_obj_set_style_local_bg_color(batteryJuice, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, color); } const char* BatteryIcon::GetPlugIcon(bool isCharging) { diff --git a/src/displayapp/screens/BatteryIcon.h b/src/displayapp/screens/BatteryIcon.h index bec2e4e0..81f94ac4 100644 --- a/src/displayapp/screens/BatteryIcon.h +++ b/src/displayapp/screens/BatteryIcon.h @@ -1,15 +1,24 @@ #pragma once #include +#include namespace Pinetime { namespace Applications { namespace Screens { class BatteryIcon { public: + void Create(lv_obj_t* parent); + + void SetColor(lv_color_t); + void SetBatteryPercentage(uint8_t percentage); + lv_obj_t* GetObject(); + static const char* GetUnknownIcon(); - static const char* GetBatteryIcon(uint8_t batteryPercent); static const char* GetPlugIcon(bool isCharging); + private: + lv_obj_t* batteryImg; + lv_obj_t* batteryJuice; }; } } -} \ No newline at end of file +} diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp index cfbe44d3..0a113e3e 100644 --- a/src/displayapp/screens/Tile.cpp +++ b/src/displayapp/screens/Tile.cpp @@ -35,14 +35,12 @@ Tile::Tile(uint8_t screenID, // Time label_time = lv_label_create(lv_scr_act(), nullptr); - lv_label_set_text(label_time, dateTimeController.FormattedTime().c_str()); lv_label_set_align(label_time, LV_LABEL_ALIGN_CENTER); lv_obj_align(label_time, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0); // Battery - batteryIcon = lv_label_create(lv_scr_act(), nullptr); - lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryController.PercentRemaining())); - lv_obj_align(batteryIcon, nullptr, LV_ALIGN_IN_TOP_RIGHT, -8, 0); + batteryIcon.Create(lv_scr_act()); + lv_obj_align(batteryIcon.GetObject(), nullptr, LV_ALIGN_IN_TOP_RIGHT, -8, 0); if (numScreens > 1) { pageIndicatorBasePoints[0].x = LV_HOR_RES - 1; @@ -113,6 +111,8 @@ Tile::Tile(uint8_t screenID, lv_label_set_text_static(backgroundLabel, ""); taskUpdate = lv_task_create(lv_update_task, 5000, LV_TASK_PRIO_MID, this); + + UpdateScreen(); } Tile::~Tile() { @@ -122,7 +122,7 @@ Tile::~Tile() { void Tile::UpdateScreen() { lv_label_set_text(label_time, dateTimeController.FormattedTime().c_str()); - lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryController.PercentRemaining())); + batteryIcon.SetBatteryPercentage(batteryController.PercentRemaining()); } void Tile::OnValueChangedEvent(lv_obj_t* obj, uint32_t buttonId) { diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h index 4869fef9..48747144 100644 --- a/src/displayapp/screens/Tile.h +++ b/src/displayapp/screens/Tile.h @@ -9,6 +9,7 @@ #include "components/settings/Settings.h" #include "components/datetime/DateTimeController.h" #include "components/battery/BatteryController.h" +#include namespace Pinetime { namespace Applications { @@ -40,13 +41,14 @@ namespace Pinetime { lv_task_t* taskUpdate; lv_obj_t* label_time; - lv_obj_t* batteryIcon; lv_point_t pageIndicatorBasePoints[2]; lv_point_t pageIndicatorPoints[2]; lv_obj_t* pageIndicatorBase; lv_obj_t* pageIndicator; lv_obj_t* btnm1; + BatteryIcon batteryIcon; + const char* btnmMap[8]; Pinetime::Applications::Apps apps[6]; }; diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp index 6f9dd1b6..dd5b2929 100644 --- a/src/displayapp/screens/WatchFaceAnalog.cpp +++ b/src/displayapp/screens/WatchFaceAnalog.cpp @@ -66,10 +66,13 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app, lv_img_set_src(bg_clock_img, &bg_clock); lv_obj_align(bg_clock_img, NULL, LV_ALIGN_CENTER, 0, 0); - batteryIcon = lv_label_create(lv_scr_act(), nullptr); - lv_label_set_text_static(batteryIcon, Symbols::batteryHalf); - lv_obj_align(batteryIcon, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 0); - lv_obj_set_auto_realign(batteryIcon, true); + batteryIcon.Create(lv_scr_act()); + lv_obj_align(batteryIcon.GetObject(), nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 0); + + plugIcon = lv_label_create(lv_scr_act(), nullptr); + lv_label_set_text_static(plugIcon, Symbols::plug); + lv_obj_set_style_local_text_color(plugIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED); + lv_obj_align(plugIcon, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 0); notificationIcon = lv_label_create(lv_scr_act(), NULL); lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00)); @@ -121,7 +124,8 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app, lv_obj_add_style(hour_body_trace, LV_LINE_PART_MAIN, &hour_line_style_trace); taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this); - UpdateClock(); + + Refresh(); } WatchFaceAnalog::~WatchFaceAnalog() { @@ -180,21 +184,18 @@ void WatchFaceAnalog::UpdateClock() { void WatchFaceAnalog::SetBatteryIcon() { auto batteryPercent = batteryPercentRemaining.Get(); - if (batteryPercent == 100) { - lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x0, 0xb0, 0x0)); - } else { - lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE); - } - lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent)); + batteryIcon.SetBatteryPercentage(batteryPercent); } void WatchFaceAnalog::Refresh() { isCharging = batteryController.IsCharging(); if (isCharging.IsUpdated()) { if (isCharging.Get()) { - lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED); - lv_label_set_text_static(batteryIcon, Symbols::plug); + lv_obj_set_hidden(batteryIcon.GetObject(), true); + lv_obj_set_hidden(plugIcon, false); } else { + lv_obj_set_hidden(batteryIcon.GetObject(), false); + lv_obj_set_hidden(plugIcon, true); SetBatteryIcon(); } } diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h index 4d76298a..04d9e711 100644 --- a/src/displayapp/screens/WatchFaceAnalog.h +++ b/src/displayapp/screens/WatchFaceAnalog.h @@ -9,6 +9,7 @@ #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" #include "components/ble/NotificationManager.h" +#include namespace Pinetime { namespace Controllers { @@ -64,9 +65,11 @@ namespace Pinetime { lv_style_t second_line_style; lv_obj_t* label_date_day; - lv_obj_t* batteryIcon; + lv_obj_t* plugIcon; lv_obj_t* notificationIcon; + BatteryIcon batteryIcon; + const Controllers::DateTime& dateTimeController; Controllers::Battery& batteryController; Controllers::Ble& bleController; diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index 866e169e..8a620bd0 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -33,14 +33,13 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app, heartRateController {heartRateController}, motionController {motionController} { - batteryIcon = lv_label_create(lv_scr_act(), nullptr); - lv_label_set_text_static(batteryIcon, Symbols::batteryFull); - lv_obj_align(batteryIcon, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0); + batteryIcon.Create(lv_scr_act()); + lv_obj_align(batteryIcon.GetObject(), lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0); batteryPlug = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xFF0000)); lv_label_set_text_static(batteryPlug, Symbols::plug); - lv_obj_align(batteryPlug, batteryIcon, LV_ALIGN_OUT_LEFT_MID, -5, 0); + lv_obj_align(batteryPlug, batteryIcon.GetObject(), LV_ALIGN_OUT_LEFT_MID, -5, 0); bleIcon = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x0082FC)); @@ -110,12 +109,7 @@ void WatchFaceDigital::Refresh() { batteryPercentRemaining = batteryController.PercentRemaining(); if (batteryPercentRemaining.IsUpdated()) { auto batteryPercent = batteryPercentRemaining.Get(); - if (batteryPercent == 100) { - lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x0, 0xb0, 0x0)); - } else { - lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE); - } - lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent)); + batteryIcon.SetBatteryPercentage(batteryPercent); } bleState = bleController.IsConnected(); @@ -123,7 +117,6 @@ void WatchFaceDigital::Refresh() { if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) { lv_label_set_text_static(bleIcon, BleIcon::GetIcon(bleState.Get())); } - lv_obj_realign(batteryIcon); lv_obj_realign(batteryPlug); lv_obj_realign(bleIcon); diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h index d33434c0..cd83689a 100644 --- a/src/displayapp/screens/WatchFaceDigital.h +++ b/src/displayapp/screens/WatchFaceDigital.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include #include @@ -59,7 +60,6 @@ namespace Pinetime { lv_obj_t* label_time_ampm; lv_obj_t* label_date; lv_obj_t* backgroundLabel; - lv_obj_t* batteryIcon; lv_obj_t* bleIcon; lv_obj_t* batteryPlug; lv_obj_t* heartbeatIcon; @@ -68,6 +68,8 @@ namespace Pinetime { lv_obj_t* stepValue; lv_obj_t* notificationIcon; + BatteryIcon batteryIcon; + Controllers::DateTime& dateTimeController; Controllers::Battery& batteryController; Controllers::Ble& bleController; diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp index 28e7a6a3..ae9f5815 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp +++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp @@ -101,11 +101,14 @@ WatchFacePineTimeStyle::WatchFacePineTimeStyle(DisplayApp* app, lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0); // Display icons - batteryIcon = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); - lv_label_set_text_static(batteryIcon, Symbols::batteryFull); - lv_obj_align(batteryIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2); - lv_obj_set_auto_realign(batteryIcon, true); + batteryIcon.Create(sidebar); + batteryIcon.SetColor(LV_COLOR_BLACK); + lv_obj_align(batteryIcon.GetObject(), nullptr, LV_ALIGN_IN_TOP_MID, 0, 2); + + plugIcon = lv_label_create(lv_scr_act(), nullptr); + lv_label_set_text_static(plugIcon, Symbols::plug); + lv_obj_set_style_local_text_color(plugIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); + lv_obj_align(plugIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2); bleIcon = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000)); @@ -340,7 +343,7 @@ bool WatchFacePineTimeStyle::OnButtonPushed() { void WatchFacePineTimeStyle::SetBatteryIcon() { auto batteryPercent = batteryPercentRemaining.Get(); - lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent)); + batteryIcon.SetBatteryPercentage(batteryPercent); } void WatchFacePineTimeStyle::AlignIcons() { @@ -358,8 +361,11 @@ void WatchFacePineTimeStyle::Refresh() { isCharging = batteryController.IsCharging(); if (isCharging.IsUpdated()) { if (isCharging.Get()) { - lv_label_set_text_static(batteryIcon, Symbols::plug); + lv_obj_set_hidden(batteryIcon.GetObject(), true); + lv_obj_set_hidden(plugIcon, false); } else { + lv_obj_set_hidden(batteryIcon.GetObject(), false); + lv_obj_set_hidden(plugIcon, true); SetBatteryIcon(); } } diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.h b/src/displayapp/screens/WatchFacePineTimeStyle.h index 465aa705..e703d89c 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.h +++ b/src/displayapp/screens/WatchFacePineTimeStyle.h @@ -8,6 +8,7 @@ #include "displayapp/Colors.h" #include "components/datetime/DateTimeController.h" #include "components/ble/BleController.h" +#include namespace Pinetime { namespace Controllers { @@ -79,7 +80,7 @@ namespace Pinetime { lv_obj_t* dateDay; lv_obj_t* dateMonth; lv_obj_t* backgroundLabel; - lv_obj_t* batteryIcon; + lv_obj_t* plugIcon; lv_obj_t* bleIcon; lv_obj_t* calendarOuter; lv_obj_t* calendarInner; @@ -93,6 +94,8 @@ namespace Pinetime { lv_obj_t* lbl_btnSet; lv_color_t needle_colors[1]; + BatteryIcon batteryIcon; + Controllers::DateTime& dateTimeController; Controllers::Battery& batteryController; Controllers::Ble& bleController; diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp index aa7f17a3..6268531a 100644 --- a/src/displayapp/screens/settings/QuickSettings.cpp +++ b/src/displayapp/screens/settings/QuickSettings.cpp @@ -35,13 +35,11 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app, // Time label_time = lv_label_create(lv_scr_act(), nullptr); - lv_label_set_text(label_time, dateTimeController.FormattedTime().c_str()); lv_label_set_align(label_time, LV_LABEL_ALIGN_CENTER); lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 0, 0); - batteryIcon = lv_label_create(lv_scr_act(), nullptr); - lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryController.PercentRemaining())); - lv_obj_align(batteryIcon, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 0); + batteryIcon.Create(lv_scr_act()); + lv_obj_align(batteryIcon.GetObject(), nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 0); static constexpr uint8_t barHeight = 20 + innerDistance; static constexpr uint8_t buttonHeight = (LV_VER_RES_MAX - barHeight - innerDistance) / 2; @@ -113,6 +111,8 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app, lv_label_set_text_static(backgroundLabel, ""); taskUpdate = lv_task_create(lv_update_task, 5000, LV_TASK_PRIO_MID, this); + + UpdateScreen(); } QuickSettings::~QuickSettings() { @@ -124,7 +124,7 @@ QuickSettings::~QuickSettings() { void QuickSettings::UpdateScreen() { lv_label_set_text(label_time, dateTimeController.FormattedTime().c_str()); - lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryController.PercentRemaining())); + batteryIcon.SetBatteryPercentage(batteryController.PercentRemaining()); } void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) { diff --git a/src/displayapp/screens/settings/QuickSettings.h b/src/displayapp/screens/settings/QuickSettings.h index 7913898d..40a2a2ef 100644 --- a/src/displayapp/screens/settings/QuickSettings.h +++ b/src/displayapp/screens/settings/QuickSettings.h @@ -8,6 +8,7 @@ #include "components/motor/MotorController.h" #include "components/settings/Settings.h" #include "components/battery/BatteryController.h" +#include namespace Pinetime { @@ -37,7 +38,6 @@ namespace Pinetime { Controllers::Settings& settingsController; lv_task_t* taskUpdate; - lv_obj_t* batteryIcon; lv_obj_t* label_time; lv_style_t btn_style; @@ -48,6 +48,8 @@ namespace Pinetime { lv_obj_t* btn3; lv_obj_t* btn3_lvl; lv_obj_t* btn4; + + BatteryIcon batteryIcon; }; } }