Skip to content

Commit aa45687

Browse files
authored
Merge pull request #151 from BuildmLearn/new-features
Update master branch after completion of GSoC EndTerm 2016
2 parents c753602 + 38a6743 commit aa45687

File tree

314 files changed

+12468
-3738
lines changed

Some content is hidden

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

314 files changed

+12468
-3738
lines changed

source-code/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ android {
3030
applicationId "org.buildmlearn.toolkit"
3131
minSdkVersion 14
3232
targetSdkVersion 23
33-
versionCode 1
34-
versionName "1.0"
33+
versionCode 2
34+
versionName "2.0.0"
3535

3636
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3737
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import static org.hamcrest.core.IsInstanceOf.instanceOf;
5757

5858
/**
59+
* Espresso test designed to test all the functionalities of Comprehension template
5960
* Created by anupam (opticod) on 7/6/16.
6061
*/
6162

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
android:allowBackup="true"
1717
android:icon="@mipmap/ic_launcher"
1818
android:label="@string/app_name"
19+
android:supportsRtl="true"
1920
android:theme="@style/AppTheme" >
2021
<activity
2122
android:name=".activity.HomeActivity"
1.33 MB
Binary file not shown.
594 KB
Binary file not shown.

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

100755100644
808 KB
Binary file not shown.
1.3 MB
Binary file not shown.

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

100755100644
802 KB
Binary file not shown.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<buildmlearn_application type="DictationTemplate">
3+
<author>
4+
<name>Anupam</name>
5+
</author>
6+
<title>Dictation</title>
7+
<data>
8+
<item>
9+
<dictation_title>Dream of the Rarebit Fiend</dictation_title>
10+
<dictation_passage>Dream of the Rarebit Fiend was a newspaper comic strip by American cartoonist Winsor McCay, begun September 10, 1904, that depicted fantastic bizarre dreams. It was McCay's second successful strip after Little Sammy Sneeze secured him a position on the cartoon staff of the New York Herald. Rarebit Fiend was printed in the Evening Telegram, a newspaper published by the Herald. The strip had no continuity or recurring characters.</dictation_passage>
11+
</item>
12+
<item>
13+
<dictation_title>Earthworks</dictation_title>
14+
<dictation_passage>Bill Bruford's Earthworks were a British jazz band led by drummer Bill Bruford. The band recorded several albums for Editions EG, Discipline Global Mobile and Summerfold Records.
15+
16+
Earthworks went through several line-ups: in addition to the band's accomplishments as a unit, Earthworks was a training ground for Django Bates, Iain Ballamy, Patrick Clahar, Mark Hodgson, Steve Hamilton and Gwilym Simcock. The final band line-up featured previously established jazz musicians in the form of Chick Corea sideman Tim Garland and veteran bass player Laurence Cottle. In interviews during the band's earlier years, Bruford sometimes compared his responsibilities within it as being similar to those of Art Blakey with the Jazz Messengers, in that he was providing an environment for young British jazz players to gain attention and experience before going on to become well-known players and bandleaders in their own right.</dictation_passage>
17+
</item>
18+
</data>
19+
</buildmlearn_application>
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<buildmlearn_application type="MatchTemplate">
3+
<author>
4+
<name>Anupam</name>
5+
</author>
6+
<title>Country Match</title>
7+
<data>
8+
<meta_details>
9+
<meta_title>Match the countries</meta_title>
10+
<meta_first_list_title>Country</meta_first_list_title>
11+
<meta_second_list_title>Capital</meta_second_list_title>
12+
</meta_details>
13+
<item>
14+
<first_list_item>India</first_list_item>
15+
<second_list_item>New Delhi</second_list_item>
16+
</item>
17+
<item>
18+
<first_list_item>Bangladesh</first_list_item>
19+
<second_list_item>Dhaka</second_list_item>
20+
</item>
21+
<item>
22+
<first_list_item>Malaysia</first_list_item>
23+
<second_list_item>Kuala Lumpur</second_list_item>
24+
</item>
25+
<item>
26+
<first_list_item>Pakistan</first_list_item>
27+
<second_list_item>Islamabad</second_list_item>
28+
</item>
29+
<item>
30+
<first_list_item>Portugal</first_list_item>
31+
<second_list_item>Lisbon</second_list_item>
32+
</item>
33+
<item>
34+
<first_list_item>Syria</first_list_item>
35+
<second_list_item>Damascus</second_list_item>
36+
</item>
37+
</data>
38+
</buildmlearn_application>

0 commit comments

Comments
 (0)