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 @@ + android:id="@+id/footer" + android:layout_height="wrap_content" + android:layout_width="fill_parent"> + - + - - \ No newline at end of file + \ 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"> - + + + + - @@ -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" /> - - \ 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.