mirror-github-bspeice/UNCCGameDay
1
0
Fork 0
mirror of https://github.com/bspeice/UNCCGameDay synced 2025-11-04 02:10:35 -05:00
Code Issues Releases Wiki Activity

I created an error in registration.java when changing the

Browse Source 
first/last name to just fulll name.
Something simple. I will update the registration.xml file to reflect
both first
and last name right now.
This commit is contained in:
RowenaWinston
2013-12-02 20:31:53 -05:00
parent 914de0c7b5
commit af728c6ee8
7 changed files with 245 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/parking_map.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 158 KiB

19
res/layout/activity_alerts.xml
View File

@ -2,15 +2,19 @@
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="#7d9a43"> android:background="#7d9a43"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin">
<TextView <TextView
android:id="@+id/alerts_label_alerts_to_receive" android:id="@+id/alerts_label_alerts_to_receive"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/alerts_label_alerts_to_receive" android:text="@string/alerts_label_alerts_to_receive"
android:textColor="@color/black" android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textColor="@color/black" />
<CheckBox <CheckBox
android:id="@+id/alerts_check_timed" android:id="@+id/alerts_check_timed"
@ -38,9 +42,10 @@
<Button <Button
android:id="@+id/getAlertsButton" android:id="@+id/getAlertsButton"
android:layout_width="wrap_content" android:layout_width="186dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/black" android:gravity="left|center_vertical"
android:text="@string/button_get_alerts" /> android:text="@string/button_get_alerts"
android:textColor="@color/black" />
</LinearLayout> </LinearLayout>

4
res/layout/activity_home.xml
View File

@ -57,7 +57,8 @@
android:layout_span="1" android:layout_span="1"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/button_clear_alerts" android:text="@string/button_clear_alerts"
android:textColor="@color/black" /> android:textColor="@color/black"
android:gravity="left|center_vertical"/>
<Button <Button
android:id="@+id/refreshAlertsButton" android:id="@+id/refreshAlertsButton"
@ -66,6 +67,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_span="1" android:layout_span="1"
android:layout_weight="1" android:layout_weight="1"
android:gravity="left|center_vertical"
android:text="@string/button_refresh_alerts" android:text="@string/button_refresh_alerts"
android:textColor="@color/black" /> android:textColor="@color/black" />
</TableRow> </TableRow>

303
res/layout/activity_parking.xml
View File

@ -1,122 +1,183 @@
<RelativeLayout xmlns:tools="http://schemas.android.com/tools" <RelativeLayout xmlns:tools="http://schemas.android.com/tool"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android1="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" android:background="#7d9a43"
android:background="#7d9a43" 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" android:paddingTop="@dimen/activity_vertical_margin"
android:paddingTop="@dimen/activity_vertical_margin" tools:context=".Parking" >
tools:context=".Parking" >
<TextView <TextView
android1:id="@+id/textViewSelectLot" android:id="@+id/textViewSelectLot"
android1:layout_width="wrap_content" android:layout_width="wrap_content"
android1:layout_height="wrap_content" android:layout_height="wrap_content"
android1:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android1:layout_alignParentTop="true" android:layout_alignParentTop="true"
android1:layout_marginTop="5dp" android:layout_marginTop="5dp"
android1:text="@string/title_parking_selection" android:text="@string/title_parking_selection"
android1:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android1:textColor="@color/black" /> android:textColor="@color/black" />
<RadioGroup <Button
android1:id="@+id/radioGroup1" android:id="@+id/buttonSilver"
android1:layout_width="wrap_content" style="?android:attr/buttonStyleSmall"
android1:layout_height="wrap_content" android:layout_width="85dp"
android1:layout_alignLeft="@+id/textViewSelectLot" android:layout_height="wrap_content"
android1:layout_below="@+id/textViewSelectLot" android:layout_alignLeft="@+id/buttonRed"
android1:layout_marginTop="10dp" > android:layout_below="@+id/buttonRed"
android:layout_centerHorizontal="true"
<RadioButton android:gravity="left|center_vertical"
android:id="@+id/radioButtonPurple" android:text="@string/silver_lot"
android:layout_width="wrap_content" android:textColor="@color/black"
android:layout_height="wrap_content" android:textSize="12sp"
android:text="@string/purple_lot" android:textStyle="bold" />
android:textColor="@color/black"
android1:textColorLink="@color/pressed_unccgameday" <Button
android:onClick="onRadioButtonClick" /> android:id="@+id/buttonOrange"
style="?android:attr/buttonStyleSmall"
<RadioButton android:layout_width="85dp"
android1:id="@+id/radioButtonGreen" android:layout_height="wrap_content"
android1:layout_width="wrap_content" android:layout_alignBaseline="@+id/buttonBlack"
android1:layout_height="wrap_content" android:layout_alignBottom="@+id/buttonBlack"
android1:text="@string/green_lot" android:layout_centerHorizontal="true"
android1:textColor="@color/black" android:gravity="left|center_vertical"
android:onClick="onRadioButtonClick" /> android:text="@string/orange_lot"
android:textColor="@color/black"
android:textSize="12sp"
<RadioButton android:textStyle="bold" />
android1:id="@+id/radioButtonSilver"
android1:layout_width="wrap_content" <Button
android1:layout_height="wrap_content" android:id="@+id/buttonRed"
android1:text="@string/silver_lot" style="?android:attr/buttonStyleSmall"
android1:textColor="@color/black" android:layout_width="85dp"
android:onClick="onRadioButtonClick" /> android:layout_height="wrap_content"
android:layout_alignLeft="@+id/buttonPurple"
<RadioButton android:layout_below="@+id/buttonPurple"
android1:id="@+id/radioButtonYellow" android:gravity="left|center_vertical"
android1:layout_width="wrap_content" android:text="@string/red_lot"
android1:layout_height="wrap_content" android:textColor="@color/black"
android1:text="@string/yellow_lot" android:textSize="12sp"
android1:textColor="@color/black" android:textStyle="bold" />
android:onClick="onRadioButtonClick" />
<Button
<RadioButton android:id="@+id/buttonPurple"
android1:id="@+id/radioButtonBlue" style="?android:attr/buttonStyleSmall"
android1:layout_width="wrap_content" android:layout_width="85dp"
android1:layout_height="wrap_content" android:layout_height="wrap_content"
android1:text="@string/blue_lot" android:layout_above="@+id/buttonGold"
android1:textColor="@color/black" android:layout_toLeftOf="@+id/buttonPink"
android:onClick="onRadioButtonClick" /> android:gravity="left|center_vertical"
android:text="@string/purple_lot"
<RadioButton android:textColor="@color/black"
android1:id="@+id/radioButtonBlack" android:textSize="12sp"
android1:layout_width="wrap_content" android:textStyle="bold" />
android1:layout_height="wrap_content"
android1:text="@string/black_lot" <ImageView
android1:textColor="@color/black" android:id="@+id/imageView1"
android:onClick="onRadioButtonClick" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<RadioButton android:layout_below="@+id/textViewSelectLot"
android1:id="@+id/radioButtonGold" android:layout_centerHorizontal="true"
android1:layout_width="wrap_content" android:layout_marginTop="18dp"
android1:layout_height="wrap_content" android:adjustViewBounds="true"
android1:text="@string/gold_lot" android:contentDescription="@string/parking_map"
android1:textColor="@color/black" android:paddingLeft="@dimen/activity_horizontal_margin"
android:onClick="onRadioButtonClick" /> android:paddingRight="@dimen/activity_horizontal_margin"
android:scaleType="fitCenter"
<RadioButton android:src="@drawable/parking_map" />
android1:id="@+id/radioButtonWhite"
android1:layout_width="wrap_content" <Button
android1:layout_height="wrap_content" android:id="@+id/buttonWhite"
android1:text="@string/white_lot" style="?android:attr/buttonStyleSmall"
android1:textColor="@color/black" android:layout_width="85dp"
android:onClick="onRadioButtonClick" /> android:layout_height="wrap_content"
android:layout_above="@+id/buttonPurple"
<RadioButton android:layout_alignLeft="@+id/buttonPink"
android1:id="@+id/radioButtonPink" android:gravity="left|center_vertical"
android1:layout_width="wrap_content" android:text="@string/white_lot"
android1:layout_height="wrap_content" android:textColor="@color/black"
android1:text="@string/pink_lot" android:textSize="12sp"
android1:textColor="@color/black" android:textStyle="bold" />
android:onClick="onRadioButtonClick" />
<Button
<RadioButton android:id="@+id/buttonPink"
android1:id="@+id/radioButtonRed" style="?android:attr/buttonStyleSmall"
android1:layout_width="wrap_content" android:layout_width="85dp"
android1:layout_height="wrap_content" android:layout_height="wrap_content"
android1:text="@string/red_lot" android:layout_above="@+id/buttonRed"
android1:textColor="@color/black" android:layout_toRightOf="@+id/buttonOrange"
android:onClick="onRadioButtonClick" /> android:gravity="left|center_vertical"
android:text="@string/pink_lot"
<RadioButton android:textColor="@color/black"
android1:id="@+id/radioButtonOrange" android:textSize="12sp"
android1:layout_width="wrap_content" android:textStyle="bold" />
android1:layout_height="wrap_content"
android1:text="@string/orange_lot" <Button
android1:textColor="@color/black" android:id="@+id/buttonYellow"
android:onClick="onRadioButtonClick" /> style="?android:attr/buttonStyleSmall"
</RadioGroup> android:layout_width="85dp"
android:layout_height="wrap_content"
android:layout_above="@+id/buttonSilver"
android:layout_alignLeft="@+id/buttonPink"
android:gravity="left|center_vertical"
android:text="@string/yellow_lot"
android:textColor="@color/black"
android:textSize="12sp"
android:textStyle="bold" />
<Button
android:id="@+id/buttonBlack"
style="?android:attr/buttonStyleSmall"
android:layout_width="85dp"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView1"
android:layout_marginTop="49dp"
android:layout_toLeftOf="@+id/buttonOrange"
android:gravity="left|center_vertical"
android:text="@string/black_lot"
android:textColor="@color/black"
android:textSize="12sp"
android:textStyle="bold" />
<Button
android:id="@+id/buttonBlue"
style="?android:attr/buttonStyleSmall"
android:layout_width="85dp"
android:layout_height="wrap_content"
android:layout_below="@+id/buttonBlack"
android:layout_toLeftOf="@+id/buttonOrange"
android:gravity="left|center_vertical"
android:text="@string/blue_lot"
android:textColor="@color/black"
android:textSize="12sp"
android:textStyle="bold" />
<Button
android:id="@+id/buttonGold"
style="?android:attr/buttonStyleSmall"
android:layout_width="85dp"
android:layout_height="wrap_content"
android:layout_below="@+id/buttonBlue"
android:layout_toLeftOf="@+id/buttonOrange"
android:gravity="left|center_vertical"
android:text="@string/gold_lot"
android:textColor="@color/black"
android:textSize="12sp"
android:textStyle="bold" />
<Button
android:id="@+id/buttonGreen"
style="?android:attr/buttonStyleSmall"
android:layout_width="85dp"
android:layout_height="wrap_content"
android:layout_below="@+id/buttonGold"
android:layout_toLeftOf="@+id/buttonOrange"
android:gravity="left|center_vertical"
android:text="@string/green_lot"
android:textColor="@color/black"
android:textSize="12sp"
android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>

51
res/layout/activity_registration.xml
View File

@ -11,24 +11,24 @@
tools:ignore="Overdraw" > tools:ignore="Overdraw" >
<TextView <TextView
android:id="@+id/studentFirstName" android:id="@+id/studentName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="@string/student_first_name" android:text="@string/student_name"
android:textAllCaps="false" android:textAllCaps="false"
android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/black"
android:textColor="@color/black" /> android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView <TextView
android:id="@+id/studentLastName" android:id="@+id/studentOrganization"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/studentFirstName" android:layout_below="@+id/studentName"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
android:text="@string/student_last_name" android:text="@string/organization_check_in"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" /> android:textColor="@color/black" />
@ -37,7 +37,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/studentLastName" android:layout_below="@+id/studentOrganization"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
android:text="@string/section_number" android:text="@string/section_number"
android:textColor="@color/black" android:textColor="@color/black"
@ -55,11 +55,11 @@
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
<EditText <EditText
android:id="@+id/editStudentFirstName" android:id="@+id/editStudentName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/studentFirstName" android:layout_below="@+id/studentName"
android:ems="10" android:ems="10"
android:inputType="textPersonName" android:inputType="textPersonName"
android:textColor="@color/black" android:textColor="@color/black"
@ -70,11 +70,11 @@
</EditText> </EditText>
<EditText <EditText
android:id="@+id/editStudentLastName" android:id="@+id/editOrganizationName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/studentLastName" android:layout_below="@+id/studentOrganization"
android:ems="10" android:ems="10"
android:inputType="text" android:inputType="text"
android:textColor="@color/black" android:textColor="@color/black"
@ -100,12 +100,32 @@
android:inputType="number" android:inputType="number"
android:textColor="@color/black" /> android:textColor="@color/black" />
<TextView
android:id="@+id/addComment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/editRowNumber"
android:layout_below="@+id/editRowNumber"
android:layout_marginTop="14dp"
android:text="@string/registration_comments"
android:textColor="@color/black" />
<EditText
android:id="@+id/editComments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/addComment"
android:layout_below="@+id/addComment"
android:ems="10"
android:inputType="textMultiLine"
android:textColor="@color/black" />
<CheckBox <CheckBox
android:id="@+id/checkBoxBroadcastInfo" android:id="@+id/checkBoxBroadcastInfo"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/editRowNumber" android:layout_alignLeft="@+id/editComments"
android:layout_below="@+id/editRowNumber" android:layout_below="@+id/editComments"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:text="@string/check_box_broadcast" android:text="@string/check_box_broadcast"
android:textColor="@color/black" /> android:textColor="@color/black" />
@ -118,7 +138,6 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:text="@string/button_register" android:text="@string/button_register"
android:textColor="@color/black" android:textColor="@color/black" />
android:onClick="onClick" />
</RelativeLayout> </RelativeLayout>

3
res/values/strings.xml
View File

@ -20,8 +20,7 @@
<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_check_in">Student Check-In</string>
<string name="student_first_name">First Name:</string> <string name="student_name">Full Name:</string>
<string name="student_last_name">Last Name:</string>
<string name="section_number">Section:</string> <string name="section_number">Section:</string>
<string name="row_number">Row:</string> <string name="row_number">Row:</string>
<string name="check_box_broadcast">Broadcast Information</string> <string name="check_box_broadcast">Broadcast Information</string>

24
src/com/uncc/gameday/activities/Parking.java
View File

@ -31,7 +31,7 @@ public class Parking extends MenuActivity {
* *
* @param v the v * @param v the v
*/ */
public void onRadioButtonClick(View v) { public void onButtonClick(View v) {
// Set up some initial fragment boilerplate // Set up some initial fragment boilerplate
FragmentManager fm = this.getFragmentManager(); FragmentManager fm = this.getFragmentManager();
LotViewFragment f = new LotViewFragment(); LotViewFragment f = new LotViewFragment();
@ -39,37 +39,37 @@ public class Parking extends MenuActivity {
// Get the actual parking lot we will load (store as a String) // Get the actual parking lot we will load (store as a String)
switch (v.getId()) { switch (v.getId()) {
case R.id.radioButtonBlack: case R.id.buttonBlack:
fBundle.putCharArray("CHOICE", ParkingChoice.BLACK.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.BLACK.getValue().toCharArray());
break; break;
case R.id.radioButtonBlue: case R.id.buttonBlue:
fBundle.putCharArray("CHOICE", ParkingChoice.BLUE.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.BLUE.getValue().toCharArray());
break; break;
case R.id.radioButtonGold: case R.id.buttonGold:
fBundle.putCharArray("CHOICE", ParkingChoice.GOLD.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.GOLD.getValue().toCharArray());
break; break;
case R.id.radioButtonGreen: case R.id.buttonGreen:
fBundle.putCharArray("CHOICE", ParkingChoice.GREEN.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.GREEN.getValue().toCharArray());
break; break;
case R.id.radioButtonOrange: case R.id.buttonOrange:
fBundle.putCharArray("CHOICE", ParkingChoice.ORANGE.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.ORANGE.getValue().toCharArray());
break; break;
case R.id.radioButtonPink: case R.id.buttonPink:
fBundle.putCharArray("CHOICE", ParkingChoice.PINK.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.PINK.getValue().toCharArray());
break; break;
case R.id.radioButtonPurple: case R.id.buttonPurple:
fBundle.putCharArray("CHOICE", ParkingChoice.PURPLE.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.PURPLE.getValue().toCharArray());
break; break;
case R.id.radioButtonRed: case R.id.buttonRed:
fBundle.putCharArray("CHOICE", ParkingChoice.RED.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.RED.getValue().toCharArray());
break; break;
case R.id.radioButtonSilver: case R.id.buttonSilver:
fBundle.putCharArray("CHOICE", ParkingChoice.SILVER.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.SILVER.getValue().toCharArray());
break; break;
case R.id.radioButtonWhite: case R.id.buttonWhite:
fBundle.putCharArray("CHOICE", ParkingChoice.WHITE.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.WHITE.getValue().toCharArray());
break; break;
case R.id.radioButtonYellow: case R.id.buttonYellow:
fBundle.putCharArray("CHOICE", ParkingChoice.YELLOW.getValue().toCharArray()); fBundle.putCharArray("CHOICE", ParkingChoice.YELLOW.getValue().toCharArray());
break; break;
} }