Permalink
Browse files

Merge pull request #3 from fkautz/master

stability and ui tweaks
  • Loading branch information...
2 parents 0a47c4f + 687239b commit fa3baae57d5b3940e47ddc36e8afc3fcc5ff4a45 @dustball dustball committed Nov 29, 2011
View
@@ -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>
File renamed without changes
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
View
@@ -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"
View
@@ -7,7 +7,7 @@
>
<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/linearLayout1" android:orientation="horizontal" android:gravity="center_vertical">
<TextView android:id="@+id/textView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#005500" android:visibility="gone"></TextView>
- <TextView android:id="@+id/textView2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#990000" ></TextView>
+ <TextView android:id="@+id/textView2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#005500" ></TextView>
</LinearLayout>
<TextView android:id="@+id/textView3" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@android:color/black" android:layout_gravity="center_vertical|right" android:layout_marginLeft="10px"></TextView>
</LinearLayout>
@@ -8,6 +8,7 @@
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;
+ }
}
Oops, something went wrong.

0 comments on commit fa3baae

Please sign in to comment.