Merge pull request #300 from vishwesh3/bug-fixes

opticod · web-flow · commit b437aa6f9eff · 2017-01-04T19:02:54.000+05:30
Fixed issue #226
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java
@@ -3,6 +3,9 @@
 import android.Manifest;
 import android.app.Dialog;
 import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -583,25 +586,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         switch (id) {
             case R.id.action_delete:
-
-                final AlertDialog dialog = new AlertDialog.Builder(this)
-                        .setTitle(R.string.dialog_delete_title)
-                        .setMessage(R.string.dialog_delete_msg)
-                        .setPositiveButton(R.string.dialog_yes, null)
-                        .setNegativeButton(R.string.dialog_no, null)
-                        .create();
-                dialog.show();
-
-                dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        dialog.dismiss();
-                        selectedTemplate.deleteItem(TemplateEditor.this, selectedPosition);
-                        selectedPosition = -1;
-                        restoreSelectedView();
-                    }
-                });
-
+                final int restorePosition = selectedPosition;
+                final Object object = selectedTemplate.deleteItem(TemplateEditor.this,selectedPosition);
+                selectedPosition = -1;
+                restoreSelectedView();
+                Snackbar.make(findViewById(R.id.relative_layout),
+                        R.string.snackbar_deleted_message,Snackbar.LENGTH_LONG)
+                        .setAction(R.string.snackbar_undo, new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                selectedTemplate.restoreItem(TemplateEditor.this,restorePosition,object);
+                                Snackbar.make(v,R.string.snackbar_restored_message,Snackbar.LENGTH_LONG).show();
+                            }
+                        }).show();
                 break;
             case R.id.action_edit:
                 selectedTemplate.editItem(this, selectedPosition);
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java
@@ -528,6 +528,7 @@ public Object deleteItem(Activity activity, int position) {
             setEmptyView(activity);
             adapter.notifyDataSetChanged();
         }
+        setEmptyView(activity);
         if (comprehensionMetaModel==null)
         {
             return comprehensionModel;
@@ -562,7 +563,7 @@ public void restoreItem(Activity activity, int position, Object object) {
                 }
             }
         }
-
+        setEmptyView(activity);
     }
 
     @Override
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/DictationTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/DictationTemplate.java
@@ -231,6 +231,7 @@ public Object deleteItem(Activity activity, int position) {
         dictData.remove(position);
         setEmptyView(activity);
         adapter.notifyDataSetChanged();
+        setEmptyView(activity);
         return dictationModel;
     }
 
@@ -243,6 +244,7 @@ public void restoreItem(Activity activity, int position, Object object) {
             {
                 dictData.add(position,dictationModel);
                 adapter.notifyDataSetChanged();
+                setEmptyView(activity);
             }
         }
     }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashTemplate.java
@@ -266,7 +266,7 @@ public Object deleteItem(Activity activity, int position) {
         mData.remove(position);
         setEmptyView(activity);
         mAdapter.notifyDataSetChanged();
-
+        setEmptyView(activity);
         return flashCardModel;
     }
 
@@ -279,6 +279,7 @@ public void restoreItem(Activity activity, int position, Object object) {
             {
                 mData.add(position,flashCardModel);
                 mAdapter.notifyDataSetChanged();
+                setEmptyView(activity);
             }
         }
     }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoTemplate.java
@@ -195,6 +195,7 @@ public Object deleteItem(Activity activity, int position) {
         infoData.remove(position);
         setEmptyView(activity);
         adapter.notifyDataSetChanged();
+        setEmptyView(activity);
         return infoModel;
     }
 
@@ -207,6 +208,7 @@ public void restoreItem(Activity activity, int position, Object object) {
             {
                 infoData.add(position,infoModel);
                 adapter.notifyDataSetChanged();
+                setEmptyView(activity);
             }
         }
     }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java
@@ -195,6 +195,7 @@ public Object deleteItem(Activity activity, int position) {
         mLearnSpellingData.remove(position);
         setEmptyView(activity);
         adapter.notifyDataSetChanged();
+        setEmptyView(activity);
         return learnSpellingModel;
     }
 
@@ -207,6 +208,7 @@ public void restoreItem(Activity activity, int position, Object object) {
             {
                 mLearnSpellingData.add(position,learnSpellingModel);
                 adapter.notifyDataSetChanged();
+                setEmptyView(activity);
             }
         }
     }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/MatchTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/MatchTemplate.java
@@ -329,6 +329,7 @@ public Object deleteItem(Activity activity, int position) {
             setEmptyView(activity);
             adapter.notifyDataSetChanged();
         }
+        setEmptyView(activity);
         if (matchMetaModel==null)
         {
             return matchModel;
@@ -358,6 +359,7 @@ public void restoreItem(Activity activity, int position, Object object) {
                 }
             }
         }
+        setEmptyView(activity);
     }
 
     @Override
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java
@@ -342,6 +342,7 @@ public Object deleteItem(Activity activity, int position) {
         quizData.remove(position);
         setEmptyView(activity);
         mAdapter.notifyDataSetChanged();
+        setEmptyView(activity);
         return quizModel;
     }
 
@@ -352,6 +353,7 @@ public void restoreItem(Activity activity, int position, Object object) {
             if (quizModel != null) {
                 quizData.add(position, quizModel);
                 mAdapter.notifyDataSetChanged();
+                setEmptyView(activity);
             }
         }
     }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java
@@ -324,6 +324,7 @@ public Object deleteItem(Activity activity, int position) {
         videoData.remove(position);
         setEmptyView(activity);
         adapter.notifyDataSetChanged();
+        setEmptyView(activity);
         return videoModel;
     }
 
@@ -334,6 +335,7 @@ public void restoreItem(Activity activity, int position, Object object) {
             if (videoModel != null) {
                 videoData.add(position, videoModel);
                 adapter.notifyDataSetChanged();
+                setEmptyView(activity);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -528,6 +528,7 @@ public Object deleteItem(Activity activity, int position) {`
`528`	`528`	`setEmptyView(activity);`
`529`	`529`	`adapter.notifyDataSetChanged();`
`530`	`530`	`}`
	`531`	`+ setEmptyView(activity);`
`531`	`532`	`if (comprehensionMetaModel==null)`
`532`	`533`	`{`
`533`	`534`	`return comprehensionModel;`
`@@ -562,7 +563,7 @@ public void restoreItem(Activity activity, int position, Object object) {`
`562`	`563`	`}`
`563`	`564`	`}`
`564`	`565`	`}`
`565`		`-`
	`566`	`+ setEmptyView(activity);`
`566`	`567`	`}`
`567`	`568`
`568`	`569`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,7 @@ public Object deleteItem(Activity activity, int position) {`
`231`	`231`	`dictData.remove(position);`
`232`	`232`	`setEmptyView(activity);`
`233`	`233`	`adapter.notifyDataSetChanged();`
	`234`	`+ setEmptyView(activity);`
`234`	`235`	`return dictationModel;`
`235`	`236`	`}`
`236`	`237`
`@@ -243,6 +244,7 @@ public void restoreItem(Activity activity, int position, Object object) {`
`243`	`244`	`{`
`244`	`245`	`dictData.add(position,dictationModel);`
`245`	`246`	`adapter.notifyDataSetChanged();`
	`247`	`+ setEmptyView(activity);`
`246`	`248`	`}`
`247`	`249`	`}`
`248`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public Object deleteItem(Activity activity, int position) {`
`266`	`266`	`mData.remove(position);`
`267`	`267`	`setEmptyView(activity);`
`268`	`268`	`mAdapter.notifyDataSetChanged();`
`269`		`-`
	`269`	`+ setEmptyView(activity);`
`270`	`270`	`return flashCardModel;`
`271`	`271`	`}`
`272`	`272`
`@@ -279,6 +279,7 @@ public void restoreItem(Activity activity, int position, Object object) {`
`279`	`279`	`{`
`280`	`280`	`mData.add(position,flashCardModel);`
`281`	`281`	`mAdapter.notifyDataSetChanged();`
	`282`	`+ setEmptyView(activity);`
`282`	`283`	`}`
`283`	`284`	`}`
`284`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@ public Object deleteItem(Activity activity, int position) {`
`195`	`195`	`infoData.remove(position);`
`196`	`196`	`setEmptyView(activity);`
`197`	`197`	`adapter.notifyDataSetChanged();`
	`198`	`+ setEmptyView(activity);`
`198`	`199`	`return infoModel;`
`199`	`200`	`}`
`200`	`201`
`@@ -207,6 +208,7 @@ public void restoreItem(Activity activity, int position, Object object) {`
`207`	`208`	`{`
`208`	`209`	`infoData.add(position,infoModel);`
`209`	`210`	`adapter.notifyDataSetChanged();`
	`211`	`+ setEmptyView(activity);`
`210`	`212`	`}`
`211`	`213`	`}`
`212`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -329,6 +329,7 @@ public Object deleteItem(Activity activity, int position) {`
`329`	`329`	`setEmptyView(activity);`
`330`	`330`	`adapter.notifyDataSetChanged();`
`331`	`331`	`}`
	`332`	`+ setEmptyView(activity);`
`332`	`333`	`if (matchMetaModel==null)`
`333`	`334`	`{`
`334`	`335`	`return matchModel;`
`@@ -358,6 +359,7 @@ public void restoreItem(Activity activity, int position, Object object) {`
`358`	`359`	`}`
`359`	`360`	`}`
`360`	`361`	`}`
	`362`	`+ setEmptyView(activity);`
`361`	`363`	`}`
`362`	`364`
`363`	`365`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,7 @@ public Object deleteItem(Activity activity, int position) {`
`342`	`342`	`quizData.remove(position);`
`343`	`343`	`setEmptyView(activity);`
`344`	`344`	`mAdapter.notifyDataSetChanged();`
	`345`	`+ setEmptyView(activity);`
`345`	`346`	`return quizModel;`
`346`	`347`	`}`
`347`	`348`
`@@ -352,6 +353,7 @@ public void restoreItem(Activity activity, int position, Object object) {`
`352`	`353`	`if (quizModel != null) {`
`353`	`354`	`quizData.add(position, quizModel);`
`354`	`355`	`mAdapter.notifyDataSetChanged();`
	`356`	`+ setEmptyView(activity);`
`355`	`357`	`}`
`356`	`358`	`}`
`357`	`359`	`}`
Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,7 @@ public Object deleteItem(Activity activity, int position) {`
`324`	`324`	`videoData.remove(position);`
`325`	`325`	`setEmptyView(activity);`
`326`	`326`	`adapter.notifyDataSetChanged();`
	`327`	`+ setEmptyView(activity);`
`327`	`328`	`return videoModel;`
`328`	`329`	`}`
`329`	`330`
`@@ -334,6 +335,7 @@ public void restoreItem(Activity activity, int position, Object object) {`
`334`	`335`	`if (videoModel != null) {`
`335`	`336`	`videoData.add(position, videoModel);`
`336`	`337`	`adapter.notifyDataSetChanged();`
	`338`	`+ setEmptyView(activity);`
`337`	`339`	`}`
`338`	`340`	`}`
`339`	`341`	`}`