Merge pull request #246 from BuildmLearn/bug-fixes

Updating master branch from bug-fixes branch

Author: opticod

.travis.yml

@@ -1,19 +1,29 @@
 before_install: cd source-code
 
 language: android
-sudo: true
 jdk: oraclejdk8
+# Turn off caching to avoid any caching problems
+cache: false
+sudo: true
+
+cache:
+  directories:
+    - ${TRAVIS_BUILD_DIR}/gradle/caches/
+    - ${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/
+    
 env:
   matrix:
-    - ADB_INSTALL_TIMEOUT=12 ANDROID_BUILD_TOOLS_VERSION=23.0.2 ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a
+    - ANDROID_API_LEVEL=23 ADB_INSTALL_TIMEOUT=12 ANDROID_BUILD_TOOLS_VERSION=23.0.2 ANDROID_ABI=armeabi-v7a ANDROID_TAG=google_apis
 
 android:
   components:
+    - tools # to get the new repository-11.xml
     - platform-tools
-    - tools
+    - tools # to install Android SDK tools
     - build-tools-$ANDROID_BUILD_TOOLS_VERSION
-    - $ANDROID_TARGET
-    - android-23
+    - android-$ANDROID_API_LEVEL    
+    # For Google APIs
+    - addon-google_apis-google-$ANDROID_API_LEVEL
     # Google Play Services
     - extra-google-google_play_services
     # Support library
@@ -22,21 +32,10 @@ android:
     - extra-google-m2repository
     - extra-android-m2repository
     # Specify at least one system image,
-    - sys-img-armeabi-v7a-$ANDROID_TARGET
-
-before_script:
-  # Create and start emulator
-  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
-  - emulator -avd test -no-skin -no-audio -no-window &
-  - android-wait-for-emulator
-  - sleep 10
-  - adb shell settings put global window_animation_scale 0 &
-  - adb shell settings put global transition_animation_scale 0 &
-  - adb shell settings put global animator_duration_scale 0 &
-  - adb shell input keyevent 82 &
+    - sys-img-armeabi-v7a-android-$ANDROID_API_LEVEL
 
 script:
-  - ./gradlew check connectedAndroidTest
+  -  ./gradlew assembleRelease
 
 notifications:
   email:

README.md

@@ -6,6 +6,20 @@ This repository contains the Android version of the [BuildmLearn Toolkit](https:
 
 [Toolkit-mobile-templates](https://github.com/BuildmLearn/Toolkit-mobile-templates) contains the template applications of the toolkit.
 
+# Application Screenshots
+<img src="https://cloud.githubusercontent.com/assets/13872065/20721460/d83d3c9a-b688-11e6-891d-1f28092de314.jpeg"  width="250" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20721466/d8c038fc-b688-11e6-9b9e-1394c6dedc74.jpeg"  width="200" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20721462/d87f6d7c-b688-11e6-82e1-f3faa596d5d0.jpeg"  width="200" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20721464/d8b36672-b688-11e6-897c-8a0c849dbeb0.jpeg"  width="200" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20722851/3542f4de-b68e-11e6-8079-aaa35d5b9943.gif"  width="250" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20722869/427b28ce-b68e-11e6-9885-48147e87b531.jpeg"  width="200" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20722870/42803256-b68e-11e6-966b-2ea24db13a60.jpeg"  width="200" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20722871/428db1e2-b68e-11e6-97cf-5adab6ff0a63.jpeg"  width="200" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20724136/10f7366c-b693-11e6-8c53-a69707f2f9c8.jpeg"  width="250" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20724137/1133c4e2-b693-11e6-9d83-61dc7676f426.jpeg"  width="200" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20724129/0cd258a0-b693-11e6-90f3-66e88aeec244.gif"  width="200" height="400" />
+<img src="https://cloud.githubusercontent.com/assets/13872065/20724248/83706d30-b693-11e6-8c17-acd711ec11f7.gif"  width="200" height="400" />
+
 # Development Setup
 1. Go to the project repo and click the `Fork` button
 2. Clone your forked repository : `git clone git@github.com:your_name/BuildmLearn-Toolkit-Android.git`

source-code/app/build.gradle

@@ -47,6 +47,7 @@ android {
     lintOptions {
         abortOnError false
     }
+    sourceSets { main { res.srcDirs = ['src/main/res', 'src/main/res/anim'] } }
 }
 
 dependencies {
@@ -55,12 +56,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;
@@ -77,8 +72,6 @@ dependencies {
     compile files('libs/axml.jar')
     compile 'com.viewpagerindicator:library:2.4.1@aar'
     compile 'com.nineoldandroids:library:2.4.0'
-    compile 'com.daimajia.easing:library:1.0.1@aar'
-    compile 'com.daimajia.androidanimations:library:1.1.3@aar'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'org.jsoup:jsoup:1.9.1'
     androidTestCompile 'com.android.support:support-annotations:23.4.0'

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.buildmlearn.toolkit" >
+    package="org.buildmlearn.toolkit">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -17,13 +17,12 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <activity
             android:name=".activity.HomeActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/NoActionBarThemeTransparentStatusBar" >
-        </activity>
+            android:theme="@style/NoActionBarThemeTransparentStatusBar"></activity>
         <activity
             android:name=".simulator.Simulator"
             android:label="@string/title_activity_simulator"
@@ -33,7 +32,7 @@
             android:name=".activity.TemplateActivity"
             android:label="@string/title_activity_template"
             android:parentActivityName=".activity.HomeActivity"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.buildmlearn.toolkit.activity.HomeActivity" />
@@ -42,8 +41,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>
 
         <meta-data
             android:name="io.fabric.ApiKey"
@@ -52,8 +50,8 @@
         <activity
             android:name=".activity.FirstRunActivity"
             android:label="@string/app_name"
-            android:theme="@style/Buildmlearn.FullScreen"
-            android:windowSoftInputMode="adjustPan" >
+            android:theme="@style/SplashTheme"
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -63,24 +61,23 @@
         <activity
             android:name=".activity.TutorialActivity"
             android:label="@string/title_activity_tutorial"
-            android:theme="@style/Buildmlearn.FullScreen" >
-        </activity>
+            android:theme="@style/Buildmlearn.FullScreen"></activity>
         <activity
             android:name=".activity.AboutBuildmLearn"
             android:label="@string/title_activity_about_buildm_learn"
             android:parentActivityName=".activity.HomeActivity"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.buildmlearn.toolkit.activity.HomeActivity" />
         </activity>
         <activity
             android:name=".activity.DeepLinkerActivity"
-            android:label="@string/title_activity_deep_linker" >
+            android:label="@string/title_activity_deep_linker">
             <intent-filter
                 android:icon="@mipmap/ic_launcher"
                 android:label="@string/app_name"
-                android:priority="1" >
+                android:priority="1">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -91,13 +88,13 @@
                 <data android:pathPattern=".*\\.buildmlearn" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.SettingsLinkerActivity">
+        <activity android:name=".activity.SettingsLinkerActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
             </intent-filter>
         </activity>
     </application>
 
-</manifest>
+</manifest>

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

@@ -7,12 +7,12 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.EditText;
 import android.widget.Toast;
 
 import com.crashlytics.android.Crashlytics;
-import com.daimajia.androidanimations.library.Techniques;
-import com.daimajia.androidanimations.library.YoYo;
 
 import org.buildmlearn.toolkit.R;
 import org.buildmlearn.toolkit.constant.Constants;
@@ -46,14 +46,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
         findViewById(R.id.focus_thief).clearFocus();
-        YoYo.with(Techniques.BounceInUp)
-                .duration(2700)
-                .playOn(findViewById(R.id.first_name));
-
-
+        Animation anim_bounceinup=AnimationUtils.loadAnimation(getBaseContext(),R.anim.bounceinup);
         name = (EditText) findViewById(R.id.first_name);
-
-
+        name.startAnimation(anim_bounceinup);
         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/HomeActivity.java

@@ -4,10 +4,14 @@
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.widget.Toast;
 
 import org.buildmlearn.toolkit.R;
 import org.buildmlearn.toolkit.constant.Constants;
@@ -25,6 +29,8 @@ public class HomeActivity extends AppCompatActivity
 
     private Section currentSection;
     private NavigationDrawerFragment mNavigationDrawerFragment;
+    private  boolean atHome = true;
+    private boolean backPressedOnce = false;
 
     /**
      * {@inheritDoc}
@@ -33,6 +39,10 @@ public class HomeActivity extends AppCompatActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putBoolean("SkipTutorial", true);
+        editor.apply();
 
         setContentView(R.layout.activity_home);
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
@@ -130,9 +140,24 @@ public void onBackPressed() {
             mNavigationDrawerFragment.closeDrawer();
             return;
         }
-        if (getFragmentManager().getBackStackEntryCount() <= 1) {
-            finish();
+        if(atHome){
+            if(backPressedOnce){
+                finish();
+            }
+            backPressedOnce=true;
+            Toast.makeText(this, "Tap back once more to exit.", Toast.LENGTH_SHORT).show();
+            new Handler().postDelayed(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    backPressedOnce= false;
+                }
+            }, 2000);
+        }
+        else if(!atHome){
+            onNavigationDrawerItemSelected(0);
+            atHome = true;
         }
-        super.onBackPressed();
     }
 }