Merge pull request #148 from BuildmLearn/new-features

Update master branch after completion of GSoC MidTerm 2016

.travis.yml

@@ -0,0 +1,47 @@
+before_install: cd source-code
+
+language: android
+sudo: true
+jdk: oraclejdk8
+env:
+  matrix:
+    - ADB_INSTALL_TIMEOUT=12 ANDROID_BUILD_TOOLS_VERSION=23.0.2 ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a
+
+android:
+  components:
+    - platform-tools
+    - tools
+    - build-tools-$ANDROID_BUILD_TOOLS_VERSION
+    - $ANDROID_TARGET
+    - android-23
+    # Google Play Services
+    - extra-google-google_play_services
+    # Support library
+    - extra-android-support
+    # Latest artifacts in local repository
+    - 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 &
+
+script:
+  - ./gradlew check connectedAndroidTest
+
+notifications:
+  email:
+    recipients:
+      - [email protected]
+      - [email protected]
+  on_success: always
+  on_failure: always

README.md

@@ -1,6 +1,53 @@
+[![Build Status](https://travis-ci.org/BuildmLearn/BuildmLearn-Toolkit-Android.svg)](https://travis-ci.org/BuildmLearn/BuildmLearn-Toolkit-Android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/05c83f4ecad84cc0a2e57d7ea39df41f)](https://www.codacy.com/app/anupam/BuildmLearn-Toolkit-Android?utm_source=github.com&utm_medium=referral&utm_content=BuildmLearn/BuildmLearn-Toolkit-Android&utm_campaign=Badge_Grade)
+
 # BuildmLearn-Toolkit-Android
 
-This repository contains the Android version of the BuildmLearn Toolkit. BuildmLearn Toolkit is an easy-to-use program that helps the users make mobile apps without any knowledge of application development.
+This repository contains the Android version of the BuildmLearn Toolkit. BuildmLearn Toolkit app is an easy-to-use android app that helps the users make another mobile apps without any knowledge of android application development. The toolkit helps creating mobile application with various functionality and allows teachers to input their custom content. Targeted at teachers, this toolkit helps them make learning fun and engaging through mobile apps.
+
+# Development Setup
+1. Go to the project repo and click the `Fork` button
+2. Clone your forked repository : `git clone [email protected]:your_name/BuildmLearn-Toolkit-Android.git`
+3. Move to android project folder `cd source-code`
+4. Open the project with Android Studio
+
+Glosarry
+======
+| Folders       | Description           |
+| ------------- |:-------------|
+| **source-code**       | **Android Project Files**           |
+| **ui-design**      | **Contains UI mockups and wireframes**   |
+| **[X]**       |   **source-code/app/src/main/java/org/buildmlearn/toolkit**    |
+| [X]/activity    | Contains various activities  |
+| [X]/adapters    | Contains various adapters    |
+| [X]/fragment | Contains various fragment  |
+| [X]/simulator | Contains simulator activity  |
+| [X]/templates | Contains various template activities |
+| [X]/model | Contains KeyStoreDetails, SavedProject, TemplateInfos, Tutorial, etc  |
+| [X]/utilities | Contains various utilities including SignerThread  |
+| [X]/views | Contains text-view font support for old-backed SDKs  |
+| [X]/infotemplate | Contains simulator's code for Info Template  |
+| [X]/learnspelling | Contains simulator's code for learnspelling Template  |
+| [X]/flashcardtemplate | Contains simulator's code for FlashCard Template  |
+| [X]/quiztemplate | Contains simulator's code for Quiz Template  |
+| [X]/videocollectiontemplate | Contains simulator's code for FlashCard Template  |
+| [X]/comprehensiontemplate | Contains simulator's code for Comprehension Template  |
+| [X]/[?]/adapter | Contains simulator's adapter for [?] Template  |
+| [X]/[?]/data  | Contains simulator's SQLiteDatabase code for [?] Template |
+| [X]/[?]/fragment | Contains simulator's fragment for [?] Template  |
+
+# How to build
+
+All dependencies are defined in ```source-code/app/build.gradle```. Import the project in Android Studio or use Gradle in command line:
+
+```
+./gradlew assembleRelease
+```
+
+The result apk file will be placed in ```source-code/app/build/outputs/apk/```.
+
+#Contribution policy
+
+All contributions should be done in **bug-fixes** branch. PRs must pass build check on Travis-CI.
 
 # License for use and distribution
 

source-code/README.md

@@ -1,4 +1,29 @@
-## How to build
+#This folder contains the project source-code
+
+Glosarry
+======
+| Folders       | Description           |
+| ------------- |:-------------|
+| **[X]**       |   **app/src/main/java/org/buildmlearn/toolkit**    |
+| [X]/activity    | Contains various activities  |
+| [X]/adapters    | Contains various adapters    |
+| [X]/fragment | Contains various fragment  |
+| [X]/simulator | Contains simulator activity  |
+| [X]/templates | Contains various template activities |
+| [X]/model | Contains KeyStoreDetails, SavedProject, TemplateInfos, Tutorial, etc  |
+| [X]/utilities | Contains various utilities including SignerThread  |
+| [X]/views | Contains text-view font support for old-backed SDKs  |
+| [X]/infotemplate | Contains simulator's code for Info Template  |
+| [X]/learnspelling | Contains simulator's code for learnspelling Template  |
+| [X]/flashcardtemplate | Contains simulator's code for FlashCard Template  |
+| [X]/quiztemplate | Contains simulator's code for Quiz Template  |
+| [X]/videocollectiontemplate | Contains simulator's code for FlashCard Template  |
+| [X]/comprehensiontemplate | Contains simulator's code for Comprehension Template  |
+| [X]/[?]/adapter | Contains simulator's adapter for [?] Template  |
+| [X]/[?]/data  | Contains simulator's SQLiteDatabase code for [?] Template |
+| [X]/[?]/fragment | Contains simulator's fragment for [?] Template  |
+
+# How to build
 
 All dependencies are defined in ```app/build.gradle```. Import the project in Android Studio or use Gradle in command line:
 

source-code/app/build.gradle

@@ -32,6 +32,8 @@ android {
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -42,21 +44,24 @@ android {
             signingConfig signingConfigs.config
         }
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:22.1.+'
-    compile 'com.android.support:cardview-v7:21.0.+'
-    compile 'com.android.support:recyclerview-v7:21.0.+'
-    compile 'com.android.support:design:22.2.1'
+    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.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.+@aar'
+    compile 'com.cocosw:bottomsheet:1.3.0@aar'
     compile('com.crashlytics.sdk.android:crashlytics:2.3.1@aar') {
         transitive = true;
     }
@@ -69,8 +74,15 @@ dependencies {
     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 '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'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+    androidTestCompile 'com.android.support.test:runner:0.5'
+    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.0.0'
+}