Latest commit after fixing errors.

This commit is contained in:
RowenaWinston 2013-12-08 14:56:46 -05:00
parent a04940e6d1
commit 84fbbeb70c
10 changed files with 231 additions and 198 deletions

View File

@ -40,7 +40,6 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<service android:name="com.uncc.gameday.alerts.AlertService"/>
</application> </application>
</manifest> </manifest>

View File

@ -3,17 +3,17 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_window_focused="false" android:state_enabled="true" <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" <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" <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" <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" <item android:state_enabled="true"
android:drawable="@drawable/gamedaytheme_btn_default_normal_holo_dark" /> android:drawable="@drawable/silver" />
<item android:state_focused="true" <item android:state_focused="true"
android:drawable="@drawable/gamedaytheme_btn_default_disabled_focused_holo_dark" /> android:drawable="@drawable/button_disabled" />
<item <item
android:drawable="@drawable/gamedaytheme_btn_default_disabled_holo_dark" /> android:drawable="@drawable/silver" />
</selector> </selector>

View File

@ -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" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/TableLayout1" android:id="@+id/TableLayout1"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -40,32 +41,42 @@
</TableRow> </TableRow>
<TableRow <LinearLayout
android:id="@+id/tableRow3" android:orientation="vertical"
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:layout_width="wrap_content"
android:layout_height="0dp"
android:orientation="horizontal"
android:layout_gravity="center"
android:layout_weight="2"
>
<Button <Button
android:id="@+id/clearAlertsButton" android:id="@+id/clearAlertsButton"
style="@style/GameDayTheme" android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_span="1" android:background="@drawable/register"
android:layout_weight="1"
android:text="@string/button_clear_alerts" android:text="@string/button_clear_alerts"
android:textColor="@color/black" /> android:textColor="@color/black"
tools:ignore="ButtonStyle"
android:layout_weight="1" />
<Button <Button
android:id="@+id/refreshAlertsButton" android:id="@+id/refreshAlertsButton"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/GameDayTheme" android:background="@drawable/register"
android:layout_span="1"
android:layout_weight="1"
android:text="@string/button_refresh_alerts" android:text="@string/button_refresh_alerts"
android:textColor="@color/black" /> android:textColor="@color/black"
</TableRow> tools:ignore="ButtonStyle"
android:layout_weight="1"/>
</LinearLayout>
</LinearLayout>
</TableLayout> </TableLayout>

View File

@ -14,187 +14,186 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginTop="5dp" android:layout_marginTop="0dp"
android:text="@string/title_parking_selection" android:text="@string/title_parking_selection"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/green" /> 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 <ImageView
android:id="@+id/imageView1" android:id="@+id/parkingMap"
android:layout_width="320dp" android:layout_width="wrap_content"
android:layout_height="250dp" android:layout_height="wrap_content"
android:layout_alignTop="@+id/textViewSelectLot" android:layout_alignLeft="@+id/textViewSelectLot"
android:layout_centerHorizontal="true" android:layout_alignParentRight="true"
android:layout_below="@+id/textViewSelectLot"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/parking_map" android:contentDescription="@string/parking_map"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:scaleType="centerCrop"
android:src="@drawable/parking_map" /> 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 <Button
android:id="@+id/buttonGold" android:id="@+id/buttonGold"
style="@style/GameDayTheme" style="@style/GameDayTheme"
android:layout_width="85dp" android:layout_width="85dp"
android:layout_height="30dp" android:layout_height="20dp"
android:layout_below="@+id/buttonBlue" android:layout_alignLeft="@+id/parkingMap"
android:layout_toLeftOf="@+id/buttonOrange" android:layout_below="@+id/parkingMap"
android:gravity="left|center_vertical" android:layout_marginTop="14dp"
android:layout_alignParentLeft="true" android:gravity="center"
android:onClick="onButtonClick"
android:text="@string/gold_lot" android:text="@string/gold_lot"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold" />
android:onClick="onButtonClick" />
<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 <Button
android:id="@+id/buttonGreen" android:id="@+id/buttonGreen"
style="@style/GameDayTheme" style="@style/GameDayTheme"
android:layout_width="85dp" android:layout_width="85dp"
android:layout_height="30dp" android:layout_height="20dp"
android:layout_below="@+id/buttonGold" android:layout_alignLeft="@+id/buttonYellow"
android:layout_toLeftOf="@+id/buttonOrange" android:layout_below="@+id/buttonYellow"
android:gravity="left|center_vertical" android:layout_marginTop="19dp"
android:gravity="center"
android:onClick="onButtonClick"
android:text="@string/green_lot" android:text="@string/green_lot"
android:layout_alignParentLeft="true"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold" />
android:onClick="onButtonClick" />
<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> </RelativeLayout>

View File

@ -23,13 +23,14 @@
<Button <Button
android:id="@+id/buttonRegister" android:id="@+id/buttonRegister"
style="@style/GameDayTheme"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:text="@string/button_register" android:text="@string/button_register"
android:textColor="@color/white" android:textColor="@color/black"
android:onClick="onClick"/> android:onClick="onClick"/>
<EditText <EditText
@ -54,7 +55,8 @@
android:layout_alignLeft="@+id/editRowNumber" android:layout_alignLeft="@+id/editRowNumber"
android:layout_marginBottom="30dp" android:layout_marginBottom="30dp"
android:text="@string/check_box_broadcast" android:text="@string/check_box_broadcast"
android:textColor="@color/white" /> android:textColor="@color/white"
style="@style/GameDayTheme"/>
<TextView <TextView
android:id="@+id/studentRow" android:id="@+id/studentRow"

View File

@ -1,15 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?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" xmlns:tools="http://schemas.android.com/tool"
style="@style/GameDayTheme"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" >
style="@style/GameDayTheme"
>
<SearchView <SearchView
android:id="@+id/searchView1" android:id="@+id/searchView1"
@ -18,22 +15,41 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="18dp" android:layout_marginTop="18dp"
android:queryHint="@string/search_hint" android:background="@color/silver"
android:inputType="text" android:inputType="text"
style="@style/GameDayTheme" > android:queryHint="@string/search_hint" >
</SearchView> </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 <TextView
android:id="@+id/textView1" android:id="@+id/textView1"
style="@style/GameDayTheme" style="@style/GameDayTheme"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/searchView1" 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:text="@string/search_text"
android:textAppearance="?android:attr/textAppearanceLarge" 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 <ListView
android:id="@+id/RSVPListView" android:id="@+id/RSVPListView"
@ -44,5 +60,6 @@
android:layout_below="@+id/textView1" > android:layout_below="@+id/textView1" >
</ListView> </ListView>
</RelativeLayout> </RelativeLayout>

View File

@ -14,7 +14,6 @@
android:paddingTop="@dimen/activity_vertical_margin"> android:paddingTop="@dimen/activity_vertical_margin">
<ImageView <ImageView
android:id="@+id/mapZoom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"

View File

@ -22,7 +22,8 @@
<ProgressBar <ProgressBar
android:id="@+id/lotViewCurrentFilled" android:id="@+id/lotViewCurrentFilled"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
style="@style/GameDayTheme" />
</LinearLayout> </LinearLayout>

View File

@ -15,7 +15,11 @@
<color name="white">#ffffff</color> <color name="white">#ffffff</color>
<color name="eggshell">#fffacd</color> <color name="eggshell">#fffacd</color>
<color name="background">#daa520</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>

View File

@ -63,6 +63,7 @@
<string name="full_lot">Full </string> <string name="full_lot">Full </string>
<string name="submit_rating">Submit Rating</string> <string name="submit_rating">Submit Rating</string>
<string name="filled_status">Filled Status</string> <string name="filled_status">Filled Status</string>
<string name="crowd">Crowd</string>
<string name="title_activity_search_rsvp">RSVP Search</string> <string name="title_activity_search_rsvp">RSVP Search</string>
<string name="internet_down_error">Internet access is currently unavailable.</string> <string name="internet_down_error">Internet access is currently unavailable.</string>
</resources> </resources>