From 30d164851ac3d4e7397e010baa24a8e5cb0dc090 Mon Sep 17 00:00:00 2001
From: Joe Robinson <joe@lc8n.com>
Date: Tue, 15 Dec 2015 20:43:45 +0000
Subject: Migrate to IntelliJ format, also contains some minor logging changes
 and moved libraries

---
 .../res/merged/debug/layout/browser.xml            | 37 ++++++++++
 .../res/merged/debug/layout/filerow.xml            | 47 +++++++++++++
 .../intermediates/res/merged/debug/layout/home.xml | 29 ++++++++
 .../res/merged/debug/layout/share.xml              | 82 ++++++++++++++++++++++
 .../res/merged/debug/layout/soundrecorder.xml      | 19 +++++
 .../res/merged/debug/layout/upload.xml             | 19 +++++
 .../res/merged/debug/layout/uploadlocation.xml     | 36 ++++++++++
 7 files changed, 269 insertions(+)
 create mode 100644 app/build/intermediates/res/merged/debug/layout/browser.xml
 create mode 100644 app/build/intermediates/res/merged/debug/layout/filerow.xml
 create mode 100644 app/build/intermediates/res/merged/debug/layout/home.xml
 create mode 100644 app/build/intermediates/res/merged/debug/layout/share.xml
 create mode 100644 app/build/intermediates/res/merged/debug/layout/soundrecorder.xml
 create mode 100644 app/build/intermediates/res/merged/debug/layout/upload.xml
 create mode 100644 app/build/intermediates/res/merged/debug/layout/uploadlocation.xml

(limited to 'app/build/intermediates/res/merged/debug/layout')

diff --git a/app/build/intermediates/res/merged/debug/layout/browser.xml b/app/build/intermediates/res/merged/debug/layout/browser.xml
new file mode 100644
index 0000000..4ba2fe4
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/layout/browser.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+	<LinearLayout
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:orientation="horizontal" >
+	        <ImageButton
+        android:id="@+id/upDirButton"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:src="@drawable/up_arrow" />
+	    
+		<EditText
+		    android:id="@+id/directoryname"
+		    android:layout_width="0dp"
+		    android:layout_height="match_parent"
+		    android:layout_weight="0.5"
+		    android:inputType="textUri" />
+
+		 <ImageButton
+	        android:id="@+id/goDirButton"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:src="@android:drawable/ic_media_play" />
+
+	</LinearLayout>
+    <ListView
+        android:id="@+id/filelist"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/build/intermediates/res/merged/debug/layout/filerow.xml b/app/build/intermediates/res/merged/debug/layout/filerow.xml
new file mode 100644
index 0000000..abede54
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/layout/filerow.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+    <ImageView android:id="@+id/fileicon"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp"/>
+	<LinearLayout
+	    android:orientation="vertical"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content">
+	
+		<TextView
+		  xmlns:android="http://schemas.android.com/apk/res/android"
+		  android:id="@+id/filetext"
+		  android:layout_width="fill_parent"
+		  android:layout_height="wrap_content"
+		  android:textStyle="bold">
+		</TextView>
+		<LinearLayout
+	    android:orientation="horizontal"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent">
+	
+			<TextView
+			  xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:id="@+id/filesize"
+			  android:layout_width="0dp"
+			  android:layout_height="wrap_content"
+			  android:layout_weight="0.5">
+			</TextView>
+
+			<TextView
+			    xmlns:android="http://schemas.android.com/apk/res/android"
+			    android:id="@+id/filemodified"
+			    android:layout_width="0dp"
+			    android:layout_height="wrap_content"
+			    android:layout_weight="0.5"
+			    android:gravity="right"
+			    android:layout_marginRight="5dp" >
+
+			</TextView>
+		</LinearLayout>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/build/intermediates/res/merged/debug/layout/home.xml b/app/build/intermediates/res/merged/debug/layout/home.xml
new file mode 100644
index 0000000..a68954f
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/layout/home.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+   <Button
+     android:id="@+id/browse"
+     android:layout_height="fill_parent"
+     android:layout_width="fill_parent"
+     android:layout_weight="1"
+     android:text="Upload File"
+	/>
+ <Button
+     android:id="@+id/audio"
+     android:layout_height="fill_parent"
+     android:layout_width="fill_parent"
+     android:layout_weight="1"
+     android:text="Record Audio"
+	/>
+ <Button
+     android:id="@+id/locate"
+     android:layout_height="fill_parent"
+     android:layout_width="fill_parent"
+     android:layout_weight="1"
+     android:text="Find Location"
+	/>
+  
+</LinearLayout>
diff --git a/app/build/intermediates/res/merged/debug/layout/share.xml b/app/build/intermediates/res/merged/debug/layout/share.xml
new file mode 100644
index 0000000..2573155
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/layout/share.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:android1="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+<ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+   <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="top"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Enter Filename" />
+
+        <EditText
+            android:id="@+id/filename"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:focusable="true" />
+        <Button
+            android:id="@+id/uploadfile"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Upload" />
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:gravity="top"
+	        android:orientation="horizontal"
+            android:background="#333333"
+            >
+
+	        <ImageView
+	            android:id="@+id/thumbnail"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:layout_centerHorizontal="true"
+	            android:layout_margin="5dp"
+	            android1:layout_marginBottom="5dp" />
+
+		</RelativeLayout>
+       	    <LinearLayout
+	        android:id="@+id/content"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:orientation="horizontal" >
+       		<Button
+				android:id="@+id/rotateleft"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:text="Rotate Left"
+			/>
+	 		<Button
+				android:id="@+id/rotateright"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:text="Rotate Right"
+			/>
+
+	 		<CheckBox
+	 		    android1:id="@+id/resize"
+	 		    android1:layout_width="wrap_content"
+	 		    android1:layout_height="wrap_content"
+	 		    android1:checked="true"
+	 		    android1:text="Reduce Size" />
+
+	 		</LinearLayout>
+
+
+	    </LinearLayout>
+</ScrollView>
+</RelativeLayout>
+
+
+
diff --git a/app/build/intermediates/res/merged/debug/layout/soundrecorder.xml b/app/build/intermediates/res/merged/debug/layout/soundrecorder.xml
new file mode 100644
index 0000000..58b62a2
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/layout/soundrecorder.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content">
+ <Button
+     android:id="@+id/Record"
+     android:layout_height="wrap_content"
+     android:layout_width="fill_parent"
+     android:text="Record"
+/>
+ <Button
+     android:id="@+id/Stop"
+     android:layout_height="wrap_content"
+     android:layout_width="fill_parent"
+     android:text="Stop"
+/>
+</LinearLayout>
diff --git a/app/build/intermediates/res/merged/debug/layout/upload.xml b/app/build/intermediates/res/merged/debug/layout/upload.xml
new file mode 100644
index 0000000..d56345d
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/layout/upload.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<ListView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+    <ProgressBar
+android:id="@+id/ProgressBar01"
+android:indeterminateOnly="false"
+android:progressDrawable="@android:drawable/progress_horizontal"
+android:indeterminateDrawable="@android:drawable/progress_indeterminate_horizontal"
+android:minHeight="20dip"
+android:maxHeight="20dip" android:layout_width="fill_parent"/>
+</LinearLayout>
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>
-- 
cgit v1.2.3