From 84fbbeb70c18eec11313cd57504e9a915f214dcd Mon Sep 17 00:00:00 2001
From: RowenaWinston <rwinsto6@uncc.edu>
Date: Sun, 8 Dec 2013 14:56:46 -0500
Subject: [PATCH] Latest commit after fixing errors.

---
 bin/AndroidManifest.xml                       |   1 -
 .../gamedaytheme_btn_default_holo_dark.xml    |  14 +-
 res/layout/activity_home.xml                  |  47 ++-
 res/layout/activity_parking.xml               | 309 +++++++++---------
 res/layout/activity_registration.xml          |   6 +-
 res/layout/activity_search_rsvp.xml           |  41 ++-
 res/layout/full_map.xml                       |   1 -
 res/layout/lot_view.xml                       |   3 +-
 res/values/colors.xml                         |   6 +-
 res/values/strings.xml                        |   1 +
 10 files changed, 231 insertions(+), 198 deletions(-)

diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
index a377483..0fdca33 100644
--- a/bin/AndroidManifest.xml
+++ b/bin/AndroidManifest.xml
@@ -40,7 +40,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <service android:name="com.uncc.gameday.alerts.AlertService"/>
     </application>
 
 </manifest>
diff --git a/res/drawable/gamedaytheme_btn_default_holo_dark.xml b/res/drawable/gamedaytheme_btn_default_holo_dark.xml
index bfc1dd2..aa3a9bb 100644
--- a/res/drawable/gamedaytheme_btn_default_holo_dark.xml
+++ b/res/drawable/gamedaytheme_btn_default_holo_dark.xml
@@ -3,17 +3,17 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/gamedaytheme_btn_default_normal_holo_dark" />
+        android:drawable="@drawable/register" />
     <item android:state_window_focused="false" android:state_enabled="false"
-        android:drawable="@drawable/gamedaytheme_btn_default_disabled_holo_dark" />
+        android:drawable="@drawable/button_disabled" />
     <item android:state_pressed="true" 
-        android:drawable="@drawable/gamedaytheme_btn_default_pressed_holo_dark" />
+        android:drawable="@drawable/register" />
     <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/gamedaytheme_btn_default_focused_holo_dark" />
+        android:drawable="@drawable/button_disabled" />
     <item android:state_enabled="true"
-        android:drawable="@drawable/gamedaytheme_btn_default_normal_holo_dark" />
+        android:drawable="@drawable/silver" />
     <item android:state_focused="true"
-        android:drawable="@drawable/gamedaytheme_btn_default_disabled_focused_holo_dark" />
+        android:drawable="@drawable/button_disabled" />
     <item
-         android:drawable="@drawable/gamedaytheme_btn_default_disabled_holo_dark" />
+         android:drawable="@drawable/silver" />
 </selector>
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 850f638..4994011 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -1,4 +1,5 @@
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TableLayout 
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/TableLayout1"
     android:layout_width="fill_parent"
@@ -40,32 +41,42 @@
  
       </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" >
+     <LinearLayout
+        android:orientation="vertical"
+        
+        >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:orientation="horizontal"
+            android:layout_gravity="center"
+            android:layout_weight="2"
+            
+            >
 
         <Button
             android:id="@+id/clearAlertsButton"
-            style="@style/GameDayTheme"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_span="1"
-            android:layout_weight="1"
+			android:background="@drawable/register"
             android:text="@string/button_clear_alerts"
-            android:textColor="@color/black" />
+            android:textColor="@color/black"
+            tools:ignore="ButtonStyle"
+            android:layout_weight="1" />
 
         <Button
             android:id="@+id/refreshAlertsButton"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            style="@style/GameDayTheme"
-            android:layout_span="1"
-            android:layout_weight="1"
+            android:background="@drawable/register"
             android:text="@string/button_refresh_alerts"
-            android:textColor="@color/black" />
-    </TableRow>
+            android:textColor="@color/black"
+            tools:ignore="ButtonStyle" 
+            android:layout_weight="1"/>
+			
+
+    </LinearLayout>
+    </LinearLayout>
 
 </TableLayout>
diff --git a/res/layout/activity_parking.xml b/res/layout/activity_parking.xml
index a31f162..f63bd6d 100644
--- a/res/layout/activity_parking.xml
+++ b/res/layout/activity_parking.xml
@@ -14,187 +14,186 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="0dp"
         android:text="@string/title_parking_selection"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="@color/green" />
 
-    <Button
-        android:id="@+id/buttonSilver"
-        style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_alignLeft="@+id/buttonRed"
-        android:layout_below="@+id/buttonRed"
-        android:layout_centerHorizontal="true"
-        android:gravity="left|center_vertical"
-        android:text="@string/silver_lot"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
-
-    <Button
-        android:id="@+id/buttonOrange"
-        style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_alignBaseline="@+id/buttonBlack"
-        android:layout_alignBottom="@+id/buttonBlack"
-        android:layout_centerHorizontal="true"
-        android:gravity="left|center_vertical"
-        android:text="@string/orange_lot"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
-
-    <Button
-        android:id="@+id/buttonRed"
-        style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_alignLeft="@+id/buttonPurple"
-        android:layout_below="@+id/buttonPurple"
-        android:gravity="left|center_vertical"
-        android:text="@string/red_lot"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
-
-    <Button
-        android:id="@+id/buttonPurple"
-        style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_above="@+id/buttonGold"
-        android:layout_toLeftOf="@+id/buttonPink"
-        android:gravity="left|center_vertical"
-        android:text="@string/purple_lot"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
-
     <ImageView
-        android:id="@+id/imageView1"
-        android:layout_width="320dp"
-        android:layout_height="250dp"
-        android:layout_alignTop="@+id/textViewSelectLot"
-        android:layout_centerHorizontal="true"
+        android:id="@+id/parkingMap"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/textViewSelectLot"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/textViewSelectLot"
         android:adjustViewBounds="true"
         android:clickable="true"
         android:contentDescription="@string/parking_map"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
-        android:scaleType="centerCrop"
         android:src="@drawable/parking_map" />
 
-    <Button
-        android:id="@+id/buttonWhite"
-        style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_above="@+id/buttonPurple"
-        android:layout_alignLeft="@+id/buttonPink"
-        android:gravity="left|center_vertical"
-        android:layout_alignParentRight="true"
-        android:text="@string/white_lot"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
-
-    <Button
-        android:id="@+id/buttonPink"
-        style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_above="@+id/buttonRed"
-        android:layout_toRightOf="@+id/buttonOrange"
-        android:gravity="left|center_vertical"
-        android:layout_alignParentRight="true"
-        android:text="@string/pink_lot"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
-
-    <Button
-        android:id="@+id/buttonYellow"
-		style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_above="@+id/buttonSilver"
-        android:layout_alignLeft="@+id/buttonPink"
-        android:gravity="left|center_vertical"
-        android:layout_alignParentRight="true"
-        android:text="@string/yellow_lot"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
-
-    <Button
-        android:id="@+id/buttonBlack"
-        style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_below="@+id/imageView1"
-        android:layout_marginTop="20dp"
-        android:layout_toLeftOf="@+id/buttonOrange"
-        android:gravity="left|center_vertical"
-        android:layout_alignParentLeft="true"
-        android:text="@string/black_lot"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
-
-    <Button
-        android:id="@+id/buttonBlue"
-        style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_below="@+id/buttonBlack"
-        android:layout_toLeftOf="@+id/buttonOrange"
-        android:gravity="left|center_vertical"
-        android:layout_alignParentLeft="true"
-        android:text="@string/blue_lot"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
-
     <Button
         android:id="@+id/buttonGold"
         style="@style/GameDayTheme"
         android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_below="@+id/buttonBlue"
-        android:layout_toLeftOf="@+id/buttonOrange"
-        android:gravity="left|center_vertical"
-        android:layout_alignParentLeft="true"
+        android:layout_height="20dp"
+        android:layout_alignLeft="@+id/parkingMap"
+        android:layout_below="@+id/parkingMap"
+        android:layout_marginTop="14dp"
+        android:gravity="center"
+        android:onClick="onButtonClick"
         android:text="@string/gold_lot"
         android:textColor="@color/black"
         android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonBlue"
+        style="@style/GameDayTheme"
+        android:layout_width="85dp"
+        android:layout_height="20dp"
+        android:layout_above="@+id/buttonRed"
+        android:layout_alignRight="@+id/parkingMap"
+        android:gravity="center"
+        android:onClick="onButtonClick"
+        android:text="@string/blue_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonPink"
+        style="@style/GameDayTheme"
+        android:layout_width="85dp"
+        android:layout_height="20dp"
+        android:layout_above="@+id/buttonRed"
+        android:layout_alignLeft="@+id/buttonGold"
+        android:gravity="center"
+        android:onClick="onButtonClick"
+        android:text="@string/pink_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonSilver"
+        style="@style/GameDayTheme"
+        android:layout_width="85dp"
+        android:layout_height="20dp"
+        android:layout_alignBaseline="@+id/buttonGold"
+        android:layout_alignBottom="@+id/buttonGold"
+        android:layout_centerHorizontal="true"
+        android:gravity="center"
+        android:onClick="onButtonClick"
+        android:text="@string/silver_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonRed"
+        style="@style/GameDayTheme"
+        android:layout_width="85dp"
+        android:layout_height="20dp"
+        android:layout_alignLeft="@+id/buttonSilver"
+        android:layout_below="@+id/buttonSilver"
+        android:layout_marginTop="14dp"
+        android:gravity="center"
+        android:onClick="onButtonClick"
+        android:text="@string/red_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonYellow"
+        style="@style/GameDayTheme"
+        android:layout_width="85dp"
+        android:layout_height="20dp"
+        android:layout_alignBaseline="@+id/buttonRed"
+        android:layout_alignBottom="@+id/buttonRed"
+        android:layout_alignLeft="@+id/buttonGold"
+        android:gravity="center"
+        android:onClick="onButtonClick"
+        android:text="@string/yellow_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonWhite"
+        style="@style/GameDayTheme"
+        android:layout_width="85dp"
+        android:layout_height="20dp"
+        android:layout_alignBaseline="@+id/buttonRed"
+        android:layout_alignBottom="@+id/buttonRed"
+        android:layout_toRightOf="@+id/buttonPurple"
+        android:gravity="center"
+        android:onClick="onButtonClick"
+        android:text="@string/white_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
 
     <Button
         android:id="@+id/buttonGreen"
         style="@style/GameDayTheme"
         android:layout_width="85dp"
-        android:layout_height="30dp"
-        android:layout_below="@+id/buttonGold"
-        android:layout_toLeftOf="@+id/buttonOrange"
-        android:gravity="left|center_vertical"
+        android:layout_height="20dp"
+        android:layout_alignLeft="@+id/buttonYellow"
+        android:layout_below="@+id/buttonYellow"
+        android:layout_marginTop="19dp"
+        android:gravity="center"
+        android:onClick="onButtonClick"
         android:text="@string/green_lot"
-        android:layout_alignParentLeft="true"
         android:textColor="@color/black"
         android:textSize="12sp"
-        android:textStyle="bold"
-        android:onClick="onButtonClick" />
+        android:textStyle="bold" />
 
+    <Button
+        android:id="@+id/buttonOrange"
+        style="@style/GameDayTheme"
+        android:layout_width="85dp"
+        android:layout_height="20dp"
+        android:layout_alignBaseline="@+id/buttonGreen"
+        android:layout_alignBottom="@+id/buttonGreen"
+        android:layout_alignLeft="@+id/buttonWhite"
+        android:gravity="center"
+        android:onClick="onButtonClick"
+        android:text="@string/orange_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonBlack"
+        style="@style/GameDayTheme"
+        android:layout_width="85dp"
+        android:layout_height="20dp"
+        android:layout_alignBaseline="@+id/buttonOrange"
+        android:layout_alignBottom="@+id/buttonOrange"
+        android:layout_alignLeft="@+id/buttonRed"
+        android:gravity="center"
+        android:onClick="onButtonClick"
+        android:text="@string/black_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonPurple"
+        style="@style/GameDayTheme"
+        android:layout_width="85dp"
+        android:layout_height="20dp"
+        android:layout_below="@+id/buttonOrange"
+        android:layout_marginTop="24dp"
+        android:layout_toRightOf="@+id/textViewSelectLot"
+        android:gravity="center"
+        android:onClick="onButtonClick"
+        android:text="@string/purple_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+    
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_registration.xml b/res/layout/activity_registration.xml
index 45e10fe..6b297e6 100644
--- a/res/layout/activity_registration.xml
+++ b/res/layout/activity_registration.xml
@@ -23,13 +23,14 @@
 
     <Button
         android:id="@+id/buttonRegister"
+        style="@style/GameDayTheme"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="15dp"
         android:gravity="center_horizontal|center_vertical"
         android:text="@string/button_register"
-        android:textColor="@color/white"
+        android:textColor="@color/black"
         android:onClick="onClick"/>
 
     <EditText
@@ -54,7 +55,8 @@
         android:layout_alignLeft="@+id/editRowNumber"
         android:layout_marginBottom="30dp"
         android:text="@string/check_box_broadcast"
-        android:textColor="@color/white" />
+        android:textColor="@color/white" 
+        style="@style/GameDayTheme"/>
 
     <TextView
         android:id="@+id/studentRow"
diff --git a/res/layout/activity_search_rsvp.xml b/res/layout/activity_search_rsvp.xml
index 8d07cf2..1460e5e 100644
--- a/res/layout/activity_search_rsvp.xml
+++ b/res/layout/activity_search_rsvp.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tool"
+    style="@style/GameDayTheme"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    style="@style/GameDayTheme"
-  >
+    android:paddingRight="@dimen/activity_horizontal_margin" >
 
     <SearchView
         android:id="@+id/searchView1"
@@ -18,22 +15,41 @@
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="18dp"
-        android:queryHint="@string/search_hint"
+        android:background="@color/silver"
         android:inputType="text"
-        style="@style/GameDayTheme" >
-        
+        android:queryHint="@string/search_hint" >
     </SearchView>
 
+    <RelativeLayout
+        android:id="@+id/relativeLayout1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="74dp" >
+    </RelativeLayout>
+
+
     <TextView
         android:id="@+id/textView1"
         style="@style/GameDayTheme"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/searchView1"
-        android:layout_below="@+id/searchView1"
+        android:layout_below="@+id/searchView1"
+        android:layout_marginTop="38dp"
+        android:paddingLeft="20dp"
         android:text="@string/search_text"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textStyle="italic" />
+        android:textStyle="italic" 
+        android:textColor="@color/green"
+       	android:padding="2dp"
+        android:shadowColor="@color/gold"
+        android:shadowDx="3"
+        android:shadowDy="-3"
+        android:shadowRadius="1.5" />
+
+
 
     <ListView
         android:id="@+id/RSVPListView"
@@ -44,5 +60,6 @@
         android:layout_below="@+id/textView1" >
 
     </ListView>
+
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/res/layout/full_map.xml b/res/layout/full_map.xml
index 6a027bb..f76fa24 100644
--- a/res/layout/full_map.xml
+++ b/res/layout/full_map.xml
@@ -14,7 +14,6 @@
     	android:paddingTop="@dimen/activity_vertical_margin">
 
         <ImageView
-            android:id="@+id/mapZoom"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
diff --git a/res/layout/lot_view.xml b/res/layout/lot_view.xml
index 9b08bed..b9df0d7 100644
--- a/res/layout/lot_view.xml
+++ b/res/layout/lot_view.xml
@@ -22,7 +22,8 @@
         <ProgressBar
             android:id="@+id/lotViewCurrentFilled"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            style="@style/GameDayTheme" />
 
     </LinearLayout>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9ee504e..3565759 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,7 +15,11 @@
  <color name="white">#ffffff</color>
  <color name="eggshell">#fffacd</color>
  <color name="background">#daa520</color>
- 
+ <color name="White">#FFF</color>
+ <color name="Black">#000</color>
+ <color name="Grey">#7F7F7F</color>
+ <color name="DarkGrey">#4F4F4F</color>
+ <color name="TransparentGrey">#7F000000</color>
 
  
  
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 64f9aab..4bc9ea5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -63,6 +63,7 @@
     <string name="full_lot">Full </string>
     <string name="submit_rating">Submit Rating</string>
     <string name="filled_status">Filled Status</string>
+    <string name="crowd">Crowd</string>
     <string name="title_activity_search_rsvp">RSVP Search</string>
     <string name="internet_down_error">Internet access is currently unavailable.</string>
 </resources>