Dialogs: async API for text prompt

raboof · raboof · commit d972db1c6435 · 2017-07-17T23:37:01.000+02:00
So you can use the keyboard from a callback, too :)
diff --git a/esp32/modules/dialogs.py b/esp32/modules/dialogs.py
@@ -64,10 +64,11 @@ def done(value):
 	if button_pushed == "B": return done(False)
 	if button_pushed == "A": return done(True)
 
-def prompt_text(description, init_text = "", true_text="OK", false_text="Back", width = 300, height = 200, font="Roboto_BlackItalic24"):
+def prompt_text(description, init_text = "", true_text="OK", false_text="Back", width = 300, height = 200, font="Roboto_BlackItalic24", cb=None):
 	"""Shows a dialog and keyboard that allows the user to input/change a string
 
-	Returns None if user aborts with button B
+	Calls the 'cb' callback or return None if user aborts with button B. Using a callback is highly recommended as it's not
+	possible to process events inside an event callback.
 
 	The caller is responsible for flushing the display after processing the response.
 	"""
@@ -86,13 +87,33 @@ def prompt_text(description, init_text = "", true_text="OK", false_text="Back",
 	ugfx.set_default_font("Roboto_Regular12")
 	button_height = 25
 
-	def okay(evt):
-		# We'd like promises here, but for now this should do
-		global wait_for_interrupt
-		button_pushed = "A"
-		wait_for_interrupt = False
-
-	button_yes = ugfx.Button(int(width*4/5), height-kb_height-button_height, int(width*1/5)-3, button_height, true_text, parent=window, cb=okay)
+	def done(result):
+		window.destroy()
+		if cb:
+			cb(result)
+		return result
+
+	def syncSuccess(evt):
+		if evt:
+			# We'd like promises here, but for now this should do
+			global wait_for_interrupt
+			button_pushed = "A"
+			wait_for_interrupt = False
+	def syncCancel(evt):
+		if evt:
+			# We'd like promises here, but for now this should do
+			global wait_for_interrupt
+			button_pushed = "B"
+			wait_for_interrupt = False
+
+	def asyncSuccess(evt):
+		if evt:
+			done(edit.text())
+	def asyncCancel(evt):
+		if evt:
+			done(False)
+
+	button_yes = ugfx.Button(int(width*4/5), height-kb_height-button_height, int(width*1/5)-3, button_height, true_text, parent=window, cb=asyncSuccess if cb else syncSuccess)
 	button_no = ugfx.Button(int(width*4/5), height-kb_height-button_height-button_height, int(width/5)-3, button_height, false_text, parent=window) if false_text else None
 	ugfx.set_default_font(font)
 	label = ugfx.Label(5, 1, int(width*4/5), height-kb_height-5-edit_height-5, description, parent=window)
@@ -114,14 +135,14 @@ def toggle_focus(pressed):
 			elif focus == 1 or not button_no:
 				button_yes.set_focus()
 				kb.enabled(0)
-				ugfx.input_attach(ugfx.BTN_A, pressed_a)
-				ugfx.input_attach(ugfx.BTN_B, pressed_b)
+				ugfx.input_attach(ugfx.BTN_A, asyncSuccess if cb else syncSuccess)
+				ugfx.input_attach(ugfx.BTN_B, asyncCancel if cb else syncCancel)
 				focus = (2 if button_no else 0)
 			else:
 				button_no.set_focus()
 				kb.enabled(0)
-				ugfx.input_attach(ugfx.BTN_A, pressed_a)
-				ugfx.input_attach(ugfx.BTN_B, pressed_b)
+				ugfx.input_attach(ugfx.BTN_A, asyncCancel if cb else syncCancel)
+				ugfx.input_attach(ugfx.BTN_B, asyncCancel if cb else syncCancel)
 				focus = 0
 			ugfx.flush()
 
@@ -138,21 +159,14 @@ def toggle_focus(pressed):
 	ugfx.flush()
 
 	wait_for_interrupt = True
-	while wait_for_interrupt:
-		time.sleep(0.2)
-
-	def done(value):
-		window.hide()
-		window.destroy()
-		button_yes.destroy()
-		if button_no: button_no.destroy()
-		label.destroy()
-		kb.destroy()
-		edit.destroy()
-		return value
+	if cb:
+		return
+	else:
+		while wait_for_interrupt:
+			time.sleep(0.2)
 
-	if (focus == 0 and no_button) or button_pushed == "B": return done(False)
-	return done(edit.text())
+		if (focus == 0 and no_button) or button_pushed == "B": return done(False)
+		return done(edit.text())
 
 def prompt_option(options, index=0, text = "Please select one of the following:", title=None, select_text="OK", none_text=None):
 	"""Shows a dialog prompting for one of multiple options
