From 54657e7e4a2efe921162bc44b96aee890810a4d0 Mon Sep 17 00:00:00 2001
From: Robert Kolner <robert.kolner@gmail.com>
Date: Mon, 5 Dec 2011 22:00:10 +0100
Subject: [PATCH] Removed footer.xml

---
 res/layout/event_list.xml                     | 10 +------
 res/layout/event_view.xml                     |  8 +----
 res/layout/footer.xml                         | 30 -------------------
 res/layout/join_us.xml                        |  8 +----
 res/layout/main.xml                           |  9 +-----
 .../app/ui/BaseDnsActivity.java               |  4 +--
 .../app/ui/DnsActivity.java                   |  1 -
 .../app/ui/EventListActivity.java             |  3 --
 .../app/ui/EventListTicketsActivity.java      |  4 ---
 9 files changed, 6 insertions(+), 71 deletions(-)
 delete mode 100644 res/layout/footer.xml

diff --git a/res/layout/event_list.xml b/res/layout/event_list.xml
index 7010560..1f29dd4 100644
--- a/res/layout/event_list.xml
+++ b/res/layout/event_list.xml
@@ -9,20 +9,12 @@
 		android:layout_width="fill_parent" 
 		android:layout_alignParentTop="true" />
 
-	<!-- Footer -->
-	<include 
-		layout="@layout/footer"
-		android:id="@+id/footer" 
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent" 
-		android:layout_alignParentBottom="true" />
-
 	<!-- Program list -->
 	<FrameLayout
 		android:layout_width="match_parent"
         android:layout_height="match_parent" 
 		android:layout_below="@id/header"
-        android:layout_above="@id/footer">
+        android:layout_alignParentBottom="true">
         
 		<ProgressBar android:id="@+id/event_list_progress_bar" 
 			android:layout_width="40px"
diff --git a/res/layout/event_view.xml b/res/layout/event_view.xml
index 0cb4e29..fe8b5fd 100644
--- a/res/layout/event_view.xml
+++ b/res/layout/event_view.xml
@@ -9,12 +9,6 @@
 		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" />
     
     <!-- The event -->
     <TextView android:id="@+id/event_view_title" 
@@ -47,7 +41,7 @@
 	<Button android:id="@+id/event_view_link"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_above="@id/footer" 
+		android:layout_alignParentBottom="true"
 		android:layout_margin="10px"
 		android:text="@string/event_link_button"
 		android:visibility="gone" />
diff --git a/res/layout/footer.xml b/res/layout/footer.xml
deleted file mode 100644
index 6ce3447..0000000
--- a/res/layout/footer.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/footer" 
-	android:visibility="gone"
-	android:layout_height="wrap_content"
-	android:layout_width="fill_parent">
-	
-	<TextView
-		android:id="@+id/program_button"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:textSize="40px"
-        android:textStyle="bold"
-        android:onClick="clickHandler"
-        android:clickable="true"
-        android:text="@string/main_menu_program" />
-    <TextView
-    	android:id="@+id/bli_med_button"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:textSize="40px"
-        android:textStyle="bold"
-        android:onClick="clickHandler"
-        android:clickable="true"
-        android:text="@string/main_menu_join" />
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/join_us.xml b/res/layout/join_us.xml
index f865bad..24e6d29 100644
--- a/res/layout/join_us.xml
+++ b/res/layout/join_us.xml
@@ -8,19 +8,13 @@
 		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" />
 			
 	<!-- Bli med-tekst -->
 	<ScrollView
 	    	android:layout_height="fill_parent"
 	        android:layout_width="fill_parent"
 	        android:layout_below="@id/header"
-	        android:layout_above="@id/footer">
+	        android:layout_alignParentBottom="true">
 		<TextView
 			android:id="@+id/join_us_textview"
 			android:layout_marginTop="10px"
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 3311213..096e652 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -8,19 +8,12 @@
 		android:layout_width="fill_parent" 
 		android:layout_alignParentTop="true"/>
 	
-	<!-- Footer (not needed right now) -->
-	<include layout="@layout/footer"
-	    android:visibility="gone"
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent" 
-		android:layout_alignParentBottom="true" />
-	
 	<!-- MENU: --> 
 	<LinearLayout 
 	    android:layout_height="fill_parent"
 		android:layout_width="fill_parent" 
 		android:layout_below="@id/header"
-		android:layout_above="@id/footer"
+		android:layout_alignParentBottom="true"
 		android:layout_marginTop="20px"
 		android:layout_marginBottom="20px"
 		android:orientation="vertical"
diff --git a/src/com/studentersamfundet/app/ui/BaseDnsActivity.java b/src/com/studentersamfundet/app/ui/BaseDnsActivity.java
index b1873a2..2b6ac5a 100644
--- a/src/com/studentersamfundet/app/ui/BaseDnsActivity.java
+++ b/src/com/studentersamfundet/app/ui/BaseDnsActivity.java
@@ -14,7 +14,7 @@ public abstract class BaseDnsActivity extends Activity {
     	Intent intent = new Intent();
     	
     	/* Program button was pushed: */
-    	if (v.getId() == R.id.program_button) {
+    	if (v.getId() == R.id.main_menu_program) {
         	intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
         			| Intent.FLAG_ACTIVITY_SINGLE_TOP);
         	
@@ -22,7 +22,7 @@ public abstract class BaseDnsActivity extends Activity {
     		startActivity(intent);
     		
     	/* Join button was pushed: */
-    	} else if (v.getId() == R.id.bli_med_button) {
+    	} else if (v.getId() == R.id.main_menu_join) {
         	intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY
         			| Intent.FLAG_ACTIVITY_SINGLE_TOP);
         	
diff --git a/src/com/studentersamfundet/app/ui/DnsActivity.java b/src/com/studentersamfundet/app/ui/DnsActivity.java
index 2ad8117..9dbb4ad 100644
--- a/src/com/studentersamfundet/app/ui/DnsActivity.java
+++ b/src/com/studentersamfundet/app/ui/DnsActivity.java
@@ -3,7 +3,6 @@ package com.studentersamfundet.app.ui;
 import java.util.Calendar;
 
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/src/com/studentersamfundet/app/ui/EventListActivity.java b/src/com/studentersamfundet/app/ui/EventListActivity.java
index 982aeda..becac36 100644
--- a/src/com/studentersamfundet/app/ui/EventListActivity.java
+++ b/src/com/studentersamfundet/app/ui/EventListActivity.java
@@ -9,7 +9,6 @@ import java.text.SimpleDateFormat;
 
 import org.w3c.dom.NodeList;
 
-import android.R.bool;
 import android.app.Dialog;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
@@ -253,8 +252,6 @@ public class EventListActivity extends BaseDnsActivity {
     
     protected OnClickListener getShortClickListener (final Event e) {
     	return new OnClickListener() {
-			
-			@Override
 			public void onClick(View v) {
 				Intent intent = new Intent(EventListActivity.this, EventViewActivity.class);
 				intent.putExtra("event", e);
diff --git a/src/com/studentersamfundet/app/ui/EventListTicketsActivity.java b/src/com/studentersamfundet/app/ui/EventListTicketsActivity.java
index 6bbd874..fd8f268 100644
--- a/src/com/studentersamfundet/app/ui/EventListTicketsActivity.java
+++ b/src/com/studentersamfundet/app/ui/EventListTicketsActivity.java
@@ -28,8 +28,6 @@ public class EventListTicketsActivity extends EventListActivity {
 	
 	   protected OnClickListener getShortClickListener (final Event e) {
 	    	return new OnClickListener() {
-				
-				@Override
 				public void onClick(View v) {
 					Uri webDestination = e.getTicketUri();
 					
@@ -42,8 +40,6 @@ public class EventListTicketsActivity extends EventListActivity {
 	    
 	    protected OnLongClickListener getLongClickListener (final Event e) {
 	    	return new OnLongClickListener() {
-				
-				@Override
 				public boolean onLongClick(View v) {
 					return false;
 				}