mirror of
				https://github.com/bspeice/UNCCGameDay
				synced 2025-11-03 18:00:43 -05:00 
			
		
		
		
	Registration now reflects first name and last name. Comments section
and organization section deleted.
This commit is contained in:
		@ -11,128 +11,111 @@
 | 
				
			|||||||
    tools:ignore="Overdraw" >
 | 
					    tools:ignore="Overdraw" >
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <TextView
 | 
					    <TextView
 | 
				
			||||||
        android:id="@+id/studentName"
 | 
					        android:id="@+id/studentFirstName"
 | 
				
			||||||
        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_name"
 | 
					        android:text="@string/student_first_name"
 | 
				
			||||||
        android:textAllCaps="false"
 | 
					        android:textAllCaps="false"
 | 
				
			||||||
        android:textColor="@color/black" 
 | 
					        android:textColor="@color/black" 
 | 
				
			||||||
        android:textAppearance="?android:attr/textAppearanceSmall" />
 | 
					        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="40dp"
 | 
					 | 
				
			||||||
        android:text="@string/organization_check_in"
 | 
					 | 
				
			||||||
        android:textAppearance="?android:attr/textAppearanceSmall"
 | 
					 | 
				
			||||||
        android:textColor="@color/black" />
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <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="40dp"
 | 
					 | 
				
			||||||
        android:text="@string/section_number"
 | 
					 | 
				
			||||||
        android:textColor="@color/black" 
 | 
					 | 
				
			||||||
        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="40dp"
 | 
					 | 
				
			||||||
        android:text="@string/row_number"
 | 
					 | 
				
			||||||
        android:textColor="@color/black" 
 | 
					 | 
				
			||||||
        android:textAppearance="?android:attr/textAppearanceSmall" />
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <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"
 | 
					 | 
				
			||||||
        android:textColor="@color/black"
 | 
					 | 
				
			||||||
        android:textColorHint="@color/black" />
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <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"
 | 
					 | 
				
			||||||
        android:textColor="@color/black" />
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <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"
 | 
					 | 
				
			||||||
        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
 | 
					 | 
				
			||||||
        android:id="@+id/checkBoxBroadcastInfo"
 | 
					 | 
				
			||||||
        android:layout_width="fill_parent"
 | 
					 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					 | 
				
			||||||
        android:layout_alignLeft="@+id/editComments"
 | 
					 | 
				
			||||||
        android:layout_below="@+id/editComments"
 | 
					 | 
				
			||||||
        android:layout_marginTop="20dp"
 | 
					 | 
				
			||||||
        android:text="@string/check_box_broadcast"
 | 
					 | 
				
			||||||
        android:textColor="@color/black" />
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <Button
 | 
					    <Button
 | 
				
			||||||
        android:id="@+id/buttonRegister"
 | 
					        android:id="@+id/buttonRegister"
 | 
				
			||||||
        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_centerHorizontal="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/black" />
 | 
					        android:textColor="@color/black" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <EditText
 | 
					    <EditText
 | 
				
			||||||
        android:id="@+id/editText1"
 | 
					        android:id="@+id/editRowNumber"
 | 
				
			||||||
        android:layout_width="wrap_content"
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
        android:layout_alignLeft="@+id/studentName"
 | 
					        android:layout_above="@+id/buttonRegister"
 | 
				
			||||||
        android:layout_below="@+id/studentName"
 | 
					        android:layout_alignLeft="@+id/buttonRegister"
 | 
				
			||||||
 | 
					        android:layout_marginBottom="70dp"
 | 
				
			||||||
 | 
					        android:ems="10"
 | 
				
			||||||
 | 
					        android:inputType="number"
 | 
				
			||||||
 | 
					        android:textColor="@color/black" >
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        <requestFocus />
 | 
				
			||||||
 | 
					    </EditText>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <CheckBox
 | 
				
			||||||
 | 
					        android:id="@+id/checkBoxBroadcastInfo"
 | 
				
			||||||
 | 
					        android:layout_width="fill_parent"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_above="@+id/buttonRegister"
 | 
				
			||||||
 | 
					        android:layout_alignLeft="@+id/editRowNumber"
 | 
				
			||||||
 | 
					        android:layout_marginBottom="30dp"
 | 
				
			||||||
 | 
					        android:text="@string/check_box_broadcast"
 | 
				
			||||||
 | 
					        android:textColor="@color/black" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <TextView
 | 
				
			||||||
 | 
					        android:id="@+id/studentRow"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_above="@+id/editRowNumber"
 | 
				
			||||||
 | 
					        android:layout_alignLeft="@+id/editRowNumber"
 | 
				
			||||||
 | 
					        android:text="@string/row_number"
 | 
				
			||||||
 | 
					        android:textAppearance="?android:attr/textAppearanceSmall"
 | 
				
			||||||
 | 
					        android:textColor="@color/black" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <EditText
 | 
				
			||||||
 | 
					        android:id="@+id/editStudentFirstName"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_alignLeft="@+id/studentFirstName"
 | 
				
			||||||
 | 
					        android:layout_below="@+id/studentFirstName"
 | 
				
			||||||
        android:ems="10"
 | 
					        android:ems="10"
 | 
				
			||||||
        android:inputType="textPersonName" />
 | 
					        android:inputType="textPersonName" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <TextView
 | 
				
			||||||
 | 
					        android:id="@+id/sectionNumber"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_above="@+id/editSectionNumber"
 | 
				
			||||||
 | 
					        android:layout_alignLeft="@+id/editSectionNumber"
 | 
				
			||||||
 | 
					        android:text="@string/section_number"
 | 
				
			||||||
 | 
					        android:textAppearance="?android:attr/textAppearanceSmall"
 | 
				
			||||||
 | 
					        android:textColor="@color/black" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <EditText
 | 
				
			||||||
 | 
					        android:id="@+id/editSectionNumber"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_alignLeft="@+id/studentRow"
 | 
				
			||||||
 | 
					        android:layout_centerVertical="true"
 | 
				
			||||||
 | 
					        android:ems="10"
 | 
				
			||||||
 | 
					        android:inputType="number"
 | 
				
			||||||
 | 
					        android:textColor="@color/black" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <TextView
 | 
				
			||||||
 | 
					        android:id="@+id/studentLastName"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_alignRight="@+id/studentFirstName"
 | 
				
			||||||
 | 
					        android:layout_below="@+id/editStudentFirstName"
 | 
				
			||||||
 | 
					        android:layout_marginTop="29dp"
 | 
				
			||||||
 | 
					        android:text="@string/student_last_name"
 | 
				
			||||||
 | 
					        android:textAppearance="?android:attr/textAppearanceSmall"
 | 
				
			||||||
 | 
					        android:textColor="@color/black" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <EditText
 | 
				
			||||||
 | 
					        android:id="@+id/editStudentLastName"
 | 
				
			||||||
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					        android:layout_alignLeft="@+id/studentLastName"
 | 
				
			||||||
 | 
					        android:layout_below="@+id/studentLastName"
 | 
				
			||||||
 | 
					        android:ems="10"
 | 
				
			||||||
 | 
					        android:inputType="text"
 | 
				
			||||||
 | 
					        android:textColor="@color/black"
 | 
				
			||||||
 | 
					        android:textColorHint="@color/black" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</RelativeLayout>
 | 
					</RelativeLayout>
 | 
				
			||||||
 | 
				
			|||||||
@ -20,7 +20,8 @@
 | 
				
			|||||||
    <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_name">First Name, Last Name:</string>
 | 
					    <string name="student_first_name">First 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>
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user