From 994aa0fad089e0408400763733d443e2fd1cb01c Mon Sep 17 00:00:00 2001 From: Christos Themelis Date: Sat, 24 Jan 2026 22:40:52 +0200 Subject: [PATCH] ui changes --- examples/simple_secure_chat_ui/main.cpp | 1 + examples/simple_secure_chat_ui/uiTasks.cpp | 2 +- src/UI/ui.c | 25 +- src/UI/ui.h | 26 +- src/UI/ui_Screen1.c | 270 +-------------------- 5 files changed, 15 insertions(+), 309 deletions(-) diff --git a/examples/simple_secure_chat_ui/main.cpp b/examples/simple_secure_chat_ui/main.cpp index 3fc565cb6..43bd8dd11 100644 --- a/examples/simple_secure_chat_ui/main.cpp +++ b/examples/simple_secure_chat_ui/main.cpp @@ -988,6 +988,7 @@ void setup() { initializeUI(); createTasks(); + lv_timer_handler(); initializeMesh(); diff --git a/examples/simple_secure_chat_ui/uiTasks.cpp b/examples/simple_secure_chat_ui/uiTasks.cpp index 7f85685be..b55220496 100644 --- a/examples/simple_secure_chat_ui/uiTasks.cpp +++ b/examples/simple_secure_chat_ui/uiTasks.cpp @@ -31,7 +31,7 @@ void createTasks() { NULL, // Parameter of the task 4, // Priority of the task &t_core1_core, // Task handle to keep track of created task - 0); // Pin task to core 0 + 1); // Pin task to core 1 xTaskCreatePinnedToCore( clock_task, // Task function. diff --git a/src/UI/ui.c b/src/UI/ui.c index 37b5a7794..e1d82c5c8 100644 --- a/src/UI/ui.c +++ b/src/UI/ui.c @@ -24,32 +24,9 @@ lv_obj_t * ui_AutoLight; lv_obj_t * ui____initial_actions0; lv_obj_t * ui_DimOverlay; -lv_obj_t * ui_TabPageWeather; -lv_obj_t * ui_Container1; -lv_obj_t * ui_Label1; -lv_obj_t * ui_ValueTemperature; -lv_obj_t * ui_Panel1; -lv_obj_t * ui_Label3; -lv_obj_t * ui_ValueFeelsLike; -lv_obj_t * ui_Panel4; -lv_obj_t * ui_Label4; -lv_obj_t * ui_ValueSunrise; -lv_obj_t * ui_Label5; -lv_obj_t * ui_ValueSunset; -lv_obj_t * ui_Container2; -lv_obj_t * ui_Humidity; -lv_obj_t * ui_ValueHumidity; -lv_obj_t * ui_Panel3; -lv_obj_t * ui_Pressure; -lv_obj_t * ui_ValuePressure; -lv_obj_t * ui_Panel2; -lv_obj_t * ui_Label2; -lv_obj_t * ui_ValueWindSpeed; -lv_obj_t * ui_ValueWindDirection; -lv_obj_t * ui_Image1; +lv_obj_t * ui_TabPageHome; lv_obj_t * ui_ValueDate; lv_obj_t * ui_ValueTime; -lv_obj_t * ui_ValueLastUpdate; lv_obj_t * ui_TabPageSettings; lv_obj_t * ui_DayLight; lv_obj_t * ui____initial_actions0; diff --git a/src/UI/ui.h b/src/UI/ui.h index f95cd60bd..37192c831 100644 --- a/src/UI/ui.h +++ b/src/UI/ui.h @@ -42,34 +42,10 @@ void ui_event_AutoLight(lv_event_t * e); extern lv_obj_t * ui_AutoLight; extern lv_obj_t * ui____initial_actions0; - extern lv_obj_t * ui_DimOverlay; -extern lv_obj_t * ui_TabPageWeather; -extern lv_obj_t * ui_Container1; -extern lv_obj_t * ui_Label1; -extern lv_obj_t * ui_ValueTemperature; -extern lv_obj_t * ui_Panel1; -extern lv_obj_t * ui_Label3; -extern lv_obj_t * ui_ValueFeelsLike; -extern lv_obj_t * ui_Panel4; -extern lv_obj_t * ui_Label4; -extern lv_obj_t * ui_ValueSunrise; -extern lv_obj_t * ui_Label5; -extern lv_obj_t * ui_ValueSunset; -extern lv_obj_t * ui_Container2; -extern lv_obj_t * ui_Humidity; -extern lv_obj_t * ui_ValueHumidity; -extern lv_obj_t * ui_Panel3; -extern lv_obj_t * ui_Pressure; -extern lv_obj_t * ui_ValuePressure; -extern lv_obj_t * ui_Panel2; -extern lv_obj_t * ui_Label2; -extern lv_obj_t * ui_ValueWindSpeed; -extern lv_obj_t * ui_ValueWindDirection; -extern lv_obj_t * ui_Image1; +extern lv_obj_t * ui_TabPageHome; extern lv_obj_t * ui_ValueDate; extern lv_obj_t * ui_ValueTime; -extern lv_obj_t * ui_ValueLastUpdate; extern lv_obj_t * ui_TabPageSettings; extern lv_obj_t * ui_DayLight; diff --git a/src/UI/ui_Screen1.c b/src/UI/ui_Screen1.c index 4702474f5..e934d7c63 100644 --- a/src/UI/ui_Screen1.c +++ b/src/UI/ui_Screen1.c @@ -57,247 +57,12 @@ void ui_Screen1_screen_init(void) LV_PART_ITEMS | LV_STATE_DEFAULT); #if defined(LANG_EN) - ui_TabPageWeather = lv_tabview_add_tab(ui_TabView1, "Weather"); + ui_TabPageHome = lv_tabview_add_tab(ui_TabView1, "Home"); #elif defined(LANG_GR) - ui_TabPageWeather = lv_tabview_add_tab(ui_TabView1, "Καιρός"); + ui_TabPageHome = lv_tabview_add_tab(ui_TabView1, "Αρχική"); #endif - ui_Container1 = lv_obj_create(ui_TabPageWeather); - lv_obj_remove_style_all(ui_Container1); - lv_obj_set_width(ui_Container1, 200); - lv_obj_set_height(ui_Container1, 390); - lv_obj_set_x(ui_Container1, -284); - lv_obj_set_y(ui_Container1, 0); - lv_obj_set_align(ui_Container1, LV_ALIGN_CENTER); - lv_obj_set_flex_flow(ui_Container1, LV_FLEX_FLOW_COLUMN); - lv_obj_set_flex_align(ui_Container1, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER); - lv_obj_clear_flag(ui_Container1, LV_OBJ_FLAG_CLICKABLE | LV_OBJ_FLAG_SCROLLABLE); /// Flags - lv_obj_set_style_pad_row(ui_Container1, 15, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_pad_column(ui_Container1, 0, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_Label1 = lv_label_create(ui_Container1); - lv_obj_set_width(ui_Label1, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_Label1, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_Label1, LV_ALIGN_CENTER); - #if defined(LANG_EN) - lv_label_set_text(ui_Label1, "Temperature"); - #elif defined(LANG_GR) - lv_label_set_text(ui_Label1, "Θερμοκρασία"); - #endif - lv_obj_set_style_text_color(ui_Label1, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_Label1, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_Label1, &lv_font_arial_26, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_ValueTemperature = lv_label_create(ui_Container1); - lv_obj_set_width(ui_ValueTemperature, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_ValueTemperature, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_ValueTemperature, LV_ALIGN_CENTER); - lv_label_set_text(ui_ValueTemperature, "--.- °C"); - lv_obj_set_style_text_color(ui_ValueTemperature, lv_color_hex(0x17ABF7), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_ValueTemperature, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_ValueTemperature, &lv_font_arial_48, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_Panel1 = lv_obj_create(ui_Container1); - lv_obj_set_height(ui_Panel1, 1); - lv_obj_set_width(ui_Panel1, lv_pct(90)); - lv_obj_set_x(ui_Panel1, 0); - lv_obj_set_y(ui_Panel1, -8); - lv_obj_set_align(ui_Panel1, LV_ALIGN_CENTER); - lv_obj_clear_flag(ui_Panel1, LV_OBJ_FLAG_SCROLLABLE); /// Flags - - ui_Label3 = lv_label_create(ui_Container1); - lv_obj_set_width(ui_Label3, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_Label3, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_Label3, LV_ALIGN_CENTER); - #if defined(LANG_EN) - lv_label_set_text(ui_Label3, "Feels like"); - #elif defined(LANG_GR) - lv_label_set_text(ui_Label3, "Αισθητή"); - #endif - lv_obj_set_style_text_color(ui_Label3, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_Label3, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_Label3, &lv_font_arial_26, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_ValueFeelsLike = lv_label_create(ui_Container1); - lv_obj_set_width(ui_ValueFeelsLike, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_ValueFeelsLike, LV_SIZE_CONTENT); /// 1 - lv_obj_set_x(ui_ValueFeelsLike, -2); - lv_obj_set_y(ui_ValueFeelsLike, 57); - lv_obj_set_align(ui_ValueFeelsLike, LV_ALIGN_CENTER); - lv_label_set_text(ui_ValueFeelsLike, "--.- °C"); - lv_obj_set_style_text_color(ui_ValueFeelsLike, lv_color_hex(0x17ABF7), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_ValueFeelsLike, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_ValueFeelsLike, &lv_font_arial_48, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_Panel4 = lv_obj_create(ui_Container1); - lv_obj_set_height(ui_Panel4, 1); - lv_obj_set_width(ui_Panel4, lv_pct(90)); - lv_obj_set_x(ui_Panel4, 0); - lv_obj_set_y(ui_Panel4, -8); - lv_obj_set_align(ui_Panel4, LV_ALIGN_CENTER); - lv_obj_clear_flag(ui_Panel4, LV_OBJ_FLAG_SCROLLABLE); /// Flags - - ui_Label4 = lv_label_create(ui_Container1); - lv_obj_set_width(ui_Label4, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_Label4, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_Label4, LV_ALIGN_CENTER); - #if defined(LANG_EN) - lv_label_set_text(ui_Label4, "Sunrise"); - #elif defined(LANG_GR) - lv_label_set_text(ui_Label4, "Ανατολή"); - #endif - lv_obj_set_style_text_color(ui_Label4, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_Label4, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_Label4, &lv_font_arial_24, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_ValueSunrise = lv_label_create(ui_Container1); - lv_obj_set_width(ui_ValueSunrise, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_ValueSunrise, LV_SIZE_CONTENT); /// 1 - lv_obj_set_x(ui_ValueSunrise, 14); - lv_obj_set_y(ui_ValueSunrise, 205); - lv_obj_set_align(ui_ValueSunrise, LV_ALIGN_CENTER); - lv_label_set_text(ui_ValueSunrise, "--:--"); - lv_obj_set_style_text_color(ui_ValueSunrise, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_ValueSunrise, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_ValueSunrise, &lv_font_arial_20, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_Label5 = lv_label_create(ui_Container1); - lv_obj_set_width(ui_Label5, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_Label5, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_Label5, LV_ALIGN_CENTER); - #if defined(LANG_EN) - lv_label_set_text(ui_Label5, "Sunset"); - #elif defined(LANG_GR) - lv_label_set_text(ui_Label5, "Δύση"); - #endif - lv_obj_set_style_text_color(ui_Label5, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_Label5, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_Label5, &lv_font_arial_24, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_ValueSunset = lv_label_create(ui_Container1); - lv_obj_set_width(ui_ValueSunset, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_ValueSunset, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_ValueSunset, LV_ALIGN_CENTER); - lv_label_set_text(ui_ValueSunset, "--:--"); - lv_obj_set_style_text_color(ui_ValueSunset, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_ValueSunset, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_ValueSunset, &lv_font_arial_20, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_Container2 = lv_obj_create(ui_TabPageWeather); - lv_obj_remove_style_all(ui_Container2); - lv_obj_set_width(ui_Container2, 200); - lv_obj_set_height(ui_Container2, 390); - lv_obj_set_x(ui_Container2, 280); - lv_obj_set_y(ui_Container2, 0); - lv_obj_set_align(ui_Container2, LV_ALIGN_CENTER); - lv_obj_set_flex_flow(ui_Container2, LV_FLEX_FLOW_COLUMN); - lv_obj_set_flex_align(ui_Container2, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER); - lv_obj_clear_flag(ui_Container2, LV_OBJ_FLAG_CLICKABLE | LV_OBJ_FLAG_SCROLLABLE); /// Flags - lv_obj_set_style_pad_row(ui_Container2, 15, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_pad_column(ui_Container2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_Humidity = lv_label_create(ui_Container2); - lv_obj_set_width(ui_Humidity, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_Humidity, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_Humidity, LV_ALIGN_CENTER); - #if defined(LANG_EN) - lv_label_set_text(ui_Humidity, "Humidity"); - #elif defined(LANG_GR) - lv_label_set_text(ui_Humidity, "Υγρασία"); - #endif - lv_obj_set_style_text_color(ui_Humidity, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_Humidity, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_Humidity, &lv_font_arial_26, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_ValueHumidity = lv_label_create(ui_Container2); - lv_obj_set_width(ui_ValueHumidity, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_ValueHumidity, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_ValueHumidity, LV_ALIGN_CENTER); - lv_label_set_text(ui_ValueHumidity, "--%"); - lv_obj_set_style_text_color(ui_ValueHumidity, lv_color_hex(0x17ABF7), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_ValueHumidity, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_ValueHumidity, &lv_font_arial_48, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_Panel3 = lv_obj_create(ui_Container2); - lv_obj_set_height(ui_Panel3, 1); - lv_obj_set_width(ui_Panel3, lv_pct(90)); - lv_obj_set_align(ui_Panel3, LV_ALIGN_CENTER); - lv_obj_clear_flag(ui_Panel3, LV_OBJ_FLAG_SCROLLABLE); /// Flags - - ui_Pressure = lv_label_create(ui_Container2); - lv_obj_set_width(ui_Pressure, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_Pressure, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_Pressure, LV_ALIGN_CENTER); - #if defined(LANG_EN) - lv_label_set_text(ui_Pressure, "Pressure"); - #elif defined(LANG_GR) - lv_label_set_text(ui_Pressure, "Πίεση"); - #endif - lv_obj_set_style_text_color(ui_Pressure, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_Pressure, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_Pressure, &lv_font_arial_26, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_ValuePressure = lv_label_create(ui_Container2); - lv_obj_set_width(ui_ValuePressure, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_ValuePressure, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_ValuePressure, LV_ALIGN_CENTER); - lv_label_set_text(ui_ValuePressure, "---- hpa"); - lv_obj_set_style_text_color(ui_ValuePressure, lv_color_hex(0x17ABF7), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_ValuePressure, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_ValuePressure, &lv_font_arial_40, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_Panel2 = lv_obj_create(ui_Container2); - lv_obj_set_height(ui_Panel2, 1); - lv_obj_set_width(ui_Panel2, lv_pct(90)); - lv_obj_set_align(ui_Panel2, LV_ALIGN_CENTER); - lv_obj_clear_flag(ui_Panel2, LV_OBJ_FLAG_SCROLLABLE); /// Flags - - ui_Label2 = lv_label_create(ui_Container2); - lv_obj_set_width(ui_Label2, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_Label2, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_Label2, LV_ALIGN_CENTER); - - #if defined(LANG_EN) - lv_label_set_text(ui_Label2, "Wind"); - #elif defined(LANG_GR) - lv_label_set_text(ui_Label2, "Άνεμος"); - #endif - lv_obj_set_style_text_color(ui_Label2, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_Label2, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_Label2, &lv_font_arial_26, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_ValueWindSpeed = lv_label_create(ui_Container2); - lv_obj_set_width(ui_ValueWindSpeed, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_ValueWindSpeed, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_ValueWindSpeed, LV_ALIGN_CENTER); - lv_label_set_text(ui_ValueWindSpeed, "-- m/s"); - lv_obj_set_style_text_color(ui_ValueWindSpeed, lv_color_hex(0x17ABF7), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_ValueWindSpeed, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_ValueWindSpeed, &lv_font_arial_48, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_ValueWindDirection = lv_label_create(ui_Container2); - lv_obj_set_width(ui_ValueWindDirection, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_ValueWindDirection, LV_SIZE_CONTENT); /// 1 - lv_obj_set_align(ui_ValueWindDirection, LV_ALIGN_CENTER); - #if defined(LANG_EN) - lv_label_set_text(ui_ValueWindDirection, "Direction: --"); - #elif defined(LANG_GR) - lv_label_set_text(ui_ValueWindDirection, "Κατεύθυνση: --"); - #endif - lv_obj_set_style_text_color(ui_ValueWindDirection, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_ValueWindDirection, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_ValueWindDirection, &lv_font_arial_20, LV_PART_MAIN | LV_STATE_DEFAULT); - - ui_Image1 = lv_img_create(ui_TabPageWeather); - lv_obj_set_width(ui_Image1, LV_SIZE_CONTENT); /// 1 - lv_obj_set_height(ui_Image1, LV_SIZE_CONTENT); /// 1 - lv_obj_set_x(ui_Image1, 0); - lv_obj_set_y(ui_Image1, 14); - lv_obj_set_align(ui_Image1, LV_ALIGN_CENTER); - lv_obj_add_flag(ui_Image1, LV_OBJ_FLAG_ADV_HITTEST); /// Flags - lv_obj_clear_flag(ui_Image1, LV_OBJ_FLAG_SCROLLABLE); /// Flags - - ui_ValueDate = lv_label_create(ui_TabPageWeather); + ui_ValueDate = lv_label_create(ui_TabPageHome); lv_obj_set_width(ui_ValueDate, LV_SIZE_CONTENT); /// 1 lv_obj_set_height(ui_ValueDate, LV_SIZE_CONTENT); /// 1 lv_obj_set_x(ui_ValueDate, 0); @@ -308,7 +73,7 @@ void ui_Screen1_screen_init(void) lv_obj_set_style_text_opa(ui_ValueDate, 255, LV_PART_MAIN | LV_STATE_DEFAULT); lv_obj_set_style_text_font(ui_ValueDate, &lv_font_arial_40, LV_PART_MAIN | LV_STATE_DEFAULT); - ui_ValueTime = lv_label_create(ui_TabPageWeather); + ui_ValueTime = lv_label_create(ui_TabPageHome); lv_obj_set_width(ui_ValueTime, LV_SIZE_CONTENT); /// 1 lv_obj_set_height(ui_ValueTime, LV_SIZE_CONTENT); /// 1 lv_obj_set_x(ui_ValueTime, 0); @@ -319,24 +84,11 @@ void ui_Screen1_screen_init(void) lv_obj_set_style_text_opa(ui_ValueTime, 255, LV_PART_MAIN | LV_STATE_DEFAULT); lv_obj_set_style_text_font(ui_ValueTime, &lv_font_arial_48, LV_PART_MAIN | LV_STATE_DEFAULT); - ui_ValueLastUpdate = lv_label_create(ui_TabPageWeather); - lv_obj_set_width(ui_ValueLastUpdate, LV_SIZE_CONTENT); /// 559 - lv_obj_set_height(ui_ValueLastUpdate, LV_SIZE_CONTENT); /// 24 - lv_obj_set_x(ui_ValueLastUpdate, 0); - lv_obj_set_y(ui_ValueLastUpdate, 179); - lv_obj_set_align(ui_ValueLastUpdate, LV_ALIGN_CENTER); #if defined(LANG_EN) - lv_label_set_text(ui_ValueLastUpdate, "Last update: --/--/----"); - #elif defined(LANG_GR) - lv_label_set_text(ui_ValueLastUpdate, "Ενημερώθηκε στις: --/--/----"); - #endif - lv_obj_set_style_text_color(ui_ValueLastUpdate, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui_ValueLastUpdate, 255, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui_ValueLastUpdate, &lv_font_arial_20, LV_PART_MAIN | LV_STATE_DEFAULT); - - - ui_TabPageContacts = lv_tabview_add_tab(ui_TabView1, "Contacts"); + #elif defined(LANG_GR) + ui_TabPageContacts = lv_tabview_add_tab(ui_TabView1, "Επαφές"); + #endif ui_Contacts = lv_list_create(ui_TabPageContacts); //lv_list_set_options(ui_Contacts, "Contact", LV_list_MODE_NORMAL); @@ -355,7 +107,11 @@ void ui_Screen1_screen_init(void) lv_obj_set_align(ui_ContactMessages, LV_ALIGN_CENTER); lv_obj_set_style_bg_color(ui_ContactMessages, lv_color_hex(0), 0); + #if defined(LANG_EN) ui_TabPageChannels = lv_tabview_add_tab(ui_TabView1, "Channels"); + #elif defined(LANG_GR) + ui_TabPageChannels = lv_tabview_add_tab(ui_TabView1, "Κανάλια"); + #endif ui_Channels = lv_dropdown_create(ui_TabPageChannels); lv_dropdown_set_options(ui_Channels, "Public"); @@ -366,8 +122,6 @@ void ui_Screen1_screen_init(void) lv_obj_set_align(ui_Channels, LV_ALIGN_CENTER); lv_obj_add_flag(ui_Channels, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags - - ui_ChannelMessages = lv_list_create(ui_TabPageChannels); //lv_list_set_options(ui_ChannelMessages, "Contact", LV_list_MODE_NORMAL); lv_obj_set_width(ui_ChannelMessages, 780); @@ -383,8 +137,6 @@ void ui_Screen1_screen_init(void) LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START); - - #if defined(LANG_EN) ui_TabPageSettings = lv_tabview_add_tab(ui_TabView1, "Settings"); #elif defined(LANG_GR)