Refactor Codes

Author: opticod

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

@@ -48,43 +48,39 @@ protected void onCreate(Bundle savedInstanceState) {
                 R.id.navigation_drawer,
                 (DrawerLayout) findViewById(R.id.drawer_layout));
         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();
+            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);
         }

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 {

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

@@ -101,8 +101,8 @@ protected void onCreate(Bundle savedInstanceState) {
         oldFileName = null;
         setContentView(R.layout.activity_template_editor);
         KeyboardHelper.hideKeyboard(this, findViewById(R.id.toolbar));
-        KeyboardHelper.hideKeyboard(this,findViewById(R.id.template_editor_listview));
-        KeyboardHelper.hideKeyboard(this,findViewById(R.id.empty));
+        KeyboardHelper.hideKeyboard(this, findViewById(R.id.template_editor_listview));
+        KeyboardHelper.hideKeyboard(this, findViewById(R.id.empty));
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
         toolkit = (ToolkitApplication) getApplicationContext();
         templateId = getIntent().getIntExtra(Constants.TEMPLATE_ID, -1);
@@ -136,11 +136,11 @@ public void onClick(View v) {
         });
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                    != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(this,
-                        new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                        PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE_RESULT);
-            }
+                != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this,
+                    new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                    PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE_RESULT);
+        }
     }
 
     /**
@@ -223,14 +223,14 @@ private void populateListView(final BaseAdapter adapter) {
         if (templateEdtiorList == null) {
             templateEdtiorList = (ListView) findViewById(R.id.template_editor_listview);
         }
-            LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            View templateHeader = inflater.inflate(R.layout.listview_header_template, templateEdtiorList, false);
-            templateEdtiorList.addHeaderView(templateHeader, null, false);
+        LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View templateHeader = inflater.inflate(R.layout.listview_header_template, templateEdtiorList, false);
+        templateEdtiorList.addHeaderView(templateHeader, null, false);
 
-            EditText authorEditText = (EditText) findViewById(R.id.author_name);
-            SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-            assert authorEditText != null;
-            authorEditText.setText(preferences.getString(getString(R.string.key_user_name), ""));
+        EditText authorEditText = (EditText) findViewById(R.id.author_name);
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        assert authorEditText != null;
+        authorEditText.setText(preferences.getString(getString(R.string.key_user_name), ""));
 
         setAdapter(adapter);
 
@@ -552,7 +552,7 @@ public void restoreSelectedView() {
             if (selectedView instanceof CardView) {
                 ((CardView) selectedView).setCardBackgroundColor(Color.WHITE);
             } else {
-            selectedView.setBackgroundResource(0);
+                selectedView.setBackgroundResource(0);
             }
         }
 
@@ -683,8 +683,8 @@ private String saveProject() {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        if (saveDraft()!=null)
-            Toast.makeText(getApplicationContext(),"Saved in Draft!",Toast.LENGTH_SHORT).show();
+        if (saveDraft() != null)
+            Toast.makeText(getApplicationContext(), "Saved in Draft!", Toast.LENGTH_SHORT).show();
 
     }
 
@@ -739,24 +739,24 @@ private String saveDraft() {
 
             int draftFileIndex = 0;
             File draftDir = new File(toolkit.getDraftDir());
-            String probableFileName = "draft"+draftFileIndex+ ".buildmlearn";
+            String probableFileName = "draft" + draftFileIndex + ".buildmlearn";
             File probableFile = new File(draftDir, probableFileName);
 
-            while(probableFile.exists()) {
+            while (probableFile.exists()) {
                 draftFileIndex++;
-                probableFileName = "draft"+draftFileIndex+ ".buildmlearn";
+                probableFileName = "draft" + draftFileIndex + ".buildmlearn";
                 probableFile = new File(draftDir, probableFileName);
             }
 
             //Create temporary File, if that file content matches with OldContent
             // Then Don't make Draft
             File tempFile = new File(toolkit.getDraftDir(), ".temp");
             File oldFile = null;
-            if (oldFileName!=null)
+            if (oldFileName != null)
                 oldFile = new File(oldFileName);
 
             FileUtils.saveXmlFile(toolkit.getDraftDir(), ".temp", doc);
-            if (oldFile == null || !FileUtils.equalContent(tempFile,oldFile)) {
+            if (oldFile == null || !FileUtils.equalContent(tempFile, oldFile)) {
                 tempFile.renameTo(probableFile);
                 return toolkit.getDraftDir() + probableFileName;
             } else {
@@ -768,7 +768,7 @@ private String saveDraft() {
         } catch (ParserConfigurationException e) {
             e.printStackTrace();
         }
-    return null;
+        return null;
     }
 
 
@@ -832,7 +832,7 @@ private void parseSavedFile(String path) {
                 populateMetaView(selectedTemplate.loadProjectMetaEditor(this, doc));
             }
             File draftDir = new File(toolkit.getDraftDir());
-            if (fXmlFile.getParentFile().compareTo(draftDir) ==0 ) {
+            if (fXmlFile.getParentFile().compareTo(draftDir) == 0) {
                 //If Draft File
                 fXmlFile.delete();
             }
@@ -880,9 +880,9 @@ private void setAdapterMeta(BaseAdapter adapter) {
     @Override
     protected void onStop() {
         super.onStop();
-        if(mApkGenerationDialog!=null) {
+        if (mApkGenerationDialog != null) {
             mApkGenerationDialog.dismiss();
-            mApkGenerationDialog=null;
+            mApkGenerationDialog = null;
         }
     }
 

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

@@ -21,7 +21,7 @@
 
 /**
  * @brief Adapter used for showing menus in the side panel
- *
+ * <p/>
  * Created by Abhishek on 21/04/15.
  */
 public class NavigationDrawerMenuAdapter extends BaseAdapter {
@@ -52,20 +52,23 @@ public NavigationDrawerMenuAdapter(Context context, LayoutInflater inflater) {
     public int getCount() {
         return sections.length;
     }
+
     /**
      * {@inheritDoc}
      */
     @Override
     public Section getItem(int position) {
         return sections[position];
     }
+
     /**
      * {@inheritDoc}
      */
     @Override
     public long getItemId(int position) {
         return position;
     }
+
     /**
      * {@inheritDoc}
      */
@@ -101,7 +104,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             tv.setCompoundDrawablesWithIntrinsicBounds(sectionIcon, null, null, null);
             tv.setBackgroundColor(backgroundColor);
         } else if (menu.getType() == Section.SECTION_DIVIDER && convertView == null) {
-                convertView = inflater.inflate(R.layout.item_section_divider, parent, false);
+            convertView = inflater.inflate(R.layout.item_section_divider, parent, false);
         }
         return convertView;
     }

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

@@ -16,7 +16,7 @@
 
 /**
  * @brief Adapter used for showing saved projects in a list
- *
+ * <p/>
  * Created by Abhishek on 01-06-2015.
  */
 public class SavedProjectAdapter extends BaseAdapter {

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

@@ -25,7 +25,7 @@
 
 /**
  * @brief Adapter used for showing Templates available in the toolkit
- * <p>
+ * <p/>
  * Created by Abhishek on 23-05-2015.
  */
 public class TemplateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

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

@@ -18,7 +18,7 @@
 
 /**
  * @brief Adapter used for showing tutorial
- *
+ * <p/>
  * Created by abhishek on 03/08/15 at 10:52 PM.
  */
 public class TutorialAdapter extends PagerAdapter {