Skip to content

Commit

Permalink
addedwrite
Browse files Browse the repository at this point in the history
  • Loading branch information
Xinran Yuan committed Aug 22, 2018
1 parent 740d81c commit 5f37294
Show file tree
Hide file tree
Showing 36 changed files with 2,519 additions and 246 deletions.
97 changes: 0 additions & 97 deletions app/build.gradle
View file
Expand Up @@ -85,107 +85,10 @@ android {

// This release includes the DEBUG selector and other various debug support features.
//
release_dbg {
buildConfigField BOOLEAN, LANGUAGE_OVERRIDE, FALSE
buildConfigField BOOLEAN, SHOW_TUTORVERSION, TRUE
buildConfigField BOOLEAN, SHOW_DEBUGLAUNCHER, TRUE
buildConfigField BOOLEAN, LANGUAGE_SWITCH, TRUE
buildConfigField BOOLEAN, NO_ASR_APPS, FALSE
buildConfigField STRING, LANGUAGE_FEATURE_ID, LANGUAGE_UNDEFINED
buildConfigField BOOLEAN, SHOW_DEMO_VIDS, TRUE

debuggable true
signingConfig signingConfigs.android
}

release_dbg_no_demo {
buildConfigField BOOLEAN, LANGUAGE_OVERRIDE, FALSE
buildConfigField BOOLEAN, SHOW_TUTORVERSION, TRUE
buildConfigField BOOLEAN, SHOW_DEBUGLAUNCHER, TRUE
buildConfigField BOOLEAN, LANGUAGE_SWITCH, TRUE
buildConfigField BOOLEAN, NO_ASR_APPS, FALSE
buildConfigField STRING, LANGUAGE_FEATURE_ID, LANGUAGE_UNDEFINED
buildConfigField BOOLEAN, SHOW_DEMO_VIDS, FALSE

signingConfig signingConfigs.android
}

// These releases will remove the language selection toggle switch if present in the UI
// They also override the LANG_<ID> in the enginedescriptor to force a default language
//
release_sw {
buildConfigField BOOLEAN, LANGUAGE_OVERRIDE, TRUE
buildConfigField BOOLEAN, SHOW_TUTORVERSION, TRUE
buildConfigField BOOLEAN, SHOW_DEBUGLAUNCHER, FALSE
buildConfigField BOOLEAN, LANGUAGE_SWITCH, FALSE
buildConfigField BOOLEAN, NO_ASR_APPS, FALSE
buildConfigField STRING, LANGUAGE_FEATURE_ID, LANGUAGE_SWAHILI
buildConfigField BOOLEAN, SHOW_DEMO_VIDS, TRUE

debuggable true
signingConfig signingConfigs.android
}

release_sw_xprize {
buildConfigField BOOLEAN, LANGUAGE_OVERRIDE, TRUE
buildConfigField BOOLEAN, SHOW_TUTORVERSION, FALSE
buildConfigField BOOLEAN, SHOW_DEBUGLAUNCHER, FALSE
buildConfigField BOOLEAN, LANGUAGE_SWITCH, FALSE
buildConfigField BOOLEAN, NO_ASR_APPS, FALSE
buildConfigField STRING, LANGUAGE_FEATURE_ID, LANGUAGE_SWAHILI
buildConfigField BOOLEAN, SHOW_DEMO_VIDS, TRUE

debuggable true
signingConfig signingConfigs.android
}

release_en {
buildConfigField BOOLEAN, LANGUAGE_OVERRIDE, TRUE
buildConfigField BOOLEAN, SHOW_TUTORVERSION, TRUE
buildConfigField BOOLEAN, SHOW_DEBUGLAUNCHER, FALSE
buildConfigField BOOLEAN, LANGUAGE_SWITCH, FALSE
buildConfigField BOOLEAN, NO_ASR_APPS, FALSE
buildConfigField STRING, LANGUAGE_FEATURE_ID, LANGUAGE_ENGLISH
buildConfigField BOOLEAN, SHOW_DEMO_VIDS, TRUE

signingConfig signingConfigs.android
}

release_en_xprize {
buildConfigField BOOLEAN, LANGUAGE_OVERRIDE, TRUE
buildConfigField BOOLEAN, SHOW_TUTORVERSION, FALSE
buildConfigField BOOLEAN, SHOW_DEBUGLAUNCHER, FALSE
buildConfigField BOOLEAN, LANGUAGE_SWITCH, FALSE
buildConfigField BOOLEAN, NO_ASR_APPS, FALSE
buildConfigField STRING, LANGUAGE_FEATURE_ID, LANGUAGE_ENGLISH
buildConfigField BOOLEAN, SHOW_DEMO_VIDS, TRUE

signingConfig signingConfigs.android
}

release_sw_noasr {
buildConfigField BOOLEAN, LANGUAGE_OVERRIDE, TRUE
buildConfigField BOOLEAN, SHOW_TUTORVERSION, TRUE
buildConfigField BOOLEAN, SHOW_DEBUGLAUNCHER, FALSE
buildConfigField BOOLEAN, LANGUAGE_SWITCH, FALSE
buildConfigField BOOLEAN, NO_ASR_APPS, TRUE
buildConfigField STRING, LANGUAGE_FEATURE_ID, LANGUAGE_SWAHILI
buildConfigField BOOLEAN, SHOW_DEMO_VIDS, TRUE
}
}

// define apk naming behavior
applicationVariants.all { variant ->
variant.outputs.each { output ->
def project = "robotutor"
def SEP = "."
def buildType = variant.variantData.variantConfiguration.buildType.name
def version = variant.versionName

def newApkName = project + SEP + buildType + SEP + version + ".apk"
output.outputFile = new File(output.outputFile.parent, newApkName)
}
}

lintOptions {
// set to true to turn off analysis progress reporting by lint
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/assets/tutors/countingx/animator_graph.json
View file
Expand Up @@ -184,6 +184,8 @@
"tracks": [
{"name": "LOG_EVENT", "type": "QUEUEDCOMMAND", "id": "SCountingX", "method": "logState", "parms": "type#node,value#PLAYCOMPLETE2:String", "features":""},

{"type": "COMMAND", "id": "SCountingX", "method": "demonstrateTenFrame", "parms":"", "features":""},

{"type": "AUDIO", "command": "PLAY", "soundsource": "{{FinalCount}}.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": ""},

{"name": "LOG_EVENT", "type": "QUEUEDCOMMAND", "id": "SCountingX", "method": "logState", "parms": "type#node,value#PLAYCOMPLETE2:String", "features":""}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/assets/tutors/countingx/assets/data/sw/countingx_1_10.json
View file
Expand Up @@ -3,8 +3,8 @@

"dataSource": [

{"type":"CountX_Data", "level":"countx_1_10", "task":"Count to 10", "layout":"default", "dataset":[0, 10], "tenPower": "one"},
{"type":"CountX_Data", "level":"countx_1_10", "task":"Count to 10", "layout":"default", "dataset":[0, 10], "tenPower": "one"}
{"type":"CountX_Data", "level":"countx_1_10", "task":"Count to 10", "layout":"default", "dataset":[0, 149], "tenPower": ["one","ten"]},
{"type":"CountX_Data", "level":"countx_1_10", "task":"Count to 10", "layout":"default", "dataset":[0, 10], "tenPower": ["one"]}

]

Expand Down
17 changes: 16 additions & 1 deletion app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TCountXComponent.java
View file
Expand Up @@ -300,11 +300,23 @@ public void playChime() {
Log.d("PlayChime", currentChime);
scope.addUpdateVar("CountChime", new TString(currentChime));
scope.addUpdateVar("OctaveChime", new TString(octaveChime));
scope.addUpdateVar("CurrentCount", new TString(String.valueOf(currentCount)));
if (mode == "placevalue"){
scope.addUpdateVar("CurrentCount", new TString(String.valueOf(currentValue)));
} else {
scope.addUpdateVar("CurrentCount", new TString(String.valueOf(currentCount)));
}


postEvent(COUNTX_CONST.PLAY_CHIME);
}

@Override
public void playCount(int count){
TScope scope = mTutor.getScope();
scope.addUpdateVar("CurrentCount", new TString(String.valueOf(count)));
postEvent(COUNTX_CONST.PLAY_CHIME);
}

@Override
public void postFinalCount() {

Expand All @@ -316,6 +328,9 @@ public void postFinalCount() {






/**
* IPublisher methods...
*
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
View file
Expand Up @@ -3,10 +3,11 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {

classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.1.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
1 change: 1 addition & 0 deletions comp_counting2/build.gradle
View file
Expand Up @@ -32,4 +32,5 @@ dependencies {
})
compile project(path: ':util')

compile project(path: ':comp_ltkplus')
}

0 comments on commit 5f37294

Please sign in to comment.