From 559305e42e1ea09b8d26085e8f8355bdb6ba0352 Mon Sep 17 00:00:00 2001
From: Joe Robinson <joe@sol.(none)>
Date: Sat, 22 Oct 2011 00:13:24 +0100
Subject: Updating with code from months ago that wasn't commited (This might
 break everything)

---
 res/drawable-hdpi/icon.png     | Bin 4147 -> 8230 bytes
 res/drawable-hdpi/marcus72.png | Bin 0 -> 8230 bytes
 res/drawable-ldpi/icon.png     | Bin 1723 -> 2635 bytes
 res/drawable-mdpi/icon.png     | Bin 2574 -> 4195 bytes
 res/layout/filerow.xml         |  14 ++++----
 res/layout/home.xml            |  58 ++++++++++++++++-----------------
 res/layout/share.xml           |  30 +++++++++++++++++
 res/layout/soundrecorder.xml   |  36 ++++++++++-----------
 res/layout/upload.xml          |  38 +++++++++++-----------
 res/layout/uploadlocation.xml  |  72 ++++++++++++++++++++---------------------
 res/menu/menu.xml              |  32 +++++++++---------
 res/values/strings.xml         |  11 ++++---
 12 files changed, 161 insertions(+), 130 deletions(-)
 create mode 100644 res/drawable-hdpi/marcus72.png
 create mode 100644 res/layout/share.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
index 8074c4c..adaeefb 100644
Binary files a/res/drawable-hdpi/icon.png and b/res/drawable-hdpi/icon.png differ
diff --git a/res/drawable-hdpi/marcus72.png b/res/drawable-hdpi/marcus72.png
new file mode 100644
index 0000000..b93712d
Binary files /dev/null and b/res/drawable-hdpi/marcus72.png differ
diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
index 1095584..4744bb9 100644
Binary files a/res/drawable-ldpi/icon.png and b/res/drawable-ldpi/icon.png differ
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
index a07c69f..a8a7390 100644
Binary files a/res/drawable-mdpi/icon.png and b/res/drawable-mdpi/icon.png differ
diff --git a/res/layout/filerow.xml b/res/layout/filerow.xml
index 7f12ffa..410c666 100644
--- a/res/layout/filerow.xml
+++ b/res/layout/filerow.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="30sp"
-  android:typeface="monospace">
-</TextView>
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="30sp"
+  android:typeface="monospace">
+</TextView>
diff --git a/res/layout/home.xml b/res/layout/home.xml
index c17cf47..a68954f 100644
--- a/res/layout/home.xml
+++ b/res/layout/home.xml
@@ -1,29 +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>
+<?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/res/layout/share.xml b/res/layout/share.xml
new file mode 100644
index 0000000..6a70ea3
--- /dev/null
+++ b/res/layout/share.xml
@@ -0,0 +1,30 @@
+<?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">
+  	<TextView
+  		android:text="Enter Filename"
+ 		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+	/>
+	<EditText
+		android:id="@+id/filename"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:focusable="true"
+	/>
+	  	<TextView
+  		android:text="   "
+ 		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+	/>
+	<Button
+		android:id="@+id/uploadfile"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:text="Upload"
+	/>
+ 
+</LinearLayout>
diff --git a/res/layout/soundrecorder.xml b/res/layout/soundrecorder.xml
index 184bbae..f707e88 100644
--- a/res/layout/soundrecorder.xml
+++ b/res/layout/soundrecorder.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content">
- <Button
-     android:id="@+id/Record"
-     android:layout_height="wrap_content"
-     android:layout_width="wrap_content"
-     android:text="Record"
-/>
- <Button
-     android:id="@+id/Stop"
-     android:layout_height="wrap_content"
-     android:layout_width="wrap_content"
-     android:text="Stop"
-/>
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  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/res/layout/upload.xml b/res/layout/upload.xml
index 13a38b7..d56345d 100644
--- a/res/layout/upload.xml
+++ b/res/layout/upload.xml
@@ -1,19 +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>
+<?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/res/layout/uploadlocation.xml b/res/layout/uploadlocation.xml
index f924d43..69251e4 100644
--- a/res/layout/uploadlocation.xml
+++ b/res/layout/uploadlocation.xml
@@ -1,36 +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>
+<?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>
diff --git a/res/menu/menu.xml b/res/menu/menu.xml
index ffc9eca..1d60246 100644
--- a/res/menu/menu.xml
+++ b/res/menu/menu.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-  xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:id="@+id/menuBrowse"
-	  android:icon="@android:drawable/ic_menu_upload"
-	  android:title="Upload Files"></item>
-<item android:id="@+id/menuRecord"
-	  android:icon="@android:drawable/ic_btn_speak_now"
-	  android:title="Record Audio"></item>
-<item android:id="@+id/menuLocate"
-	  android:icon="@android:drawable/ic_menu_compass"
-	  android:title="Send Location"></item>
-<item android:id="@+id/menuExit"
-	  android:icon="@android:drawable/ic_menu_close_clear_cancel"
-	  android:title="Exit"></item>
-</menu>
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:id="@+id/menuBrowse"
+	  android:icon="@android:drawable/ic_menu_upload"
+	  android:title="Upload Files"></item>
+<item android:id="@+id/menuRecord"
+	  android:icon="@android:drawable/ic_btn_speak_now"
+	  android:title="Record Audio"></item>
+<item android:id="@+id/menuLocate"
+	  android:icon="@android:drawable/ic_menu_compass"
+	  android:title="Send Location"></item>
+<item android:id="@+id/menuExit"
+	  android:icon="@android:drawable/ic_menu_close_clear_cancel"
+	  android:title="Exit"></item>
+</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4f00040..9e611cf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="hello">Hello World, fileBrowser!</string>
-    <string name="app_name">blauploader</string>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello World, fileBrowser!</string>
+    <string name="app_name">blauploader</string>
+    <string name="cancel">Cancel</string>
+</resources>
-- 
cgit v1.2.3