Skip to content

Commit b542e26

Browse files
committed
Replace 'old' with 'ago' and adjust positioning
1 parent 9d13f7a commit b542e26

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/displayapp/screens/Weather.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ Weather::Weather(Controllers::Settings& settingsController,
4444
lv_obj_set_style_local_text_color(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
4545
lv_obj_set_style_local_text_font(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
4646
lv_label_set_text(temperature, "---");
47-
lv_obj_align(temperature, nullptr, LV_ALIGN_CENTER, 0, -30);
47+
lv_obj_align(temperature, nullptr, LV_ALIGN_CENTER, 0, -32);
4848
lv_obj_set_auto_realign(temperature, true);
4949

5050
lastUpdated = lv_label_create(lv_scr_act(), nullptr);
5151
lv_obj_set_style_local_text_color(lastUpdated, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::bg);
5252
lv_label_set_text_fmt(lastUpdated, "");
53-
lv_obj_align(lastUpdated, nullptr, LV_ALIGN_CENTER, -40, 0);
53+
lv_obj_align(lastUpdated, nullptr, LV_ALIGN_CENTER, -40, -1);
5454

5555
minTemperature = lv_label_create(lv_scr_act(), nullptr);
5656
lv_obj_set_style_local_text_color(minTemperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::bg);
@@ -148,13 +148,13 @@ void Weather::Refresh() {
148148
int64_t secondsSinceEpoch = dateTimeController.CurrentDateTime().time_since_epoch().count() / 1000000000;
149149
int64_t secondsSinceWeatherUpdate = secondsSinceEpoch - optCurrentWeather->timestamp;
150150
if (secondsSinceWeatherUpdate < 0) {
151-
lv_label_set_text_fmt(lastUpdated, "0s old", secondsSinceWeatherUpdate);
151+
lv_label_set_text_fmt(lastUpdated, "0s ago", secondsSinceWeatherUpdate);
152152
} else if (secondsSinceWeatherUpdate < 60) {
153-
lv_label_set_text_fmt(lastUpdated, "%ds old", secondsSinceWeatherUpdate);
153+
lv_label_set_text_fmt(lastUpdated, "%ds ago", secondsSinceWeatherUpdate);
154154
} else if (secondsSinceWeatherUpdate > 59 && secondsSinceWeatherUpdate < 3600) {
155-
lv_label_set_text_fmt(lastUpdated, "%dm old", secondsSinceWeatherUpdate / 60);
155+
lv_label_set_text_fmt(lastUpdated, "%dm ago", secondsSinceWeatherUpdate / 60);
156156
} else if (secondsSinceWeatherUpdate > 3599) {
157-
lv_label_set_text_fmt(lastUpdated, "%dh old", secondsSinceWeatherUpdate / 3600);
157+
lv_label_set_text_fmt(lastUpdated, "%dh ago", secondsSinceWeatherUpdate / 3600);
158158
}
159159
} else {
160160
lv_label_set_text(icon, "");

0 commit comments

Comments
 (0)