Skip to content

Rename 'ScreenPassord'to 'ScreenPassword' #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Rename 'ScreenPassord'to 'ScreenPassword' #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c6ba09
Update ui_ScreenPassord.c
lboue Jul 25, 2024
0366c5b
Update ui.h
lboue Jul 25, 2024
cbd5ea9
Update filelist.txt
lboue Jul 25, 2024
0fc8fd9
Update CMakeLists.txt
lboue Jul 25, 2024
9cf50b5
Update ui.c
lboue Jul 25, 2024
5313e1a
Update WiFiClock.ino
lboue Jul 25, 2024
d320145
Update ESP_PanelVersions.h
lboue Jul 25, 2024
31fa1a8
Update library.properties
lboue Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/SquareLine/v8/WiFiClock/WiFiClock.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ void handleWifiListItemClick(lv_event_t * e)
if (selected_wifi_name != NULL) {
Serial.printf("%s\n", selected_wifi_name);
}
_ui_screen_change(&ui_ScreenPassord, LV_SCR_LOAD_ANIM_NONE, 0, 0, &ui_ScreenPassord_screen_init);
_ui_screen_change(&ui_ScreenPassword, LV_SCR_LOAD_ANIM_NONE, 0, 0, &ui_ScreenPassword_screen_init);
lvgl_port_unlock();
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/SquareLine/v8/WiFiClock/libraries/ui/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SET(SOURCES screens/ui_ScreenClock.c
screens/ui_ScreenSet.c
screens/ui_ScreenWifiList.c
screens/ui_ScreenPassord.c
screens/ui_ScreenPassword.c
screens/ui_ScreenAla.c
ui.c
components/ui_comp_hook.c
Expand Down
2 changes: 1 addition & 1 deletion examples/SquareLine/v8/WiFiClock/libraries/ui/src/filelist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
screens/ui_ScreenClock.c
screens/ui_ScreenSet.c
screens/ui_ScreenWifiList.c
screens/ui_ScreenPassord.c
screens/ui_ScreenPassword.c
screens/ui_ScreenAla.c
ui.c
components/ui_comp_hook.c
Expand Down
18 changes: 9 additions & 9 deletions examples/SquareLine/v8/WiFiClock/libraries/ui/src/screens/ui_ScreenPassord.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

#include "../ui.h"

void ui_ScreenPassord_screen_init(void)
void ui_ScreenPassword_screen_init(void)
{
ui_ScreenPassord = lv_obj_create(NULL);
lv_obj_clear_flag( ui_ScreenPassord, LV_OBJ_FLAG_SCROLLABLE ); /// Flags
lv_obj_set_style_bg_color(ui_ScreenPassord, lv_color_hex(0x112D4E), LV_PART_MAIN | LV_STATE_DEFAULT );
lv_obj_set_style_bg_opa(ui_ScreenPassord, 255, LV_PART_MAIN| LV_STATE_DEFAULT);
ui_ScreenPassword = lv_obj_create(NULL);
lv_obj_clear_flag( ui_ScreenPassword, LV_OBJ_FLAG_SCROLLABLE ); /// Flags
lv_obj_set_style_bg_color(ui_ScreenPassword, lv_color_hex(0x112D4E), LV_PART_MAIN | LV_STATE_DEFAULT );
lv_obj_set_style_bg_opa(ui_ScreenPassword, 255, LV_PART_MAIN| LV_STATE_DEFAULT);

ui_TextPassword = lv_textarea_create(ui_ScreenPassord);
ui_TextPassword = lv_textarea_create(ui_ScreenPassword);
lv_obj_set_width( ui_TextPassword, 283);
lv_obj_set_height( ui_TextPassword, 42);
lv_obj_set_x( ui_TextPassword, -1 );
Expand All @@ -22,7 +22,7 @@ lv_textarea_set_placeholder_text(ui_TextPassword,"Please enter Wifi password");
lv_obj_set_style_bg_color(ui_TextPassword, lv_color_hex(0xDBE2EF), LV_PART_MAIN | LV_STATE_DEFAULT );
lv_obj_set_style_bg_opa(ui_TextPassword, 255, LV_PART_MAIN| LV_STATE_DEFAULT);

ui_KeyboardPassword = lv_keyboard_create(ui_ScreenPassord);
ui_KeyboardPassword = lv_keyboard_create(ui_ScreenPassword);
lv_obj_set_width( ui_KeyboardPassword, 300);
lv_obj_set_height( ui_KeyboardPassword, 120);
lv_obj_set_x( ui_KeyboardPassword, 0 );
Expand All @@ -31,7 +31,7 @@ lv_obj_set_align( ui_KeyboardPassword, LV_ALIGN_CENTER );
lv_obj_set_style_bg_color(ui_KeyboardPassword, lv_color_hex(0xDBE2EF), LV_PART_MAIN | LV_STATE_DEFAULT );
lv_obj_set_style_bg_opa(ui_KeyboardPassword, 255, LV_PART_MAIN| LV_STATE_DEFAULT);

ui_ButtonRetWifi = lv_btn_create(ui_ScreenPassord);
ui_ButtonRetWifi = lv_btn_create(ui_ScreenPassword);
lv_obj_set_width( ui_ButtonRetWifi, 30);
lv_obj_set_height( ui_ButtonRetWifi, 26);
lv_obj_set_x( ui_ButtonRetWifi, -138 );
Expand All @@ -55,7 +55,7 @@ lv_img_set_zoom(ui_ImageRetWifi,30);
lv_obj_set_style_img_recolor(ui_ImageRetWifi, lv_color_hex(0xDBE2EF), LV_PART_MAIN| LV_STATE_DEFAULT);
lv_obj_set_style_img_recolor_opa(ui_ImageRetWifi, 255, LV_PART_MAIN| LV_STATE_DEFAULT);

ui_SpinnerLoadPassword = lv_spinner_create(ui_ScreenPassord,1000,90);
ui_SpinnerLoadPassword = lv_spinner_create(ui_ScreenPassword,1000,90);
lv_obj_set_width( ui_SpinnerLoadPassword, 80);
lv_obj_set_height( ui_SpinnerLoadPassword, 80);
lv_obj_set_align( ui_SpinnerLoadPassword, LV_ALIGN_CENTER );
Expand Down
8 changes: 4 additions & 4 deletions examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ lv_obj_t *ui_LabelWifiList;
lv_obj_t *ui_SpinnerLoadWifi;


// SCREEN: ui_ScreenPassord
void ui_ScreenPassord_screen_init(void);
lv_obj_t *ui_ScreenPassord;
// SCREEN: ui_ScreenPassword
void ui_ScreenPassword_screen_init(void);
lv_obj_t *ui_ScreenPassword;
lv_obj_t *ui_TextPassword;
void ui_event_KeyboardPassword( lv_event_t * e);
lv_obj_t *ui_KeyboardPassword;
Expand Down Expand Up @@ -181,7 +181,7 @@ lv_disp_set_theme(dispp, theme);
ui_ScreenClock_screen_init();
ui_ScreenSet_screen_init();
ui_ScreenWifiList_screen_init();
ui_ScreenPassord_screen_init();
ui_ScreenPassword_screen_init();
ui_ScreenAla_screen_init();
ui____initial_actions0 = lv_obj_create(NULL);
lv_disp_load_scr( ui_ScreenClock);
Expand Down
6 changes: 3 additions & 3 deletions examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ extern lv_obj_t *ui_ButtonRetSet;
extern lv_obj_t *ui_ImageRetSet;
extern lv_obj_t *ui_LabelWifiList;
extern lv_obj_t *ui_SpinnerLoadWifi;
// SCREEN: ui_ScreenPassord
void ui_ScreenPassord_screen_init(void);
extern lv_obj_t *ui_ScreenPassord;
// SCREEN: ui_ScreenPassword
void ui_ScreenPassword_screen_init(void);
extern lv_obj_t *ui_ScreenPassword;
extern lv_obj_t *ui_TextPassword;
void ui_event_KeyboardPassword( lv_event_t * e);
extern lv_obj_t *ui_KeyboardPassword;
Expand Down
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP32_Display_Panel
version=0.1.5
version=0.1.6
author=espressif
maintainer=espressif
sentence=ESP32_Display_Panel is an Arduino library designed for ESP SoCs to drive display panels and facilitate rapid GUI development.
Expand Down
2 changes: 1 addition & 1 deletion src/ESP_PanelVersions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/* Library Version */
#define ESP_PANEL_VERSION_MAJOR 0
#define ESP_PANEL_VERSION_MINOR 1
#define ESP_PANEL_VERSION_PATCH 5
#define ESP_PANEL_VERSION_PATCH 6

/* File `ESP_Panel_Conf.h` */
#define ESP_PANEL_CONF_VERSION_MAJOR 0
Expand Down
Loading