Merge pull request #278 from octacode/deleter

opticod · web-flow · commit 9f6c0dc95db7 · 2016-12-12T23:08:50.000+05:30
Enhancing the delete feature.
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/DraftsFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/DraftsFragment.java
@@ -367,7 +367,10 @@ private void deleteItems() {
             }
         }
         if(deleted)
-            Toast.makeText(activity, "Project Successfully Deleted!", Toast.LENGTH_SHORT).show();
+            if(selectedPositions.size()==1)
+                Toast.makeText(activity,"Project Successfully Deleted", Toast.LENGTH_SHORT).show();
+            else
+                Toast.makeText(activity,selectedPositions.size()+" Projects Successfully Deleted", Toast.LENGTH_SHORT).show();
         else
             Toast.makeText(activity, "Project Deletion Failed!", Toast.LENGTH_SHORT).show();
     }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java
@@ -453,7 +453,10 @@ private void deleteItems() {
             }
         }
         if(deleted)
-            Toast.makeText(activity, "Project Successfully Deleted!", Toast.LENGTH_SHORT).show();
+            if(selectedPositions.size()==1)
+                Toast.makeText(activity,"Project Successfully Deleted", Toast.LENGTH_SHORT).show();
+            else
+                Toast.makeText(activity,selectedPositions.size()+" Projects Successfully Deleted", Toast.LENGTH_SHORT).show();
         else
             Toast.makeText(activity, "Project Deletion Failed!", Toast.LENGTH_SHORT).show();
     }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java
@@ -495,7 +495,10 @@ private void deleteItems() {
             }
         }
         if(deleted)
-            Toast.makeText(activity, "Project Successfully Deleted!", Toast.LENGTH_SHORT).show();
+            if(selectedPositions.size()==1)
+                Toast.makeText(activity,"Project Successfully Deleted", Toast.LENGTH_SHORT).show();
+            else
+                Toast.makeText(activity,selectedPositions.size()+" Projects Successfully Deleted", Toast.LENGTH_SHORT).show();
         else
             Toast.makeText(activity, "Project Deletion Failed!", Toast.LENGTH_SHORT).show();
     }

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,10 @@ private void deleteItems() {`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`	`if(deleted)`
`370`		`- Toast.makeText(activity, "Project Successfully Deleted!", Toast.LENGTH_SHORT).show();`
	`370`	`+ if(selectedPositions.size()==1)`
	`371`	`+ Toast.makeText(activity,"Project Successfully Deleted", Toast.LENGTH_SHORT).show();`
	`372`	`+ else`
	`373`	`+ Toast.makeText(activity,selectedPositions.size()+" Projects Successfully Deleted", Toast.LENGTH_SHORT).show();`
`371`	`374`	`else`
`372`	`375`	`Toast.makeText(activity, "Project Deletion Failed!", Toast.LENGTH_SHORT).show();`
`373`	`376`	`}`
Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,10 @@ private void deleteItems() {`
`453`	`453`	`}`
`454`	`454`	`}`
`455`	`455`	`if(deleted)`
`456`		`- Toast.makeText(activity, "Project Successfully Deleted!", Toast.LENGTH_SHORT).show();`
	`456`	`+ if(selectedPositions.size()==1)`
	`457`	`+ Toast.makeText(activity,"Project Successfully Deleted", Toast.LENGTH_SHORT).show();`
	`458`	`+ else`
	`459`	`+ Toast.makeText(activity,selectedPositions.size()+" Projects Successfully Deleted", Toast.LENGTH_SHORT).show();`
`457`	`460`	`else`
`458`	`461`	`Toast.makeText(activity, "Project Deletion Failed!", Toast.LENGTH_SHORT).show();`
`459`	`462`	`}`
Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,10 @@ private void deleteItems() {`
`495`	`495`	`}`
`496`	`496`	`}`
`497`	`497`	`if(deleted)`
`498`		`- Toast.makeText(activity, "Project Successfully Deleted!", Toast.LENGTH_SHORT).show();`
	`498`	`+ if(selectedPositions.size()==1)`
	`499`	`+ Toast.makeText(activity,"Project Successfully Deleted", Toast.LENGTH_SHORT).show();`
	`500`	`+ else`
	`501`	`+ Toast.makeText(activity,selectedPositions.size()+" Projects Successfully Deleted", Toast.LENGTH_SHORT).show();`
`499`	`502`	`else`
`500`	`503`	`Toast.makeText(activity, "Project Deletion Failed!", Toast.LENGTH_SHORT).show();`
`501`	`504`	`}`