This commit is contained in:
RowenaWinston 2013-10-28 20:33:41 -04:00
parent 71ea42e080
commit ecc5a001ed
15 changed files with 394 additions and 49 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 299 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -1,7 +1,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical"
android:background="#ffcc00">
<TextView <TextView
android:id="@+id/alerts_label_alerts_to_receive" android:id="@+id/alerts_label_alerts_to_receive"

View File

@ -1,41 +1,47 @@
<RelativeLayout 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:layout_width="match_parent" android:id="@+id/TableLayout1"
android:layout_height="match_parent" android:layout_width="fill_parent"
android:paddingBottom="@dimen/activity_vertical_margin" android:layout_height="fill_parent"
android:paddingLeft="@dimen/activity_horizontal_margin" android:background="#f0ead6"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".Home" > tools:context=".Home" >
<TextView <TableRow
android:id="@+id/home_label_welcome" android:id="@+id/tableRow1"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" >
android:text="@string/hello_world" />
<LinearLayout
android:id="@+id/home_layout_alerts_root"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/home_label_welcome"
android:layout_below="@+id/home_label_welcome"
android:orientation="vertical" >
<TextView <TextView
android:id="@+id/home_label_recent_alerts" android:id="@+id/recentAlertsTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/home_label_recent_alerts" />
<LinearLayout
android:id="@+id/home_layout_alerts"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:text="@string/home_label_recent_alerts"
android:textColor="@color/black" />
</TableRow>
</LinearLayout> <TableRow
android:id="@+id/tableRow2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_vertical_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_weight="1"
android:background="@color/eggshell" >
</LinearLayout> <TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
android:stretchColumns="yes" >
</TableLayout>
</TableRow>
</RelativeLayout>
<Button
android:id="@+id/clearAlertsbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/button_clear_alerts" />
</TableLayout>

View File

@ -6,11 +6,138 @@
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:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:background="#f0ead6"
tools:context=".Parking" > tools:context=".Parking" >
<TextView <TextView
android:id="@+id/textParking"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/hello_world" /> android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="@string/title_activity_parking"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/textViewSelectLot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/textParking"
android:layout_marginTop="21dp"
android:text="@string/title_parking_selection"
android:textColor="@color/black"
android:textAppearance="?android:attr/textAppearanceSmall" />
<RadioButton
android:id="@+id/radioButtonGreen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/textViewSelectLot"
android:layout_marginTop="17dp"
android:textColor="@color/green"
android:text="@string/green_lot" />
<RadioButton
android:id="@+id/radioButtonBlack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/radioButtonGreen"
android:layout_alignBottom="@+id/radioButtonGreen"
android:layout_marginLeft="42dp"
android:layout_toRightOf="@+id/textViewSelectLot"
android:textColor="@color/black"
android:text="@string/black_lot" />
<RadioButton
android:id="@+id/radioButtonRed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/radioButtonBlack"
android:layout_below="@+id/radioButtonBlack"
android:layout_marginTop="15dp"
android:textColor="@color/red"
android:text="@string/red_lot" />
<RadioButton
android:id="@+id/radioButtonBlue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/radioButtonRed"
android:layout_alignBottom="@+id/radioButtonRed"
android:layout_alignRight="@+id/radioButtonGold"
android:textColor="@color/blue"
android:text="@string/blue_lot" />
<RadioButton
android:id="@+id/radioButtonSilver"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/radioButtonRed"
android:layout_below="@+id/radioButtonRed"
android:layout_marginTop="16dp"
android:textColor="@color/silver"
android:text="@string/silver_lot" />
<RadioButton
android:id="@+id/radioButtonOrange"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/radioButtonSilver"
android:layout_alignBottom="@+id/radioButtonSilver"
android:layout_alignLeft="@+id/radioButtonBlue"
android:textColor="@color/orange"
android:text="@string/orange_lot" />
<RadioButton
android:id="@+id/radioButtonYellow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/radioButtonSilver"
android:layout_below="@+id/radioButtonSilver"
android:layout_marginTop="18dp"
android:textColor="@color/yellow"
android:text="@string/yellow_lot" />
<RadioButton
android:id="@+id/radioButtonPurple"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/radioButtonYellow"
android:layout_alignBottom="@+id/radioButtonYellow"
android:layout_alignLeft="@+id/radioButtonOrange"
android:textColor="@color/purple"
android:text="@string/puple_lot" />
<RadioButton
android:id="@+id/radioButtonPink"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/radioButtonYellow"
android:layout_below="@+id/radioButtonYellow"
android:layout_marginTop="18dp"
android:textColor="@color/pink"
android:text="@string/pink_lot" />
<RadioButton
android:id="@+id/radioButtonWhite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/radioButtonPink"
android:layout_alignBottom="@+id/radioButtonPink"
android:layout_alignLeft="@+id/radioButtonGold"
android:textColor="@color/white"
android:text="@string/white_lot" />
<RadioButton
android:id="@+id/radioButtonGold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/radioButtonGreen"
android:layout_below="@+id/radioButtonWhite"
android:layout_marginTop="16dp"
android:textColor="@color/gold"
android:text="@string/gold_lot" />
</RelativeLayout> </RelativeLayout>

View File

@ -6,11 +6,114 @@
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:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:background="#f0ead6"
tools:context=".Registration" > tools:context=".Registration" >
<TextView <TextView
android:id="@+id/registrationTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/hello_world" /> android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="@string/title_activity_registration"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/studentName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/registrationTitle"
android:layout_marginTop="26dp"
android:text="@string/student_name"
android:textAllCaps="false"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/studentOrganization"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/studentName"
android:layout_marginTop="72dp"
android:text="@string/student_organization"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/sectionNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/studentOrganization"
android:layout_marginTop="72dp"
android:text="@string/section_number"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/studentRow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/sectionNumber"
android:layout_marginTop="72dp"
android:text="@string/row_number"
android:textAppearance="?android:attr/textAppearanceSmall" />
<EditText
android:id="@+id/editStudentName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/studentName"
android:ems="10"
android:inputType="textPersonName" >
<requestFocus />
</EditText>
<EditText
android:id="@+id/editOrganizationName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/studentOrganization"
android:ems="10"
android:inputType="text" />
<EditText
android:id="@+id/editSectionNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/sectionNumber"
android:layout_below="@+id/sectionNumber"
android:ems="10"
android:inputType="number" />
<EditText
android:id="@+id/editRowNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/studentRow"
android:ems="10"
android:inputType="number" />
<Button
android:id="@+id/buttonSave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="18dp"
android:layout_toRightOf="@+id/checkBoxBroadcastInfo"
android:text="@string/button_save" />
<CheckBox
android:id="@+id/checkBoxBroadcastInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/buttonSave"
android:layout_alignBottom="@+id/buttonSave"
android:layout_alignParentLeft="true"
android:text="@string/check_box_broadcast" />
</RelativeLayout> </RelativeLayout>

52
res/layout/alerts_row.xml Normal file
View File

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp" >
<TextView
android:id="@+id/alertsChoicesTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_span="2"
android:layout_weight="1"
android:textColor="@color/black"
android:textIsSelectable="true"
android:background="@android:color/transparent"/>
<Button
android:id="@+id/getAlertsButton"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/button_get_alerts" />
<RadioGroup
android:id="@+id/alertChoicesRadioGrou"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<RadioButton
android:id="@+id/UniversityRadio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/select_university_alerts" />
<RadioButton
android:id="@+id/OraganizationRadio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/select_organization_alerts" />
<RadioButton
android:id="@+id/StudentRadio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/select_twitter_alerts" />
</RadioGroup>
</TableRow>

23
res/values/colors.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="gold">#b8860b</color>
<color name="darkGreen">#006600</color>
<color name="green">#33ff00</color>
<color name="black">#000000</color>
<color name="red">#ff0000</color>
<color name="blue">#0066cc</color>
<color name="silver">#848482</color>
<color name="orange">#ff6600</color>
<color name="yellow">#ffff31</color>
<color name="purple">#8806ce</color>
<color name="pink">#ff3399</color>
<color name="white">#ffffff</color>
<color name="eggshell">#fffacd</color>
</resources>

View File

@ -1,7 +1,7 @@
<resources> <resources>
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_horizontal_margin">5dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen> <dimen name="activity_vertical_margin">5dp</dimen>
</resources> </resources>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">UNCCGameDay</string> <string name="app_name">UNCC Game Day</string>
<string name="action_alert_settings">Alert Settings</string> <string name="action_alert_settings">Alert Settings</string>
<string name="hello_world">Welcome to UNCC GameDay!</string> <string name="hello_world">Welcome to UNCC GameDay!</string>
<string name="title_activity_parking">Parking</string> <string name="title_activity_parking">Parking</string>
@ -9,13 +9,46 @@
<string name="title_activity_alerts">Alerts</string> <string name="title_activity_alerts">Alerts</string>
<string name="alerts_label_alerts_to_receive">Select Alerts to Receive:</string> <string name="alerts_label_alerts_to_receive">Select Alerts to Receive:</string>
<string name="alerts_check_timed">Timed (Reserve Ticket&#8230;)</string> <string name="alerts_check_timed">Timed (Reserve Ticket&#8230;)</string>
<string name="button_clear_alerts">Clear All Alerts</string>
<string name="alerts_check_organizations">Organizations</string> <string name="alerts_check_organizations">Organizations</string>
<string name="alerts_check_university">University</string> <string name="alerts_check_university">University</string>
<string name="home_label_recent_alerts">Recent Alerts:</string> <string name="home_label_recent_alerts">Recent Alerts:</string>
<string name="gameday_handle">UNCCGameDay</string> <string name="gameday_handle">UNCC Game Day</string>
<string name="university_handle">unccharlotte</string> <string name="university_handle">unccharlotte</string>
<string name="db_path">Gameday.sqlite</string> <string name="db_path">Gameday.sqlite</string>
<string name="preferences_file">GamedayPreferences</string> <string name="preferences_file">GamedayPreferences</string>
<string name="server_hostname">uncc-gameday.no-ip.org</string> <string name="server_hostname">uncc-gameday.no-ip.org</string>
<string name="student_check_in">Student Check-In</string>
<string name="student_name">Student Name:</string>
<string name="student_organization">Organization:</string>
<string name="section_number">Section:</string>
<string name="row_number">Row:</string>
<string name="check_box_broadcast">Broadcast Information</string>
<string name="organization_check_in">Organization Name:</string>
<string name="organization_location">Location:</string>
<string name="organization_prizes">Prizes/Giveaways:</string>
<string name="organization_comments">Comments:</string>
<string name="registration_view_check_ins">View Check-In List</string>
<string name="button_save">Save</string>
<string name="title_parking_selection">Please Select a Lot</string>
<string name="button_get_alerts">Get Alerts</string>
<string name="select_university_alerts">University Alerts</string>
<string name="select_organization_alerts">Organization Alerts</string>
<string name="select_twitter_alerts">Twitter Alerts</string>
<string name="black_lot">Black Lot</string>
<string name="green_lot">Green Lot</string>
<string name="red_lot">Red Lot</string>
<string name="blue_lot">Blue Lot</string>
<string name="silver_lot">Silver Lot</string>
<string name="orange_lot">Orange Lot</string>
<string name="yellow_lot">Yellow Lot</string>
<string name="puple_lot">Purple Lot</string>
<string name="pink_lot">Pink Lot</string>
<string name="white_lot">White Lot</string>
<string name="gold_lot">Gold Lot</string>
</resources> </resources>