Merge pull request #327 from free4murad/match-bug

Fixed option duplicacy in match template list and metadata delete issue in Comprehension and MatchTemplate issue

Author: opticod

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

@@ -174,6 +174,21 @@ public void onClick(View v) {
                     String first_list_itemText = first_list_item.getText().toString().trim();
                     String second_list_itemText = second_list_item.getText().toString().trim();
 
+                    if(matchData.size() > 0) {
+                        for (int i = 0; i < matchData.size(); i++) {
+                            if (first_list_itemText.equals(matchData.get(i).getMatchA()) || first_list_itemText.equals(matchData.get(i).getMatchB())) {
+                                first_list_item.requestFocus();
+                                first_list_item.setError("Option already inserted in list");
+                                return;
+                            }
+                            if (second_list_itemText.equals(matchData.get(i).getMatchA()) || second_list_itemText.equals(matchData.get(i).getMatchB())) {
+                                second_list_item.requestFocus();
+                                second_list_item.setError("Option already inserted in list");
+                                return;
+                            }
+                        }
+                    }
+
                     MatchModel temp = new MatchModel(first_list_itemText, second_list_itemText);
                     matchData.add(temp);
                     adapter.notifyDataSetChanged();
@@ -303,6 +318,23 @@ public void onClick(View v) {
                         String first_list_itemText = first_list_item.getText().toString().trim();
                         String second_list_itemText = second_list_item.getText().toString().trim();
 
+                        if (matchData.size() > 0){
+                            for(int i=0;i<matchData.size();i++){
+                                if(i == position)
+                                    continue;
+                                if (first_list_itemText.equals(matchData.get(i).getMatchA()) || first_list_itemText.equals(matchData.get(i).getMatchB())) {
+                                    first_list_item.requestFocus();
+                                    first_list_item.setError("Option already inserted in the list");
+                                    return;
+                                }
+                                if (second_list_itemText.equals(matchData.get(i).getMatchA()) || second_list_itemText.equals(matchData.get(i).getMatchB())) {
+                                    second_list_item.requestFocus();
+                                    second_list_item.setError("Option already inserted in the list");
+                                    return;
+                                }
+                            }
+                        }
+
                         data.setMatchA(first_list_itemText);
                         data.setMatchB(second_list_itemText);
 
@@ -352,7 +384,7 @@ public void restoreItem(Activity activity, int position, Object object) {
             }
         }else {
             if (object instanceof MatchModel) {
-               MatchModel matchModel = (MatchModel) object;
+                MatchModel matchModel = (MatchModel) object;
                 if (matchModel != null) {
                     matchData.add(position, matchModel);
                     adapter.notifyDataSetChanged();
@@ -432,4 +464,4 @@ private void setEmptyView(Activity activity) {
             activity.findViewById(R.id.empty).setVisibility(View.GONE);
         }
     }
-}
+}