Update gesture sample to be consistent with other samples (not act as a library).

Unify gradle/build tools version across samples and reconfigure Camera/Card samples as composites.

Change-Id: Id62f42c7a54620669f579755994ce7d6cbc7bc3f

Author: jbolinger

Camera2Sample/app/build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc. All rights reserved.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,15 +26,11 @@ android {
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.aar'])
+    implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'
+
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 }

Camera2Sample/app/src/main/java/com/example/glass/camera2sample/BaseActivity.java

@@ -22,14 +22,14 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.MotionEvent;
 import android.view.View;
-import com.example.glass.camera2sample.GlassGestureDetector.Gesture;
-import com.example.glass.camera2sample.GlassGestureDetector.OnGestureListener;
+import com.example.glass.ui.GlassGestureDetector;
 
 /**
  * Base activity for all activities in application for Glass. It hides the UI, making application
  * full screen and sets {@link GlassGestureDetector}.
  */
-public abstract class BaseActivity extends AppCompatActivity implements OnGestureListener {
+public abstract class BaseActivity extends AppCompatActivity
+        implements GlassGestureDetector.OnGestureListener {
 
   private View decorView;
   private GlassGestureDetector glassGestureDetector;
@@ -65,7 +65,7 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
   }
 
   @Override
-  public boolean onGesture(Gesture gesture) {
+  public boolean onGesture(GlassGestureDetector.Gesture gesture) {
     switch (gesture) {
       case SWIPE_DOWN:
         finish();

Camera2Sample/app/src/main/java/com/example/glass/camera2sample/CameraFragment.java

@@ -37,17 +37,17 @@
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import com.example.glass.camera2sample.GlassGestureDetector.Gesture;
-import com.example.glass.camera2sample.GlassGestureDetector.OnGestureListener;
 import com.example.glass.camera2sample.CameraActionHandler.CameraActionHandlerCallback;
 import com.example.glass.camera2sample.CameraActionHandler.CameraMode;
+import com.example.glass.ui.GlassGestureDetector;
+
 import java.util.Objects;
 
 /**
  * Fragment responsible for displaying the camera preview and handling camera actions.
  */
 public class CameraFragment extends Fragment
-    implements OnRequestPermissionsResultCallback, OnGestureListener, CameraActionHandlerCallback {
+    implements OnRequestPermissionsResultCallback, GlassGestureDetector.OnGestureListener, CameraActionHandlerCallback {
 
   private static final String TAG = CameraFragment.class.getSimpleName();
 
@@ -191,7 +191,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
   }
 
   @Override
-  public boolean onGesture(Gesture gesture) {
+  public boolean onGesture(GlassGestureDetector.Gesture gesture) {
     switch (gesture) {
       case TAP:
         cameraActionHandler.performTapAction();

Camera2Sample/app/src/main/java/com/example/glass/camera2sample/GlassGestureDetector.java

@@ -17,9 +17,10 @@
 package com.example.glass.camera2sample;
 
 import android.os.Bundle;
-import com.example.glass.camera2sample.GlassGestureDetector.Gesture;
 import android.view.KeyEvent;
 
+import com.example.glass.ui.GlassGestureDetector;
+
 /**
  * Main activity of the application. It creates instance of {@link CameraFragment} and passes
  * gestures to it.
@@ -37,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
   }
 
   @Override
-  public boolean onGesture(Gesture gesture) {
+  public boolean onGesture(GlassGestureDetector.Gesture gesture) {
     return cameraFragment.onGesture(gesture) || super.onGesture(gesture);
   }
 

Camera2Sample/app/src/main/java/com/example/glass/camera2sample/MainActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc. All rights reserved.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,3 +15,9 @@
  */
 
 include ':app'
+
+includeBuild('../GestureLibrarySample') {
+    dependencySubstitution {
+        substitute module('com.example.glass.ui:gesture-lib-sample') with project(':main')
+    }
+}

Camera2Sample/settings.gradle

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 apply plugin: 'com.android.application'
 
 android {
@@ -12,12 +28,15 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+    implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'
+
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
+
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.robolectric:robolectric:4.1'
+    
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }

CardSample/app/build.gradle

@@ -20,6 +20,8 @@
 import android.support.annotation.NonNull;
 import android.support.v7.util.DiffUtil;
 
+import java.util.Objects;
+
 /**
  * Represents the single menu item object.
  */
@@ -71,4 +73,18 @@ Drawable getIcon() {
   String getText() {
     return text;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    GlassMenuItem that = (GlassMenuItem) o;
+    return Objects.equals(icon, that.icon) &&
+            Objects.equals(text, that.text);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(icon, text);
+  }
 }

CardSample/app/src/main/java/com/example/android/glass/cardsample/menu/GlassMenuItem.java

@@ -7,8 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        
+        classpath 'com.android.tools.build:gradle:3.5.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

CardSample/build.gradle

@@ -1,5 +1,19 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

CardSample/gradle/wrapper/gradle-wrapper.jar

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"