Migrate to IntelliJ format, also contains some minor logging changes and moved librariesHEADmaster

1 files changed, 36 insertions, 0 deletions

diff --git a/app/build/intermediates/res/merged/debug/layout/uploadlocation.xml b/app/build/intermediates/res/merged/debug/layout/uploadlocation.xml
new file mode 100644
index 0000000..69251e4
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/layout/uploadlocation.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout

+  xmlns:android="http://schemas.android.com/apk/res/android"

+  android:orientation="vertical"

+  android:layout_width="wrap_content"

+  android:layout_height="wrap_content">

+   <TextView

+ 	android:text="Current Location"

+ 	     android:layout_height="wrap_content"

+     android:layout_width="wrap_content"

+ 	 />

+ <TextView

+ 	android:id="@+id/location"

+ 	android:text=""

+ 	     android:layout_height="wrap_content"

+     android:layout_width="wrap_content"

+ 	 />

+ 	 <LinearLayout

+ 	   android:orientation="horizontal"

+  android:layout_width="wrap_content"

+  android:layout_height="wrap_content"

+  >

+ <Button

+     android:id="@+id/getlocation"

+     android:layout_height="wrap_content"

+     android:layout_width="wrap_content"

+     android:text="Get Location"

+/>

+ <Button

+     android:id="@+id/uploadlocation"

+     android:layout_height="wrap_content"

+     android:layout_width="wrap_content"

+     android:text="Upload"

+/>

+</LinearLayout>

+</LinearLayout>