From c2ae07bf5c48e6f8d85e094392346e5508e75d38 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Sat, 7 Nov 2020 15:52:39 +0100
Subject: [PATCH] Remove custom email regexp

Use the EmailValidator package instead
---
 lib/screens/settings_screen.dart | 7 ++-----
 pubspec.lock                     | 7 +++++++
 pubspec.yaml                     | 1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index ab033aea..1abd4c8b 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 
 import 'package:dynamic_theme/dynamic_theme.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:email_validator/email_validator.dart';
 import 'package:ext_storage/ext_storage.dart';
 import 'package:icloud_documents_path/icloud_documents_path.dart';
 import 'package:path/path.dart' as p;
@@ -120,11 +121,7 @@ class SettingsListState extends State<SettingsList> {
             return tr('settings.email.validator.empty');
           }
 
-          bool emailValid = RegExp(
-                  r"^[a-zA-Z0-9.\-!#$%&'*+/=?^_``{|}~]+@[a-zA-Z0-9\-]+\.[a-zA-Z\-]+")
-              .hasMatch(value);
-
-          if (!emailValid) {
+          if (!EmailValidator.validate(value)) {
             return tr('settings.email.validator.invalid');
           }
           return null;
diff --git a/pubspec.lock b/pubspec.lock
index 57c78114..724e0661 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -220,6 +220,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.0.2"
+  email_validator:
+    dependency: "direct main"
+    description:
+      name: email_validator
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.6"
   equatable:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b45220f1..b656e4b6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -65,6 +65,7 @@ dependencies:
   permission_handler: ^5.0.1+1
   ext_storage: ^1.0.3
   time: ^1.3.0
+  email_validator: ^1.0.6
   icloud_documents_path:
     git: https://github.com/GitJournal/icloud_documents_path.git