diff --git a/main/displays/menus/statisticsmenu.cpp b/main/displays/menus/statisticsmenu.cpp index 0c3ebb8..37a984f 100644 --- a/main/displays/menus/statisticsmenu.cpp +++ b/main/displays/menus/statisticsmenu.cpp @@ -6,6 +6,9 @@ #include "actioninterface.h" #include "fmt/core.h" #include "utils.h" +#include "icons/time.h" +#include "icons/reboot.h" +#include "icons/update.h" using namespace espgui; @@ -38,7 +41,13 @@ class CurrentKilometersText : public virtual espgui::TextInterface { class TotalKilometersText : public virtual espgui::TextInterface { public: std::string text() const override { - return fmt::format("total: {:.2f}m", drivingStatistics.totalMeters ); + return fmt::format("total: {:.1f}km", drivingStatistics.totalMeters / 1000.f ); + } +}; + +class TotalMetersText : public virtual espgui::TextInterface { + public: std::string text() const override { + return fmt::format("total: {:.0f}m", drivingStatistics.totalMeters ); } }; @@ -74,13 +83,15 @@ public: StatisticsMenu::StatisticsMenu() { constructMenuItem>(); - constructMenuItem>(); + constructMenuItem>>(); constructMenuItem>(); constructMenuItem>(); constructMenuItem>(); - constructMenuItem>(); - constructMenuItem, SaveKilometersAction>>(); - constructMenuItem, ClearCurrentStatsAction>>(); + constructMenuItem>(); +// constructMenuItem>(); + constructMenuItem>(); + constructMenuItem, SaveKilometersAction, StaticMenuItemIcon<&bobbyicons::update>>>(); + constructMenuItem, ClearCurrentStatsAction, StaticMenuItemIcon<&bobbyicons::reboot>>>(); constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); }