mirror-github-bspeice
/
UNCCGameDay
mirror of https://github.com/bspeice/UNCCGameDay
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/DjBushido/UNCCGameDay.git

master
Felix X. Fant 2013-12-08 22:53:28 -05:00
parent 43505eadf7 07d454754c
commit ae52dd030a
4 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
res/layout/activity_home.xml
View File

@ -41,39 +41,47 @@
</TableRow> </TableRow>
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
> >
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:orientation="horizontal" android:layout_gravity="center_horizontal"
android:layout_gravity="center"
android:layout_weight="2" android:layout_weight="2"
android:orientation="horizontal"
> android:paddingBottom="@dimen/activity_vertical_margin"
tools:ignore="UselessParent" >
<Button <Button
android:id="@+id/clearAlertsButton" android:id="@+id/clearAlertsButton"
style="?android:attr/buttonStyleSmall"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="32dp"
android:background="@drawable/register" android:layout_gravity="center_horizontal|center_vertical"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="#488214"
android:text="@string/button_clear_alerts" android:text="@string/button_clear_alerts"
android:textColor="@color/black" android:textColor="@color/white"
tools:ignore="ButtonStyle" tools:ignore="ButtonStyle,NestedWeights" />
android:layout_weight="1" />
<Button <Button
android:id="@+id/refreshAlertsButton" android:id="@+id/refreshAlertsButton"
style="?android:attr/buttonStyleSmall"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="32dp"
android:background="@drawable/register" android:layout_gravity="center_horizontal|center_vertical"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:background="#488214"
android:text="@string/button_refresh_alerts" android:text="@string/button_refresh_alerts"
android:textColor="@color/black" android:textColor="@color/white"
tools:ignore="ButtonStyle" tools:ignore="ButtonStyle" />
android:layout_weight="1"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

8
res/layout/activity_registration.xml
View File

@ -31,8 +31,6 @@
<requestFocus /> <requestFocus />
<Button <Button
android:id="@+id/buttonRegister" android:id="@+id/buttonRegister"
style="@style/GameDayTheme" style="@style/GameDayTheme"
@ -40,10 +38,11 @@
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:background="#488214"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:onClick="onClick"
android:text="@string/button_register" android:text="@string/button_register"
android:textColor="@color/black" android:textColor="@color/white" />
android:onClick="onClick"/>
<EditText <EditText
android:id="@+id/editRowNumber" android:id="@+id/editRowNumber"
@ -110,4 +109,5 @@
android:textColor="@color/white" android:textColor="@color/white"
android:textColorHint="@color/black" /> android:textColorHint="@color/black" />
</RelativeLayout> </RelativeLayout>

12
res/layout/lot_view.xml
View File

@ -3,11 +3,10 @@
xmlns:tools="http://schemas.android.com/tool" xmlns:tools="http://schemas.android.com/tool"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_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:orientation="vertical" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -21,9 +20,10 @@
<ProgressBar <ProgressBar
android:id="@+id/lotViewCurrentFilled" android:id="@+id/lotViewCurrentFilled"
android:layout_width="fill_parent" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/GameDayTheme" /> android:layout_gravity="center_vertical|top" />
</LinearLayout> </LinearLayout>
@ -67,4 +67,6 @@
android:text="@string/submit_rating" android:text="@string/submit_rating"
android:onClick="onSubmitRating" /> android:onClick="onSubmitRating" />
</LinearLayout> </LinearLayout>

2
src/com/uncc/gameday/activities/parking/LotViewFragment.java
View File

@ -55,7 +55,7 @@ public class LotViewFragment extends DialogFragment {
Bundle args = this.getArguments(); Bundle args = this.getArguments();
if (args.containsKey("CHOICE")) if (args.containsKey("CHOICE"))
pc = ParkingChoice.valueOf(String.valueOf(args.get("CHOICE"))); pc = ParkingChoice.valueOf(String.valueOf((char[])args.get("CHOICE")));
else else
pc = ParkingChoice.BLACK; pc = ParkingChoice.BLACK;