Moved connection requests to async tasks, added additional informatio…

…n on event item click, removed header completely from app
fkautz · Nov 28, 2011 · f54924b · f54924b
1 parent c17b326
commit f54924b
Show file tree

Hide file tree

Showing 7 changed files with 492 additions and 304 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -8,13 +8,15 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name">
         <activity android:name=".EventActivity"
                   android:label="@string/app_name"
-                  android:theme="@android:style/Theme.NoTitleBar"> 
+                  android:theme="@android:style/Theme.NoTitleBar"
+                  > 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".StaffActivity" 
-        		  android:theme="@android:style/Theme.NoTitleBar"/>
+				  android:theme="@android:style/Theme.NoTitleBar"
+        		  />
     </application>
-</manifest>
+</manifest>
diff --git a/res/layout/main.xml b/res/layout/main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/mainLayout"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -9,17 +10,9 @@
 	    android:id="@+id/imageView1" 
 	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content" 
-	    android:layout_marginTop="10px"
+	    android:layout_margin="10px"
 	    android:src="@drawable/hacker_dojo_logo_transparent" 
 	    />
-	<TextView
-	    android:id="@+id/header"
-	    android:layout_width="fill_parent" 
-	    android:layout_height="wrap_content" 
-	    android:textSize="16pt"
-	    android:gravity="center_vertical|center_horizontal"
-	    android:visibility="visible"
-	    />
 
 	<ListView 
 		android:id="@android:id/list"

diff --git a/src/com/hackerdojo/android/infoapp/Event.java b/src/com/hackerdojo/android/infoapp/Event.java
@@ -8,6 +8,7 @@ public class Event implements Comparable<Event> {
 	private String title;
 	private String host;
 	private String location;
+	private int size;
 	public Date getStartDate() {
 		return startDate;
 	}
@@ -48,4 +49,10 @@ public int compareTo(Event another) {
 		}
 		return comp;
 	}
+	public int getSize() {
+		return size;
+	}
+	public void setSize(int size) {
+		this.size = size;
+	}
 }