Removed footer.xml

This commit is contained in:
Robert Kolner committed 2011-12-05 22:00:10 +01:00
1 parent ff649b0851
commit 54657e7e4a
9 files changed
+6 -71

No files matched your search

+1 -9
View File
@@ -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"
+1 -7
View File
@@ -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" />
-30
View File
@@ -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>
+1 -7
View File
@@ -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"
+1 -8
View File
@@ -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"