Merge branch 'bug-fixes' of https://github.com/BuildmLearn/BuildmLearn-Toolkit-Android into bug-fixes

Author: opticod

source-code/app/build.gradle

@@ -47,6 +47,7 @@ android {
     lintOptions {
         abortOnError false
     }
+    sourceSets { main { res.srcDirs = ['src/main/res', 'src/main/res/anim'] } }
 }
 
 dependencies {
@@ -71,8 +72,6 @@ dependencies {
     compile files('libs/axml.jar')
     compile 'com.viewpagerindicator:library:2.4.1@aar'
     compile 'com.nineoldandroids:library:2.4.0'
-    compile 'com.daimajia.easing:library:1.0.1@aar'
-    compile 'com.daimajia.androidanimations:library:1.1.3@aar'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'org.jsoup:jsoup:1.9.1'
     androidTestCompile 'com.android.support:support-annotations:23.4.0'

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java

@@ -7,12 +7,12 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.EditText;
 import android.widget.Toast;
 
 import com.crashlytics.android.Crashlytics;
-import com.daimajia.androidanimations.library.Techniques;
-import com.daimajia.androidanimations.library.YoYo;
 
 import org.buildmlearn.toolkit.R;
 import org.buildmlearn.toolkit.constant.Constants;
@@ -46,13 +46,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
         findViewById(R.id.focus_thief).clearFocus();
-        YoYo.with(Techniques.BounceInUp)
-                .duration(2700)
-                .playOn(findViewById(R.id.first_name));
-
-
+        Animation anim_bounceinup=AnimationUtils.loadAnimation(getBaseContext(),R.anim.bounceinup);
         name = (EditText) findViewById(R.id.first_name);
-
+        name.startAnimation(anim_bounceinup);
 
         name.setOnKeyListener(new View.OnKeyListener() {
             @Override

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

@@ -1,6 +1,7 @@
 package org.buildmlearn.toolkit.adapter;
 
 import android.content.Context;
+import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,7 +12,10 @@
 import org.buildmlearn.toolkit.views.TextViewPlus;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 /**
  * @brief Adapter used for showing saved APIs in a list
@@ -23,10 +27,12 @@ public class SavedApiAdapter extends BaseAdapter {
 
     private final Context mContext;
     private final ArrayList<SavedApi> data;
+    private Map selectedPositions;
 
     public SavedApiAdapter(Context mContext, ArrayList<SavedApi> data) {
         this.mContext = mContext;
         this.data = data;
+        selectedPositions = new HashMap();
     }
 
     /**
@@ -56,6 +62,37 @@ public long getItemId(int i) {
     /**
      * {@inheritDoc}
      */
+
+    public boolean isPositionSelected(int position)
+    {
+        return selectedPositions.containsKey(position);
+    }
+
+    public void putSelectedPosition(int position) {
+        selectedPositions.put(position,true);
+    }
+
+    public ArrayList<Integer> getSelectedPositions()
+    {
+        ArrayList<Integer> positions = new ArrayList<>();
+        for(Object key : selectedPositions.keySet())
+        {
+            positions.add((Integer)key);
+        }
+        Collections.sort(positions);
+        return positions;
+    }
+
+    public void removeSelectedPosition(int position)
+    {
+        selectedPositions.remove(position);
+    }
+
+    public int selectedPositionsSize()
+    {
+        return selectedPositions.size();
+    }
+
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         LayoutInflater mInflater;
@@ -71,6 +108,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder = (ApiHolder) convertView.getTag();
         }
 
+        if (selectedPositions.containsKey(position)) {
+            convertView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.color_divider));
+        } else {
+            convertView.setBackgroundColor(0);
+        }
+
         SavedApi apiData = getItem(position);
         holder.details.setText(String.format(Locale.ENGLISH, "Modified: %s, Author: ", apiData.getDate(), apiData.getAuthor()));
         holder.apkName.setText(apiData.getName());

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

@@ -12,7 +12,10 @@
 import org.buildmlearn.toolkit.views.TextViewPlus;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 /**
  * @brief Adapter used for showing saved projects in a list
@@ -23,12 +26,12 @@ public class SavedProjectAdapter extends BaseAdapter {
 
     private final Context mContext;
     private final ArrayList<SavedProject> data;
-    private int selectedPosition;
+    private Map selectedPositions;
 
     public SavedProjectAdapter(Context mContext, ArrayList<SavedProject> data) {
         this.mContext = mContext;
         this.data = data;
-        selectedPosition = -1;
+        selectedPositions = new HashMap();
     }
 
     /**
@@ -55,14 +58,35 @@ public long getItemId(int i) {
         return i;
     }
 
-    public int getSelectedPosition() {
-        return selectedPosition;
+    public boolean isPositionSelected(int position)
+    {
+        return selectedPositions.containsKey(position);
     }
 
-    public void setSelectedPosition(int selectedPosition) {
-        this.selectedPosition = selectedPosition;
+    public void putSelectedPosition(int position) {
+        selectedPositions.put(position,true);
     }
 
+    public ArrayList<Integer> getSelectedPositions()
+    {
+        ArrayList<Integer> positions = new ArrayList<>();
+        for(Object key : selectedPositions.keySet())
+        {
+            positions.add((Integer)key);
+        }
+        Collections.sort(positions);
+        return positions;
+    }
+
+    public void removeSelectedPosition(int position)
+    {
+        selectedPositions.remove(position);
+    }
+
+    public int selectedPositionsSize()
+    {
+        return selectedPositions.size();
+    }
     /**
      * {@inheritDoc}
      */
@@ -81,7 +105,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder = (ProjectHolder) convertView.getTag();
         }
 
-        if (selectedPosition == position) {
+        if (selectedPositions.containsKey(position)) {
             convertView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.color_divider));
         } else {
             convertView.setBackgroundColor(0);

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

@@ -146,11 +146,13 @@ private void setAdapter(DraftProjectAdapter adapter) {
     }
 
     private void setEmptyText() {
-
+        getView().findViewById(R.id.newProject).setVisibility(View.GONE);
+        getView().findViewById(R.id.no_saved_project).setVisibility(View.GONE);
+        getView().findViewById(R.id.no_saved_apks).setVisibility(View.GONE);
         if (mListView.getAdapter().getCount() == 0) {
-            getView().findViewById(R.id.empty).setVisibility(View.VISIBLE);
+            getView().findViewById(R.id.no_saved_drafts).setVisibility(View.VISIBLE);
         } else {
-            getView().findViewById(R.id.empty).setVisibility(View.GONE);
+            getView().findViewById(R.id.no_saved_drafts).setVisibility(View.GONE);
         }
     }
 
@@ -251,6 +253,7 @@ public void onPrepareOptionsMenu(Menu menu) {
         menu.clear();
         if (showTemplateSelectedMenu) {
             activity.getMenuInflater().inflate(R.menu.menu_project_selected, menu);
+            menu.findItem(R.id.action_share).setVisible(false);
         } else if (mAdapter.getCount() > 0) {
             activity.getMenuInflater().inflate(R.menu.menu_draft, menu);
         }