Working horizontal layout

Closes #21

code/SensorLogger/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     package="uk.co.md87.android.sensorlogger" android:versionCode="9" android:versionName="0.1.3">
+     package="uk.co.md87.android.sensorlogger" android:versionCode="10" android:versionName="0.1.4">
     <application android:label="Sensor Logger">
          <activity android:name=".MainActivity" android:label="Sensor Logger">
             <intent-filter>

code/SensorLogger/res/layout-land/main.xml

@@ -0,0 +1,60 @@
+<?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"
+    android:weightSum="100">
+    <RelativeLayout
+        android:orientation="vertical"
+        android:layout_height="fill_parent"
+        android:layout_width="0px"
+        android:layout_weight="70"
+        android:padding="5px"
+        android:id="@+id/left">
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Hello Android from NetBeans"/>
+        <TextView
+            android:id="@+id/viewcaption"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/text"
+            android:layout_marginTop="10dip"
+            android:text="View your uploaded data at:"/>
+    </RelativeLayout>
+    <RelativeLayout
+        android:orientation="vertical"
+        android:layout_height="fill_parent"
+        android:layout_width="0px"
+        android:padding="5px"
+        android:layout_weight="30">
+        <TextView
+            android:id="@+id/caption"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/text"
+            android:gravity="center"
+            android:text="Caption"/>
+        <EditText
+            android:id="@+id/entry"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:drawable/editbox_background"
+            android:layout_below="@id/caption" />
+        <Button
+            android:id="@+id/start"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/entry"
+            android:layout_marginTop="40dip"
+            android:text="Start recording"/>
+        <Button
+            android:id="@+id/upload"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/start"
+            android:text="Upload data"/>
+    </RelativeLayout>
+</LinearLayout>

code/SensorLogger/res/layout/main.xml

@@ -2,12 +2,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">" 
+    android:layout_height="fill_parent"
+    android:padding="5px">
     <TextView
         android:id="@+id/text"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:text="Hello Android from NetBeans"/>
+        android:text="Hello Android from NetBeans"
+        android:layout_marginBottom="15dip"/>
     <TextView
         android:id="@+id/caption"
         android:layout_width="fill_parent"
@@ -19,7 +21,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@android:drawable/editbox_background"
-        android:layout_below="@id/caption" />
+        android:layout_below="@id/caption"
+        android:layout_marginBottom="15dip"/>
     <Button
         android:id="@+id/start"
         android:layout_width="wrap_content"
@@ -38,5 +41,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/upload"
-        android:text="View your uploaded data at:"/>
+        android:text="View your uploaded data at:"
+        android:layout_marginTop="15dip"/>
 </RelativeLayout>

code/SensorLogger/src/uk/co/md87/android/sensorlogger/MainActivity.java

@@ -23,7 +23,7 @@ import android.widget.TextView;
  */
 public class MainActivity extends Activity implements OnClickListener {
 
-    static final String VERSION = "0.1.3";
+    static final String VERSION = "0.1.4";
 
     static String ACTIVITY = "Unknown";
 
@@ -38,9 +38,7 @@ public class MainActivity extends Activity implements OnClickListener {
         ((Button) findViewById(R.id.upload)).setOnClickListener(this);
         ((Button) findViewById(R.id.upload)).setEnabled(false);
 
-        ((TextView) findViewById(R.id.text)).setText("Welcome to sensor logger v"
-                + VERSION + "..."
-                + "\n\nThis application records any changes in your phone's "
+        ((TextView) findViewById(R.id.text)).setText("This application records any changes in your phone's "
                 + "accelerometer and magnetic field sensors to a text file, "
                 + "along with the timestamp that the change occured at.\n\n"
                 + "Once 1,000 entries have been recorded (~50 seconds), the data will be "

code/SensorLogger/src/uk/co/md87/android/sensorlogger/R.java

@@ -13,6 +13,7 @@ public final class R {
     public static final class id {
         public static final int caption=0x7f040001;
         public static final int entry=0x7f040002;
+        public static final int left=0x7f040006;
         public static final int start=0x7f040003;
         public static final int text=0x7f040000;
         public static final int upload=0x7f040004;