Attaching Match the following template in template list

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java

@@ -127,7 +127,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.button_add_item).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (templateId == 5 && selectedTemplate.currentMetaEditorAdapter().isEmpty()) {
+                if ((templateId == 5 || templateId == 7) && selectedTemplate.currentMetaEditorAdapter().isEmpty()) {
                     selectedTemplate.addMetaData(TemplateEditor.this);
                 } else {
                     selectedTemplate.addItem(TemplateEditor.this);
@@ -301,7 +301,7 @@ private void setUpTemplateEditor() {
             selectedTemplate = (TemplateInterface) templateObject;
             selectedTemplate.setTemplateId(templateId);
             populateListView(selectedTemplate.newTemplateEditorAdapter(this));
-            if (templateId == 5) {
+            if (templateId == 5 || templateId == 7) {
                 populateMetaView(selectedTemplate.newMetaEditorAdapter(this));
             }
             setUpActionBar();
@@ -325,7 +325,7 @@ private void restoreTemplateEditor(Bundle savedInstanceState) {
             finish();
         } else {
             populateListView(selectedTemplate.currentTemplateEditorAdapter());
-            if (templateId == 5) {
+            if (templateId == 5 || templateId == 7) {
                 populateMetaView(selectedTemplate.currentMetaEditorAdapter());
             }
             setUpActionBar();
@@ -637,7 +637,7 @@ private String saveProject() {
                 doc.appendChild(rootElement);
                 Element dataElement = doc.createElement("data");
                 rootElement.appendChild(dataElement);
-                if (selectedTemplate.getItems(doc).size() == 0 || (selectedTemplate.getItems(doc).size() < 2 && templateId == 5)) {
+                if (selectedTemplate.getItems(doc).size() == 0 || (selectedTemplate.getItems(doc).size() < 2 && (templateId == 5 || templateId == 7))) {
                     Toast.makeText(this, "Unable to perform action: No Data", Toast.LENGTH_SHORT).show();
                     return null;
                 }
@@ -810,7 +810,7 @@ private void parseSavedFile(String path) {
             selectedTemplate = (TemplateInterface) templateObject;
             selectedTemplate.setTemplateId(templateId);
             populateListView(selectedTemplate.loadProjectTemplateEditor(this, items));
-            if (templateId == 5) {
+            if (templateId == 5 || templateId == 7) {
                 populateMetaView(selectedTemplate.loadProjectMetaEditor(this, doc));
             }
             File draftDir = new File(toolkit.getDraftDir());

source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/TemplateAdapter.java

@@ -88,7 +88,8 @@ private enum ListColor {
         RED("#F53B3C"),
         GRAYISH("#78909C"),
         PURPLE("#AB47BC"),
-        YELLOW("#F9A01E");
+        YELLOW("#F9A01E"),
+        YELLOW_GREEN("#9ACD32");
 
         private
         @ColorRes

source-code/app/src/main/java/org/buildmlearn/toolkit/model/Template.java

@@ -9,6 +9,7 @@
 import org.buildmlearn.toolkit.templates.FlashTemplate;
 import org.buildmlearn.toolkit.templates.InfoTemplate;
 import org.buildmlearn.toolkit.templates.LearnSpellingTemplate;
+import org.buildmlearn.toolkit.templates.MatchTemplate;
 import org.buildmlearn.toolkit.templates.QuizTemplate;
 import org.buildmlearn.toolkit.templates.VideoCollectionTemplate;
 
@@ -25,7 +26,8 @@ public enum Template {
     FLASH_CARD(R.string.flash_card_title, R.string.flash_card_description, R.drawable.basic_m_learning, R.string.flash_card_template, FlashTemplate.class, R.string.flash_assets_name),
     VIDEO_COLLECTION(R.string.video_collection_title, R.string.video_collection_description, R.drawable.video_collection, R.string.video_collection_template, VideoCollectionTemplate.class, R.string.video_assets_name),
     COMPREHENSION(R.string.comprehension_title, R.string.comprehension_description, R.drawable.comprehension, R.string.comprehension_template, ComprehensionTemplate.class, R.string.comprehension_assets_name),
-    DICTATION(R.string.dictation_title, R.string.dictation_description, R.drawable.comprehension, R.string.dictation_template, DictationTemplate.class, R.string.dictation_assets_name);
+    DICTATION(R.string.dictation_title, R.string.dictation_description, R.drawable.comprehension, R.string.dictation_template, DictationTemplate.class, R.string.dictation_assets_name),
+    MATCH_THE_FOLLOWING(R.string.match_title, R.string.match_description, R.drawable.comprehension, R.string.match_template, MatchTemplate.class, R.string.match_assets_name);
 
     @StringRes
     final

source-code/app/src/main/res/values/strings.xml

@@ -149,6 +149,25 @@
     <string name="dictation_passage_title">Passage :</string>
     <string name="dictation_completed_message">Hurrah! You have completed the Dictation.</string>
 
+    <!-- MatchTheFollowing Template-->
+    <string name="match_title">Match</string>
+    <string name="match_template">MatchTemplate</string>
+    <string name="match_description">Choose this template to create applications for practising match the following.</string>
+    <string name="match_template_title_hint">Enter Title</string>
+    <string name="match_template_passage_hint">Enter Passage</string>
+
+    <string name="match_navigation_drawer_open">Open navigation drawer</string>
+    <string name="match_navigation_drawer_close">Close navigation drawer</string>
+
+    <string name="match_previous">PREVIOUS</string>
+    <string name="match_next">NEXT</string>
+    <string name="match_about_us">About Us</string>
+    <string name="match_about_text">This application has been developed using the BuildmLearn Toolkit.\n\nTo know more about BuildmLearn Toolkit visit <a href="https://buildmlearn.org/">here</a>.</string>
+    <string name="match_buildmlearn_logo">BuildmLearn Logo</string>
+    <string name="match_go_to_questions">GO TO QUESTIONS</string>
+    <string name="match_passage_title">Passage :</string>
+    <string name="match_completed_message">Hurrah! You have completed the Match the Following.</string>
+
     <!-- Assets Filename -->
     <string name="spelling_assets_name">spelling_content.xml</string>
     <string name="quiz_assets_name">quiz_content.xml</string>
@@ -157,6 +176,7 @@
     <string name="video_assets_name">video_content.xml</string>
     <string name="comprehension_assets_name">comprehension_content.xml</string>
     <string name="dictation_assets_name">dictation_content.xml</string>
+    <string name="match_assets_name">match_content.xml</string>
 
     <!-- Template Resources-->
     <string name="basic_m_learning_title">Basic mLearning</string>
@@ -360,4 +380,19 @@
     <string name="hint_passage_dict">Click the Sound Icon to recite. And enter the passage that you hear.</string>
     <string name="restart_dict">RESTART</string>
     <string name="sound_icon_dict">Sound Icon</string>
+    <string name="divider">Divider</string>
+    <string name="first_list_title">First List Title</string>
+    <string name="enter_first_list_title">Enter First List Title</string>
+    <string name="second_list_title">Second List Title</string>
+    <string name="enter_second_list_title">Enter Second List Title</string>
+    <string name="match_first_list_title">Enter First List Title</string>
+    <string name="match_second_list_title">Enter Second List Title</string>
+    <string name="match_dialog_add_title">Enter two matching topics below</string>
+    <string name="first_list_item_match">First List Item</string>
+    <string name="second_list_item_match">Second List Item</string>
+    <string name="enter_first_list_item_match">Enter First List Item</string>
+    <string name="enter_second_list_item_match">Enter Second List Item</string>
+    <string name="match_dialog_edit_title">Edit two matching topics below</string>
+    <string name="meta_title">Title</string>
+    <string name="meta_title_match_hint">Enter Title</string>
 </resources>