Merge branch 'scopeInfinity-bug_selection' into bug-fixes

Author: opticod

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

@@ -22,10 +22,12 @@ public class SavedProjectAdapter extends BaseAdapter {
 
     private final Context mContext;
     private final ArrayList<SavedProject> data;
+    private int selectedPosition;
 
     public SavedProjectAdapter(Context mContext, ArrayList<SavedProject> data) {
         this.mContext = mContext;
         this.data = data;
+        selectedPosition = -1;
     }
 
     /**
@@ -52,6 +54,15 @@ public long getItemId(int i) {
         return i;
     }
 
+
+    public void setSelectedPosition(int selectedPosition) {
+        this.selectedPosition = selectedPosition;
+    }
+
+    public int getSelectedPosition() {
+        return selectedPosition;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -70,6 +81,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder = (ProjectHolder) convertView.getTag();
         }
 
+        if (selectedPosition == position) {
+            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.color_divider));
+        } else {
+            convertView.setBackgroundColor(0);
+        }
+
         SavedProject projectData = getItem(position);
         holder.details.setText("Modified: " + projectData.getDate() + ", Author: " + projectData.getAuthor());
         holder.projectName.setText(projectData.getName());

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

@@ -12,6 +12,7 @@
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -59,8 +60,6 @@ public class LoadProjectFragment extends Fragment implements AbsListView.OnItemC
     private ArrayList<SavedProject> savedProjects;
     private View selectedView = null;
 
-    private int selectedPosition = -1;
-
     /**
      * {@inheritDoc}
      */
@@ -130,18 +129,18 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
         mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-                if (selectedPosition == position) {
-                    selectedPosition = -1;
+                if (mAdapter.getSelectedPosition() == position) {
+                    mAdapter.setSelectedPosition(-1);
                     view.setBackgroundResource(0);
                     restoreColorScheme();
                 } else {
                     if (selectedView != null) {
                         selectedView.setBackgroundResource(0);
                     }
                     selectedView = view;
-                    selectedPosition = position;
-                    Log.d(TAG, "Position: " + selectedPosition);
                     view.setBackgroundColor(ContextCompat.getColor(mToolkit, R.color.color_divider));
+                    mAdapter.setSelectedPosition(position);
+                    Log.d(TAG, "Position: " + position);
                     changeColorScheme();
                 }
                 return true;
@@ -273,12 +272,12 @@ private void changeColorScheme() {
         activity.invalidateOptionsMenu();
     }
 
-    /**
+     /**
      * {@inheritDoc}
      */
     @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
         if (showTemplateSelectedMenu) {
             activity.getMenuInflater().inflate(R.menu.menu_project_selected, menu);
         }
@@ -305,7 +304,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     @Override
                     public void onClick(View v) {
                         dialog.dismiss();
-                        deleteItem(selectedPosition);
+                        deleteItem(mAdapter.getSelectedPosition());
                         restoreSelectedView();
                     }
                 });
@@ -326,6 +325,7 @@ private void deleteItem(int selectedPosition) {
         boolean deleted = file.delete();
         if (deleted) {
             savedProjects.remove(selectedPosition);
+            mAdapter.setSelectedPosition(-1);
             mAdapter.notifyDataSetChanged();
             setEmptyText();
             Toast.makeText(activity, "Project Successfully Deleted!", Toast.LENGTH_SHORT).show();