Skip to content

Commit 303b01b

Browse files
lboueLzw655
authored andcommitted
fix(examples): fix WiFiClock wrong name ScreenPassord by @lboue (#82)
closes #83
1 parent 9436426 commit 303b01b

File tree

7 files changed

+20
-19
lines changed

7 files changed

+20
-19
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
* fix(examples): fix `LVGL_PORT_ROTATION_DEGREE` issue by @lboue (#76)
88
* fix(examples): fix issue with I2C.ino EXAMPLE_TOUCH_ADDRESS missing as variable by @lboue (#84)
9+
* fix(examples): fix WiFiClock wrong name `ScreenPassord` by @lboue (#82)
910
* fix(gt911): allow to set the GT911 touch device address by @lboue (#86)
1011

1112
## v0.1.5 - 2024-07-09

examples/SquareLine/v8/WiFiClock/WiFiClock.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ void handleWifiListItemClick(lv_event_t * e)
512512
if (selected_wifi_name != NULL) {
513513
Serial.printf("%s\n", selected_wifi_name);
514514
}
515-
_ui_screen_change(&ui_ScreenPassord, LV_SCR_LOAD_ANIM_NONE, 0, 0, &ui_ScreenPassord_screen_init);
515+
_ui_screen_change(&ui_ScreenPassword, LV_SCR_LOAD_ANIM_NONE, 0, 0, &ui_ScreenPassword_screen_init);
516516
lvgl_port_unlock();
517517
}
518518
}

examples/SquareLine/v8/WiFiClock/libraries/ui/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SET(SOURCES screens/ui_ScreenClock.c
22
screens/ui_ScreenSet.c
33
screens/ui_ScreenWifiList.c
4-
screens/ui_ScreenPassord.c
4+
screens/ui_ScreenPassword.c
55
screens/ui_ScreenAla.c
66
ui.c
77
components/ui_comp_hook.c

examples/SquareLine/v8/WiFiClock/libraries/ui/src/filelist.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
screens/ui_ScreenClock.c
22
screens/ui_ScreenSet.c
33
screens/ui_ScreenWifiList.c
4-
screens/ui_ScreenPassord.c
4+
screens/ui_ScreenPassword.c
55
screens/ui_ScreenAla.c
66
ui.c
77
components/ui_comp_hook.c

examples/SquareLine/v8/WiFiClock/libraries/ui/src/screens/ui_ScreenPassord.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
#include "../ui.h"
77

8-
void ui_ScreenPassord_screen_init(void)
8+
void ui_ScreenPassword_screen_init(void)
99
{
10-
ui_ScreenPassord = lv_obj_create(NULL);
11-
lv_obj_clear_flag( ui_ScreenPassord, LV_OBJ_FLAG_SCROLLABLE ); /// Flags
12-
lv_obj_set_style_bg_color(ui_ScreenPassord, lv_color_hex(0x112D4E), LV_PART_MAIN | LV_STATE_DEFAULT );
13-
lv_obj_set_style_bg_opa(ui_ScreenPassord, 255, LV_PART_MAIN| LV_STATE_DEFAULT);
10+
ui_ScreenPassword = lv_obj_create(NULL);
11+
lv_obj_clear_flag( ui_ScreenPassword, LV_OBJ_FLAG_SCROLLABLE ); /// Flags
12+
lv_obj_set_style_bg_color(ui_ScreenPassword, lv_color_hex(0x112D4E), LV_PART_MAIN | LV_STATE_DEFAULT );
13+
lv_obj_set_style_bg_opa(ui_ScreenPassword, 255, LV_PART_MAIN| LV_STATE_DEFAULT);
1414

15-
ui_TextPassword = lv_textarea_create(ui_ScreenPassord);
15+
ui_TextPassword = lv_textarea_create(ui_ScreenPassword);
1616
lv_obj_set_width( ui_TextPassword, 283);
1717
lv_obj_set_height( ui_TextPassword, 42);
1818
lv_obj_set_x( ui_TextPassword, -1 );
@@ -22,7 +22,7 @@ lv_textarea_set_placeholder_text(ui_TextPassword,"Please enter Wifi password");
2222
lv_obj_set_style_bg_color(ui_TextPassword, lv_color_hex(0xDBE2EF), LV_PART_MAIN | LV_STATE_DEFAULT );
2323
lv_obj_set_style_bg_opa(ui_TextPassword, 255, LV_PART_MAIN| LV_STATE_DEFAULT);
2424

25-
ui_KeyboardPassword = lv_keyboard_create(ui_ScreenPassord);
25+
ui_KeyboardPassword = lv_keyboard_create(ui_ScreenPassword);
2626
lv_obj_set_width( ui_KeyboardPassword, 300);
2727
lv_obj_set_height( ui_KeyboardPassword, 120);
2828
lv_obj_set_x( ui_KeyboardPassword, 0 );
@@ -31,7 +31,7 @@ lv_obj_set_align( ui_KeyboardPassword, LV_ALIGN_CENTER );
3131
lv_obj_set_style_bg_color(ui_KeyboardPassword, lv_color_hex(0xDBE2EF), LV_PART_MAIN | LV_STATE_DEFAULT );
3232
lv_obj_set_style_bg_opa(ui_KeyboardPassword, 255, LV_PART_MAIN| LV_STATE_DEFAULT);
3333

34-
ui_ButtonRetWifi = lv_btn_create(ui_ScreenPassord);
34+
ui_ButtonRetWifi = lv_btn_create(ui_ScreenPassword);
3535
lv_obj_set_width( ui_ButtonRetWifi, 30);
3636
lv_obj_set_height( ui_ButtonRetWifi, 26);
3737
lv_obj_set_x( ui_ButtonRetWifi, -138 );
@@ -55,7 +55,7 @@ lv_img_set_zoom(ui_ImageRetWifi,30);
5555
lv_obj_set_style_img_recolor(ui_ImageRetWifi, lv_color_hex(0xDBE2EF), LV_PART_MAIN| LV_STATE_DEFAULT);
5656
lv_obj_set_style_img_recolor_opa(ui_ImageRetWifi, 255, LV_PART_MAIN| LV_STATE_DEFAULT);
5757

58-
ui_SpinnerLoadPassword = lv_spinner_create(ui_ScreenPassord,1000,90);
58+
ui_SpinnerLoadPassword = lv_spinner_create(ui_ScreenPassword,1000,90);
5959
lv_obj_set_width( ui_SpinnerLoadPassword, 80);
6060
lv_obj_set_height( ui_SpinnerLoadPassword, 80);
6161
lv_obj_set_align( ui_SpinnerLoadPassword, LV_ALIGN_CENTER );

examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ lv_obj_t *ui_LabelWifiList;
5858
lv_obj_t *ui_SpinnerLoadWifi;
5959

6060

61-
// SCREEN: ui_ScreenPassord
62-
void ui_ScreenPassord_screen_init(void);
63-
lv_obj_t *ui_ScreenPassord;
61+
// SCREEN: ui_ScreenPassword
62+
void ui_ScreenPassword_screen_init(void);
63+
lv_obj_t *ui_ScreenPassword;
6464
lv_obj_t *ui_TextPassword;
6565
void ui_event_KeyboardPassword( lv_event_t * e);
6666
lv_obj_t *ui_KeyboardPassword;
@@ -181,7 +181,7 @@ lv_disp_set_theme(dispp, theme);
181181
ui_ScreenClock_screen_init();
182182
ui_ScreenSet_screen_init();
183183
ui_ScreenWifiList_screen_init();
184-
ui_ScreenPassord_screen_init();
184+
ui_ScreenPassword_screen_init();
185185
ui_ScreenAla_screen_init();
186186
ui____initial_actions0 = lv_obj_create(NULL);
187187
lv_disp_load_scr( ui_ScreenClock);

examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ extern lv_obj_t *ui_ButtonRetSet;
6666
extern lv_obj_t *ui_ImageRetSet;
6767
extern lv_obj_t *ui_LabelWifiList;
6868
extern lv_obj_t *ui_SpinnerLoadWifi;
69-
// SCREEN: ui_ScreenPassord
70-
void ui_ScreenPassord_screen_init(void);
71-
extern lv_obj_t *ui_ScreenPassord;
69+
// SCREEN: ui_ScreenPassword
70+
void ui_ScreenPassword_screen_init(void);
71+
extern lv_obj_t *ui_ScreenPassword;
7272
extern lv_obj_t *ui_TextPassword;
7373
void ui_event_KeyboardPassword( lv_event_t * e);
7474
extern lv_obj_t *ui_KeyboardPassword;

0 commit comments

Comments
 (0)