Skip to content

Commit

Permalink
Moved connection requests to async tasks, added additional informatio…
Browse files Browse the repository at this point in the history
…n on event item click, removed header completely from app
  • Loading branch information
fkautz committed Nov 28, 2011
1 parent c17b326 commit f54924b
Show file tree
Hide file tree
Showing 7 changed files with 492 additions and 304 deletions.
8 changes: 5 additions & 3 deletions AndroidManifest.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@
<application android:icon="@drawable/icon" android:label="@string/app_name"> <application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".EventActivity" <activity android:name=".EventActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar"> android:theme="@android:style/Theme.NoTitleBar"
>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".StaffActivity" <activity android:name=".StaffActivity"
android:theme="@android:style/Theme.NoTitleBar"/> android:theme="@android:style/Theme.NoTitleBar"
/>
</application> </application>
</manifest> </manifest>
11 changes: 2 additions & 9 deletions res/layout/main.xml
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/mainLayout"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
Expand All @@ -9,17 +10,9 @@
android:id="@+id/imageView1" android:id="@+id/imageView1"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10px" android:layout_margin="10px"
android:src="@drawable/hacker_dojo_logo_transparent" 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 <ListView
android:id="@android:id/list" android:id="@android:id/list"
Expand Down
7 changes: 7 additions & 0 deletions src/com/hackerdojo/android/infoapp/Event.java
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class Event implements Comparable<Event> {
private String title; private String title;
private String host; private String host;
private String location; private String location;
private int size;
public Date getStartDate() { public Date getStartDate() {
return startDate; return startDate;
} }
Expand Down Expand Up @@ -48,4 +49,10 @@ public int compareTo(Event another) {
} }
return comp; return comp;
} }
public int getSize() {
return size;
}
public void setSize(int size) {
this.size = size;
}
} }
Loading

0 comments on commit f54924b

Please sign in to comment.