@@ -44,13 +44,13 @@ Weather::Weather(Controllers::Settings& settingsController,
44
44
lv_obj_set_style_local_text_color (temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
45
45
lv_obj_set_style_local_text_font (temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
46
46
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 );
48
48
lv_obj_set_auto_realign (temperature, true );
49
49
50
50
lastUpdated = lv_label_create (lv_scr_act (), nullptr );
51
51
lv_obj_set_style_local_text_color (lastUpdated, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::bg);
52
52
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 );
54
54
55
55
minTemperature = lv_label_create (lv_scr_act (), nullptr );
56
56
lv_obj_set_style_local_text_color (minTemperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::bg);
@@ -148,13 +148,13 @@ void Weather::Refresh() {
148
148
int64_t secondsSinceEpoch = dateTimeController.CurrentDateTime ().time_since_epoch ().count () / 1000000000 ;
149
149
int64_t secondsSinceWeatherUpdate = secondsSinceEpoch - optCurrentWeather->timestamp ;
150
150
if (secondsSinceWeatherUpdate < 0 ) {
151
- lv_label_set_text_fmt (lastUpdated, " 0s old " , secondsSinceWeatherUpdate);
151
+ lv_label_set_text_fmt (lastUpdated, " 0s ago " , secondsSinceWeatherUpdate);
152
152
} else if (secondsSinceWeatherUpdate < 60 ) {
153
- lv_label_set_text_fmt (lastUpdated, " %ds old " , secondsSinceWeatherUpdate);
153
+ lv_label_set_text_fmt (lastUpdated, " %ds ago " , secondsSinceWeatherUpdate);
154
154
} 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 );
156
156
} 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 );
158
158
}
159
159
} else {
160
160
lv_label_set_text (icon, " " );
0 commit comments