diff options
Diffstat (limited to 'src/displayapp')
| -rw-r--r-- | src/displayapp/DisplayAppRecovery.cpp | 2 | ||||
| -rw-r--r-- | src/displayapp/DisplayAppRecovery.h | 4 | ||||
| -rw-r--r-- | src/displayapp/screens/WatchFacePineTimeStyle.cpp | 40 |
3 files changed, 33 insertions, 13 deletions
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp index 9fe59c40..c4bd5766 100644 --- a/src/displayapp/DisplayAppRecovery.cpp +++ b/src/displayapp/DisplayAppRecovery.cpp @@ -122,7 +122,7 @@ void DisplayApp::PushMessage(Display::Messages msg) { void DisplayApp::Register(Pinetime::System::SystemTask* /*systemTask*/) { } -void DisplayApp::Register(Pinetime::Controllers::WeatherService* /*weatherService*/) { +void DisplayApp::Register(Pinetime::Controllers::SimpleWeatherService* /*weatherService*/) { } void DisplayApp::Register(Pinetime::Controllers::MusicService* /*musicService*/) { diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h index 41aedb17..fd79ef28 100644 --- a/src/displayapp/DisplayAppRecovery.h +++ b/src/displayapp/DisplayAppRecovery.h @@ -34,7 +34,7 @@ namespace Pinetime { class AlarmController; class BrightnessController; class FS; - class WeatherService; + class SimpleWeatherService; class MusicService; class NavigationService; } @@ -69,7 +69,7 @@ namespace Pinetime { void PushMessage(Pinetime::Applications::Display::Messages msg); void Register(Pinetime::System::SystemTask* systemTask); - void Register(Pinetime::Controllers::WeatherService* weatherService); + void Register(Pinetime::Controllers::SimpleWeatherService* weatherService); void Register(Pinetime::Controllers::MusicService* musicService); void Register(Pinetime::Controllers::NavigationService* NavigationService); diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp index 65122493..baa2e184 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp +++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp @@ -45,16 +45,36 @@ namespace { const char* GetIcon(const Pinetime::Controllers::SimpleWeatherService::Icons icon) { switch (icon) { - case Pinetime::Controllers::SimpleWeatherService::Icons::Sun: return Symbols::sun; break; - case Pinetime::Controllers::SimpleWeatherService::Icons::CloudsSun: return Symbols::cloudSun; break; - case Pinetime::Controllers::SimpleWeatherService::Icons::Clouds: return Symbols::cloud; break; - case Pinetime::Controllers::SimpleWeatherService::Icons::BrokenClouds: return Symbols::cloud; break; // TODO missing symbol - case Pinetime::Controllers::SimpleWeatherService::Icons::Thunderstorm: return Symbols::cloud; break; // TODO missing symbol - case Pinetime::Controllers::SimpleWeatherService::Icons::Snow: return Symbols::cloud; break; // TODO missing symbol - case Pinetime::Controllers::SimpleWeatherService::Icons::CloudShowerHeavy: return Symbols::cloudShowersHeavy; break; - case Pinetime::Controllers::SimpleWeatherService::Icons::CloudSunRain: return Symbols::cloudSunRain; break; - case Pinetime::Controllers::SimpleWeatherService::Icons::Smog: return Symbols::smog; break; - default: return Symbols::ban; break; + case Pinetime::Controllers::SimpleWeatherService::Icons::Sun: + return Symbols::sun; + break; + case Pinetime::Controllers::SimpleWeatherService::Icons::CloudsSun: + return Symbols::cloudSun; + break; + case Pinetime::Controllers::SimpleWeatherService::Icons::Clouds: + return Symbols::cloud; + break; + case Pinetime::Controllers::SimpleWeatherService::Icons::BrokenClouds: + return Symbols::cloud; + break; // TODO missing symbol + case Pinetime::Controllers::SimpleWeatherService::Icons::Thunderstorm: + return Symbols::cloud; + break; // TODO missing symbol + case Pinetime::Controllers::SimpleWeatherService::Icons::Snow: + return Symbols::cloud; + break; // TODO missing symbol + case Pinetime::Controllers::SimpleWeatherService::Icons::CloudShowerHeavy: + return Symbols::cloudShowersHeavy; + break; + case Pinetime::Controllers::SimpleWeatherService::Icons::CloudSunRain: + return Symbols::cloudSunRain; + break; + case Pinetime::Controllers::SimpleWeatherService::Icons::Smog: + return Symbols::smog; + break; + default: + return Symbols::ban; + break; } } } |
