From f9af985dd6a0de77f0d99439f42cd8b49a3189ba Mon Sep 17 00:00:00 2001
From: RowenaWinston <rwinsto6@uncc.edu>
Date: Sun, 8 Dec 2013 20:56:07 -0500
Subject: [PATCH 1/9] Changed registration button

---
 AndroidManifest.xml                  |  2 +-
 res/layout/activity_registration.xml | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a377483..7498481 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/GameDayTheme"
+        android:theme="@style/AppBaseTheme"
         android:name="com.uncc.gameday.GameDay" >
         <activity
             android:name="com.uncc.gameday.activities.Alerts"
diff --git a/res/layout/activity_registration.xml b/res/layout/activity_registration.xml
index 72ec722..3e17ed5 100644
--- a/res/layout/activity_registration.xml
+++ b/res/layout/activity_registration.xml
@@ -31,26 +31,25 @@
         
         <requestFocus />
 
-
-
     <Button
-        android:id="@+id/buttonRegister"
-        style="@style/GameDayTheme"
+        android:id="@+id/Button1"
         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:onClick="onClick"
         android:text="@string/button_register"
-        android:textColor="@color/black"
-        android:onClick="onClick"/>
+        android:textColor="@color/white"
+        style="?android:attr/buttonStyleSmall"
+        android:background="#488214" />
 
     <EditText
         android:id="@+id/editRowNumber"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/buttonRegister"
-        android:layout_alignLeft="@+id/buttonRegister"
+        android:layout_above="@+id/Button1"
+        android:layout_alignLeft="@+id/Button1"
         android:layout_marginBottom="70dp"
         android:ems="10"
         android:inputType="number"
@@ -62,7 +61,7 @@
         android:id="@+id/checkBoxBroadcastInfo"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/buttonRegister"
+        android:layout_above="@+id/Button1"
         android:layout_alignLeft="@+id/editRowNumber"
         android:layout_marginBottom="30dp"
         android:text="@string/check_box_broadcast"

From 9e05b955fa8e464a1939c22d20cc716f0dbbcd09 Mon Sep 17 00:00:00 2001
From: bspeice <bspeice@uncc.edu>
Date: Sun, 8 Dec 2013 21:33:46 -0500
Subject: [PATCH 2/9] Use the right theme...

---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 674787c..0cdca62 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppBaseTheme"
+        android:theme="@style/GameDayTheme"
         android:name="com.uncc.gameday.GameDay" >
         <activity
             android:name="com.uncc.gameday.activities.Parking"

From c7bf7ae7bda6113fcda4deb5a7d6463cfee6b527 Mon Sep 17 00:00:00 2001
From: RowenaWinston <rwinsto6@uncc.edu>
Date: Sun, 8 Dec 2013 21:50:43 -0500
Subject: [PATCH 3/9] Modified register button

---
 res/layout/activity_registration.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/layout/activity_registration.xml b/res/layout/activity_registration.xml
index 2f517c6..231e28d 100644
--- a/res/layout/activity_registration.xml
+++ b/res/layout/activity_registration.xml
@@ -43,7 +43,9 @@
         android:gravity="center_horizontal|center_vertical"
         android:text="@string/button_register"
         android:textColor="@color/black"
-        android:onClick="onClick"/>
+        android:onClick="onClick"
+        style="?android:attr/buttonStyleSmall"
+        android:background="#488214"/>
 
     <EditText
         android:id="@+id/editRowNumber"
@@ -110,4 +112,5 @@
         android:textColor="@color/white"
         android:textColorHint="@color/black" />
 
+   
 </RelativeLayout>

From 674882121a4e30d9e077b9094a12b9c8bb47a115 Mon Sep 17 00:00:00 2001
From: bspeice <bspeice@uncc.edu>
Date: Sun, 8 Dec 2013 21:55:09 -0500
Subject: [PATCH 4/9] Remove a duplicate style value

---
 res/layout/activity_registration.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/layout/activity_registration.xml b/res/layout/activity_registration.xml
index 231e28d..7388bc2 100644
--- a/res/layout/activity_registration.xml
+++ b/res/layout/activity_registration.xml
@@ -44,7 +44,6 @@
         android:text="@string/button_register"
         android:textColor="@color/black"
         android:onClick="onClick"
-        style="?android:attr/buttonStyleSmall"
         android:background="#488214"/>
 
     <EditText

From 2d0c901462f3bf30cdaf836b8a839b76a977d8fd Mon Sep 17 00:00:00 2001
From: bspeice <bspeice@uncc.edu>
Date: Sun, 8 Dec 2013 22:03:11 -0500
Subject: [PATCH 5/9] Restore a cast that was remove earlier

---
 src/com/uncc/gameday/activities/parking/LotViewFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/uncc/gameday/activities/parking/LotViewFragment.java b/src/com/uncc/gameday/activities/parking/LotViewFragment.java
index 87a5278..35b3a65 100644
--- a/src/com/uncc/gameday/activities/parking/LotViewFragment.java
+++ b/src/com/uncc/gameday/activities/parking/LotViewFragment.java
@@ -55,7 +55,7 @@ public class LotViewFragment extends DialogFragment {
 		Bundle args = this.getArguments();
 		
 		if (args.containsKey("CHOICE"))
-			pc = ParkingChoice.valueOf(String.valueOf(args.get("CHOICE")));
+			pc = ParkingChoice.valueOf(String.valueOf((char[])args.get("CHOICE")));
 		else
 			pc = ParkingChoice.BLACK;
 		

From 2568ff97f60e8aa1f72f682ef3cca591f74631b4 Mon Sep 17 00:00:00 2001
From: bspeice <bspeice@uncc.edu>
Date: Sun, 8 Dec 2013 22:10:01 -0500
Subject: [PATCH 6/9] Change the "Register" text to white

---
 res/layout/activity_registration.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/layout/activity_registration.xml b/res/layout/activity_registration.xml
index 7388bc2..4ba39ee 100644
--- a/res/layout/activity_registration.xml
+++ b/res/layout/activity_registration.xml
@@ -31,8 +31,6 @@
         
         <requestFocus />
 
-
-
     <Button
         android:id="@+id/buttonRegister"
         style="@style/GameDayTheme"
@@ -40,11 +38,11 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="15dp"
+        android:background="#488214"
         android:gravity="center_horizontal|center_vertical"
-        android:text="@string/button_register"
-        android:textColor="@color/black"
         android:onClick="onClick"
-        android:background="#488214"/>
+        android:text="@string/button_register"
+        android:textColor="@color/white" />
 
     <EditText
         android:id="@+id/editRowNumber"

From fbf1073565b33d086b93c7b6c22968158451f5a6 Mon Sep 17 00:00:00 2001
From: bspeice <bspeice@uncc.edu>
Date: Sun, 8 Dec 2013 22:21:31 -0500
Subject: [PATCH 7/9] Get the parking progress bar correct

---
 res/layout/lot_view.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/res/layout/lot_view.xml b/res/layout/lot_view.xml
index b9df0d7..a5f3305 100644
--- a/res/layout/lot_view.xml
+++ b/res/layout/lot_view.xml
@@ -3,11 +3,10 @@
     xmlns:tools="http://schemas.android.com/tool"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:orientation="vertical" >
+    android:paddingTop="@dimen/activity_vertical_margin" >
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,9 +20,10 @@
 
         <ProgressBar
             android:id="@+id/lotViewCurrentFilled"
-            android:layout_width="fill_parent"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/GameDayTheme" />
+            android:layout_gravity="center_vertical|top" />
 
     </LinearLayout>
 
@@ -67,4 +67,6 @@
         android:text="@string/submit_rating" 
         android:onClick="onSubmitRating" />
 
+
+
 </LinearLayout>

From e45556fdf7c1c509523639eeebc46be2dde478d8 Mon Sep 17 00:00:00 2001
From: RowenaWinston <rwinsto6@uncc.edu>
Date: Sun, 8 Dec 2013 22:32:08 -0500
Subject: [PATCH 8/9] Modified home page buttons to android theme

---
 res/layout/activity_home.xml | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 65294a7..7b4f767 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -48,32 +48,37 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:orientation="horizontal"
-            android:layout_gravity="center"
+            android:layout_gravity="center_horizontal|center"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:layout_weight="2"
-            
-            >
+            android:orientation="horizontal"
+            tools:ignore="UselessParent" >
 
         <Button
             android:id="@+id/clearAlertsButton"
+            style="?android:attr/buttonStyleSmall"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
-			android:background="@drawable/register"
+            android:layout_height="32dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginRight="10dp"
+            android:layout_weight="1"
+            android:background="#488214"
             android:text="@string/button_clear_alerts"
-            android:textColor="@color/black"
-            tools:ignore="ButtonStyle"
-            android:layout_weight="1" />
+            android:textColor="@color/white"
+            tools:ignore="ButtonStyle,NestedWeights" />
 
         <Button
             android:id="@+id/refreshAlertsButton"
+            style="?android:attr/buttonStyleSmall"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="@drawable/register"
+            android:layout_height="32dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="1"
+            android:background="#488214"
             android:text="@string/button_refresh_alerts"
-            android:textColor="@color/black"
-            tools:ignore="ButtonStyle" 
-            android:layout_weight="1"/>
-			
+            android:textColor="@color/white"
+            tools:ignore="ButtonStyle" />
 
     </LinearLayout>
     </LinearLayout>

From 07d454754c5e4f4f6c9e521b50c947259befa076 Mon Sep 17 00:00:00 2001
From: RowenaWinston <rwinsto6@uncc.edu>
Date: Sun, 8 Dec 2013 22:45:13 -0500
Subject: [PATCH 9/9] Centered Home buttons

---
 res/layout/activity_home.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 7b4f767..2ba173b 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -41,17 +41,20 @@
       </TableRow>
 
      <LinearLayout
-        android:orientation="vertical"
-        
+        	android:orientation="vertical"
+         	android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
         >
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="fill_parent"
             android:layout_height="0dp"
-            android:layout_gravity="center_horizontal|center"
-            android:layout_marginBottom="@dimen/activity_vertical_margin"
+            android:layout_gravity="center_horizontal"
             android:layout_weight="2"
             android:orientation="horizontal"
+            android:paddingBottom="@dimen/activity_vertical_margin"
             tools:ignore="UselessParent" >
 
         <Button
@@ -59,7 +62,7 @@
             style="?android:attr/buttonStyleSmall"
             android:layout_width="0dp"
             android:layout_height="32dp"
-            android:layout_gravity="center_horizontal"
+            android:layout_gravity="center_horizontal|center_vertical"
             android:layout_marginRight="10dp"
             android:layout_weight="1"
             android:background="#488214"
@@ -72,7 +75,7 @@
             style="?android:attr/buttonStyleSmall"
             android:layout_width="0dp"
             android:layout_height="32dp"
-            android:layout_gravity="center_horizontal"
+            android:layout_gravity="center_horizontal|center_vertical"
             android:layout_marginLeft="10dp"
             android:layout_weight="1"
             android:background="#488214"