git push origin bug-fixesMerge branch 'vishwesh3-deleteIssue' into bug-fixes

opticod · opticod · commit 4b9343e71129 · 2016-12-20T20:07:47.000+05:30
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/DraftProjectAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/DraftProjectAdapter.java
@@ -119,6 +119,10 @@ public View getView(int position, View convertView, ViewGroup parent) {
         holder.draftTitle.setText(String.format(Locale.ENGLISH, "Drafted on %s", projectData.getDate()));
         holder.draftIcon.setText("D");
         convertView.setTag(holder);
+        if (projectData.isSelected())
+        {
+            convertView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.color_divider));
+        }
         return convertView;
     }
 
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/SavedApiAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/SavedApiAdapter.java
@@ -119,6 +119,10 @@ public View getView(int position, View convertView, ViewGroup parent) {
         holder.apkName.setText(apiData.getName());
         holder.projectIcon.setText(apiData.getName().substring(0, 1).toUpperCase(Locale.US));
         convertView.setTag(holder);
+        if (apiData.isSelected())
+        {
+            convertView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.color_divider));
+        }
         return convertView;
     }
 
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
@@ -324,11 +324,12 @@ public void onClick(View v) {
                 for(int i=0;i<mAdapter.getCount();i++) {
                     if (!mAdapter.isPositionSelected(i))
                     {
-                        mListView.getChildAt(i).setBackgroundColor(ContextCompat.getColor(mToolkit, R.color.color_divider));
+                        draftProjects.get(i).setSelected(true);
                         mAdapter.putSelectedPosition(i);
                         changeColorScheme();
                     }
                 }
+                mAdapter.notifyDataSetChanged();
                 break;
 
             case R.id.action_unselect_all:
@@ -363,9 +364,10 @@ public void onClick(View v) {
     private void unselectAll() {
         for (int i = 0; i < mAdapter.getCount(); i++)
             if (mAdapter.isPositionSelected(i)) {
-                mListView.getChildAt(i).setBackgroundColor(0);
+                draftProjects.get(i).setSelected(false);
                 mAdapter.removeSelectedPosition(i);
             }
+        mAdapter.notifyDataSetChanged();
         restoreColorScheme();
     }
 
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
@@ -416,11 +416,12 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                 for(int i=0;i<mAdapter.getCount();i++) {
                     if (!mAdapter.isPositionSelected(i))
                     {
-                        mListView.getChildAt(i).setBackgroundColor(ContextCompat.getColor(mToolkit, R.color.color_divider));
+                        savedApis.get(i).setSelected(true);
                         mAdapter.putSelectedPosition(i);
                         changeColorScheme();
                     }
                 }
+                mAdapter.notifyDataSetChanged();
                 break;
 
             case R.id.action_unselect_all:
@@ -436,10 +437,11 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
     public void unselectAll() {
         for (int i = 0; i < mAdapter.getCount(); i++)
             if (mAdapter.isPositionSelected(i)) {
-                mListView.getChildAt(i).setBackgroundColor(0);
+                savedApis.get(i).setSelected(false);
                 mAdapter.removeSelectedPosition(i);
             }
         restoreColorScheme();
+        mAdapter.notifyDataSetChanged();
     }
 
     /**
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
@@ -456,11 +456,12 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                 for(int i=0;i<mAdapter.getCount();i++) {
                     if (!mAdapter.isPositionSelected(i))
                     {
-                        mListView.getChildAt(i).setBackgroundColor(ContextCompat.getColor(mToolkit, R.color.color_divider));
+                        savedProjects.get(i).setSelected(true);
                         mAdapter.putSelectedPosition(i);
                         changeColorScheme();
                     }
                 }
+                mAdapter.notifyDataSetChanged();
                 break;
 
             case R.id.action_unselect_all:
@@ -476,10 +477,11 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
     private void unselectAll() {
         for (int i = 0; i < mAdapter.getCount(); i++)
             if (mAdapter.isPositionSelected(i)) {
-                mListView.getChildAt(i).setBackgroundColor(0);
+                savedProjects.get(i).setSelected(false);
                 mAdapter.removeSelectedPosition(i);
             }
         restoreColorScheme();
+        mAdapter.notifyDataSetChanged();
     }
 
     /**
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/model/SavedApi.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/model/SavedApi.java
@@ -17,6 +17,15 @@ public class SavedApi {
     private long unformattedDate;
     private String name;
     private String author;
+    private boolean isSelected = false;
+
+    public boolean isSelected() {
+        return isSelected;
+    }
+
+    public void setSelected(boolean selected) {
+        isSelected = selected;
+    }
 
     public SavedApi(File file, String fileName, long date) {
 
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/model/SavedProject.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/model/SavedProject.java
@@ -18,6 +18,15 @@ public class SavedProject {
     private String type;
     private String author;
     private long unformattedDate;
+    private boolean isSelected = false;
+
+    public boolean isSelected() {
+        return isSelected;
+    }
+
+    public void setSelected(boolean selected) {
+        isSelected = selected;
+    }
 
     public SavedProject(File file, String fileName, long date, String type, String fullPath) {
 

Original file line number	Diff line number	Diff line change
`@@ -324,11 +324,12 @@ public void onClick(View v) {`
`324`	`324`	`for(int i=0;i<mAdapter.getCount();i++) {`
`325`	`325`	`if (!mAdapter.isPositionSelected(i))`
`326`	`326`	`{`
`327`		`- mListView.getChildAt(i).setBackgroundColor(ContextCompat.getColor(mToolkit, R.color.color_divider));`
	`327`	`+ draftProjects.get(i).setSelected(true);`
`328`	`328`	`mAdapter.putSelectedPosition(i);`
`329`	`329`	`changeColorScheme();`
`330`	`330`	`}`
`331`	`331`	`}`
	`332`	`+ mAdapter.notifyDataSetChanged();`
`332`	`333`	`break;`
`333`	`334`
`334`	`335`	`case R.id.action_unselect_all:`
`@@ -363,9 +364,10 @@ public void onClick(View v) {`
`363`	`364`	`private void unselectAll() {`
`364`	`365`	`for (int i = 0; i < mAdapter.getCount(); i++)`
`365`	`366`	`if (mAdapter.isPositionSelected(i)) {`
`366`		`- mListView.getChildAt(i).setBackgroundColor(0);`
	`367`	`+ draftProjects.get(i).setSelected(false);`
`367`	`368`	`mAdapter.removeSelectedPosition(i);`
`368`	`369`	`}`
	`370`	`+ mAdapter.notifyDataSetChanged();`
`369`	`371`	`restoreColorScheme();`
`370`	`372`	`}`
`371`	`373`
Original file line number	Diff line number	Diff line change
`@@ -416,11 +416,12 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {`
`416`	`416`	`for(int i=0;i<mAdapter.getCount();i++) {`
`417`	`417`	`if (!mAdapter.isPositionSelected(i))`
`418`	`418`	`{`
`419`		`- mListView.getChildAt(i).setBackgroundColor(ContextCompat.getColor(mToolkit, R.color.color_divider));`
	`419`	`+ savedApis.get(i).setSelected(true);`
`420`	`420`	`mAdapter.putSelectedPosition(i);`
`421`	`421`	`changeColorScheme();`
`422`	`422`	`}`
`423`	`423`	`}`
	`424`	`+ mAdapter.notifyDataSetChanged();`
`424`	`425`	`break;`
`425`	`426`
`426`	`427`	`case R.id.action_unselect_all:`
`@@ -436,10 +437,11 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {`
`436`	`437`	`public void unselectAll() {`
`437`	`438`	`for (int i = 0; i < mAdapter.getCount(); i++)`
`438`	`439`	`if (mAdapter.isPositionSelected(i)) {`
`439`		`- mListView.getChildAt(i).setBackgroundColor(0);`
	`440`	`+ savedApis.get(i).setSelected(false);`
`440`	`441`	`mAdapter.removeSelectedPosition(i);`
`441`	`442`	`}`
`442`	`443`	`restoreColorScheme();`
	`444`	`+ mAdapter.notifyDataSetChanged();`
`443`	`445`	`}`
`444`	`446`
`445`	`447`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -456,11 +456,12 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {`
`456`	`456`	`for(int i=0;i<mAdapter.getCount();i++) {`
`457`	`457`	`if (!mAdapter.isPositionSelected(i))`
`458`	`458`	`{`
`459`		`- mListView.getChildAt(i).setBackgroundColor(ContextCompat.getColor(mToolkit, R.color.color_divider));`
	`459`	`+ savedProjects.get(i).setSelected(true);`
`460`	`460`	`mAdapter.putSelectedPosition(i);`
`461`	`461`	`changeColorScheme();`
`462`	`462`	`}`
`463`	`463`	`}`
	`464`	`+ mAdapter.notifyDataSetChanged();`
`464`	`465`	`break;`
`465`	`466`
`466`	`467`	`case R.id.action_unselect_all:`
`@@ -476,10 +477,11 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {`
`476`	`477`	`private void unselectAll() {`
`477`	`478`	`for (int i = 0; i < mAdapter.getCount(); i++)`
`478`	`479`	`if (mAdapter.isPositionSelected(i)) {`
`479`		`- mListView.getChildAt(i).setBackgroundColor(0);`
	`480`	`+ savedProjects.get(i).setSelected(false);`
`480`	`481`	`mAdapter.removeSelectedPosition(i);`
`481`	`482`	`}`
`482`	`483`	`restoreColorScheme();`
	`484`	`+ mAdapter.notifyDataSetChanged();`
`483`	`485`	`}`
`484`	`486`
`485`	`487`	`/**`