Terminal Watchface Improvements and added Weather. #2001

JustScott · 2024-02-03T19:01:09Z

Use @vkareh's new weather forecast app as a template to implement the weather into the terminal watch face.
Use InfintimeTheme Colors instead of hardcoded hex values.
Reorder code to match the order of the UI.
Implement @vkareh's variable battery icon color to the battery percentage text.
Added a new InfinitimeTheme color, gray, and turn certain values gray when they contain no data, like weather.

I don't personally use the terminal watch face, so I'm looking for suggestions on what colors you guys want, and if I should change certain text like the steps# in the step counter.

github-actions · 2024-02-03T19:11:27Z

Build checks have not completed. Possible reasons for this are:

The checks need to be approved by a maintainer
The branch has conflicts
The firmware build has failed

vkareh · 2024-02-03T19:35:11Z

This is really cool, I like the graying out of n/a data!

How does it truncate if you have longer weather condition names, like Scattered Clouds or something?

Also, there seems to be a # sign after some of the lines, is that on purpose?

One suggestion though: the PS1 could be, say, lightGray so that it doesn't overpower the rest of the data, maybe then the time can be white so that it's easier to see at a quick glance?

I haven't really used this face a lot, but this PR might tip the scale for me.

vkareh · 2024-02-03T19:37:13Z

src/displayapp/screens/WatchFaceTerminal.cpp


 using namespace Pinetime::Applications::Screens;

+namespace {
+ lv_color_t temperatureColor(int16_t temperature) {


This makes me think that we can make this part of the InfiniTimeTheme...

src/displayapp/screens/WatchFaceTerminal.cpp

JustScott · 2024-02-03T19:40:32Z

@vkareh I'm confused about the #'s at the end of the lines as well, they were already there so i didn't want to remove them incase there was a reason. As far as the trunacation, I modified your GetCondition function to GetSimpleCondition, which just uses a single word, like cloudy instead of Scattered Clouds... it misses out on some detail, but I just don't see a way of fitting more than one word.

vkareh · 2024-02-03T19:42:28Z

src/displayapp/screens/WatchFaceTerminal.cpp

+ // We lock satuation and brightness at 100% and traverse the cilinder
+ // between red and green, thus avoiding the darker RGB on medium battery
+ // charges and giving us a much nicer color range.
+ uint8_t hue = batteryPercentRemaining.Get() * 120 / 100;


Any chance this can live elsewhere and we can reuse it here? Not super important, since my color PR may not ever be merged though 😛

Maybe in the theme too?

Should I add it to InfiniTimeTheme.h in this PR, or should that be a seperate PR?

vkareh · 2024-02-03T19:43:58Z

src/displayapp/screens/WatchFaceTerminal.h

 ~WatchFaceTerminal() override;

 void Refresh() override;

 private:
 Utility::DirtyValue<int> batteryPercentRemaining {};
+ Utility::DirtyValue<uint8_t> hue {};


I think this can be a local variable inside the function, no need to track its state at the class level

vkareh · 2024-02-03T19:45:56Z

src/displayapp/screens/WeatherSymbols.cpp

+ case Pinetime::Controllers::SimpleWeatherService::Icons::Clouds:
+ return "Cloudy";
+ case Pinetime::Controllers::SimpleWeatherService::Icons::BrokenClouds:
+ return "Cloudy";


I see what you did here. Clever.
It will conflict with the weather app PR, so we'll need to find a good middle ground if both make it into main

Okay, I see this is a different, simplified, function. Makes sense now! 👍

JustScott · 2024-02-03T20:04:03Z

This is with the time and date fonts white. I think the prompts look better in the first image with the lightGray, instead of the second image with gray. Thoughts?

vkareh · 2024-02-03T20:22:50Z

I think the prompts look better in the first image with the lightGray, instead of the second image with gray. Thoughts?

In fully agree. Light gray looks better

AlbeyAmakiir · 2024-02-04T02:49:04Z

I really like the prompts being light gray. Good idea.

I'm a fan of each item being a different colour the way it currently is, and especially the [LABEL] part being the base terminal colour, as the colour helps direct my eye, but I do like the idea of the battery changing colour and the empty items being grayed out.

I dunno where the # has come from. It's not on mine, and I use the watchface all the time. Here's what mine looks like, at version 1.14.0:

FintasticMan · 2024-02-04T15:34:09Z

I agree with Albey above that I prefer the labels being white. The # symbols come from the way that the text was being coloured. It was done with #012345 text#, and I presume the final # wasn't removed at first. It has been fixed now though, I see.

I definitely prefer lightGray to gray, but perhaps if the labels are the same colour white works too?

Is there a reason that the same function for the weather description from the forecast app can't be used here? Are some words too long to fit?

I quite liked the colour variety of the current watch face. Maybe we can experiment with the colours a bit?

JustScott · 2024-02-04T17:27:41Z

@FintasticMan Ah that's where the # came from, and yes more than a one word weather description overflows. Here's a version of the face with the labels white (#ffffff), the time and date using their original color value, and the prompts still using the lightGray value.

JustScott · 2024-02-04T17:50:01Z

What are your guys thoughts on replacing the 'you have mail' text for new notifications, with just turning the the prompts orange (or some other color)?

AlbeyAmakiir · 2024-02-04T23:00:34Z

The extra line is nice and obvious. Only changing colour wouldn't communicate to new users of the face why it has done so. Moreso, communicating any information through colour alone makes it inaccessible to colourblind users.

That said, I'm not opposed to adding that colour to the mail text. That could make it stand out even better than it does now, I think.

Was there another reason you suggested changing the colour instead of having the line?

JustScott · 2024-02-05T01:45:05Z

@AlbeyAmakiir I just thought it was a bit out of place for a terminal watch face to have random text above the first prompt appear. But you're right, just changing the color wouldn't work, I hadn't taken into account color blind users.

I think having a more realistic terminal message could fit the lore a little better, I made an example of a background 'notify' job completing in the picture below, but if anyone has a better one let me know. (I'm also completely fine with leaving it as it was if that's how people prefer it).

AlbeyAmakiir · 2024-02-05T04:07:52Z

Hmm, I'm not sure. Having it at the top does have the advantage that it's right next to the direction in which you need to swipe for notifications, which I only noticed because your alternative is at the other extreme. But you're right it's a little off-lore. I also considered a [MAIL] entry in the output, but that doesn't have the benefit of being entirely invisible until there's a notification, which seems like it might be important for grabbing attention.

So it might be best to leave it as is, but I'm chill if others feel differently. I'm not sure how to weigh up the pros and cons of all these options.

vkareh · 2024-02-05T15:41:08Z

src/displayapp/screens/WatchFaceTerminal.cpp

+ char tempUnit = 'C';
+ lv_obj_set_style_local_text_color(weather, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, temperatureColor(temp));
+ if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
+ condition = Symbols::GetSimpleCondition(optCurrentWeather->iconId);


This is in the wrong scope. It also doesn't need DirtyValue tracking.

I suggest just calling it in the lv_label_set_text_fmt:

lv_label_set_text_fmt(weather, "#ffffff [WTHR]# %i°%c %s ", temp / 100, tempUnit, Symbols::GetSimpleCondition(optCurrentWeather->iconId));

Then get rid of the condition variable.

vkareh · 2024-02-05T15:47:45Z

src/displayapp/screens/WeatherSymbols.cpp

+ case Pinetime::Controllers::SimpleWeatherService::Icons::Snow:
+ return "Snowy";
+ case Pinetime::Controllers::SimpleWeatherService::Icons::Smog:
+ return "Misty";


This line is misaligned

vkareh · 2024-02-05T16:01:21Z

src/displayapp/screens/WeatherSymbols.cpp

+ case Pinetime::Controllers::SimpleWeatherService::Icons::Sun:
+ return "Clear";
+ case Pinetime::Controllers::SimpleWeatherService::Icons::CloudsSun:
+ return "Cloudy";
+ case Pinetime::Controllers::SimpleWeatherService::Icons::Clouds:
+ return "Cloudy";
+ case Pinetime::Controllers::SimpleWeatherService::Icons::BrokenClouds:
+ return "Cloudy";
+ case Pinetime::Controllers::SimpleWeatherService::Icons::CloudShowerHeavy:
+ return "Rainy";
+ case Pinetime::Controllers::SimpleWeatherService::Icons::CloudSunRain:
+ return "Rainy";
+ case Pinetime::Controllers::SimpleWeatherService::Icons::Thunderstorm:
+ return "Stormy";
+ case Pinetime::Controllers::SimpleWeatherService::Icons::Snow:
+ return "Snowy";
+ case Pinetime::Controllers::SimpleWeatherService::Icons::Smog:
+ return "Misty";


I think these should follow the OWM main group names more closely:

Clear

Clouds

Clouds

Clouds

Drizzle

Rain

Thunder(storm) <--- Thunderstorm doesn't fit, but Thunder does

Snow

Mist <--- This one doesn't have a single name for the main group, but I've seen several apps defaulting to Mist, since it's the first one in the atmosphere condition group.

vkareh · 2024-02-05T16:07:34Z

src/displayapp/screens/WatchFaceTerminal.cpp

+ uint8_t hue = batteryPercentRemaining.Get() * 120 / 100;
+ lv_obj_set_style_local_text_color(batteryValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hsv_to_rgb(hue, 100, 100));
+ lv_label_set_text_fmt(batteryValue, "#ffffff [BATT]# %d%%", batteryPercentRemaining.Get());
+ if (batteryController.IsPowerPresent()) {


I think this should call IsCharging() instead, as once it reaches 100% the controller will stop charging once the battery is full. Also, displaying 100% Charging looks odd.

vkareh · 2024-02-05T17:41:10Z

@JustScott

What are your guys thoughts on replacing the 'you have mail' text for new notifications, with just turning the the prompts orange (or some other color)?

I agree with @AlbeyAmakiir with regards to accessibility. Color-coding on a notification is not great UX. The [1]+ Done line at the bottom looks really cool, but the implication is that a background job is finished. The Done message is bash's rendering of a POSIX signal (I think SIGHUP) and so the text can be anything (bash has built-ins for Done, Stopped, Exit, etc...). I think the message can very well be [1]+ Notify, a reasonable rendering of a made-up SIGNOTIFY POSIX signal (we're all playing make believe here anyway, right?)

Playing with a terminal, I recreated what the flow would look like this (and yes, I modified my PS1 and created a now alias just for this test 😝):

user@watch:~ $ now
[TIME] 12:28:51
[DATE] 02/05/24
user@watch:~ $ echo "You have mail." &
[1] 71270
You have mail.
[1]+  Done                    echo "You have mail."
user@watch:~ $ now
[TIME] 12:28:54
[DATE] 02/05/24
user@watch:~ $ notify-send "You have mail." &
[1] 71281
user@watch:~ $ now
[TIME] 12:28:59
[DATE] 02/05/24
[1]+  Done                    notify-send "You have mail."
user@watch:~ $

Based on this, the signal message can be either before the top prompt (in the case of using echo &) or before the bottom prompt (in the case of using notify-send &).
In both cases it shows up before the prompt, and never after it.

Translating this to the watch face, I think we have two options that could work and satisfy the lore:

I personally prefer the first one.

vkareh · 2024-02-05T19:22:51Z

Not sure if this is desired, but continuing on the theme/lore aspect, I recolored the watchface to use a 3-bit color space (8 colors). Maybe better to just use LVGL's pre-defined colors (which more or less simulate a 4-bit color space)

Not sure, maybe it's too much...

AlbeyAmakiir · 2024-02-12T02:27:07Z

I won't know for sure until I see it on the actual watch screen, but on my computer the 3-bit colours look a bit too harsh. Maybe it'll be fine irl, though? I'm not sure.

I definitely prefer the notify text being at the top over the bottom. (Also, I really appreciate that you actually tested that on a terminal. Fantastic. XD )

vkareh · 2024-02-12T15:30:30Z

@AlbeyAmakiir I agree - the 3-bit colours are not great, to be honest.

FintasticMan · 2024-02-12T16:22:39Z

I would say it would be best to break the weather display out of this PR into its own, so that we can discuss that separately from changing the UI.

pbone64 · 2024-03-08T16:16:28Z

I much prefer the white prompts. It fits the terminal theme better (at least in my experience) and using less colours makes the face as a whole less busy.

@vkareh

Use @vkareh's new weather forecast app as a template to implement the weather into the terminal watch face. Use InfintimeTheme Colors instead of hardcoded hex values. Reorder code to match the order of the UI. Implement @vkareh's variable battery icon color to the battery percentage text. Added a new IninftimeTheme color, gray, and turn certain values gray when they contain no data, like weather.

Labels are now a static white #ffffff, while the values can still dynamically change color.

defining it first. changed the 'you have mail' to '[1]+ Notify, to better align with terminal lore. Use `IsCharging` instead of `IsPowerPresent` to stop displaying the 'Charging' text once the battery's full. Update the return values for weather condition in `GetSimpleCondition` to match the standard names used in the rest of the project.

Integrat-edCircuit · 2024-06-12T07:28:32Z

+1 having weather on terminal watchface would be great, as it is more precise for the number of steps than pinetimestyle

vkareh reviewed Feb 3, 2024

View reviewed changes

src/displayapp/screens/WatchFaceTerminal.cpp Outdated Show resolved Hide resolved

vkareh reviewed Feb 3, 2024

View reviewed changes

JustScott force-pushed the terminal_weather branch from 66b10c5 to 44d3f52 Compare February 3, 2024 19:52

vkareh reviewed Feb 5, 2024

View reviewed changes

JustScott force-pushed the terminal_weather branch from 1c7fcb9 to dbce980 Compare February 5, 2024 21:54

JustScott force-pushed the terminal_weather branch from dbce980 to 9fa41c4 Compare February 21, 2024 00:13

JustScott added 6 commits March 15, 2024 00:56

Updated date, time, and prompt colors

ffda367

Removed random #'s from the text values

8144494

Updated terminal coloring

49b00d2

Labels are now a static white #ffffff, while the values can still dynamically change color.

Rebase with upstream & Fix conflicts

241e4ef

JustScott force-pushed the terminal_weather branch from 9fa41c4 to 241e4ef Compare March 15, 2024 06:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Terminal Watchface Improvements and added Weather. #2001

Terminal Watchface Improvements and added Weather. #2001

JustScott commented Feb 3, 2024 •

edited

github-actions bot commented Feb 3, 2024 •

edited

vkareh commented Feb 3, 2024

vkareh Feb 3, 2024

JustScott commented Feb 3, 2024

vkareh Feb 3, 2024

minacode Feb 4, 2024

JustScott Feb 5, 2024

vkareh Feb 3, 2024

JustScott Feb 3, 2024

vkareh Feb 3, 2024

vkareh Feb 3, 2024

JustScott commented Feb 3, 2024

vkareh commented Feb 3, 2024

AlbeyAmakiir commented Feb 4, 2024

FintasticMan commented Feb 4, 2024

JustScott commented Feb 4, 2024

JustScott commented Feb 4, 2024 •

edited

AlbeyAmakiir commented Feb 4, 2024

JustScott commented Feb 5, 2024

AlbeyAmakiir commented Feb 5, 2024

vkareh Feb 5, 2024

vkareh Feb 5, 2024

vkareh Feb 5, 2024

vkareh Feb 5, 2024

JustScott Feb 5, 2024

vkareh commented Feb 5, 2024

vkareh commented Feb 5, 2024

AlbeyAmakiir commented Feb 12, 2024

vkareh commented Feb 12, 2024

FintasticMan commented Feb 12, 2024

pbone64 commented Mar 8, 2024

Integrat-edCircuit commented Jun 12, 2024

Terminal Watchface Improvements and added Weather. #2001

Are you sure you want to change the base?

Terminal Watchface Improvements and added Weather. #2001

Conversation

JustScott commented Feb 3, 2024 • edited

github-actions bot commented Feb 3, 2024 • edited

vkareh commented Feb 3, 2024

Choose a reason for hiding this comment

JustScott commented Feb 3, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JustScott commented Feb 3, 2024

vkareh commented Feb 3, 2024

AlbeyAmakiir commented Feb 4, 2024

FintasticMan commented Feb 4, 2024

JustScott commented Feb 4, 2024

JustScott commented Feb 4, 2024 • edited

AlbeyAmakiir commented Feb 4, 2024

JustScott commented Feb 5, 2024

AlbeyAmakiir commented Feb 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vkareh commented Feb 5, 2024

vkareh commented Feb 5, 2024

AlbeyAmakiir commented Feb 12, 2024

vkareh commented Feb 12, 2024

FintasticMan commented Feb 12, 2024

pbone64 commented Mar 8, 2024

Integrat-edCircuit commented Jun 12, 2024

JustScott commented Feb 3, 2024 •

edited

github-actions bot commented Feb 3, 2024 •

edited

JustScott commented Feb 4, 2024 •

edited