merged development into dptam-patch

RoboTutorLLC · Mar 29, 2018 · 2ebde32 · 2ebde32
1 parent 7a990c2
commit 2ebde32
Show file tree

Hide file tree

Showing 140 changed files with 7,668 additions and 1,716 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -94,6 +94,7 @@ android {
             buildConfigField STRING, LANGUAGE_FEATURE_ID, LANGUAGE_UNDEFINED
             buildConfigField BOOLEAN, SHOW_DEMO_VIDS, TRUE
 
+            debuggable true
             signingConfig signingConfigs.android
         }
 
@@ -121,6 +122,7 @@ android {
             buildConfigField STRING, LANGUAGE_FEATURE_ID, LANGUAGE_SWAHILI
             buildConfigField BOOLEAN, SHOW_DEMO_VIDS, TRUE
 
+            debuggable true
             signingConfig signingConfigs.android
         }
 
@@ -133,6 +135,7 @@ android {
             buildConfigField STRING, LANGUAGE_FEATURE_ID, LANGUAGE_SWAHILI
             buildConfigField BOOLEAN, SHOW_DEMO_VIDS, TRUE
 
+            debuggable true
             signingConfig signingConfigs.android
         }
 
@@ -195,7 +198,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'com.android.support:percent:25.2.0'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -29,4 +29,4 @@
 
     </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/assets/tutors/activity_selector/assets/data/en/dev_data.json b/app/src/main/assets/tutors/activity_selector/assets/data/en/dev_data.json
@@ -28,14 +28,6 @@
           "prompt": "numbers and math",
           "help": "Tap here for numbers and math"
         },
-        {
-          "datatype": "IMAGEBUTTON",
-          "resource": "button_shapes_select",
-          "componentID": "Sbutton4",
-          "behavior": "SELECT_SHAPES",
-          "prompt": "shapes",
-          "help": "Tap here to learn shapes"
-        },
         {
           "datatype": "IMAGEBUTTON",
           "resource": "button_robotutor_select",

diff --git a/app/src/main/assets/tutors/activity_selector/assets/data/sw/dev_data.json b/app/src/main/assets/tutors/activity_selector/assets/data/sw/dev_data.json
@@ -28,14 +28,6 @@
           "prompt": "numbers and math",
           "help": "Tap here for numbers and math"
         },
-        {
-          "datatype": "IMAGEBUTTON",
-          "resource": "button_shapes_select",
-          "componentID": "Sbutton4",
-          "behavior": "SELECT_SHAPES",
-          "prompt": "shapes",
-          "help": "Tap here to learn shapes"
-        },
         {
           "datatype": "IMAGEBUTTON",
           "resource": "button_robotutor_select",
@@ -106,6 +98,171 @@
   "rootSkillMath": "bpop.addsub:0..8.incr.ADD-1-V.1",
   "rootSkillShapes": "bpop.shp:say_mc",
   "writeTransitions":{
+    "write.num:test": {
+      "type": "TRANSITION",
+      "skill": "numbers",
+      "tutor_id": "write.num:test",
+      "tutor_desc": "write.num",
+      "tutor_data": "[file]write.num_test.json",
+      "cell_row": "1",
+      "cell_column": "9",
+      "same": "write.num:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
+    "write.ltr:test": {
+      "type": "TRANSITION",
+      "skill": "letters",
+      "tutor_id": "write.ltr:test",
+      "tutor_desc": "write.ltr.uc",
+      "tutor_data": "[file]write.ltr_test.json",
+      "cell_row": "3",
+      "cell_column": "9",
+      "same": "write.wrd:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
+    "write.ltr.dic:test": {
+      "type": "TRANSITION",
+      "skill": "letters",
+      "tutor_id": "write.ltr.dic:test",
+      "tutor_desc": "write.ltr.uc.dic",
+      "tutor_data": "[file]write.ltr.dic_test.json",
+      "cell_row": "4",
+      "cell_column": "9",
+      "same": "write.wrd:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
+    "write.wrd:test": {
+      "type": "TRANSITION",
+      "skill": "letters",
+      "tutor_id": "write.wrd:test",
+      "tutor_desc": "write.wrd",
+      "tutor_data": "[file]write.wrd_test.json",
+      "cell_row": "5",
+      "cell_column": "9",
+      "same": "write.wrd:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
+    "write.wrd.dic:test": {
+      "type": "TRANSITION",
+      "skill": "letters",
+      "tutor_id": "write.wrd.dic:test",
+      "tutor_desc": "write.wrd.dic",
+      "tutor_data": "[file]write.wrd.dic_test.json",
+      "cell_row": "6",
+      "cell_column": "9",
+      "same": "write.wrd:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
+    "write.dotCount:testDot": {
+      "type": "TRANSITION",
+      "skill": "letters",
+      "tutor_id": "write.dotCount:testDot",
+      "tutor_desc": "write.dotCount",
+      "tutor_data": "[file]write.dotCount_testDot.json",
+      "cell_row": "7",
+      "cell_column": "9",
+      "same": "write.wrd:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
+    "write.arith:testArith_add": {
+      "type": "TRANSITION",
+      "skill": "letters",
+      "tutor_id": "write.arith:testArith_add",
+      "tutor_desc": "write.arith.add",
+      "tutor_data": "[file]write.arith_testArith_add.json",
+      "cell_row": "8",
+      "cell_column": "9",
+      "same": "write.wrd:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
+    "write.arith:testArith_sub": {
+      "type": "TRANSITION",
+      "skill": "letters",
+      "tutor_id": "write.arith:testArith_sub",
+      "tutor_desc": "write.arith.sub",
+      "tutor_data": "[file]write.arith_testArith_sub.json",
+      "cell_row": "9",
+      "cell_column": "9",
+      "same": "write.wrd:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
+    "write.ltr.trc:test": {
+      "type": "TRANSITION",
+      "skill": "letters",
+      "tutor_id": "write.ltr.trc:test",
+      "tutor_desc": "write.ltr.uc.trc",
+      "tutor_data": "[file]write.ltr.trc_test.json",
+      "cell_row": "10",
+      "cell_column": "9",
+      "same": "write.wrd:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
+    "write.num.trc:test": {
+      "type": "TRANSITION",
+      "skill": "letters",
+      "tutor_id": "write.num.trc:test",
+      "tutor_desc": "write.num.trc",
+      "tutor_data": "[file]write.num.trc_test.json",
+      "cell_row": "11",
+      "cell_column": "9",
+      "same": "write.wrd:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
+    "write.missingLtr:test": {
+      "type": "TRANSITION",
+      "skill": "letters",
+      "tutor_id": "write.missingLtr:test",
+      "tutor_desc": "write.missingLtr",
+      "tutor_data": "[file]write.missingLtr_test.json",
+      "cell_row": "12",
+      "cell_column": "9",
+      "same": "write.wrd:test",
+      "next": "bpop.wrd:3chr_say_mc",
+      "next_next": "bpop.wrd:3chr_say_rise",
+      "prev": "akira:2chr",
+      "harder": "write.wrd:3chr",
+      "easier": "bpop.ltr.mix:rnd_say_show_rise"
+    },
     "story.hear::letters_alphabet_song": {
       "type": "TRANSITION",
       "skill": "letters",
@@ -7420,6 +7577,7 @@
       "prev": "bpop.mn:0..9.MN-SD-UP-OFF2-BL1.incr.8",
       "harder": "bpop.mn:100..900.MN-TD-UP-OFF2-BL4.incr.69",
       "easier": "bpop.mn:0..9.MN-SD-UP-OFF2-BL2.incr.7"
+
     },
     "bpop.mn:100..900.MN-TD-UP-OFF1-BL1.incr.68": {
       "type": "TRANSITION",

diff --git a/app/src/main/assets/tutors/bubble_pop/animator_graph.json b/app/src/main/assets/tutors/bubble_pop/animator_graph.json
@@ -19,7 +19,7 @@
           "COMMENT": "Intro Clip - we only ever visit this node once",
           "maptype":"moduleMap",
           "mapname": "INTROSTATE",
-          "preenter": ["SET_VERSION","SET_DATASOURCE"],
+          "preenter": ["SET_VERSION","SET_DATASOURCE", "SET_SOUND_TRACK"],
           "preexit": [],
           "edges": [
             {
@@ -159,7 +159,7 @@
           "tracks": [
             {"name": "LOG_EVENT", "type": "QUEUEDCOMMAND", "id": "SBubblePop", "method": "logState", "parms": "type#node,value#INTROSTATE:String", "features":""},
 
-            {"type": "AUDIO", "command": "PLAY", "soundsource": "gamesound.mp3", "soundpackage":"tutor_effect", "repeat":true, "volume": 0.10, "mode":"event", "features": ""},
+            {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.sound_track}}", "soundpackage":"tutor_effect", "repeat":true, "volume": 0.10, "mode":"event", "features": ""},
             {"type": "AUDIO", "command": "PLAY", "soundsource": "Please tap on it.mp3", "soundpackage":"default", "volume": 0.7, "mode":"flow", "features": ""}
           ]
         },
@@ -396,11 +396,12 @@
 
         "COMMENT": "@@@@@  CActions @@@@@ ",
 
-        "PLAY_BACKINGTRACK": {"type": "AUDIO", "command": "PLAY", "soundsource": "gamesound.mp3", "soundpackage":"tutor_effect", "repeat":true, "volume": 0.20, "mode":"event", "features": ""},
+        "PLAY_BACKINGTRACK": {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.sound_track}}", "soundpackage":"tutor_effect", "repeat":true, "volume": 0.20, "mode":"event", "features": ""},
         "PLAY_PROMPT": {"type": "AUDIO", "command": "PLAY", "soundsource": "Please tap on it.mp3", "soundpackage":"default", "volume": 0.7, "mode":"flow", "features": ""},
 
         "SET_VERSION":{"type": "COMMAND", "id": "Sbanner", "method": "setVersionID", "parms": "v.0.0.1:String","features":""},
         "SET_DATASOURCE":{"type": "COMMAND", "id": "SBubblePop", "method": "setDataSource", "parms": "[file]bp_data.json:String","features":"!DATA_SBUBBLEPOP"},
+        "SET_SOUND_TRACK":{"type": "COMMAND", "id": "SBubblePop", "method": "setSoundTrack"},
         "NEXT_DATASET":{"type": "COMMAND", "id": "SBubblePop", "method": "next" ,"features":""},
 
 

diff --git a/...rc/main/assets/tutors/bubble_pop/assets/data/sw/bpop.addsub_0..800.incr.ADD-100-H.31.json b/...rc/main/assets/tutors/bubble_pop/assets/data/sw/bpop.addsub_0..800.incr.ADD-100-H.31.json
@@ -2,7 +2,7 @@
   "gen_stimulustype": "text-data",
   "dataSource": [
     {
-      "stimulus_type": "reference",
+      "stimulus_type": "text_data",
       "response_set": [
         "7",
         "6",
@@ -11,18 +11,18 @@
       "question_type": "rising",
       "gen_question": false,
       "responsetype_set": [
-        "reference",
-        "reference",
-        "reference"
+        "text_data",
+        "text_data",
+        "text_data"
       ],
-      "answer_type": "reference",
+      "answer_type": "text_data",
       "question_say": false,
       "question_show": true,
       "stimulus": "0+100",
       "answer": "100"
     },
     {
-      "stimulus_type": "reference",
+      "stimulus_type": "text_data",
       "response_set": [
         "1",
         "200",
@@ -31,11 +31,11 @@
       "question_type": "rising",
       "gen_question": false,
       "responsetype_set": [
-        "reference",
-        "reference",
-        "reference"
+        "text_data",
+        "text_data",
+        "text_data"
       ],
-      "answer_type": "reference",
+      "answer_type": "text_data",
       "question_say": false,
       "question_show": true,
       "stimulus": "100+100",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,4 +29,4 @@

		</application>

		</manifest>
		</manifest>