Merge pull request #297 from BuildmLearn/bug-fixes

DEC-2016 Update of Master Branch from bug-fixes branch
BuildmLearn · Dec 13, 2016 · b9302e7 · b9302e7
2 parents 8999b68 + e9c8607
commit b9302e7
Show file tree

Hide file tree

Showing 153 changed files with 1,450 additions and 1,295 deletions.
diff --git a/source-code/app/build.gradle b/source-code/app/build.gradle
@@ -31,7 +31,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 23
         versionCode 2
-        versionName "2.0.0"
+        versionName "2.5.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -51,27 +51,25 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:23.4.0'
     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.cocosw:bottomsheet:1.3.0@aar'
     compile('com.crashlytics.sdk.android:crashlytics:2.3.1@aar') {
         transitive = true;
     }
-    compile files('libs/core-1.51.0.0.jar')
-    compile files('libs/prov-1.51.0.0.jar')
-    compile files('libs/zipio-lib-1.8.jar')
+
     compile files('libs/zipsigner-lib-1.17.jar')
     compile files('libs/zipsigner-lib-optional-1.16.jar')
-    compile files('libs/pkix-1.51.0.0.jar')
     compile files('libs/kellinwood-logging-android-1.4.jar')
     compile files('libs/kellinwood-logging-lib-1.1.jar')
     compile files('libs/kellinwood-logging-log4j-1.0.jar')
     compile files('libs/axml.jar')
-    compile 'com.viewpagerindicator:library:2.4.1@aar'
-    compile 'com.nineoldandroids:library:2.4.0'
+    compile files('libs/pkix-1.51.0.0.jar')
+    compile files('libs/core-1.51.0.0.jar')
+    compile files('libs/prov-1.51.0.0.jar')
+    compile files('libs/zipio-lib-1.8.jar')
+
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'org.jsoup:jsoup:1.9.1'
     androidTestCompile 'com.android.support:support-annotations:23.4.0'

diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/ToolkitApplication.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/ToolkitApplication.java
@@ -18,7 +18,7 @@ public class ToolkitApplication extends Application {
 
     private static String dir;
 
-    private boolean isExternalStorageAvailable = false;
+    private static boolean isExternalStorageAvailable = false;
 
     /**
      * @return Folder path
@@ -31,6 +31,10 @@ public static String getUnZipDir() {
     @Override
     public void onCreate() {
         super.onCreate();
+        storagePathsValidate();
+    }
+
+    public void storagePathsValidate() {
         if (checkExternalStorage()) {
             isExternalStorageAvailable = true;
             dir = Environment.getExternalStorageDirectory().getAbsolutePath();
@@ -50,8 +54,6 @@ public void onCreate() {
                 f.mkdirs();
             }
         }
-
-
     }
 
     /**

diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/AboutBuildmLearn.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/AboutBuildmLearn.java
@@ -36,7 +36,7 @@ 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: 2.5.0");
             e.printStackTrace();
         }
 

diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java
@@ -10,7 +10,6 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.EditText;
-import android.widget.Toast;
 
 import com.crashlytics.android.Crashlytics;
 
@@ -58,7 +57,12 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                         case KeyEvent.KEYCODE_ENTER:
 
                             if (name.getText().toString().equals("")) {
-                                Toast.makeText(getApplicationContext(), "Enter name", Toast.LENGTH_SHORT).show();
+                                name.setError(getApplicationContext().getResources().getString(R.string.enter_name));
+                                return false;
+                            }
+                            else if(!Character.isLetterOrDigit(name.getText().toString().charAt(0)))
+                            {
+                                name.setError(getApplicationContext().getResources().getString(R.string.valid_msg));
                                 return false;
                             }