Merge pull request #358 from synaptek/comp_refactor

refactoring of active components

app/build.gradle

@@ -129,18 +129,18 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'com.android.support:percent:25.2.0'
-    compile project(':banner')
+    compile project(':comp_banner')
     compile project(':comp_ltkplus')
     compile project(':util')
     compile project(':mn_component')
-    compile project(':listener')
-    compile project(':rt_component')
+    compile project(':comp_listener')
+    compile project(':comp_reading')
     compile project(':sm_component')
     compile project(':fw_component')
     compile project(':nl_component')
-    compile project(':asm_component')
-    compile project(':ak_component')
-    compile project(':bp_component')
+    compile project(':comp_math')
+    compile project(':comp_akira')
+    compile project(':comp_bubblepop')
     compile project(':comp_writing')
     compile project(':comp_pointtap')
     compile project(path: ':comp_ask')

build.gradle

@@ -36,7 +36,7 @@ allprojects {
 
         // Semantic versioning description:
         // <Milestone release> <Feature Release> <Patch release> <Asset Compatibility INDEX>
-        rtVersionName="0.33.1.1"
+        rtVersionName="0.33.2.1"
     }
 }
 

banner/build.gradle → comp_akira/build.gradle

@@ -1,38 +1,39 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion rootProject.ext.rtCompileSdkVersion
-    buildToolsVersion rootProject.ext.rtBuildToolsVersion
-
-    defaultConfig {
-        minSdkVersion rootProject.ext.rtMinSdkVersion
-        targetSdkVersion rootProject.ext.rtTargetSdkVersion
-        versionCode rootProject.ext.rtVersionCode
-        versionName rootProject.ext.rtVersionName
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    lintOptions {
-        // set to true to turn off analysis progress reporting by lint
-        quiet true
-        // if true, stop the gradle build if errors are found
-        abortOnError false
-        // if true, only report errors
-        ignoreWarnings true
-    }
-}
-
-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'
-    compile project(':util')
-    compile project(':comp_logging')
-}
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion rootProject.ext.rtCompileSdkVersion
+    buildToolsVersion rootProject.ext.rtBuildToolsVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.rtMinSdkVersion
+        targetSdkVersion rootProject.ext.rtTargetSdkVersion
+        versionCode rootProject.ext.rtVersionCode
+        versionName rootProject.ext.rtVersionName
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    lintOptions {
+        // set to true to turn off analysis progress reporting by lint
+        quiet true
+        // if true, stop the gradle build if errors are found
+        abortOnError false
+        // if true, only report errors
+        ignoreWarnings true
+    }
+}
+
+dependencies {
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:percent:25.2.0'
+    testCompile 'junit:junit:4.12'
+    compile project(':util')
+    compile project(':comp_scoreboard')
+    compile project(':comp_logging')
+}

banner/.gitignore → comp_banner/.gitignore

@@ -1,5 +1,5 @@
-*.iml
-/local.properties
-.DS_Store
-/build
-/captures
+*.iml
+/local.properties
+.DS_Store
+/build
+/captures

banner/src/androidTest/java/cmu/xprize/banner/ApplicationTest.java → comp_banner/src/androidTest/java/cmu/xprize/banner/ApplicationTest.java

@@ -1,13 +1,13 @@
-package cmu.xprize.banner;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
+package cmu.xprize.banner;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
 }

banner/src/main/AndroidManifest.xml → comp_banner/src/main/AndroidManifest.xml

@@ -1,12 +1,12 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cmu.xprize.banner">
-
-    <application
-        android:allowBackup="true"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-
-    </application>
-
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cmu.xprize.banner">
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
+    </application>
+
+</manifest>

banner/src/main/java/cmu/xprize/README.md → comp_banner/src/main/java/cmu/xprize/README.md

@@ -1,4 +1,4 @@
-This is the Banner Component for RoboTutor  
-
-v0.0.1 
+This is the Banner Component for RoboTutor  
+
+v0.0.1 
 Provides the Persona functionality and tutor controlbar funstions