From 269a468c307e17973627c6b57daad384369b798a Mon Sep 17 00:00:00 2001
From: Robert Kolner <robert.kolner@gmail.com>
Date: Wed, 14 Sep 2011 18:07:36 +0200
Subject: [PATCH] Cleaned up xml-files.

---
 res/layout/footer.xml                         |  8 ++++---
 res/layout/header.xml                         | 18 ++++++++------
 res/layout/main.xml                           | 24 +++++++++++++------
 .../app/ui/ProgramList.java                   |  5 ++--
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/res/layout/footer.xml b/res/layout/footer.xml
index 8be28ff..1ca0381 100644
--- a/res/layout/footer.xml
+++ b/res/layout/footer.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/bottom_buttons" android:layout_width="fill_parent"
-	android:layout_height="wrap_content" >
+	android:id="@+id/footer" 
+	android:layout_height="wrap_content"
+	android:layout_width="fill_parent">
+	
 	<TextView
 		android:id="@+id/program_button"
         android:layout_height="wrap_content"
@@ -18,7 +20,7 @@
     	android:id="@+id/bli_med_button"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_weight="0"
+        android:layout_weight="1"
         android:layout_gravity="right"
         android:textSize="40px"
         android:textStyle="bold"
diff --git a/res/layout/header.xml b/res/layout/header.xml
index 95aaca1..edb5aef 100644
--- a/res/layout/header.xml
+++ b/res/layout/header.xml
@@ -1,11 +1,15 @@
 <?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="80dip"
-	android:orientation="horizontal">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/header"
+	android:layout_height="80dip"
+	android:layout_width="fill_parent" >
 
-	<ImageView android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:src="@drawable/dnstest"
-		android:layout_gravity="center_vertical" android:layout_marginLeft="10dip"
+	<ImageView 
+		android:src="@drawable/dnstest"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent" 
+		android:layout_gravity="center_vertical" 
+		android:layout_marginLeft="10dip"
 		android:layout_marginRight="10dip" />
 	
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 80c5f28..3c2e3f4 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -3,14 +3,26 @@
 	android:layout_width="fill_parent" android:layout_height="fill_parent">
     
     <!-- Header -->
-    <include layout="@layout/header" android:id="@+id/header"
-		android:layout_height="80dip" android:layout_width="fill_parent" />
+    <include layout="@layout/header" 
+    	android:id="@+id/header"
+		android:layout_height="wrap_content" 
+		android:layout_width="fill_parent" 
+		android:layout_alignParentTop="true"/>
+	
+	<!-- Footer -->
+	<include layout="@layout/footer" 
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent" 
+		android:layout_alignParentBottom="true" />
 	
 	<!-- Formålsparagraf -->
-	<ImageView android:layout_width="fill_parent"
+	<ImageView 
 		android:id="@+id/paragraph"
 		android:layout_marginTop="100px"
-		android:layout_height="wrap_content" android:layout_below="@id/header"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent" 
+		android:layout_below="@id/header"
+		android:layout_above="@id/footer"
 		android:src="@drawable/partest" />
 		
 	<!-- Bli med-tekst -->
@@ -20,11 +32,9 @@
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:layout_below="@id/header"
+        android:layout_above="@id/footer"
         android:layout_weight="1"
         android:layout_marginLeft="20dip"
         android:text="@string/join_us" />
 	
-	<!-- Footer -->
-	<include layout="@layout/footer" android:id="@+id/footer" android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:layout_alignParentBottom="true" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/com/studentersamfundet/app/ui/ProgramList.java b/src/com/studentersamfundet/app/ui/ProgramList.java
index ba1190c..c30a6ca 100644
--- a/src/com/studentersamfundet/app/ui/ProgramList.java
+++ b/src/com/studentersamfundet/app/ui/ProgramList.java
@@ -4,6 +4,7 @@ import org.w3c.dom.NodeList;
 
 import android.app.ListActivity;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 import android.widget.Toast;
@@ -25,8 +26,8 @@ public class ProgramList extends ListActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.event_list);
         
-        // View v = this.findViewById(R.id.program_button);
-        // v.setClickable(false);
+        View v = this.findViewById(R.id.program_button);
+        v.setClickable(false);
         
         // Do we have intarwebs?
         // YAY = Fetch the feed.