Skip to content

Commit 7fb398c

Browse files
ThomasFarstrikeThomasFarstrike
committed
Wifi app: cleanup styling
1 parent 9c65ed8 commit 7fb398c

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- AppStore app: eliminate all thread by using TaskManager
66
- AppStore app: add support for BadgeHub backend
77
- OSUpdate app: show download speed
8+
- WiFi app: new "Add network" functionality for out-of-range or hidden networks
89
- API: add TaskManager that wraps asyncio
910
- API: add DownloadManager that uses TaskManager
1011
- API: use aiorepl to eliminate another thread

‎internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/wifi.py‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import ujson
21
import os
32
import time
43
import lvgl as lv
@@ -8,8 +7,6 @@
87
from mpos.ui.keyboard import MposKeyboard
98

109
import mpos.config
11-
import mpos.ui.anim
12-
import mpos.ui.theme
1310
from mpos.net.wifi_service import WifiService
1411

1512
have_network = True
@@ -236,53 +233,44 @@ class PasswordPage(Activity):
236233

237234
def onCreate(self):
238235
password_page=lv.obj()
236+
password_page.set_style_pad_all(0, lv.PART.MAIN)
239237
password_page.set_flex_flow(lv.FLEX_FLOW.COLUMN)
240-
#password_page.set_style_pad_all(5, 5)
241238
self.selected_ssid = self.getIntent().extras.get("selected_ssid")
242239
# SSID:
243240
if self.selected_ssid is None:
244241
print("No ssid selected, the user should fill it out.")
245242
label=lv.label(password_page)
246243
label.set_text(f"Network name:")
247-
label.align(lv.ALIGN.TOP_LEFT, 0, 5)
248244
self.ssid_ta=lv.textarea(password_page)
249-
self.ssid_ta.set_width(lv.pct(100))
245+
self.ssid_ta.set_width(lv.pct(90))
246+
self.ssid_ta.set_style_margin_left(5, lv.PART.MAIN)
250247
self.ssid_ta.set_one_line(True)
251248
self.ssid_ta.set_placeholder_text("Enter the SSID")
252-
#self.ssid_ta.align_to(label, lv.ALIGN.OUT_BOTTOM_LEFT, 5, 5) # leave 5 margin for focus border
253249
self.keyboard=MposKeyboard(password_page)
254-
#self.keyboard.align_to(self.ssid_ta, lv.ALIGN.OUT_BOTTOM_LEFT, -5, 5) # reset margin for focus border
255-
self.keyboard.align(lv.ALIGN.BOTTOM_MID, 0, 0)
256250
self.keyboard.set_textarea(self.ssid_ta)
257251
self.keyboard.add_flag(lv.obj.FLAG.HIDDEN)
258252

259253
# Password:
260254
label=lv.label(password_page)
261255
if self.selected_ssid is None:
262256
label.set_text("Password:")
263-
#label.align_to(self.ssid_ta, lv.ALIGN.OUT_BOTTOM_LEFT, -5, 5) # reset margin for focus border
264257
else:
265258
label.set_text(f"Password for '{self.selected_ssid}':")
266-
#label.align(lv.ALIGN.TOP_LEFT, 0, 4)
267259
self.password_ta=lv.textarea(password_page)
268-
self.password_ta.set_width(lv.pct(100))
260+
self.password_ta.set_width(lv.pct(90))
261+
self.password_ta.set_style_margin_left(5, lv.PART.MAIN)
269262
self.password_ta.set_one_line(True)
270-
#self.password_ta.align_to(label, lv.ALIGN.OUT_BOTTOM_LEFT, 5, 5) # leave 5 margin for focus border
271263
pwd = self.findSavedPassword(self.selected_ssid)
272264
if pwd:
273265
self.password_ta.set_text(pwd)
274266
self.password_ta.set_placeholder_text("Password")
275267
self.keyboard=MposKeyboard(password_page)
276-
#self.keyboard.align_to(self.password_ta, lv.ALIGN.OUT_BOTTOM_LEFT, -5, 5) # reset margin for focus border
277-
self.keyboard.align(lv.ALIGN.BOTTOM_MID, 0, 0)
278268
self.keyboard.set_textarea(self.password_ta)
279269
self.keyboard.add_flag(lv.obj.FLAG.HIDDEN)
280270
buttons = lv.obj(password_page)
281-
#buttons.set_flex_flow(lv.FLEX_FLOW.ROW)
282271
# Connect button
283272
self.connect_button = lv.button(buttons)
284273
self.connect_button.set_size(100,40)
285-
#self.connect_button.align(lv.ALIGN.left,10,-40)
286274
self.connect_button.align(lv.ALIGN.LEFT_MID, 0, 0)
287275
self.connect_button.add_event_cb(self.connect_cb,lv.EVENT.CLICKED,None)
288276
label=lv.label(self.connect_button)
@@ -291,16 +279,15 @@ def onCreate(self):
291279
# Close button
292280
self.cancel_button=lv.button(buttons)
293281
self.cancel_button.set_size(100,40)
294-
#self.cancel_button.align(lv.ALIGN.BOTTOM_RIGHT,-10,-40)
295282
self.cancel_button.align(lv.ALIGN.RIGHT_MID, 0, 0)
296283
self.cancel_button.add_event_cb(self.cancel_cb,lv.EVENT.CLICKED,None)
297284
label=lv.label(self.cancel_button)
298285
label.set_text("Close")
299286
label.center()
300287
buttons.set_width(lv.pct(100))
301288
buttons.set_height(lv.SIZE_CONTENT)
302-
buttons.set_style_pad_all(5, 5)
303289
buttons.set_style_bg_opa(lv.OPA.TRANSP, 0)
290+
buttons.set_style_border_width(0, lv.PART.MAIN)
304291
self.setContentView(password_page)
305292

306293
def connect_cb(self, event):

0 commit comments

Comments
 (0)