Improved Code Quality- 3

Author: opticod

source-code/app/src/androidTest/java/org/buildmlearn/toolkit/espresso/ComprehensionTest.java

@@ -64,7 +64,7 @@
 @LargeTest
 public class ComprehensionTest {
     @Rule
-    public ActivityTestRule<TemplateEditor> mActivityRule =
+    public final ActivityTestRule<TemplateEditor> mActivityRule =
             new ActivityTestRule<TemplateEditor>(TemplateEditor.class) {
                 @Override
                 protected Intent getActivityIntent() {
@@ -204,15 +204,15 @@ public void saveAPK() {
         onView(withText("Save APK")).perform(click());
 
         Intent intent = new Intent();
-        intent.setAction(android.content.Intent.ACTION_VIEW);
+        intent.setAction(Intent.ACTION_VIEW);
         String finalApk = getText(allOf(withResourceName("content"), is(instanceOf(AppCompatTextView.class))));
         finalApk = finalApk.substring(18, finalApk.length());
         File file = new File(finalApk);
         intent.setDataAndType(Uri.fromFile(file), "application/vnd.android.package-archive");
         mActivityRule.getActivity().startActivity(intent);
     }
 
-    String getText(final Matcher<View> matcher) {
+    private String getText(final Matcher<View> matcher) {
         final String[] stringHolder = {null};
         onView(matcher).perform(new ViewAction() {
             @Override

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

@@ -16,10 +16,6 @@
  */
 public class ToolkitApplication extends Application {
 
-    private String projectDir;
-    private String toolkitDir;
-    private String apkDir;
-
     private String dir;
     private boolean isExternalStorageAvailable = false;
 

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

@@ -38,7 +38,6 @@ protected void onCreate(Bundle savedInstanceState) {
      */
         NavigationDrawerFragment mNavigationDrawerFragment = (NavigationDrawerFragment)
                 getSupportFragmentManager().findFragmentById(R.id.navigation_drawer);
-        CharSequence mTitle = getTitle();
 
         // Set up the drawer.
         mNavigationDrawerFragment.setUp(

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

@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setHomeButtonEnabled(true);
-        ListAdapter mAdapter = new TemplateAdapter(this, 6);
+        ListAdapter mAdapter = new TemplateAdapter(this);
         AbsListView mListView = (AbsListView) findViewById(android.R.id.list);
         mListView.setAdapter(mAdapter);
 

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

@@ -135,14 +135,12 @@ public void onClick(View v) {
             }
         });
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+        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);
             }
-        }
     }
 
     /**
@@ -525,6 +523,8 @@ public void onFail(Exception e) {
             case android.R.id.home:
                 onBackPressed();
                 break;
+            default: //do nothing
+                break;
         }
         return true;
     }
@@ -602,10 +602,10 @@ private String saveProject() {
         String author = ((EditText) findViewById(R.id.author_name)).getText().toString();
         assert findViewById(R.id.template_title) != null;
         String title = ((EditText) findViewById(R.id.template_title)).getText().toString();
-        if (author.equals("")) {
+        if ("".equals(author)) {
             assert authorEditText != null;
             authorEditText.setError("Author name is required");
-        } else if (title.equals("")) {
+        } else if ("".equals(title)) {
             assert titleEditText != null;
             titleEditText.setError("Title is required");
         } else {

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

@@ -100,10 +100,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
             tv.setText(sectionTitle);
             tv.setCompoundDrawablesWithIntrinsicBounds(sectionIcon, null, null, null);
             tv.setBackgroundColor(backgroundColor);
-        } else if (menu.getType() == Section.SECTION_DIVIDER) {
-            if (convertView == null) {
+        } else if (menu.getType() == Section.SECTION_DIVIDER && convertView == null) {
                 convertView = inflater.inflate(R.layout.item_section_divider, parent, false);
-            }
         }
         return convertView;
     }

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

@@ -79,8 +79,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
     }
 
     public class ProjectHolder {
-        TextViewPlus projectName;
-        TextViewPlus projectIcon;
-        TextViewPlus details;
+        public TextViewPlus projectName;
+        public TextViewPlus projectIcon;
+        public TextViewPlus details;
     }
 }

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

@@ -26,7 +26,7 @@ public class TemplateAdapter extends BaseAdapter {
     private final Template[] templates = Template.values();
     private final ListColor[] colors = ListColor.values();
 
-    public TemplateAdapter(Context context, int count) {
+    public TemplateAdapter(Context context) {
         this.context = context;
     }
 

source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensionTemplate/Constants.java renamed to source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/Constants.java

@@ -1,4 +1,4 @@
-package org.buildmlearn.toolkit.comprehensionTemplate;
+package org.buildmlearn.toolkit.comprehensiontemplate;
 
 /**
  * Created by Anupam (opticod) on 5/6/16.

source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensionTemplate/data/ComprehensionContract.java renamed to source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/data/ComprehensionContract.java

@@ -1,4 +1,4 @@
-package org.buildmlearn.toolkit.comprehensionTemplate.data;
+package org.buildmlearn.toolkit.comprehensiontemplate.data;
 
 import android.provider.BaseColumns;