From ba63a53bbfa973dac19f24dfa8559a3e8caf26a0 Mon Sep 17 00:00:00 2001
From: Pk11 <epicpkmn11@outlook.com>
Date: Sat, 20 Aug 2022 16:34:31 -0500
Subject: [PATCH] Add Wi-Fi signal indicator

---
 assets/gfx/sprites.t3s               |   4 ++++
 assets/gfx/sprites/wifi/wifi_0.png   | Bin 0 -> 467 bytes
 assets/gfx/sprites/wifi/wifi_1.png   | Bin 0 -> 254 bytes
 assets/gfx/sprites/wifi/wifi_2.png   | Bin 0 -> 381 bytes
 assets/gfx/sprites/wifi/wifi_3.png   | Bin 0 -> 535 bytes
 assets/gfx/sprites/wifi/wifi_off.png | Bin 0 -> 488 bytes
 include/gui/gfx.hpp                  |   1 +
 source/gui/gfx.cpp                   |  15 +++++++++++++++
 source/menu/downList.cpp             |   1 +
 source/screens/mainScreen.cpp        |   1 +
 10 files changed, 22 insertions(+)
 create mode 100644 assets/gfx/sprites/wifi/wifi_0.png
 create mode 100644 assets/gfx/sprites/wifi/wifi_1.png
 create mode 100644 assets/gfx/sprites/wifi/wifi_2.png
 create mode 100644 assets/gfx/sprites/wifi/wifi_3.png
 create mode 100644 assets/gfx/sprites/wifi/wifi_off.png

diff --git a/assets/gfx/sprites.t3s b/assets/gfx/sprites.t3s
index d956479..48cec1c 100644
--- a/assets/gfx/sprites.t3s
+++ b/assets/gfx/sprites.t3s
@@ -11,6 +11,10 @@ sprites/battery/battery_4.png
 sprites/battery/battery_blink.png
 sprites/battery/battery_charge.png
 sprites/battery/battery_charge_full.png
+sprites/wifi/wifi_0.png
+sprites/wifi/wifi_1.png
+sprites/wifi/wifi_2.png
+sprites/wifi/wifi_3.png
 sprites/cancel.png
 sprites/checked.png
 sprites/delete.png
diff --git a/assets/gfx/sprites/wifi/wifi_0.png b/assets/gfx/sprites/wifi/wifi_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fe75afcc6495a9e2fe0ae3b4883d50dff6adbb8
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0f<RNK~zYI?UOM}13?glXA(gPfrO+<Wf`;xXeB|k&_+Q*#L}xoAvTu!
z14IjdK-!2RR{jYsv{BTMA0XNotrRq3@!3qwa@?6jO_v7?x9{z|w>!g$^zoknia?>8
z8f{~k6Oknmxl`2&@F60o>JYFZBEuqbqN>$yZ#oNH(88nf0N8ik(a(XIPK@Kgp;K4~
z%Jvd}K+ZHb=m3a^nP-5S9ee>cftc^icYwpifGyzF<QkCio2MM}TOez^0`ovV;02Sw
z9H6!z0jf?&$_-dF;TlLAHx67G{}d4LY}-p<%(yggV|>94hyn{h(g}QTngd=yfM*)O
z8&EVpX<pH=S>%C+6;^;m*bIOKuy1q&m<TlW1#DPBx!K>a0B25Rlh!*4hybHb@iwp%
z(4t*n&lz$Sh_nsxg_X?n-u7p}seM0~R{F`KU1CN=K1F0rL_}4mRCU_4Rnt--wVeU`
z*{pS*t!7&W|77k9@@QeX)4J}4@(T=farQ_=uyx#<>-5nJd;w3LE|VoQ6*m9?002ov
JPDHLkV1nyD$VLDF

literal 0
HcmV?d00001

diff --git a/assets/gfx/sprites/wifi/wifi_1.png b/assets/gfx/sprites/wifi/wifi_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb77e01c0ef1667235d8f2b363b15e8fd49abc40
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_eJzX3_
zJUZV_wB=(=6mdPTuJLD!*@BSOB3hlDu@TKvZ#1N?m|_+6YoYSRjFu-E%LM8ZJyeXA
z?|px_I$kaX2>#6baB4ynvz3Fa1rv9IkkgI&DeI<PSy=U9+FYxE`O|7NR<R~<nKTL;
zusw4S%wS%dQX=B?VtHnK*!EXJxpyw^e&sfIZ*E;;P~d0(FRP-wWD8QS1z&&V)w?gL
yN_4}nih@6{;@-XXy|l>fr0B+5e@o}vKjKk8*{anXP%$6qd<IWfKbLh*2~7Z!p=lWa

literal 0
HcmV?d00001

diff --git a/assets/gfx/sprites/wifi/wifi_2.png b/assets/gfx/sprites/wifi/wifi_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..88c23bd721143217009f33d09220f442910633ad
GIT binary patch
literal 381
zcmV-@0fPRCP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0WwKMK~zYI?UKJM#BmtMUmtPhFc@6QBC;UcO$L+Pb&K6*ltuX~jQ#<O
z#bBaju#ha2iG{(PK`27%LN9~w@a@~VUtKBPdwqZ2Kc46LKpSne5vq~uATSRUfH7bQ
z_yF#Jb6^+P2_d{Tl&bctYwEkTaj&kZsd~*P)$2(7rEaSW>WJE{_Nn9Ql6n*iI#e^Y
z%!k#NNN}P~)lq0py@@neYFC`^Ouh%6fh}M;giwx5GQcb_%FhihfP)aiTL@ua%>tXi
zKwWE!wM(n(YPrJhpVU>g>PPvNj7B{MvcM;>2b=*ZU<R0uo^FH?78`0F1@x$o>ZLkS
zfzPQA>S@E~F_T_3d8atvr>2_@NSGDWTeYO-TVk3BD8&w3tXJ33@+Qqf%|}xd)!bkA
b`A7H$;b|w<^i*g900000NkvXXu0mjfL{+O7

literal 0
HcmV?d00001

diff --git a/assets/gfx/sprites/wifi/wifi_3.png b/assets/gfx/sprites/wifi/wifi_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bd5128aa453cc6313abafbcc03cb4b0f2b444d6
GIT binary patch
literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0nAB6K~zYI?bOSQk8v0U@bjG*88c~=X|j;mx$W3kSjo5~S&0>;BpYI7
zWv5xmKVTzefrW)6C6`!W<+fnq61mH*#^7V~oqGE<Grt*$lBeFy`<!#0bDpR7P5xJ#
zD(wK6nPg#-z9e&!3?+G)<av_YrIevbPeniW;sU-JyFTF*wqr)y1elfNV3Hk4rq$O&
zNp2;1R-dUg$=oDMlXO(vn<Rrt4wq8Cj^=tTUQ}m4a2lJ?Jx<a-Y{T_NsykTH3fx~s
z;Ubo|*<vfdU?c8Vjn7y=(%jH+eFz;5Vn24`OeKHBTinHQY(Y;0-(8c#Fy;q~aRr+j
zz+MdE%Qy!fsh8M;&PJL8IFH`Z;x5L+O8$<M*oyg>jvg$;E?jO5x`e)VyPSs)m2eG9
zC$Rt3cvLwLFtypA(uz;=KFNtByGK5v>TFe#1xbdJ+)Z+!l=7*Rat_Oq97{60ouO8D
zT{wcFQFi|h`!Md`V9aKXdNs+iB;S&pO>#3yXOfjkR#fQGQp)y8Ij;j|;5F`H(J1`^
zyuyu1i#J5N(R!z5zXx5vJfKBv9iHL|*8CRHmH|&12Yx(JUPpV#A1bV=DIR0sZ~OU&
Z>L<dz9>S<oyo~?=002ovPDHLkV1hlf_i_LL

literal 0
HcmV?d00001

diff --git a/assets/gfx/sprites/wifi/wifi_off.png b/assets/gfx/sprites/wifi/wifi_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..848425bd0147967f3a7c4f265e65e98374c5bc27
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0i8)iK~zYI?bXkVjZqxO@$VJWBtpuRg-L9LY5oku5DUtmU`0t5cFM+R
z?rIil%0i)R##YJHWHXx~8)Zl{L|Dj=EavjEc+OMD<39K5_U!oV&N-jw{XO6B`F?vM
z{;MKf#j|p~{x3e*8WDRVVl*PQM?@zgzC^@wL_BS^TAj?>j)-#+G1U(`g0q-MN4-8_
zyo9H{>0aQ?xQwqE<U1bWCZ=&6xA7RKD)1$2sDmHIyJY-<yO_jKpKRNH*Am96rVIF)
z4D;CEvxa}d+v$SKY5f@!rRi99>x)=dd5bfc!*hJVi3)rs^AF=z+F!$-z&<SCWM<r^
zXt!@!>T6wU4(}BWF_g|)xP<%I(k<-+S*jh}!)c6G;CB=cU1|Y4`qgxIsvkw?9IUH(
zwl{&dY5#?~E=uNIc!OD$?#bY<a2y-6vz>T=C+Iu8-2zuzkz&Zs%bH>!W$=f%f+;L!
zfo?PbZ+AI6ijP=q9G-bLVYm@Ej^H&`l~X#1>TaIErB)h+HxdBXdeuA))GAhRXpjIe
e(fd#IPwE#uGu^4yb>OT30000<MNUMnLSTYK#pZDU

literal 0
HcmV?d00001

diff --git a/include/gui/gfx.hpp b/include/gui/gfx.hpp
index 93d3a4b..e21b27b 100644
--- a/include/gui/gfx.hpp
+++ b/include/gui/gfx.hpp
@@ -51,6 +51,7 @@ namespace GFX {
 	void DrawTime();
 	void DrawBattery();
 	void HandleBattery();
+	void DrawWifi();
 	void DrawIcon(const int Idx, int X, int Y, uint32_t Color = UIThemes->SideBarIconColor(), float BlendPower = 1.0f, float ScaleX = 1, float ScaleY = 1);
 };
 
diff --git a/source/gui/gfx.cpp b/source/gui/gfx.cpp
index 8cc0604..9650aad 100644
--- a/source/gui/gfx.cpp
+++ b/source/gui/gfx.cpp
@@ -173,6 +173,21 @@ void GFX::HandleBattery() {
 	}
 }
 
+/*
+	Draws the Wi-Fi signal icon
+*/
+void GFX::DrawWifi() {
+	constexpr int wifiIcons[] = {
+		sprites_wifi_0_idx,
+		sprites_wifi_1_idx,
+		sprites_wifi_2_idx,
+		sprites_wifi_3_idx
+	};
+
+	u8 level = osGetWifiStrength();
+	GFX::DrawIcon(wifiIcons[level], 330, 0, UIThemes->TextColor());
+}
+
 /*
 	Draws the sidebar icons blended with the SideBarIconColor.
 */
diff --git a/source/menu/downList.cpp b/source/menu/downList.cpp
index 40faa37..8c75ba0 100644
--- a/source/menu/downList.cpp
+++ b/source/menu/downList.cpp
@@ -129,6 +129,7 @@ void StoreUtils::DrawDownList(const std::vector<std::string> &entries, bool fetc
 
 	GFX::DrawTime();
 	GFX::DrawBattery();
+	GFX::DrawWifi();
 	Animation::QueueEntryDone();
 
 	GFX::DrawBottom();
diff --git a/source/screens/mainScreen.cpp b/source/screens/mainScreen.cpp
index 20d4d5a..21d255a 100644
--- a/source/screens/mainScreen.cpp
+++ b/source/screens/mainScreen.cpp
@@ -130,6 +130,7 @@ void MainScreen::Draw(void) const {
 	config->list() ? StoreUtils::DrawList() : StoreUtils::DrawGrid();
 	GFX::DrawTime();
 	GFX::DrawBattery();
+	GFX::DrawWifi();
 	Animation::QueueEntryDone();
 
 	/* Download-ception. */