From 287399f9932eb5562917c3fc4986cc65bec7fed2 Mon Sep 17 00:00:00 2001
From: JF002 <JF002@users.noreply.github.com>
Date: Tue, 1 Jun 2021 21:01:32 +0200
Subject: Navigation app: reduce memory usage (#362)

* Navigation app:
 - Renaming and reformatting according to coding conventions
 - declare iconMap as constexpr and use char* instead of std::string

This reduces the flash usage from 424644B to 419344B (-5300B)!
---
 src/displayapp/screens/Navigation.h | 101 ++----------------------------------
 1 file changed, 4 insertions(+), 97 deletions(-)

(limited to 'src/displayapp/screens/Navigation.h')

diff --git a/src/displayapp/screens/Navigation.h b/src/displayapp/screens/Navigation.h
index 46816c33..eb7e00c4 100644
--- a/src/displayapp/screens/Navigation.h
+++ b/src/displayapp/screens/Navigation.h
@@ -45,103 +45,10 @@ namespace Pinetime {
 
         Pinetime::Controllers::NavigationService& navService;
 
-        std::string m_flag;
-        std::string m_narrative;
-        std::string m_manDist;
-        int m_progress;
-
-        /** Watchapp */
-
-        const char* iconForName(std::string icon);
-
-        std::array<std::pair<std::string, const char*>, 89> m_iconMap = {{
-          {"arrive-left", "\xEE\xA4\x81"},
-          {"arrive-right", "\xEE\xA4\x82"},
-          {"arrive-straight", "\xEE\xA4\x80"},
-          {"arrive", "\xEE\xA4\x80"},
-          {"close", "\xEE\xA4\x83"},
-          {"continue-left", "\xEE\xA4\x85"},
-          {"continue-right", "\xEE\xA4\x86"},
-          {"continue-slight-left", "\xEE\xA4\x87"},
-          {"continue-slight-right", "\xEE\xA4\x88"},
-          {"continue-straight", "\xEE\xA4\x84"},
-          {"continue-uturn", "\xEE\xA4\x89"},
-          {"continue", "\xEE\xA4\x84"},
-          {"depart-left", "\xEE\xA4\x8B"},
-          {"depart-right", "\xEE\xA4\x8C"},
-          {"depart-straight", "\xEE\xA4\x8A"},
-          {"end-of-road-left", "\xEE\xA4\x8D"},
-          {"end-of-road-right", "\xEE\xA4\x8E"},
-          {"ferry", "\xEE\xA4\x8F"},
-          {"flag", "\xEE\xA4\x90"},
-          {"fork-left", "\xEE\xA4\x92"},
-          {"fork-right", "\xEE\xA4\x93"},
-          {"fork-slight-left", "\xEE\xA4\x94"},
-          {"fork-slight-right", "\xEE\xA4\x95"},
-          {"fork-straight", "\xEE\xA4\x96"},
-          {"invalid", "\xEE\xA4\x84"},
-          {"invalid-left", "\xEE\xA4\x85"},
-          {"invalid-right", "\xEE\xA4\x86"},
-          {"invalid-slight-left", "\xEE\xA4\x87"},
-          {"invalid-slight-right", "\xEE\xA4\x88"},
-          {"invalid-straight", "\xEE\xA4\x84"},
-          {"invalid-uturn", "\xEE\xA4\x89"},
-          {"merge-left", "\xEE\xA4\x97"},
-          {"merge-right", "\xEE\xA4\x98"},
-          {"merge-slight-left", "\xEE\xA4\x99"},
-          {"merge-slight-right", "\xEE\xA4\x9A"},
-          {"merge-straight", "\xEE\xA4\x84"},
-          {"new-name-left", "\xEE\xA4\x85"},
-          {"new-name-right", "\xEE\xA4\x86"},
-          {"new-name-sharp-left", "\xEE\xA4\x9B"},
-          {"new-name-sharp-right", "\xEE\xA4\x9C"},
-          {"new-name-slight-left", "\xEE\xA4\x87"},
-          {"new-name-slight-right", "\xEE\xA4\x88"},
-          {"new-name-straight", "\xEE\xA4\x84"},
-          {"notification-left", "\xEE\xA4\x85"},
-          {"notification-right", "\xEE\xA4\x86"},
-          {"notification-sharp-left", "\xEE\xA4\x9B"},
-          {"notification-sharp-right", "\xEE\xA4\xA5"},
-          {"notification-slight-left", "\xEE\xA4\x87"},
-          {"notification-slight-right", "\xEE\xA4\x88"},
-          {"notification-straight", "\xEE\xA4\x84"},
-          {"off-ramp-left", "\xEE\xA4\x9D"},
-          {"off-ramp-right", "\xEE\xA4\x9E"},
-          {"off-ramp-slight-left", "\xEE\xA4\x9F"},
-          {"off-ramp-slight-right", "\xEE\xA4\xA0"},
-          {"on-ramp-left", "\xEE\xA4\x85"},
-          {"on-ramp-right", "\xEE\xA4\x86"},
-          {"on-ramp-sharp-left", "\xEE\xA4\x9B"},
-          {"on-ramp-sharp-right", "\xEE\xA4\xA5"},
-          {"on-ramp-slight-left", "\xEE\xA4\x87"},
-          {"on-ramp-slight-right", "\xEE\xA4\x88"},
-          {"on-ramp-straight", "\xEE\xA4\x84"},
-          {"rotary", "\xEE\xA4\xA1"},
-          {"rotary-left", "\xEE\xA4\xA2"},
-          {"rotary-right", "\xEE\xA4\xA3"},
-          {"rotary-sharp-left", "\xEE\xA4\xA4"},
-          {"rotary-sharp-right", "\xEE\xA4\xA5"},
-          {"rotary-slight-left", "\xEE\xA4\xA6"},
-          {"rotary-slight-right", "\xEE\xA4\xA7"},
-          {"rotary-straight", "\xEE\xA4\xA8"},
-          {"roundabout", "\xEE\xA4\xA1"},
-          {"roundabout-left", "\xEE\xA4\xA2"},
-          {"roundabout-right", "\xEE\xA4\xA3"},
-          {"roundabout-sharp-left", "\xEE\xA4\xA4"},
-          {"roundabout-sharp-right", "\xEE\xA4\xA5"},
-          {"roundabout-slight-left", "\xEE\xA4\xA6"},
-          {"roundabout-slight-right", "\xEE\xA4\xA7"},
-          {"roundabout-straight", "\xEE\xA4\xA8"},
-          {"turn-left", "\xEE\xA4\x85"},
-          {"turn-right", "\xEE\xA4\x86"},
-          {"turn-sharp-left", "\xEE\xA4\x9B"},
-          {"turn-sharp-right", "\xEE\xA4\xA5"},
-          {"turn-slight-left", "\xEE\xA4\x87"},
-          {"turn-slight-right", "\xEE\xA4\x88"},
-          {"turn-straight", "\xEE\xA4\x84"},
-          {"updown", "\xEE\xA4\xA9"},
-          {"uturn", "\xEE\xA4\x89"},
-        }};
+        std::string flag;
+        std::string narrative;
+        std::string manDist;
+        int progress;
       };
     }
   }
-- 
cgit v1.2.3-70-g09d2