Merge branch 'ishaan1995-master' into bug-fixes

Author: opticod

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/BuildmLearn/BuildmLearn-Toolkit-Android.svg)](https://travis-ci.org/BuildmLearn/BuildmLearn-Toolkit-Android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/05c83f4ecad84cc0a2e57d7ea39df41f)](https://www.codacy.com/app/anupam/BuildmLearn-Toolkit-Android?utm_source=github.com&utm_medium=referral&utm_content=BuildmLearn/BuildmLearn-Toolkit-Android&utm_campaign=Badge_Grade)
+[![Preview the app](https://img.shields.io/badge/Preview-Appetize.io-green.svg)](https://appetize.io/app/k56b095hpt7ppmhmmhbg2ayj20) [![Build Status](https://travis-ci.org/BuildmLearn/BuildmLearn-Toolkit-Android.svg)](https://travis-ci.org/BuildmLearn/BuildmLearn-Toolkit-Android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/05c83f4ecad84cc0a2e57d7ea39df41f)](https://www.codacy.com/app/anupam/BuildmLearn-Toolkit-Android?utm_source=github.com&utm_medium=referral&utm_content=BuildmLearn/BuildmLearn-Toolkit-Android&utm_campaign=Badge_Grade)
 
 # BuildmLearn-Toolkit-Android
 
@@ -70,3 +70,9 @@ Redistributions in binary form must reproduce the above copyright notice, this l
 Neither the name of the BuildmLearn nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## Maintainers
+The project is maintained by
+- Pankaj Nathani ([@croozeus](https://github.com/croozeus))
+- Anupam Das ([@opticod](https://github.com/opticod))
+

source-code/app/build.gradle

@@ -55,12 +55,6 @@ dependencies {
     compile 'com.android.support:cardview-v7:23.4.0'
     compile 'com.android.support:recyclerview-v7:23.4.0'
     compile 'com.android.support:design:23.4.0'
-    compile('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') {
-        transitive = true
-    }
-    compile('com.github.afollestad.material-dialogs:commons:0.8.5.3@aar') {
-        transitive = true
-    }
     compile 'com.cocosw:bottomsheet:1.3.0@aar'
     compile('com.crashlytics.sdk.android:crashlytics:2.3.1@aar') {
         transitive = true;

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

@@ -10,8 +10,8 @@
 
 /**
  * @brief Extended Application class
- *
- *
+ * <p/>
+ * <p/>
  * Created by Abhishek on 31-05-2015.
  */
 public class ToolkitApplication extends Application {
@@ -20,6 +20,13 @@ public class ToolkitApplication extends Application {
 
     private boolean isExternalStorageAvailable = false;
 
+    /**
+     * @return Folder path
+     * @brief Returns folder path for unzipped apks
+     */
+    public static String getUnZipDir() {
+        return dir + Constants.UNZIP;
+    }
 
     @Override
     public void onCreate() {
@@ -48,58 +55,49 @@ public void onCreate() {
     }
 
     /**
-     * @brief Returns external storage directory.
      * @return folder file
+     * @brief Returns external storage directory.
      */
     public File getDir() {
         return Environment.getExternalStorageDirectory();
     }
 
     /**
-     * @brief Returns directory for BuildmLearn toolkit  manually created files.
      * @return folder path
+     * @brief Returns directory for BuildmLearn toolkit  manually created files.
      */
     public String getProjectDir() {
         return dir + Constants.BUILD_M_LEARN_PATH;
 
     }
 
     /**
-     * @brief Returns folder path for saved projects
      * @return Folder path
+     * @brief Returns folder path for saved projects
      */
     public String getSavedDir() {
         return dir + Constants.SAVED_DIR;
     }
 
     /**
-     * @brief Returns folder path for saved projects
      * @return Folder path
+     * @brief Returns folder path for saved projects
      */
     public String getDraftDir() {
         return dir + Constants.DRAFT_DIR;
     }
 
-
     /**
-     * @brief Returns folder path for unzipped apks
      * @return Folder path
-     */
-    public static String getUnZipDir() {
-        return dir + Constants.UNZIP;
-    }
-
-    /**
      * @brief Returns folder path for storing generated apks
-     * @return Folder path
      */
     public String getApkDir() {
         return dir + Constants.APK_DIR;
     }
 
     /**
-     * @brief Checks if external storage is present for storing data
      * @return true if external storage is present, else false
+     * @brief Checks if external storage is present for storing data
      */
     public boolean checkExternalStorage() {
 
@@ -117,8 +115,8 @@ public boolean isExternalStorageAvailable() {
     }
 
     /**
-     * @brief Returns folder path for Download directory
      * @return Folder path
+     * @brief Returns folder path for Download directory
      */
     public String getDownloadDirectory() {
         return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();

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

@@ -36,12 +36,11 @@ protected void onCreate(Bundle savedInstanceState) {
         } catch (PackageManager.NameNotFoundException e) {
             assert findViewById(R.id.app_version) != null;
             assert ((TextView) findViewById(R.id.app_version)) != null;
-            ((TextView)findViewById(R.id.app_version)).setText("Version: 1.0");
+            ((TextView) findViewById(R.id.app_version)).setText("Version: 1.0");
             e.printStackTrace();
         }
 
 
-
     }
 
 }

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

@@ -22,7 +22,7 @@
 
 /**
  * @brief Activity responsible for handling files opened from file explorer
- *
+ * <p/>
  * This activity is started whenever users opens a .buildmlearn file from file explorer.
  * This activity is responsible for getting the template type from the file, and passes the template Id and
  * file path to Template Editor/ activity.

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

@@ -47,46 +47,40 @@ protected void onCreate(Bundle savedInstanceState) {
         mNavigationDrawerFragment.setUp(
                 R.id.navigation_drawer,
                 (DrawerLayout) findViewById(R.id.drawer_layout));
-        if (getIntent().hasExtra(Constants.START_FRAGMENT)) {
-            if (getIntent().getIntExtra(Constants.START_FRAGMENT, 0) == 3) {
-                currentSection.setIsSelected(false);
-                Section[] menuItem = Section.values();
-                Section selectedMenuItem = menuItem[3];
-                selectedMenuItem.setIsSelected(true);
-                currentSection = selectedMenuItem;
-                FragmentTransaction ft = getFragmentManager().beginTransaction();
-                ft.replace(R.id.container, new SettingsFragment());
-                ft.commit();
-            }
+        if (getIntent().hasExtra(Constants.START_FRAGMENT) && getIntent().getIntExtra(Constants.START_FRAGMENT, 0) == 3) {
+            currentSection.setIsSelected(false);
+            Section[] menuItem = Section.values();
+            Section selectedMenuItem = menuItem[3];
+            selectedMenuItem.setIsSelected(true);
+            currentSection = selectedMenuItem;
+            FragmentTransaction ft = getFragmentManager().beginTransaction();
+            ft.replace(R.id.container, new SettingsFragment());
+            ft.commit();
         }
     }
+
     /**
      * {@inheritDoc}
      */
     @Override
     public void onNavigationDrawerItemSelected(int position) {
-        if(position==-1)
-        {
-            if(currentSection!=null)
-            {
-                if(currentSection.toString().equals("OPEN_PROJECT"))
-                {
-                    LoadProjectFragment f = (LoadProjectFragment)getFragmentManager().findFragmentByTag(currentSection.getViewName());
-                    if(f!=null)
+        if (position == -1) {
+            if (currentSection != null) {
+                if (currentSection.toString().equals("OPEN_PROJECT")) {
+                    LoadProjectFragment f = (LoadProjectFragment) getFragmentManager().findFragmentByTag(currentSection.getViewName());
+                    if (f != null)
                         f.closeSearch();
-                }
-                else if(currentSection.toString().equals("OPEN_APK"))
-                {
-                    LoadApkFragment f = (LoadApkFragment)getFragmentManager().findFragmentByTag(currentSection.getViewName());
-                    if(f!=null)
+                } else if (currentSection.toString().equals("OPEN_APK")) {
+                    LoadApkFragment f = (LoadApkFragment) getFragmentManager().findFragmentByTag(currentSection.getViewName());
+                    if (f != null)
                         f.closeSearch();
                 }
             }
-            return ;
+            return;
         }
         Section[] menuItem = Section.values();
         Section selectedMenuItem = menuItem[position];
-        if(getSupportActionBar()!=null) {
+        if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayShowHomeEnabled(true);
             getSupportActionBar().setDisplayShowCustomEnabled(false);
         }
@@ -103,7 +97,7 @@ else if(currentSection.toString().equals("OPEN_APK"))
                 }
             }
         } else if (selectedMenuItem.getType() == Section.FRAGMENT) {
-            if (currentSection == null || selectedMenuItem != currentSection) {
+            if (currentSection == null || !selectedMenuItem.equals(currentSection)) {
                 currentSection = selectedMenuItem;
                 FragmentManager fm = getFragmentManager();
                 FragmentTransaction ft = fm.beginTransaction().setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE).addToBackStack(null);

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

@@ -12,7 +12,7 @@
 
 /**
  * @brief Activity responsible for changing settings from android settings menu
- * <p>
+ * <p/>
  * This activity is started whenever users clicks App Settings under App notifications in android settings menu.
  */
 public class SettingsLinkerActivity extends Activity {