Narration Capture Mode

.gitignore

@@ -49,58 +49,57 @@ local.properties
 app/src/main/assets/tutors/word_copy/debug_animator_graph.json
 util/a.java
 =======
-# Built application files
-**/repo*
-**/build
-**/captures
-**/keystore
+# Built application files
+**/repo*
+**/build
+**/captures
+**/keystore
 *keystore
-
-keystore.properties
-
-# The tutor audio data is now externalized and is managed by the 
-# RTAssetPackager
-
-/app/src/main/assets/tutors/trackdata/LIBRARY/audio/*
-
-# We keep a copy of the live story data to support the RTAssetMAnager 
-# building the transitions and checking the datasource validity
-# however the canonical data is in the RTAssetPublisher
-
-/app/src/verify/assets/tutors/*
-
-# External Assets
-/app/audio_assets/*
-
-local.properties
-
-# Gradle generated files
-.gradle/
-
-# IntelliJ - User-specific configurations
-.idea/*
-.idea/gradle.xml
-.idea/libraries/
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/vcs.xml
-**/*.iml
-*.apk
-
-# OS-specific files
-**/.DS_Store
-
-app/src/main/assets/tutors/word_copy/debug_animator_graph.json
-util/a.java
+
+keystore.properties
+
+# The tutor audio data is now externalized and is managed by the 
+# RTAssetPackager
+
+/app/src/main/assets/tutors/trackdata/LIBRARY/audio/*
+
+# We keep a copy of the live story data to support the RTAssetMAnager 
+# building the transitions and checking the datasource validity
+# however the canonical data is in the RTAssetPublisher
+
+/app/src/verify/assets/tutors/*
+
+# External Assets
+/app/audio_assets/*
+
+local.properties
+
+# Gradle generated files
+.gradle/
+
+# IntelliJ - User-specific configurations
+.idea/*
+.idea/gradle.xml
+.idea/libraries/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+**/*.iml
+*.apk
+
+# OS-specific files
+**/.DS_Store
+
+app/src/main/assets/tutors/word_copy/debug_animator_graph.json
+util/a.java
 LICENCE.md
 README.md
 .vscode
-.nvimlog
 tags

.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>narrate_mode</name>
+	<comment>Project narrate_mode created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1623181697411</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=C\:/Program Files/Java/jdk-14.0.1
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

README.md

@@ -3,15 +3,16 @@
 # **RoboTutor**
 
 
-Welcome to RoboTutor_2020:  XPRIZE's repo has the version of RoboTutor uploaded on 11/20/2018, but RoboTutor has been updated here since then.  **This is the newest version.**
+Welcome to RoboTutor:  XPRIZE's repo has the version uploaded on 11/20/2018, but RoboTutor has been updated here since then.
+For changes since 11/20/2018, see [https://github.com/RoboTutorLLC/RoboTutor](https://github.com/RoboTutorLLC/RoboTutor).
 
 For changes prior to 3/16/2020, see [https://github.com/RoboTutorLLC/RoboTutor_2019](https://github.com/RoboTutorLLC/RoboTutor_2019).  However, it's no longer the newest.
 
 --- 
 ## Quick Installation
 To quickly install the most recent version of RoboTutor without having to download the full source code, follow these steps:
 
-1. Go to [this Google Drive folder](https://drive.google.com/drive/u/1/folders/1VyajTK_SShmBB4GXJ74737pBS_IKunL_)(updated 8/26/2020).
+1. Go to [this Google Drive folder](https://docs.google.com/document/d/1YoVx1K0LdHVNayiFUhkgffE5v28SPcg0FGIvaU84A_U/edit#) (updated 6/16/2020).
 
 2. Download the APK to your tablet (do not install yet).
 

app/build.gradle

@@ -82,6 +82,16 @@ android {
         ignoreWarnings true
     }
 
+
+    configurations {
+        all {
+            exclude group: 'com.gitub.adrielcafe', module: 'ffmpeg-android-java'
+        }
+    }
+
+    applicationVariants.all { variant ->
+        variant.getRuntimeConfiguration().exclude group: 'com.github.adrielcafe', module: 'ffmpeg-android-java'
+    }
     apply from: "checkstyle.gradle"
     afterEvaluate{
         preBuild.dependsOn('checkstyle')
@@ -96,8 +106,12 @@ repositories {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    implementation 'com.writingminds:FFmpegAndroid:0.3.2'
-    implementation 'com.google.guava:guava:25.0-android'
+
+    implementation ('com.writingminds:FFmpegAndroid:0.3.2') {
+        exclude group: 'com.gitub.adrielcafe', module: 'ffmpeg-android-java'
+    }
+    implementation 'com.google.guava:guava:22.0-android'
+
     implementation 'com.android.support:appcompat-v7:25.2.0'
     implementation 'com.android.support:percent:25.2.0'
     implementation 'com.google.code.gson:gson:2.8.7'
@@ -106,7 +120,9 @@ dependencies {
     implementation project(':comp_ltkplus')
     implementation project(':util')
     implementation project(':mn_component')
-    implementation project(':comp_listener')
+    implementation (project(':comp_listener')) {
+        exclude group: 'com.gitub.adrielcafe', module: 'ffmpeg-android-java'
+    }
     implementation project(':comp_reading')
     implementation project(':comp_questions')
     implementation project(':sm_component')