Merge pull request SHA2017-badge#107 from SHA2017-badge/badge-UXfixes

annejan · web-flow · commit ce7d979b2f98 · 2017-07-23T22:32:24.000+02:00
Launcher UX fixes
diff --git a/esp32/modules/installer.py b/esp32/modules/installer.py
@@ -14,7 +14,7 @@
 ugfx.string(140,75, "WiFi","PermanentMarker22",ugfx.WHITE)
 ugfx.flush()
 
-timeout = 500
+timeout = 250
 while not wifi.sta_if.isconnected():
     time.sleep(0.1)
     timeout = timeout - 1
diff --git a/esp32/modules/launcher.py b/esp32/modules/launcher.py
@@ -14,22 +14,29 @@
 ugfx.clear(ugfx.WHITE)
 ugfx.flush()
 
-ugfx.string_box(148,22,148,26, "STILL", "Roboto_BlackItalic24", ugfx.BLACK, ugfx.justifyCenter)
-ugfx.string_box(148,45,148,23, "Hacking", "PermanentMarker22", ugfx.BLACK, ugfx.justifyCenter)
-ugfx.string_box(148,70,148,26, "Anyway", "Roboto_BlackItalic24", ugfx.BLACK, ugfx.justifyCenter)
+ugfx.string_box(148,0,148,26, "STILL", "Roboto_BlackItalic24", ugfx.BLACK, ugfx.justifyCenter)
+ugfx.string_box(148,23,148,23, "Hacking", "PermanentMarker22", ugfx.BLACK, ugfx.justifyCenter)
+ugfx.string_box(148,48,148,26, "Anyway", "Roboto_BlackItalic24", ugfx.BLACK, ugfx.justifyCenter)
 
 #the line under the text
 str_len = ugfx.get_string_width("Hacking","PermanentMarker22")
 line_begin = 148 + int((148-str_len)/2)
 line_end = str_len+line_begin
-ugfx.line(line_begin, 68, line_end, 68, ugfx.BLACK)
+ugfx.line(line_begin, 46, line_end, 46, ugfx.BLACK)
 
 #the cursor past the text
 cursor_pos = line_end+5
-ugfx.line(cursor_pos, 46, cursor_pos, 66, ugfx.BLACK)
+ugfx.line(cursor_pos, 22, cursor_pos, 44, ugfx.BLACK)
 
-ugfx.string_box(148,110,148,18, version.name,"Roboto_Regular12",ugfx.BLACK, ugfx.justifyLeft)
-ugfx.flush()
+# Instructions
+ugfx.line(148, 78, 296, 78, ugfx.BLACK)
+ugfx.string_box(148,78,148,18, " A: Run", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft)
+ugfx.string_box(148,78,148,18, " B: Uninstall", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyRight)
+ugfx.string_box(148,92,148,18, " START: Return to home", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft)
+ugfx.line(148, 110, 296, 110, ugfx.BLACK)
+ugfx.string_box(148,110,148,18, " " + version.name, "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft)
+
+# ugfx.flush()
 options = None
 install_path = None
 
@@ -107,6 +114,8 @@ def perform_uninstall(ok):
 ugfx.input_attach(ugfx.JOY_UP, lambda pushed: ugfx.flush() if pushed else 0)
 ugfx.input_attach(ugfx.JOY_DOWN, lambda pushed: ugfx.flush() if pushed else 0)
 
+ugfx.input_attach(ugfx.BTN_START, lambda pushed: appglue.start_app("") if pushed else 0)
+
 ugfx.set_lut(ugfx.LUT_FULL)
 ugfx.flush()
 ugfx.set_lut(ugfx.LUT_FASTER)
