Merge branch 'master' into add_optionscontainer_abilities

examples/multilinetextinput/multilinetextinput/app.py

@@ -11,6 +11,9 @@ def enable_toggle_pressed(self, widget, **kwargs):
     def readonly_toggle_pressed(self, widget, **kwargs):
         self.multiline_input.readonly = not self.multiline_input.readonly
 
+    def add_content_pressed(self, widget, **kwargs):
+        self.multiline_input.value = "All work and no play makes Jack a dull boy... " * 100
+
     def clear_pressed(self, widget, **kwargs):
         self.multiline_input.clear()
 
@@ -41,6 +44,11 @@ def startup(self):
             on_press=self.readonly_toggle_pressed,
             style=Pack(flex=1)
         )
+        button_add_content = toga.Button(
+            'Add content',
+            on_press=self.add_content_pressed,
+            style=Pack(flex=1)
+        )
         button_clear = toga.Button(
             'Clear',
             on_press=self.clear_pressed,
@@ -50,7 +58,8 @@ def startup(self):
             children=[
                 button_toggle_enabled,
                 button_toggle_readonly,
-                button_clear
+                button_add_content,
+                button_clear,
             ],
             style=Pack(
                 direction=ROW,

examples/textinput/textinput/app.py

@@ -1,9 +1,9 @@
-import re
 from string import ascii_lowercase, ascii_uppercase, digits
 
 import toga
 from toga.constants import COLUMN
 from toga.style import Pack
+from toga import validators
 
 EMPTY_PASSWORD = 'Empty password'
 
@@ -71,18 +71,25 @@ def startup(self):
         self.password_input = toga.PasswordInput(
             placeholder='Password...',
             style=Pack(padding=10),
-            on_change=self.on_password_change
+            on_change=self.on_password_change,
+            validators=[
+                validators.MinLength(10),
+                validators.ContainsUppercase(),
+                validators.ContainsLowercase(),
+                validators.ContainsSpecial(),
+                validators.ContainsDigit()
+            ]
         )
         self.email_input = toga.TextInput(
             placeholder='Email...',
             style=Pack(padding=10),
-            validator=self.validate_email
+            validators=[validators.Email()]
         )
         self.number_input = toga.NumberInput(style=Pack(padding=10))
         btn_extract = toga.Button(
             'Extract values',
             on_press=self.do_extract_values,
-            style=Pack(flex=1)
+            style=Pack(flex=1),
         )
 
         # Outermost box
@@ -131,23 +138,6 @@ def get_password_content_label(self, content):
                 contains.add("special characters")
         return "Password contains: {}".format(', '.join(contains))
 
-    @classmethod
-    def validate_email(cls, value):
-        if value == "":
-            return
-        split_email = value.split("@")
-        email_parts = len(split_email)
-        if email_parts == 1:
-            return 'No "@" in address'
-        if email_parts >= 3:
-            return 'Too many "@" symbols in address'
-        name, domain = split_email
-        if not re.match(r"[A-Za-z][A-Za-z0-9\-.]*", name):
-            return 'Email name is invalid'
-        if not re.match(r"[A-Za-z][A-Za-z0-9\-.]*", domain):
-            return 'Email domain is invalid'
-        return
-
 
 def main():
     return TextInputApp('TextInput', 'org.beeware.widgets.textinput')

src/cocoa/toga_cocoa/widgets/passwordinput.py

@@ -10,6 +10,10 @@ def textDidChange_(self, notification) -> None:
         if self.interface.on_change:
             self.interface.on_change(self.interface)
 
+    @objc_method
+    def textShouldEndEditing_(self, textObject) -> bool:
+        return self.interface.validate()
+
 
 class PasswordInput(TextInput):
     def create(self):