Merge pull request #3 from Andover-Robotics/master

Merge all of the DogeCV 2018 stuff

DogeCV/build.gradle

@@ -5,7 +5,6 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 19
         versionCode 1
         versionName "1.0"
 
@@ -18,8 +17,13 @@ android {
         }
     }
 }
-
+repositories {
+    flatDir {
+        dirs '../libs'
+    }
+}
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(path: ':openCVLibrary320')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(path: ':openCVLibrary3')
+    implementation (name: 'RobotCore-release', ext: 'aar')
 }

DogeCV/src/main/java/com/disnodeteam/dogecv/ActivityViewDisplay.java

@@ -6,8 +6,9 @@
 
 /**
  * Created by guinea on 6/23/17.
- * Copyright (c) 2017 FTC Team 5484 Enderbots
- *
+ * -------------------------------------------------------------------------------------
+ * Copyright (c) 2018 FTC Team 5484 Enderbots
+ * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -17,15 +18,20 @@
  * 
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- *
+ * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
+ * 
+ * 
+ * By downloading, copying, installing or using the software you agree to this license.
+ * If you do not agree to this license, do not download, install,
+ * copy or use the software.
+ * -------------------------------------------------------------------------------------
  * This ViewDisplay displays a View over the entire screen.
  * As a singleton, you'll want to pass ActivityViewDisplay.getInstance() instead of directly instantiating it.
  */

DogeCV/src/main/java/com/disnodeteam/dogecv/CameraViewDisplay.java

@@ -4,12 +4,15 @@
 import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
 
 
 /**
  * Created by guinea on 6/23/17.
- * Copyright (c) 2017 FTC Team 5484 Enderbots
- *
+ * -------------------------------------------------------------------------------------
+ * Copyright (c) 2018 FTC Team 5484 Enderbots
+ * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -19,15 +22,20 @@
  * 
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- *
+ * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
+ * 
+ * 
+ * By downloading, copying, installing or using the software you agree to this license.
+ * If you do not agree to this license, do not download, install,
+ * copy or use the software.
+ * -------------------------------------------------------------------------------------
  * Nicely adds/removes a View from the main body of the robot controller app screen.
  * As a singleton, you'll want to pass CameraViewDisplay.getInstance() instead of directly instantiating it.
  */
@@ -41,11 +49,10 @@ private CameraViewDisplay() {
 
     public static CameraViewDisplay getInstance() {
         if (instance == null) instance = new CameraViewDisplay();
-
         return instance;
     }
 
-    public void setCurrentView(Context context, View newView) {
+    public void setCurrentView(final Context context, View newView) {
         // finding the resID dynamically allows this class to exist outside of the TeamCode module
         final int resID = context.getResources().getIdentifier("RelativeLayout", "id", context.getPackageName());
         final Activity activity = (Activity) context;
@@ -57,9 +64,9 @@ public void run() {
                 if (view != null) {
                     l.removeView(view);
                 }
+                l.addView(new ScrollView(context));
                 l.addView(queuedView);
                 view = queuedView;
-
             }
         });
     }