Merge pull request #4 from Keller-M/revert-3-ARIntegration

Revert "Adding AR Integration" due to errors with Git.
CANIS-NAU · Feb 12, 2020 · 1433609 · 1433609
2 parents d28ba7c + be8bcf5
commit 1433609
Show file tree

Hide file tree

Showing 37 changed files with 12 additions and 788 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,11 +1,10 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.ar.sceneform.plugin'
 
 android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.example.aorora"
-        minSdkVersion 24
+        minSdkVersion 23
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
@@ -17,12 +16,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-
-        sourceCompatibility '1.8'
-        targetCompatibility '1.8'
-    }
-
 }
 
 dependencies {
@@ -43,14 +36,6 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:11.6.0'
     implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2'
     implementation "com.airbnb.android:lottie:2.5.0"
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.google.ar.sceneform.ux:sceneform-ux:1.9.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:design:28.0.0'
 
 
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,11 +5,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-feature
-        android:name="android.hardware.camera.ar"
-        android:required="true" />
 
 
 
@@ -23,9 +18,8 @@
         android:supportsRtl="true"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
-        <activity android:name=".AR_Main" ></activity>>
-        <activity android:name=".MindfulnessMeditationGame_R" />
-        !**activity android:name=".MindfulnessMeditationGame_R" />
+        <activity android:name=".MindfulnessMeditationGame_R"></activity>
+        <activity android:name=".MindfulnessMeditationGame_R9" />
         <activity android:name=".ReceiptPage" />
         <activity android:name=".EndOfMindfulnessGamePage" />
         <activity android:name=".PollenStoreDailyQuestPage" />
@@ -46,20 +40,13 @@
         <activity android:name=".HomeScreen" />
         <activity android:name=".MindfullnessSelection" />
         <activity android:name=".SurveyPage" />
-        <activity android:name=".ButterflyClicked"
-            ></activity>
-        <activity
-            android:name=".ButterflyMenu"
-            android:label="@string/app_name"/>
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <meta-data
-            android:name="com.google.ar.core"
-            android:value="required" />
 
         <service
             android:name=".DetectedActivitiesIntentService"

diff --git a/app/src/main/java/com/example/aorora/AR_Main.java b/app/src/main/java/com/example/aorora/AR_Main.java