Merge branch 'master' of github.com:neuf/DNSapp

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"

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>
+</FrameLayout>

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>

src/com/studentersamfundet/app/FeedFetcher.java

@@ -80,29 +80,24 @@ public class FeedFetcher {
 	        return itemNodes;
 	}
 	
-	void saveFile(InputStream in, Context c) {
+	void saveFile(InputStream in, Context c) throws IOException, FileNotFoundException {
+		final String FILENAME = "dns_events";
+		final int BUFFER_SIZE = 2000;
+		
 		InputStreamReader isr = new InputStreamReader(in);
-		int charRead;
-		int BUFFER_SIZE = 2000;
-		String FILENAME = "dns_events";
-		String str = "";
+		
 		char[] inputBuffer = new char[BUFFER_SIZE];
-		
-		try {
-			while ((charRead = isr.read(inputBuffer))>0) {
-				String readString = String.copyValueOf(inputBuffer, 0, charRead);
-				str += readString;
-				inputBuffer = new char[BUFFER_SIZE];
-			}
-			in.close();
-		} catch (IOException e) {}
-	
-		try {
-			FileOutputStream fos = c.openFileOutput(FILENAME, Context.MODE_PRIVATE);
-			fos.write(str.getBytes());
-			fos.close();
-		} catch (FileNotFoundException e) {
-		} catch (IOException e){} 
-		
+		StringBuilder outputStr = new StringBuilder();
+
+		int charRead;
+		while ((charRead = isr.read(inputBuffer)) > 0) {
+			outputStr.append(charRead);
+			inputBuffer = new char[BUFFER_SIZE];
+		}
+		in.close();
+
+		FileOutputStream fos = c.openFileOutput(FILENAME, Context.MODE_PRIVATE);
+		fos.write(outputStr.toString().getBytes());
+		fos.close();
 	}
 }

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;
@@ -26,8 +27,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.