From 251a41eb67ef36d34b741d8480b24f3c7a591481 Mon Sep 17 00:00:00 2001
From: RowenaWinston <rwinsto6@uncc.edu>
Date: Wed, 30 Oct 2013 14:15:38 -0400
Subject: [PATCH] UI updates

---
 res/layout/activity_home.xml              | 45 +++++++++++++++++------
 res/layout/activity_parking.xml           |  9 ++---
 res/layout/activity_registration.xml      | 14 +++++--
 res/values/colors_unccgameday.xml         |  2 +-
 res/values/strings.xml                    |  3 +-
 src/com/uncc/gameday/activities/Home.java | 19 ++++++++++
 6 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 9e945d3..82060c4 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -17,6 +17,7 @@
             android:layout_height="wrap_content"
             android:text="@string/home_label_recent_alerts"
             android:textColor="@color/black" />
+ 
     </TableRow>
 
     <TableRow
@@ -26,18 +27,38 @@
         android:layout_marginLeft="@dimen/activity_vertical_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_weight="1"
-        android:background="@color/eggshell"
-        android:showDividers="end" >
-        
+        android:background="@color/eggshell">
+ 	<requestFocus/>
+
+ 	<ListView
+ 	    android:id="@+id/alertsListView"
+ 	    android:layout_width="match_parent"
+ 	    android:layout_height="wrap_content"
+ 	    android:layout_weight="1"
+ 	    android:background="@android:color/transparent" >
+
+ 	</ListView>
+ 
+      </TableRow>
+      
+     
+      <TableRow
+        android:id="@+id/tableRow3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/activity_vertical_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin">
+
+         <Button
+             android:id="@+id/clearAlertsButton"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_span="2"
+             android:layout_weight="1"
+             android:text="@string/button_clear_alerts"
+             android:textColor="@color/black" />
+    
     </TableRow>
 
-    
+</TableLayout>
 
-    <Button
-        android:id="@+id/clearAlertsbutton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/button_clear_alerts" 
-        android:textColor="@color/black" />
-
-</TableLayout>
\ No newline at end of file
diff --git a/res/layout/activity_parking.xml b/res/layout/activity_parking.xml
index 619f765..ebf8e53 100644
--- a/res/layout/activity_parking.xml
+++ b/res/layout/activity_parking.xml
@@ -33,9 +33,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/puple_lot"
-        android:textColor="@color/black" />
- 
-    
+        android:textColor="@color/black"
+        android1:textColorLink="@color/pressed_unccgameday" />
    
     <RadioButton
         android1:id="@+id/radioButtonGreen"
@@ -116,7 +115,7 @@
     android1:layout_alignParentBottom="true"
     android1:layout_centerHorizontal="true"
     android:textColor="@color/black"
-    android1:gravity="bottom|center_horizontal"
-    android1:text="@string/button_get_lot_info" />
+    android1:text="@string/button_get_lot_info"
+    android1:textColorLink="@color/pressed_unccgameday" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_registration.xml b/res/layout/activity_registration.xml
index b309e8c..64b3e30 100644
--- a/res/layout/activity_registration.xml
+++ b/res/layout/activity_registration.xml
@@ -60,7 +60,9 @@
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/studentName"
         android:ems="10"
-        android:inputType="textPersonName" >
+        android:inputType="textPersonName"
+        android:textColor="@color/black"
+        android:textColorLink="@color/black" >
 
         <requestFocus />
     </EditText>
@@ -72,7 +74,9 @@
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/studentOrganization"
         android:ems="10"
-        android:inputType="text" />
+        android:inputType="text"
+        android:textColor="@color/black"
+        android:textColorHint="@color/black" />
 
     <EditText
         android:id="@+id/editSectionNumber"
@@ -81,7 +85,8 @@
         android:layout_alignLeft="@+id/sectionNumber"
         android:layout_below="@+id/sectionNumber"
         android:ems="10"
-        android:inputType="number" />
+        android:inputType="number"
+        android:textColor="@color/black" />
 
     <EditText
         android:id="@+id/editRowNumber"
@@ -90,7 +95,8 @@
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/studentRow"
         android:ems="10"
-        android:inputType="number" />
+        android:inputType="number"
+        android:textColor="@color/black" />
 
     <Button
         android:id="@+id/buttonSave"
diff --git a/res/values/colors_unccgameday.xml b/res/values/colors_unccgameday.xml
index ba14ed8..ad2f1a6 100755
--- a/res/values/colors_unccgameday.xml
+++ b/res/values/colors_unccgameday.xml
@@ -18,5 +18,5 @@
 -->
 
 <resources>
-    <color name="pressed_unccgameday">#CCB99F10</color>
+    <color name="pressed_unccgameday">#b8860b</color>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9b7241c..edf978f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,7 +47,8 @@
     <string name="pink_lot">Pink Lot</string>
     <string name="white_lot">White Lot</string>
     <string name="gold_lot">Gold Lot</string>
-    
+    <string name="title_enter_location">Enter a city:</string>
+
     <string name="button_clear_parking_choices">Clear Selections</string>
     <string name="button_get_lot_info">Get Parking Info</string>
         
diff --git a/src/com/uncc/gameday/activities/Home.java b/src/com/uncc/gameday/activities/Home.java
index 63d6366..d2c31c3 100644
--- a/src/com/uncc/gameday/activities/Home.java
+++ b/src/com/uncc/gameday/activities/Home.java
@@ -6,18 +6,37 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
+import android.widget.Button;
+import android.widget.TableLayout;
 
 import com.uncc.gameday.R;
 import com.uncc.gameday.alerts.AlertService;
 
 public class Home extends MenuActivity {
 	
+	private TableLayout alertsScrollView;
+	
+	Button clearAlertsButton;
+	Button getAlertsButton;
+	
 	private final long alarmRate = 300000; // 5 Minutes
 	
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_home);
 		
+		alertsScrollView = (TableLayout) findViewById(R.id.alertsScrollView);
+		
+		clearAlertsButton = (Button) findViewById(R.id.clearAlertsButton);
+		getAlertsButton = (Button) findViewById(R.id.getAlertsButton);
+		
+		clearAlertsButton.setOnClickListener(clearAlertsButtonListener);
+		getAlertsButton.setOnClickListener(getAlertsButtonListener);
+		
+		updateAlertsList(null);
+	
+	
+		
 		// Start up the AlarmManager to fetch alerts in the background
 		AlarmManager am = (AlarmManager) this.getSystemService(ALARM_SERVICE);
 		Intent alertFetcher = new Intent(this, AlertService.class);