Merge branch 'bug-fixes' into check-update

Author: opticod

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

@@ -93,6 +93,7 @@ private static void allowPermissionsIfNeeded() {
                 try {
                     allowPermissions.click();
                 } catch (UiObjectNotFoundException e) {
+                e.printStackTrace();
                 }
             }
         }
@@ -118,13 +119,13 @@ public void run() {
         });
     }
 
-    public void toolbarTitle() {
+    private void toolbarTitle() {
         String title = "Comprehension Template";
         onView(allOf(instanceOf(TextView.class), withParent(withId(R.id.toolbar))))
                 .check(matches(withText(title)));
     }
 
-    public void addMetaDetails() {
+    private void addMetaDetails() {
         String passTitle = "PassageTitle";
         String passage = "Short Passage.";
         String timer = "180";
@@ -143,7 +144,7 @@ public void addMetaDetails() {
 
     }
 
-    public void editMetaDetails() {
+    private void editMetaDetails() {
         String passTitle = "EditedPassageTitle";
         String passage = "EditedShort Passage.";
 
@@ -158,7 +159,7 @@ public void editMetaDetails() {
 
     }
 
-    public void addQuestions() {
+    private void addQuestions() {
         String question = "This is just a silly question whose answer is (b).";
 
         onView(withId(R.id.button_add_item)).perform(click());
@@ -180,7 +181,7 @@ public void addQuestions() {
 
     }
 
-    public void editQuestions() {
+    private void editQuestions() {
         String question = "This is just a silly question whose answer changed to (a).";
 
         onData(anything()).inAdapterView(withId(R.id.template_editor_listview)).atPosition(1).perform(longClick());
@@ -193,13 +194,13 @@ public void editQuestions() {
 
     }
 
-    public void addTemplate() {
+    private void addTemplate() {
 
         onView(withId(R.id.author_name)).perform(replaceText("Anupam"));
         onView(withId(R.id.template_title)).perform(replaceText("Testing template"));
     }
 
-    public void saveAPK() {
+    private void saveAPK() {
 
         onView(withId(R.id.action_save)).perform(click());
         onView(withText("Save APK")).perform(click());
@@ -235,7 +236,7 @@ public void perform(UiController uiController, View view) {
         return stringHolder[0];
     }
 
-    public void checkSimulator() {
+    private void checkSimulator() {
         onView(withId(R.id.action_simulate)).perform(click());
         onView(withText("Testing template")).check(matches(isDisplayed()));
         onView(withText("Anupam")).check(matches(isDisplayed()));

source-code/app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
         android:required="true" />
 
     <application
+        android:fullBackupContent="true"
         android:name=".ToolkitApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -22,7 +23,7 @@
             android:name=".activity.HomeActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/NoActionBarThemeTransparentStatusBar"></activity>
+            android:theme="@style/NoActionBarThemeTransparentStatusBar" />
         <activity
             android:name=".simulator.Simulator"
             android:label="@string/title_activity_simulator"
@@ -41,7 +42,7 @@
             android:name=".activity.TemplateEditor"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_template_editor"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activity.FirstRunActivity"
             android:label="@string/app_name"
@@ -56,7 +57,7 @@
         <activity
             android:name=".activity.TutorialActivity"
             android:label="@string/title_activity_tutorial"
-            android:theme="@style/Buildmlearn.FullScreen"></activity>
+            android:theme="@style/Buildmlearn.FullScreen" />
         <activity
             android:name=".activity.AboutBuildmLearn"
             android:label="@string/title_activity_about_buildm_learn"

source-code/app/src/main/assets/MatchApp.apk

@@ -104,7 +104,7 @@ public String getApkDir() {
     public boolean checkExternalStorage() {
 
         boolean result = false;
-        File f = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/BuildmLearn123/");
+        File f = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + Constants.BUILD_M_LEARN_PATH_123);
         if (!f.isDirectory()) {
             result = f.mkdirs();
             f.delete();

source-code/app/src/main/assets/VideoCollectionApp.apk

@@ -35,8 +35,8 @@ protected void onCreate(Bundle savedInstanceState) {
             ((TextView) findViewById(R.id.app_version)).setText(String.format(Locale.ENGLISH, "Version: %s", version));
         } 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: 2.5.0");
+            assert ( findViewById(R.id.app_version)) != null;
+            ((TextView) findViewById(R.id.app_version)).setText("Version: 1.0");
             e.printStackTrace();
         }
 

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

@@ -11,6 +11,7 @@
 import android.view.animation.AnimationUtils;
 import android.widget.EditText;
 
+
 import com.crashlytics.android.Crashlytics;
 
 import org.buildmlearn.toolkit.R;
@@ -45,9 +46,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
         findViewById(R.id.focus_thief).clearFocus();
-        Animation anim_bounceinup=AnimationUtils.loadAnimation(getBaseContext(),R.anim.bounceinup);
+        Animation animBounceinup=AnimationUtils.loadAnimation(getBaseContext(),R.anim.bounceinup);
         name = (EditText) findViewById(R.id.first_name);
-        name.startAnimation(anim_bounceinup);
+        name.startAnimation(animBounceinup);
         name.setOnKeyListener(new View.OnKeyListener() {
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {

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

@@ -4,16 +4,19 @@
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.design.widget.NavigationView;
 
 import android.app.FragmentManager;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
 import android.os.Handler;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;;
+import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
@@ -41,7 +44,7 @@ public class HomeActivity extends AppCompatActivity
 
     private SmoothNavigationToggle smoothNavigationToggle;
 
-    NavigationView navigationView;
+    private NavigationView navigationView;
 
     /**
      * {@inheritDoc}
@@ -107,7 +110,7 @@ public boolean onNavigationItemSelected(MenuItem item) {
             getSupportActionBar().setDisplayShowHomeEnabled(true);
             getSupportActionBar().setDisplayShowTitleEnabled(true);
         }
-
+        restoreColorScheme();
         switch(id){
             case R.id.nav_home:
                 smoothNavigationToggle.runWhenIdle(new Runnable() {
@@ -199,6 +202,16 @@ public void run() {
         return true;
     }
 
+    private void restoreColorScheme() {
+        int primaryColor = ContextCompat.getColor(HomeActivity.this, R.color.color_primary);
+        int primaryColorDark = ContextCompat.getColor(HomeActivity.this, R.color.color_primary_dark);
+        getSupportActionBar().setBackgroundDrawable(new ColorDrawable(primaryColor));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            getWindow().setStatusBarColor(primaryColorDark);
+            getWindow().setNavigationBarColor(primaryColor);
+        }
+    }
+
     @Override
     public void onBackPressed() {
         FragmentManager fragmentManager = getFragmentManager();