UI commit2

This commit is contained in:
RowenaWinston
2013-10-28 23:06:37 -04:00
parent ecc5a001ed
commit f6da66101d
46 changed files with 385 additions and 124 deletions

View File

@ -2,13 +2,14 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:background="#ffcc00">
android:background="#daa520">
<TextView
android:id="@+id/alerts_label_alerts_to_receive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/alerts_label_alerts_to_receive"
android:textColor="@color/black"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox
@ -16,6 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/alerts_check_timed"
android:textColor="@color/black"
android:onClick="onClickTimedAlerts" />
<CheckBox
@ -23,6 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/alerts_check_organizations"
android:textColor="@color/black"
android:onClick="onClickOrganizationAlerts" />
<CheckBox
@ -30,6 +33,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/alerts_check_university"
android:textColor="@color/black"
android:onClick="onClickUniversityAlerts" />
<Button
android:id="@+id/getAlertsButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:text="@string/button_get_alerts" />
</LinearLayout>

View File

@ -3,7 +3,7 @@
android:id="@+id/TableLayout1"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#f0ead6"
android:background="#daa520"
tools:context=".Home" >
<TableRow
@ -26,14 +26,9 @@
android:layout_marginLeft="@dimen/activity_vertical_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_weight="1"
android:background="@color/eggshell" >
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
android:stretchColumns="yes" >
</TableLayout>
android:background="@color/eggshell"
android:showDividers="end" >
</TableRow>
@ -42,6 +37,7 @@
android:id="@+id/clearAlertsbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/button_clear_alerts" />
android:text="@string/button_clear_alerts"
android:textColor="@color/black" />
</TableLayout>

View File

@ -6,28 +6,18 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="#f0ead6"
android:background="#daa520"
tools:context=".Parking" >
<TextView
android:id="@+id/textParking"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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" />
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<RadioButton
android:id="@+id/radioButtonGreen"
@ -36,19 +26,10 @@
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:hint="@string/green_lot"
android:text="@string/green_lot"
android:textColor="@color/black"
android:text="@string/black_lot" />
android:textColorHint="@color/green" />
<RadioButton
android:id="@+id/radioButtonRed"
@ -57,8 +38,8 @@
android:layout_alignLeft="@+id/radioButtonBlack"
android:layout_below="@+id/radioButtonBlack"
android:layout_marginTop="15dp"
android:textColor="@color/red"
android:text="@string/red_lot" />
android:text="@string/red_lot"
android:textColor="@color/black" />
<RadioButton
android:id="@+id/radioButtonBlue"
@ -67,8 +48,8 @@
android:layout_alignBaseline="@+id/radioButtonRed"
android:layout_alignBottom="@+id/radioButtonRed"
android:layout_alignRight="@+id/radioButtonGold"
android:textColor="@color/blue"
android:text="@string/blue_lot" />
android:text="@string/blue_lot"
android:textColor="@color/black" />
<RadioButton
android:id="@+id/radioButtonSilver"
@ -77,8 +58,8 @@
android:layout_alignLeft="@+id/radioButtonRed"
android:layout_below="@+id/radioButtonRed"
android:layout_marginTop="16dp"
android:textColor="@color/silver"
android:text="@string/silver_lot" />
android:text="@string/silver_lot"
android:textColor="@color/black" />
<RadioButton
android:id="@+id/radioButtonOrange"
@ -87,8 +68,8 @@
android:layout_alignBaseline="@+id/radioButtonSilver"
android:layout_alignBottom="@+id/radioButtonSilver"
android:layout_alignLeft="@+id/radioButtonBlue"
android:textColor="@color/orange"
android:text="@string/orange_lot" />
android:text="@string/orange_lot"
android:textColor="@color/black" />
<RadioButton
android:id="@+id/radioButtonYellow"
@ -97,8 +78,8 @@
android:layout_alignLeft="@+id/radioButtonSilver"
android:layout_below="@+id/radioButtonSilver"
android:layout_marginTop="18dp"
android:textColor="@color/yellow"
android:text="@string/yellow_lot" />
android:text="@string/yellow_lot"
android:textColor="@color/black" />
<RadioButton
android:id="@+id/radioButtonPurple"
@ -107,8 +88,8 @@
android:layout_alignBaseline="@+id/radioButtonYellow"
android:layout_alignBottom="@+id/radioButtonYellow"
android:layout_alignLeft="@+id/radioButtonOrange"
android:textColor="@color/purple"
android:text="@string/puple_lot" />
android:text="@string/puple_lot"
android:textColor="@color/black" />
<RadioButton
android:id="@+id/radioButtonPink"
@ -117,8 +98,8 @@
android:layout_alignLeft="@+id/radioButtonYellow"
android:layout_below="@+id/radioButtonYellow"
android:layout_marginTop="18dp"
android:textColor="@color/pink"
android:text="@string/pink_lot" />
android:text="@string/pink_lot"
android:textColor="@color/black" />
<RadioButton
android:id="@+id/radioButtonWhite"
@ -127,8 +108,8 @@
android:layout_alignBaseline="@+id/radioButtonPink"
android:layout_alignBottom="@+id/radioButtonPink"
android:layout_alignLeft="@+id/radioButtonGold"
android:textColor="@color/white"
android:text="@string/white_lot" />
android:text="@string/white_lot"
android:textColor="@color/black" />
<RadioButton
android:id="@+id/radioButtonGold"
@ -137,7 +118,17 @@
android:layout_alignLeft="@+id/radioButtonGreen"
android:layout_below="@+id/radioButtonWhite"
android:layout_marginTop="16dp"
android:textColor="@color/gold"
android:text="@string/gold_lot" />
android:text="@string/gold_lot"
android:textColor="@color/black" />
<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_toRightOf="@+id/textViewSelectLot"
android:text="@string/black_lot"
android:textColor="@color/black" />
</RelativeLayout>

View File

@ -6,27 +6,18 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="#f0ead6"
android:background="#daa520"
tools:context=".Registration" >
<TextView
android:id="@+id/registrationTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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:textColor="@color/black"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
@ -36,6 +27,7 @@
android:layout_alignParentLeft="true"
android:layout_below="@+id/studentName"
android:layout_marginTop="72dp"
android:textColor="@color/black"
android:text="@string/student_organization"
android:textAppearance="?android:attr/textAppearanceSmall" />
@ -47,6 +39,7 @@
android:layout_below="@+id/studentOrganization"
android:layout_marginTop="72dp"
android:text="@string/section_number"
android:textColor="@color/black"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
@ -57,6 +50,7 @@
android:layout_below="@+id/sectionNumber"
android:layout_marginTop="72dp"
android:text="@string/row_number"
android:textColor="@color/black"
android:textAppearance="?android:attr/textAppearanceSmall" />
<EditText
@ -104,6 +98,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="18dp"
android:textColor="@color/black"
android:layout_toRightOf="@+id/checkBoxBroadcastInfo"
android:text="@string/button_save" />
@ -114,6 +109,7 @@
android:layout_alignBaseline="@+id/buttonSave"
android:layout_alignBottom="@+id/buttonSave"
android:layout_alignParentLeft="true"
android:textColor="@color/black"
android:text="@string/check_box_broadcast" />
</RelativeLayout>

View File

@ -1,52 +0,0 @@
<?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>