AdvancedEntry Email Check Update ( #103 )

enisn · Mar 25, 2019 · 64a48f1 · 64a48f1
1 parent 88803ef
commit 64a48f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/InputKit/Shared/Controls/AdvancedEntry.cs b/InputKit/Shared/Controls/AdvancedEntry.cs
@@ -285,7 +285,7 @@ public bool IsAnnotated
                     case AnnotationType.Text:
                         return Text.All(c => c == ' ' || !(Char.IsSymbol(c) || Char.IsSurrogate(c) || Char.IsControl(c) || Char.IsPunctuation(c)));
                     case AnnotationType.Email:
-                        return Regex.Match(Text, "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$").Success;
+                        return Regex.Match(Text, @"^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$").Success;
                     case AnnotationType.Password:
                         return Text.Any(Char.IsDigit) && Text.Any(Char.IsLetter);
                     case AnnotationType.Regex:

diff --git a/Sample.InputKit/Sample.InputKit/MainPage.xaml b/Sample.InputKit/Sample.InputKit/MainPage.xaml
@@ -40,7 +40,7 @@
                             SelectedItem="{Binding SelectedItem}"
                             />
 
-            <input:AdvancedEntry Placeholder="E-mail" IsRequired="True" ValidationMessage="Hey it's wrong!!" Annotation="Regex" RegexPattern="^([\w\.\-]+)@([\w\-]+)((\.(\w){2,3})+)$" />
+            <input:AdvancedEntry Placeholder="E-mail" IsRequired="True" ValidationMessage="Hey it's wrong!!" Annotation="Email"/>
 
             <input:AdvancedSlider MaxValue="5000" MinValue="50" StepValue="50" Value="{Binding Price}" ValuePrefix="Price:" ValueSuffix="€" Title="Choose Budget:"/>