Merge pull request #277 from BuildmLearn/fixes

#276 FIXED: Issue with Search in SavedProjects and SavedAPKs + My Drafts

Author: opticod

source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/DraftsFragment.java

@@ -179,6 +179,7 @@ public void onResume() {
         if (mAdapter != null) {
             reloadContent();
         }
+        setEmptyText();
         super.onResume();
     }
 

source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadApkFragment.java

@@ -365,9 +365,8 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
                     public void afterTextChanged(Editable s) {
                         String text = s.toString().trim();
                         savedApis.clear();
-                        SavedApi tempApi;
                         for (int i = 0; i < allsavedApis.size(); i++) {
-                            if (allsavedApis.get(i).getName().contains(text)) {
+                            if (allsavedApis.get(i).getName().toLowerCase().contains(text.toLowerCase())) {
                                 savedApis.add(allsavedApis.get(i));
                             }
                         }
@@ -382,6 +381,11 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                             editSearch.onKeyPreIme(keyCode, event);
                             if (isSearchOpened) {
                                 closeSearch();
+                                savedApis.clear();
+                                for (int i = 0; i < allsavedApis.size(); i++) {
+                                    savedApis.add(allsavedApis.get(i));
+                                }
+                                mAdapter.notifyDataSetChanged();
                             }
                             return true;
                         }
@@ -425,11 +429,23 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
     private void deleteItems() {
         ArrayList<Integer> selectedPositions = mAdapter.getSelectedPositions();
         boolean deleted = false;
+
         for(int selectedPosition : selectedPositions) {
             SavedApi apk = savedApis.get(selectedPosition);
             File file = new File(apk.getFile().getPath());
             deleted = file.delete();
             if (deleted) {
+                int selectedPos = -1;
+                for (int i = 0; i < allsavedApis.size(); i++) {
+                    SavedApi sApi = allsavedApis.get(i);
+                    if (sApi.getName().equals(apk.getName())) {
+                        selectedPos = i;
+                        break;
+                    }
+                }
+                if (selectedPos != -1) {
+                    allsavedApis.remove(selectedPos);
+                }
                 savedApis.remove(selectedPosition);
                 mAdapter.removeSelectedPosition(selectedPosition);
                 mAdapter.notifyDataSetChanged();

source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java

@@ -29,7 +29,6 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
-
 import org.buildmlearn.toolkit.R;
 import org.buildmlearn.toolkit.ToolkitApplication;
 import org.buildmlearn.toolkit.activity.TemplateActivity;
@@ -405,9 +404,8 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
                     public void afterTextChanged(Editable s) {
                         String text = s.toString().trim();
                         savedProjects.clear();
-                        SavedProject tempProject;
                         for (int i = 0; i < allsavedProjects.size(); i++) {
-                            if (allsavedProjects.get(i).getName().contains(text)) {
+                            if (allsavedProjects.get(i).getName().toLowerCase().contains(text.toLowerCase())) {
                                savedProjects.add(allsavedProjects.get(i));
                             }
                         }
@@ -422,12 +420,18 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                             editSearch.onKeyPreIme(keyCode, event);
                             if (isSearchOpened) {
                                 closeSearch();
+                                savedProjects.clear();
+                                for (int i = 0; i < allsavedProjects.size(); i++) {
+                                    savedProjects.add(allsavedProjects.get(i));
+                                }
+                                mAdapter.notifyDataSetChanged();
                             }
                             return true;
                         }
                         return false;
                     }
                 });
+
                 editSearch.requestFocus();
                 InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.showSoftInput(editSearch, InputMethodManager.SHOW_IMPLICIT);
@@ -466,12 +470,24 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
     private void deleteItems() {
         ArrayList<Integer> selectedPositions = mAdapter.getSelectedPositions();
         boolean deleted = false;
+
         for(int selectedPosition : selectedPositions) {
             SavedProject project = savedProjects.get(selectedPosition);
             File file = new File(project.getFile().getPath());
             deleted = file.delete();
 
             if (deleted) {
+                int selectedPos = -1;
+                for (int i = 0; i < allsavedProjects.size(); i++) {
+                    SavedProject sProject = allsavedProjects.get(i);
+                    if (sProject.getName().equals(project.getName())) {
+                        selectedPos = i;
+                        break;
+                    }
+                }
+                if (selectedPos != -1) {
+                    allsavedProjects.remove(selectedPos);
+                }
                 savedProjects.remove(selectedPosition);
                 mAdapter.removeSelectedPosition(selectedPosition);
                 mAdapter.notifyDataSetChanged();