Final touches for the demo

DPigeon · Apr 15, 2020 · 63fd5e2 · 63fd5e2
1 parent 6ecf14a
commit 63fd5e2
Show file tree

Hide file tree

Showing 31 changed files with 290 additions and 398 deletions.
diff --git a/android/.gradle/5.6.4/executionHistory/executionHistory.bin b/android/.gradle/5.6.4/executionHistory/executionHistory.bin
diff --git a/android/.gradle/5.6.4/executionHistory/executionHistory.lock b/android/.gradle/5.6.4/executionHistory/executionHistory.lock
diff --git a/android/.gradle/5.6.4/fileHashes/fileHashes.bin b/android/.gradle/5.6.4/fileHashes/fileHashes.bin
diff --git a/android/.gradle/5.6.4/fileHashes/fileHashes.lock b/android/.gradle/5.6.4/fileHashes/fileHashes.lock
diff --git a/android/.gradle/5.6.4/javaCompile/classAnalysis.bin b/android/.gradle/5.6.4/javaCompile/classAnalysis.bin
diff --git a/android/.gradle/5.6.4/javaCompile/javaCompile.lock b/android/.gradle/5.6.4/javaCompile/javaCompile.lock
diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/android/.idea/workspace.xml b/android/.idea/workspace.xml
diff --git a/android/app/app.iml b/android/app/app.iml
@@ -30,16 +30,16 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />

diff --git a/android/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml b/android/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml
@@ -40,28 +40,40 @@
 
         <activity
             android:name="com.example.utilisateur.uvexposureapp.UserActivity"
+            android:configChanges="orientation"
             android:enabled="true"
-            android:parentActivityName="com.example.utilisateur.uvexposureapp.MainActivity" />
+            android:parentActivityName="com.example.utilisateur.uvexposureapp.MainActivity"
+            android:screenOrientation="portrait" >
+        </activity>
         <activity
             android:name="com.example.utilisateur.uvexposureapp.MainActivity"
+            android:configChanges="orientation"
             android:parentActivityName="com.example.utilisateur.uvexposureapp.LoginActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/DefaultScreen" />
         <activity
             android:name="com.example.utilisateur.uvexposureapp.WeatherActivity"
-            android:parentActivityName="com.example.utilisateur.uvexposureapp.MainActivity" />
+            android:configChanges="orientation"
+            android:parentActivityName="com.example.utilisateur.uvexposureapp.MainActivity"
+            android:screenOrientation="portrait" >
+        </activity>
         <activity
             android:name="com.example.utilisateur.uvexposureapp.GraphActivity"
             android:parentActivityName="com.example.utilisateur.uvexposureapp.MainActivity"
             android:screenOrientation="landscape" />
         <activity
             android:name="com.example.utilisateur.uvexposureapp.BluetoothActivity"
-            android:parentActivityName="com.example.utilisateur.uvexposureapp.UserActivity" />
+            android:configChanges="orientation"
+            android:parentActivityName="com.example.utilisateur.uvexposureapp.UserActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.example.utilisateur.uvexposureapp.Location"
             android:parentActivityName="com.example.utilisateur.uvexposureapp.WeatherActivity" />
         <activity
             android:name="com.example.utilisateur.uvexposureapp.LoginActivity"
+            android:configChanges="orientation"
             android:parentActivityName="com.example.utilisateur.uvexposureapp.LoginActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/DefaultScreen" />
         <activity
             android:name="com.example.utilisateur.uvexposureapp.splashScreen"

diff --git a/android/app/build/intermediates/dex/debug/mergeProjectDexDebug/out/classes.dex b/android/app/build/intermediates/dex/debug/mergeProjectDexDebug/out/classes.dex
diff --git a/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Tue Apr 14 03:37:42 EDT 2020
+#Tue Apr 14 13:21:35 EDT 2020
 path.2=classes2.dex
 path.1=classes.dex
 path.0=classes.dex

diff --git a/...oid/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/...oid/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
diff --git a/android/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/android/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
@@ -41,28 +41,40 @@
 
         <activity
             android:name="com.example.utilisateur.uvexposureapp.UserActivity"
+            android:configChanges="orientation"
             android:enabled="true"
-            android:parentActivityName="com.example.utilisateur.uvexposureapp.MainActivity" />
+            android:parentActivityName="com.example.utilisateur.uvexposureapp.MainActivity"
+            android:screenOrientation="portrait" >
+        </activity>
         <activity
             android:name="com.example.utilisateur.uvexposureapp.MainActivity"
+            android:configChanges="orientation"
             android:parentActivityName="com.example.utilisateur.uvexposureapp.LoginActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/DefaultScreen" />
         <activity
             android:name="com.example.utilisateur.uvexposureapp.WeatherActivity"
-            android:parentActivityName="com.example.utilisateur.uvexposureapp.MainActivity" />
+            android:configChanges="orientation"
+            android:parentActivityName="com.example.utilisateur.uvexposureapp.MainActivity"
+            android:screenOrientation="portrait" >
+        </activity>
         <activity
             android:name="com.example.utilisateur.uvexposureapp.GraphActivity"
             android:parentActivityName="com.example.utilisateur.uvexposureapp.MainActivity"
             android:screenOrientation="landscape" />
         <activity
             android:name="com.example.utilisateur.uvexposureapp.BluetoothActivity"
-            android:parentActivityName="com.example.utilisateur.uvexposureapp.UserActivity" />
+            android:configChanges="orientation"
+            android:parentActivityName="com.example.utilisateur.uvexposureapp.UserActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.example.utilisateur.uvexposureapp.Location"
             android:parentActivityName="com.example.utilisateur.uvexposureapp.WeatherActivity" />
         <activity
             android:name="com.example.utilisateur.uvexposureapp.LoginActivity"
+            android:configChanges="orientation"
             android:parentActivityName="com.example.utilisateur.uvexposureapp.LoginActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/DefaultScreen" />
         <activity
             android:name="com.example.utilisateur.uvexposureapp.splashScreen"

diff --git a/...ermediates/javac/debug/classes/com/example/utilisateur/uvexposureapp/MainActivity$6.class b/...ermediates/javac/debug/classes/com/example/utilisateur/uvexposureapp/MainActivity$6.class
diff --git a/...ermediates/javac/debug/classes/com/example/utilisateur/uvexposureapp/MainActivity$7.class b/...ermediates/javac/debug/classes/com/example/utilisateur/uvexposureapp/MainActivity$7.class
diff --git a/...ermediates/javac/debug/classes/com/example/utilisateur/uvexposureapp/MainActivity$8.class b/...ermediates/javac/debug/classes/com/example/utilisateur/uvexposureapp/MainActivity$8.class
diff --git a/...ermediates/javac/debug/classes/com/example/utilisateur/uvexposureapp/MainActivity$9.class b/...ermediates/javac/debug/classes/com/example/utilisateur/uvexposureapp/MainActivity$9.class
diff --git a/...ntermediates/javac/debug/classes/com/example/utilisateur/uvexposureapp/MainActivity.class b/...ntermediates/javac/debug/classes/com/example/utilisateur/uvexposureapp/MainActivity.class