edb/android-app
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up xml-files.

Browse Source
This commit is contained in:
Robert Kolner committed 2011-09-14 18:07:36 +02:00
1 parent 9c16bbfa57
commit 269a468c30
4 files changed
+36 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

res/layout/footer.xml
+5 -3
View File
@@ -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
+11 -7
View File
@@ -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
+17 -7
View File
@@ -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/ui/ProgramList.java
+3 -2
View File
@@ -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.