diff --git a/WiFiManager.cpp b/WiFiManager.cpp index e507e24..82a3e29 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -698,18 +698,20 @@ String WiFiManager::getScanItemOut(){ // token precheck, to speed up replacements on large ap lists String HTTP_ITEM_STR = FPSTR(HTTP_ITEM); + + + // toggle icons with percentage + HTTP_ITEM_STR.replace("{qp}", FPSTR(HTTP_ITEM_QP)); + HTTP_ITEM_STR.replace("{h}",_scanDispOptions ? "" : "h"); + HTTP_ITEM_STR.replace("{qi}", FPSTR(HTTP_ITEM_QI)); + HTTP_ITEM_STR.replace("{h}",_scanDispOptions ? "h" : ""); + bool tok_r = HTTP_ITEM_STR.indexOf(FPSTR(T_r)) > 0; bool tok_R = HTTP_ITEM_STR.indexOf(FPSTR(T_R)) > 0; bool tok_e = HTTP_ITEM_STR.indexOf(FPSTR(T_e)) > 0; bool tok_q = HTTP_ITEM_STR.indexOf(FPSTR(T_q)) > 0; bool tok_i = HTTP_ITEM_STR.indexOf(FPSTR(T_i)) > 0; - // toggle icons with percentage - if(_scanDispOptions && tok_q && !tok_r){ - HTTP_ITEM_STR.replace(FPSTR(T_q), FPSTR(HTTP_ITEM_QP)); - tok_r = true; - } else HTTP_ITEM_STR.replace(FPSTR(T_q), FPSTR(HTTP_ITEM_QI)); - //display networks in page for (int i = 0; i < n; i++) { if (indices[i] == -1) continue; // skip dups diff --git a/strings_en.h b/strings_en.h index 6150753..31e1adc 100644 --- a/strings_en.h +++ b/strings_en.h @@ -24,9 +24,9 @@ const char HTTP_HEAD_END[] PROGMEM = "
"; const char HTTP_ROOT_MAIN[] PROGMEM = "

{v}

WiFiManager

"; const char HTTP_PORTAL_OPTIONS[] PROGMEM = "




"; -const char HTTP_ITEM_QI[] PROGMEM = ""; // rssi icons -const char HTTP_ITEM_QP[] PROGMEM = "
{r}%
"; // rssi percentage -const char HTTP_ITEM[] PROGMEM = "
{v}{q}
"; // {q} = HTTP_ITEM_QI, {r} = HTTP_ITEM_QP +const char HTTP_ITEM_QI[] PROGMEM = ""; // rssi icons +const char HTTP_ITEM_QP[] PROGMEM = "
{r}%
"; // rssi percentage +const char HTTP_ITEM[] PROGMEM = "
{v}{qi}{qp}
"; // {q} = HTTP_ITEM_QI, {r} = HTTP_ITEM_QP // const char HTTP_ITEM[] PROGMEM = "
{v} {R} {r}% {q} {e}
"; // test all tokens const char HTTP_FORM_START[] PROGMEM = "


"; @@ -63,6 +63,7 @@ const char HTTP_STYLE[] PROGMEM = ""; const char HTTP_HELP[] PROGMEM = @@ -213,6 +214,7 @@ const char T_e[] PROGMEM = "{e}"; // @token e const char T_q[] PROGMEM = "{q}"; // @token q const char T_r[] PROGMEM = "{r}"; // @token r const char T_R[] PROGMEM = "{R}"; // @token R +const char T_h[] PROGMEM = "{h}"; // @token h // http const char HTTP_HEAD_CL[] PROGMEM = "Content-Length";