From 2d73c70bf76bb02eada70db5559a1c2fdd7c5d3b Mon Sep 17 00:00:00 2001
From: RowenaWinston <rwinsto6@uncc.edu>
Date: Mon, 9 Dec 2013 01:01:08 -0500
Subject: [PATCH] Finally freaking get the parking buttons arranged.

---
 AndroidManifest.xml                 |   4 +-
 res/layout/activity_parking.xml     | 325 +++++++++++++++-------------
 res/layout/activity_search_rsvp.xml |   4 -
 3 files changed, 172 insertions(+), 161 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0cdca62..01627d3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5,8 +5,8 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="11"
-        android:targetSdkVersion="17" />
+        android:minSdkVersion="14"
+        android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
diff --git a/res/layout/activity_parking.xml b/res/layout/activity_parking.xml
index 10b72a0..0b3eebd 100644
--- a/res/layout/activity_parking.xml
+++ b/res/layout/activity_parking.xml
@@ -1,12 +1,14 @@
 <RelativeLayout xmlns:tools="http://schemas.android.com/tool"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools1="http://schemas.android.com/tools"
     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"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".Parking" >
+    tools:context=".Parking"
+    tools1:ignore="UselessParent" >
 
     <TextView
         android:id="@+id/textViewSelectLot"
@@ -33,167 +35,180 @@
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:src="@drawable/parking_map" />
 
-    <Button
-        android:id="@+id/buttonGold"
-        style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        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" />
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@+id/parkingMap" >
 
-    <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/buttonYellow"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_margin="5dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/yellow_lot"
+            android:textColor="@color/white" />
 
-    <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/buttonRed"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/buttonYellow"
+            android:layout_margin="5dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/red_lot"
+            android:textColor="@color/white"
+            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/buttonPink"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@id/buttonRed"
+            android:layout_margin="5dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/pink_lot"
+            android:textColor="@color/white"
+            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/buttonPurple"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/buttonPink"
+            android:layout_margin="5dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/purple_lot"
+            android:textColor="@color/white"
+            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/buttonOrange"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_margin="5dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/orange_lot"
+            android:textColor="@color/white"
+            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="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/buttonOrange"
+            android:layout_centerHorizontal="true"
+            android:layout_margin="5dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/green_lot"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            android:textStyle="bold" />
 
-    <Button
-        android:id="@+id/buttonGreen"
-        style="@style/GameDayTheme"
-        android:layout_width="85dp"
-        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:textColor="@color/black"
-        android:textSize="12sp"
-        android:textStyle="bold" />
+        <Button
+            android:id="@+id/buttonWhite"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/buttonGreen"
+            android:layout_centerHorizontal="true"
+            android:layout_margin="5dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/white_lot"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            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/buttonBlue"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentCenter="true"
+            android:layout_below="@id/buttonWhite"
+            android:layout_centerHorizontal="true"
+            android:layout_margin="5dp"
+            android:layout_marginLeft="14dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/blue_lot"
+            android:textColor="@color/white"
+            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/buttonGold"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/buttonBlack"
+            android:layout_margin="5dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/gold_lot"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/buttonSilver"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/buttonGold"
+            android:layout_margin="5dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/silver_lot"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/buttonBlack"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_margin="5dp"
+            android:background="#488214"
+            android:gravity="center"
+            android:onClick="onButtonClick"
+            android:text="@string/black_lot"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            android:textStyle="bold" />
+    </RelativeLayout>
 
-    <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_search_rsvp.xml b/res/layout/activity_search_rsvp.xml
index 01c9963..ebb20e4 100644
--- a/res/layout/activity_search_rsvp.xml
+++ b/res/layout/activity_search_rsvp.xml
@@ -35,10 +35,6 @@
         android:layout_alignParentTop="true"
         android:padding="2dp"
         android:paddingLeft="20dp"
-        android:shadowColor="@color/silver"
-        android:shadowDx="3"
-        android:shadowDy="-3"
-        android:shadowRadius="1.5"
         android:text="@string/search_text"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="@color/white"