From 3a8c7dc038605f7a0ebefa479b204d6d019743cd Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Mon, 18 Dec 2023 18:07:36 +0100 Subject: Simple Weather Service - code cleaning and improvements Add missing icons (heavy clouds, thunderstorm, snow). Remove unneeded comparison operator (!=), improve conversion of Timestamp and MessageType, order includes. Fix typo in documentation. Remove not related change in StopWatch. --- src/displayapp/fonts/fonts.json | 2 +- src/displayapp/screens/StopWatch.cpp | 2 -- src/displayapp/screens/Symbols.h | 3 +++ src/displayapp/screens/WatchFacePineTimeStyle.cpp | 12 ++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/displayapp') diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json index 8416fc5e..48d382d0 100644 --- a/src/displayapp/fonts/fonts.json +++ b/src/displayapp/fonts/fonts.json @@ -68,7 +68,7 @@ "sources": [ { "file": "FontAwesome5-Solid+Brands+Regular.woff", - "range": "0xf185, 0xf6c4, 0xf743, 0xf740, 0xf75f, 0xf0c2, 0xf05e" + "range": "0xf185, 0xf6c4, 0xf743, 0xf740, 0xf75f, 0xf0c2, 0xf05e, 0xf73b, 0xf0e7, 0xf2dc" } ], "bpp": 1, diff --git a/src/displayapp/screens/StopWatch.cpp b/src/displayapp/screens/StopWatch.cpp index bdb3fde6..f0359da4 100644 --- a/src/displayapp/screens/StopWatch.cpp +++ b/src/displayapp/screens/StopWatch.cpp @@ -5,8 +5,6 @@ using namespace Pinetime::Applications::Screens; -constexpr int Pinetime::Applications::Screens::StopWatch::maxLapCount; - namespace { TimeSeparated_t convertTicksToTimeSegments(const TickType_t timeElapsed) { // Centiseconds diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h index 7154ff44..a6f1494a 100644 --- a/src/displayapp/screens/Symbols.h +++ b/src/displayapp/screens/Symbols.h @@ -45,6 +45,9 @@ namespace Pinetime { static constexpr const char* cloudShowersHeavy = "\xEF\x9D\x80"; static constexpr const char* smog = "\xEF\x9D\x9F"; static constexpr const char* cloud = "\xEF\x83\x82"; + static constexpr const char* cloud_meatball = "\xEF\x9C\xBB"; + static constexpr const char* bolt = "\xEF\x83\xA7"; + static constexpr const char* snowflake = "\xEF\x8B\x9C"; static constexpr const char* ban = "\xEF\x81\x9E"; // lv_font_sys_48.c diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp index baa2e184..d11114d6 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp +++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp @@ -55,14 +55,14 @@ namespace { return Symbols::cloud; break; case Pinetime::Controllers::SimpleWeatherService::Icons::BrokenClouds: - return Symbols::cloud; - break; // TODO missing symbol + return Symbols::cloud_meatball; + break; case Pinetime::Controllers::SimpleWeatherService::Icons::Thunderstorm: - return Symbols::cloud; - break; // TODO missing symbol + return Symbols::bolt; + break; case Pinetime::Controllers::SimpleWeatherService::Icons::Snow: - return Symbols::cloud; - break; // TODO missing symbol + return Symbols::snowflake; + break; case Pinetime::Controllers::SimpleWeatherService::Icons::CloudShowerHeavy: return Symbols::cloudShowersHeavy; break; -- cgit v1.2.3-70-g09d2