Display a netstatus icon. Updated/added icons from #79. Closes #79.

Makefile.pc

@@ -9,7 +9,7 @@ EXTRA_CFLAGS="-D__USE_MINGW_ANSI_STDIO"
 EXTRA_LDFLAGS="-lws2_32"
 endif
 
-test : pc_main/main.cpp pc_main/pc_launch.c pc_main/pc_power.c \
+test : pc_main/main.cpp pc_main/pc_launch.c pc_main/pc_power.c pc_main/pc_netstatus.c \
 	common/menu.c common/font.c common/language.c common/launch.c common/worker.c \
 	common/menu-entry.c common/menu-list.c common/message-box.c common/text.c \
 	common/ui.c common/assets.c common/math.c common/theme.c \

common/assets.c

@@ -20,6 +20,13 @@ assetsDataEntry g_assetsDataList[AssetId_Max] = {
     GENASSET("hbmenu_logo_light.bin"),
     GENASSET("theme_icon_dark.bin"),
     GENASSET("theme_icon_light.bin"),
+    GENASSET("airplane_icon.bin"),
+    GENASSET("wifi_none_icon.bin"),
+    GENASSET("wifi1_icon.bin"),
+    GENASSET("wifi2_icon.bin"),
+    GENASSET("wifi3_icon.bin"),
+    GENASSET("eth_icon.bin"),
+    GENASSET("eth_none_icon.bin"),
 };
 
 static void assetsClearEntry(assetsDataEntry *entry) {

common/assets.h

@@ -10,6 +10,13 @@ typedef enum {
     AssetId_hbmenu_logo_light,
     AssetId_theme_icon_dark,
     AssetId_theme_icon_light,
+    AssetId_airplane_icon,
+    AssetId_wifi_none_icon,
+    AssetId_wifi1_icon,
+    AssetId_wifi2_icon,
+    AssetId_wifi3_icon,
+    AssetId_eth_icon,
+    AssetId_eth_none_icon,
 
     AssetId_Max
 } AssetId;

common/common.h

@@ -64,6 +64,7 @@ typedef union {
 #include "message-box.h"
 #include "power.h"
 #include "netloader.h"
+#include "netstatus.h"
 
 void menuStartupPath(void);
 void menuStartup(void);

common/menu.c

@@ -414,7 +414,36 @@ void drawWave(int id, float timer, color_t color, int height, float phase, float
     }
 }
 
-void drawTime() {
+void drawCharge() {
+    char chargeString[5];
+    uint32_t batteryCharge;
+    bool isCharging;
+    bool validPower;
+
+    validPower = powerGetDetails(&batteryCharge, &isCharging);
+    
+    if (validPower)
+    {
+        batteryCharge = (batteryCharge > 100) ? 100 : batteryCharge;
+
+        sprintf(chargeString, "%d%%", batteryCharge);
+        
+        int tmpX = GetTextXCoordinate(interuiregular14, 1180 - 10, chargeString, 'r');
+
+        DrawText(interuiregular14, tmpX - 17, 0 + 47 + 10 + 21 + 4, themeCurrent.textColor, chargeString);
+        drawIcon(1180 - 16 - 8, 0 + 47 + 10 + 6, 24, 24, assetsGetDataBuffer(AssetId_battery_icon), themeCurrent.textColor);
+        if (isCharging)
+            drawIcon(tmpX - 32 - 10, 0 + 47 + 10 + 6, 24, 24, assetsGetDataBuffer(AssetId_charging_icon), themeCurrent.textColor);
+    }
+}
+
+void drawNetwork(int tmpX) {
+    AssetId id;
+    if (netstatusGetDetails(&id))
+        drawIcon(tmpX + 5, 0 + 47 + 10 + 3, 24, 24, assetsGetDataBuffer(id), themeCurrent.textColor);
+}
+
+void drawStatus() {
 
     char timeString[9];
 
@@ -431,29 +460,8 @@ void drawTime() {
 
     DrawText(interuimedium20, tmpX, 0 + 47 + 10, themeCurrent.textColor, timeString);
 
-}
-
-void drawCharge() {
-    char chargeString[5];
-    uint32_t batteryCharge;
-    bool isCharging;
-    bool validPower;
-
-    validPower = powerGetDetails(&batteryCharge, &isCharging);
-    
-    if (validPower)
-    {
-        batteryCharge = (batteryCharge > 100) ? 100 : batteryCharge;
-
-        sprintf(chargeString, "%d%%", batteryCharge);
-        
-        int tmpX = GetTextXCoordinate(interuiregular14, 1180, chargeString, 'r');
-
-        DrawText(interuiregular14, tmpX - 15, 0 + 47 + 10 + 21, themeCurrent.textColor, chargeString);
-        drawIcon(1180 - 11, 0 + 47 + 10 + 6, 10, 15, assetsGetDataBuffer(AssetId_battery_icon), themeCurrent.textColor);
-        if (isCharging)
-            drawIcon(tmpX - 32, 0 + 47 + 10 + 6, 9, 15, assetsGetDataBuffer(AssetId_charging_icon), themeCurrent.textColor);
-    }
+    drawCharge();
+    drawNetwork(tmpX);
 }
 
 void drawButtons(menu_s* menu, bool emptyDir, int *x_image_out) {
@@ -553,8 +561,7 @@ void menuLoop(void) {
     DrawText(interuiregular14, 180 + 256, 46 + 16 + 18, themeCurrent.textColor, tmpstr);
     #endif
 
-    drawTime();
-    drawCharge();
+    drawStatus();
 
     memset(&netloader_state, 0, sizeof(netloader_state));
     netloaderGetState(&netloader_state);