Permalink
Browse files

Redesign of homepage

  • Loading branch information...
immranderson committed Apr 15, 2013
1 parent 47fd5d0 commit 9fc3b6df50e57b9afad71959fef90627cb084da8
View
@@ -16,21 +16,24 @@
android:name="com.hackerdojo.android.infoapp.EventActivity"
android:label="@string/app_name"
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="com.hackerdojo.android.infoapp.StaffActivity"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name="com.hackerdojo.android.infoapp.SubEventActivity"
- android:theme="@android:style/Theme.NoTitleBar"
- android:label="@string/title_activity_sub_event" >
+ android:label="@string/title_activity_sub_event"
+ android:theme="@android:style/Theme.NoTitleBar" >
</activity>
+ <activity
+ android:name="com.hackerdojo.android.infoapp.HelloGridView"
+ 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>
</application>
</manifest>
View
@@ -9,3 +9,4 @@
# Project target.
target=android-14
+android.library.reference.1=../../Workspace/gridlayout_v7
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
File renamed without changes.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
@@ -1,13 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:padding="10sp"
- >
- <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/linearLayout1" android:orientation="vertical" android:gravity="center_vertical">
- <TextView android:id="@+id/textView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#005500"></TextView>
- <TextView android:id="@+id/textView2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#990000" ></TextView>
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:padding="10dp" >
+
+ <LinearLayout
+ android:id="@+id/linearLayout1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="#005500" >
+ </TextView>
+
+ <TextView
+ android:id="@+id/textView2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="#990000" >
+ </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" android:layout_marginLeft="10px"></TextView>
+
+ <TextView
+ android:id="@+id/textView3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginLeft="10dp"
+ android:textColor="@android:color/black" >
+ </TextView>
+
</LinearLayout>
View
@@ -10,28 +10,19 @@
android:id="@+id/imageView1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_margin="10px"
- android:src="@drawable/hacker_dojo_logo_transparent"
+ android:layout_margin="10dp"
+ android:src="@drawable/hacker_dojo_logo_transparent_2"
/>
<ListView
android:id="@android:id/list"
- android:layout_width="wrap_content"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="@android:color/darker_gray"
- android:dividerHeight="1px"
+ android:dividerHeight="1dp"
android:cacheColorHint="#00000000"
android:layout_weight="1"
/>
- <TextView
- android:id="@android:id/empty"
- android:text="@string/emptyEvents"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
- android:gravity="center_vertical|center_horizontal"
- android:textSize="16pt"
- android:layout_weight="1"
- />
<TextView
android:id="@+id/empty"
android:layout_height="fill_parent"
@@ -46,26 +37,5 @@
android:layout_height="wrap_content"
android:layout_weight="0"
>
- <Button
- android:id="@+id/eventsButton"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Events"
- android:layout_weight="2"
- />
- <Button
- android:id="@+id/staffButton"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Staff on Site"
- android:layout_weight="2"
- />
- <Button
- android:id="@+id/navigateButton"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Navigate to the Dojo"
- android:layout_weight="2"
- />
</LinearLayout>
</LinearLayout>
View
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/white"
+ android:orientation="vertical" >
+
+ <ImageView
+ android:id="@+id/top_image"
+ android:src="@drawable/hacker_dojo_logo_transparent_2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <GridView
+ android:id="@+id/gridview"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:columnWidth="100dp"
+ android:horizontalSpacing="20dp"
+ android:numColumns="auto_fit"
+ android:stretchMode="columnWidth"
+ android:verticalSpacing="20dp" />
+
+</LinearLayout>
View
@@ -1,13 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:padding="10sp"
- >
- <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="#005500" ></TextView>
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:padding="10dp" >
+
+ <LinearLayout
+ android:id="@+id/linearLayout1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:orientation="horizontal" >
+
+ <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="#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>
+
+ <TextView
+ android:id="@+id/textView3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|right"
+ android:layout_marginLeft="10dp"
+ android:textColor="@android:color/black" >
+ </TextView>
+
</LinearLayout>
View
@@ -9,5 +9,8 @@
<string name="hello_world">Hello world!</string>
<string name="title_activity_sub_events">SubEventsActivity</string>
<string name="title_activity_sub">SubActivity</string>
+ <string name="navigate_button_label">Navigate to the Dojo!</string>
+ <string name="staff_button_label">Staff on Site</string>
+ <string name="event_button_label">Events</string>
</resources>
@@ -8,10 +8,12 @@
private String title;
private String host;
private String location;
+ private String description; //add extended description for SubEvent Activity...
private int size;
public Date getStartDate() {
return startDate;
}
+
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
@@ -40,6 +42,14 @@ public void setLocation(String location) {
this.location = location;
}
+ public String getDescription(){
+ return description;
+ }
+
+ public void setDescription(String description){
+ this.description = description;
+ }
+
@Override
public int compareTo(Event another) {
Event anotherEvent = (Event) another;
@@ -68,8 +68,8 @@ public void onCreate(Bundle savedInstanceState) {
public void onResume() {
super.onResume();
- Button eventButton = (Button) findViewById(R.id.eventsButton);
- eventButton.setVisibility(View.GONE);
+ //Button eventButton = (Button) findViewById(R.id.eventsButton);
+ //eventButton.setVisibility(View.GONE);
if (Calendar.getInstance().getTimeInMillis()
- lastChecked.get().getTimeInMillis() > (1000 * 60 * 10)) { // 10
@@ -33,14 +33,14 @@ public void onCreate(Bundle savedInstanceState) {
public void onResume() {
super.onResume();
- Button eventsButton = (Button) findViewById(R.id.eventsButton);
- eventsButton.setOnClickListener(this);
-
- Button staffButton = (Button) findViewById(R.id.staffButton);
- staffButton.setOnClickListener(this);
-
- Button navigateButton = (Button) findViewById(R.id.navigateButton);
- navigateButton.setOnClickListener(this);
+// Button eventsButton = (Button) findViewById(R.id.eventsButton);
+// eventsButton.setOnClickListener(this);
+//
+// Button staffButton = (Button) findViewById(R.id.staffButton);
+// staffButton.setOnClickListener(this);
+//
+// Button navigateButton = (Button) findViewById(R.id.navigateButton);
+// navigateButton.setOnClickListener(this);
// hide dojo logo when sideways, takes up a lot of room
View dojoLogo = findViewById(R.id.imageView1);
@@ -56,15 +56,15 @@ public void onResume() {
public void onClick(View v) {
Log.i(TAG, "Button Click: " + v.getId());
switch (v.getId()) {
- case R.id.eventsButton:
- openEvents();
- break;
- case R.id.staffButton:
- openStaff();
- break;
- case R.id.navigateButton:
- openNavigation();
- break;
+// case R.id.eventsButton:
+// openEvents();
+// break;
+// case R.id.staffButton:
+// openStaff();
+// break;
+// case R.id.navigateButton:
+// openNavigation();
+// break;
default:
}
Oops, something went wrong.

0 comments on commit 9fc3b6d

Please sign in to comment.