Skip to content

Commit dcd15bd

Browse files
opticodopticod
authored
Merge pull request #148 from BuildmLearn/new-features
Update master branch after completion of GSoC MidTerm 2016
2 parents 73699fc + 4cd9e58 commit dcd15bd

File tree

362 files changed

+8240
-1659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

362 files changed

+8240
-1659
lines changed

‎.travis.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
before_install: cd source-code
2+
3+
language: android
4+
sudo: true
5+
jdk: oraclejdk8
6+
env:
7+
matrix:
8+
- ADB_INSTALL_TIMEOUT=12 ANDROID_BUILD_TOOLS_VERSION=23.0.2 ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a
9+
10+
android:
11+
components:
12+
- platform-tools
13+
- tools
14+
- build-tools-$ANDROID_BUILD_TOOLS_VERSION
15+
- $ANDROID_TARGET
16+
- android-23
17+
# Google Play Services
18+
- extra-google-google_play_services
19+
# Support library
20+
- extra-android-support
21+
# Latest artifacts in local repository
22+
- extra-google-m2repository
23+
- extra-android-m2repository
24+
# Specify at least one system image,
25+
- sys-img-armeabi-v7a-$ANDROID_TARGET
26+
27+
before_script:
28+
# Create and start emulator
29+
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
30+
- emulator -avd test -no-skin -no-audio -no-window &
31+
- android-wait-for-emulator
32+
- sleep 10
33+
- adb shell settings put global window_animation_scale 0 &
34+
- adb shell settings put global transition_animation_scale 0 &
35+
- adb shell settings put global animator_duration_scale 0 &
36+
- adb shell input keyevent 82 &
37+
38+
script:
39+
- ./gradlew check connectedAndroidTest
40+
41+
notifications:
42+
email:
43+
recipients:
44+
- croozeus@gmail.com
45+
- anupam.das.bwn@gmail.com
46+
on_success: always
47+
on_failure: always

‎README.md

+48-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,53 @@
1+
[![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)
2+
13
# BuildmLearn-Toolkit-Android
24

3-
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.
5+
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.
6+
7+
# Development Setup
8+
1. Go to the project repo and click the `Fork` button
9+
2. Clone your forked repository : `git clone git@github.com:your_name/BuildmLearn-Toolkit-Android.git`
10+
3. Move to android project folder `cd source-code`
11+
4. Open the project with Android Studio
12+
13+
Glosarry
14+
======
15+
| Folders | Description |
16+
| ------------- |:-------------|
17+
| **source-code** | **Android Project Files** |
18+
| **ui-design** | **Contains UI mockups and wireframes** |
19+
| **[X]** | **source-code/app/src/main/java/org/buildmlearn/toolkit** |
20+
| [X]/activity | Contains various activities |
21+
| [X]/adapters | Contains various adapters |
22+
| [X]/fragment | Contains various fragment |
23+
| [X]/simulator | Contains simulator activity |
24+
| [X]/templates | Contains various template activities |
25+
| [X]/model | Contains KeyStoreDetails, SavedProject, TemplateInfos, Tutorial, etc |
26+
| [X]/utilities | Contains various utilities including SignerThread |
27+
| [X]/views | Contains text-view font support for old-backed SDKs |
28+
| [X]/infotemplate | Contains simulator's code for Info Template |
29+
| [X]/learnspelling | Contains simulator's code for learnspelling Template |
30+
| [X]/flashcardtemplate | Contains simulator's code for FlashCard Template |
31+
| [X]/quiztemplate | Contains simulator's code for Quiz Template |
32+
| [X]/videocollectiontemplate | Contains simulator's code for FlashCard Template |
33+
| [X]/comprehensiontemplate | Contains simulator's code for Comprehension Template |
34+
| [X]/[?]/adapter | Contains simulator's adapter for [?] Template |
35+
| [X]/[?]/data | Contains simulator's SQLiteDatabase code for [?] Template |
36+
| [X]/[?]/fragment | Contains simulator's fragment for [?] Template |
37+
38+
# How to build
39+
40+
All dependencies are defined in ```source-code/app/build.gradle```. Import the project in Android Studio or use Gradle in command line:
41+
42+
```
43+
./gradlew assembleRelease
44+
```
45+
46+
The result apk file will be placed in ```source-code/app/build/outputs/apk/```.
47+
48+
#Contribution policy
49+
50+
All contributions should be done in **bug-fixes** branch. PRs must pass build check on Travis-CI.
451

552
# License for use and distribution
653

‎source-code/README.md

+26-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
1-
## How to build
1+
#This folder contains the project source-code
2+
3+
Glosarry
4+
======
5+
| Folders | Description |
6+
| ------------- |:-------------|
7+
| **[X]** | **app/src/main/java/org/buildmlearn/toolkit** |
8+
| [X]/activity | Contains various activities |
9+
| [X]/adapters | Contains various adapters |
10+
| [X]/fragment | Contains various fragment |
11+
| [X]/simulator | Contains simulator activity |
12+
| [X]/templates | Contains various template activities |
13+
| [X]/model | Contains KeyStoreDetails, SavedProject, TemplateInfos, Tutorial, etc |
14+
| [X]/utilities | Contains various utilities including SignerThread |
15+
| [X]/views | Contains text-view font support for old-backed SDKs |
16+
| [X]/infotemplate | Contains simulator's code for Info Template |
17+
| [X]/learnspelling | Contains simulator's code for learnspelling Template |
18+
| [X]/flashcardtemplate | Contains simulator's code for FlashCard Template |
19+
| [X]/quiztemplate | Contains simulator's code for Quiz Template |
20+
| [X]/videocollectiontemplate | Contains simulator's code for FlashCard Template |
21+
| [X]/comprehensiontemplate | Contains simulator's code for Comprehension Template |
22+
| [X]/[?]/adapter | Contains simulator's adapter for [?] Template |
23+
| [X]/[?]/data | Contains simulator's SQLiteDatabase code for [?] Template |
24+
| [X]/[?]/fragment | Contains simulator's fragment for [?] Template |
25+
26+
# How to build
227

328
All dependencies are defined in ```app/build.gradle```. Import the project in Android Studio or use Gradle in command line:
429

‎source-code/app/app.iml

-137
This file was deleted.

‎source-code/app/build.gradle

+18-6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ android {
3232
targetSdkVersion 23
3333
versionCode 1
3434
versionName "1.0"
35+
36+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3537
}
3638
buildTypes {
3739
release {
@@ -42,21 +44,24 @@ android {
4244
signingConfig signingConfigs.config
4345
}
4446
}
47+
lintOptions {
48+
abortOnError false
49+
}
4550
}
4651

4752
dependencies {
4853
compile fileTree(include: ['*.jar'], dir: 'libs')
49-
compile 'com.android.support:appcompat-v7:22.1.+'
50-
compile 'com.android.support:cardview-v7:21.0.+'
51-
compile 'com.android.support:recyclerview-v7:21.0.+'
52-
compile 'com.android.support:design:22.2.1'
54+
compile 'com.android.support:appcompat-v7:23.4.0'
55+
compile 'com.android.support:cardview-v7:23.4.0'
56+
compile 'com.android.support:recyclerview-v7:23.4.0'
57+
compile 'com.android.support:design:23.4.0'
5358
compile('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') {
5459
transitive = true
5560
}
5661
compile('com.github.afollestad.material-dialogs:commons:0.8.5.3@aar') {
5762
transitive = true
5863
}
59-
compile 'com.cocosw:bottomsheet:1.+@aar'
64+
compile 'com.cocosw:bottomsheet:1.3.0@aar'
6065
compile('com.crashlytics.sdk.android:crashlytics:2.3.1@aar') {
6166
transitive = true;
6267
}
@@ -69,8 +74,15 @@ dependencies {
6974
compile files('libs/kellinwood-logging-android-1.4.jar')
7075
compile files('libs/kellinwood-logging-lib-1.1.jar')
7176
compile files('libs/kellinwood-logging-log4j-1.0.jar')
77+
compile files('libs/axml.jar')
7278
compile 'com.viewpagerindicator:library:2.4.1@aar'
7379
compile 'com.nineoldandroids:library:2.4.0'
7480
compile 'com.daimajia.easing:library:1.0.1@aar'
7581
compile 'com.daimajia.androidanimations:library:1.1.3@aar'
76-
}
82+
compile 'com.squareup.picasso:picasso:2.5.2'
83+
compile 'org.jsoup:jsoup:1.9.1'
84+
androidTestCompile 'com.android.support:support-annotations:23.4.0'
85+
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
86+
androidTestCompile 'com.android.support.test:runner:0.5'
87+
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.0.0'
88+
}

‎source-code/app/libs/axml.jar

60.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)