Fixing some remaining field validation issues

Author: opticod

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java

@@ -5,6 +5,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Build;
+import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.BaseAdapter;
@@ -19,7 +20,6 @@
 import org.buildmlearn.toolkit.model.TemplateInterface;
 import org.buildmlearn.toolkit.utilities.FileDialog;
 import org.buildmlearn.toolkit.views.TextViewPlus;
-import android.support.v7.app.AlertDialog;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -237,6 +237,7 @@ public void onClick(View v) {
 
                 for (EditText option : options) {
                     if ("".equals(option.getText().toString().trim())){
+                        option.setText("");
                         continue;
                     }
                     if (option.getText().toString()!= null && "".equals(option.getText().toString().trim())) {
@@ -467,6 +468,7 @@ public void onClick(View v) {
 
                     for (EditText option : options) {
                         if ("".equals(option.getText().toString().trim())){
+                            option.setText("");
                             continue;
                         }
                         if (option.getText().toString()!= null && "".equals(option.getText().toString().trim())) {

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java

@@ -9,8 +9,6 @@
 import android.view.View;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
-import android.widget.Toast;
-
 
 import org.buildmlearn.toolkit.R;
 import org.buildmlearn.toolkit.infotemplate.fragment.SplashFragment;
@@ -47,9 +45,6 @@ public static boolean validated(Context context, EditText word, EditText meaning
         if ("".equals(wordText)) {
             word.setError(context.getString(R.string.enter_word));
             return false;
-        } else if (!wordText.matches("([A-Za-z ]+)")){
-            word.setError(context.getString(R.string.enter_valid_word));
-            return false;
         } else if ("".equals(meaningText)) {
             meaning.setError(context.getString(R.string.enter_description));
             return false;

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java

@@ -9,8 +9,6 @@
 import android.view.View;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
-import android.widget.Toast;
-
 
 import org.buildmlearn.toolkit.R;
 import org.buildmlearn.toolkit.learnspelling.fragment.SplashFragment;
@@ -47,15 +45,9 @@ private static boolean validated(Context context, EditText word, EditText meanin
         if ("".equals(wordText)) {
             word.setError(context.getString(R.string.enter_word));
             return false;
-        } else if (!wordText.matches("([A-Za-z ]+)")){
-            word.setError(context.getString(R.string.enter_valid_word));
-            return false;
         } else if ("".equals(meaningText)) {
             meaning.setError(context.getString(R.string.enter_meaning));
             return false;
-        } else if(!meaningText.matches("([A-Za-z ]+)")){
-            meaning.setError(context.getString(R.string.enter_valid_meaning));
-            return false;
         }
         return true;
 

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java

@@ -12,7 +12,6 @@
 import android.widget.RadioButton;
 import android.widget.Toast;
 
-
 import org.buildmlearn.toolkit.R;
 import org.buildmlearn.toolkit.model.Template;
 import org.buildmlearn.toolkit.model.TemplateInterface;
@@ -173,6 +172,7 @@ public void onClick(View v) {
                 }
                 for (EditText option : options) {
                     if ("".equals(option.getText().toString().trim())){
+                        option.setText("");
                         continue;
                     }
                     if (option.getText().toString()!= null && "".equals(option.getText().toString().trim())) {
@@ -295,6 +295,7 @@ public void onClick(View v) {
 
                 for (EditText option : options) {
                     if ("".equals(option.getText().toString().trim())){
+                        option.setText("");
                         continue;
                     }
                     if (option.getText().toString()!= null && "".equals(option.getText().toString().trim())) {

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java

@@ -71,8 +71,6 @@ private static boolean validated(Context context, EditText link) {
         if ("".equals(linkText)) {
             link.setError(context.getString(R.string.video_collection_template_link_hint));
             return false;
-        } else if(!Patterns.WEB_URL.matcher(linkText).matches()){
-            link.setError(context.getString(R.string.video_collection_template_link_valid_hint));
         } else if (!(linkText.contains(YOUTUBE + ".com") || linkText.contains(YOUTUBE_SHORT) || linkText.contains(DAILYMOTION + ".com") || linkText.contains(VIMEO + ".com"))) {
             link.setError(context.getString(R.string.video_collection_template_linited_links));
             return false;