feedc0de/esp-gui-lib
1
0
Fork 0
Code Issues 6 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Color/Font utilities and new TextWithValueHelper #14

Merged
CommanderRedYT merged 3 commits from better-ui into main 2022-06-09 16:12:15 +02:00
Conversation 3 Commits 3 Files Changed 3 +57 -6
3 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2fe1d1ed28 - Show all commits

10
src/textwithvaluehelper.h
View File

@@ -4,8 +4,6 @@
#include <fmt/core.h> #include <fmt/core.h>
#include <strutils.h> #include <strutils.h>
#include <espstrutils.h> #include <espstrutils.h>
#include <espwifiutils.h>
#include <espchrono.h>
// local includes // local includes
#include "textinterface.h" #include "textinterface.h"
@@ -23,8 +21,6 @@ struct TextWithValueHelper : public Taccessor, public virtual TextInterface
{ {
using cpputils::toString; using cpputils::toString;
using espcpputils::toString; using espcpputils::toString;
using wifi_stack::toString;
using espchrono::toString;
return fmt::format("{} {}", Tprefix, richTextEscape(toString(Taccessor::getValue()))); return fmt::format("{} {}", Tprefix, richTextEscape(toString(Taccessor::getValue())));
} }
@@ -39,8 +35,6 @@ struct ChangeableTextWithValueHelper : public Taccessor, public virtual TextInte
{ {
using cpputils::toString; using cpputils::toString;
using espcpputils::toString; using espcpputils::toString;
using wifi_stack::toString;
using espchrono::toString;
return fmt::format("{} {}", m_prefix, richTextEscape(toString(Taccessor::getValue()))); return fmt::format("{} {}", m_prefix, richTextEscape(toString(Taccessor::getValue())));
} }
@@ -62,8 +56,6 @@ struct TextWithHighlightedValueHelper : public Taccessor, public virtual TextInt
{ {
using cpputils::toString; using cpputils::toString;
using espcpputils::toString; using espcpputils::toString;
using wifi_stack::toString;
using espchrono::toString;
return fmt::format("{} {}{}", Tprefix, Tguilib_color, richTextEscape(toString(Taccessor::getValue()))); return fmt::format("{} {}{}", Tprefix, Tguilib_color, richTextEscape(toString(Taccessor::getValue())));
} }
@@ -78,8 +70,6 @@ struct ChangeableTextWithHighlightedValueHelper : public Taccessor, public virtu
{ {
using cpputils::toString; using cpputils::toString;
using espcpputils::toString; using espcpputils::toString;
using wifi_stack::toString;
using espchrono::toString;
return fmt::format("{} {}{}", m_prefix, Tguilib_color, richTextEscape(toString(Taccessor::getValue()))); return fmt::format("{} {}{}", m_prefix, Tguilib_color, richTextEscape(toString(Taccessor::getValue())));
} }