mirror of
https://github.com/bspeice/UNCCGameDay
synced 2024-12-11 17:28:12 -05:00
Finally freaking get the parking buttons arranged.
This commit is contained in:
parent
b8efb779fe
commit
2d73c70bf7
@ -5,8 +5,8 @@
|
|||||||
android:versionName="1.0" >
|
android:versionName="1.0" >
|
||||||
|
|
||||||
<uses-sdk
|
<uses-sdk
|
||||||
android:minSdkVersion="11"
|
android:minSdkVersion="14"
|
||||||
android:targetSdkVersion="17" />
|
android:targetSdkVersion="19" />
|
||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
<uses-permission android:name="android.permission.INTERNET"/>
|
||||||
|
|
||||||
<application
|
<application
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
<RelativeLayout xmlns:tools="http://schemas.android.com/tool"
|
<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:tools1="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
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"
|
||||||
|
tools1:ignore="UselessParent" >
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textViewSelectLot"
|
android:id="@+id/textViewSelectLot"
|
||||||
@ -33,167 +35,180 @@
|
|||||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
android:src="@drawable/parking_map" />
|
android:src="@drawable/parking_map" />
|
||||||
|
|
||||||
<Button
|
<RelativeLayout
|
||||||
android:id="@+id/buttonGold"
|
android:layout_width="fill_parent"
|
||||||
style="@style/GameDayTheme"
|
android:layout_height="fill_parent"
|
||||||
android:layout_width="85dp"
|
android:layout_below="@+id/parkingMap" >
|
||||||
android:layout_height="20dp"
|
|
||||||
android:layout_alignLeft="@+id/parkingMap"
|
|
||||||
android:layout_below="@+id/parkingMap"
|
|
||||||
android:layout_marginTop="14dp"
|
|
||||||
android:gravity="center"
|
|
||||||
android:onClick="onButtonClick"
|
|
||||||
android:text="@string/gold_lot"
|
|
||||||
android:textColor="@color/black"
|
|
||||||
android:textSize="12sp"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonBlue"
|
android:id="@+id/buttonYellow"
|
||||||
style="@style/GameDayTheme"
|
style="?android:attr/buttonStyleSmall"
|
||||||
android:layout_width="85dp"
|
android:layout_width="70dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_above="@+id/buttonRed"
|
android:layout_alignParentTop="true"
|
||||||
android:layout_alignRight="@+id/parkingMap"
|
android:layout_margin="5dp"
|
||||||
android:gravity="center"
|
android:background="#488214"
|
||||||
android:onClick="onButtonClick"
|
android:gravity="center"
|
||||||
android:text="@string/blue_lot"
|
android:onClick="onButtonClick"
|
||||||
android:textColor="@color/black"
|
android:text="@string/yellow_lot"
|
||||||
android:textSize="12sp"
|
android:textColor="@color/white" />
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonPink"
|
android:id="@+id/buttonRed"
|
||||||
style="@style/GameDayTheme"
|
style="?android:attr/buttonStyleSmall"
|
||||||
android:layout_width="85dp"
|
android:layout_width="70dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_above="@+id/buttonRed"
|
android:layout_below="@id/buttonYellow"
|
||||||
android:layout_alignLeft="@+id/buttonGold"
|
android:layout_margin="5dp"
|
||||||
android:gravity="center"
|
android:background="#488214"
|
||||||
android:onClick="onButtonClick"
|
android:gravity="center"
|
||||||
android:text="@string/pink_lot"
|
android:onClick="onButtonClick"
|
||||||
android:textColor="@color/black"
|
android:text="@string/red_lot"
|
||||||
android:textSize="12sp"
|
android:textColor="@color/white"
|
||||||
android:textStyle="bold" />
|
android:textSize="12sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonSilver"
|
android:id="@+id/buttonPink"
|
||||||
style="@style/GameDayTheme"
|
style="?android:attr/buttonStyleSmall"
|
||||||
android:layout_width="85dp"
|
android:layout_width="70dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/buttonGold"
|
android:layout_alignParentLeft="true"
|
||||||
android:layout_alignBottom="@+id/buttonGold"
|
android:layout_below="@id/buttonRed"
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_margin="5dp"
|
||||||
android:gravity="center"
|
android:background="#488214"
|
||||||
android:onClick="onButtonClick"
|
android:gravity="center"
|
||||||
android:text="@string/silver_lot"
|
android:onClick="onButtonClick"
|
||||||
android:textColor="@color/black"
|
android:text="@string/pink_lot"
|
||||||
android:textSize="12sp"
|
android:textColor="@color/white"
|
||||||
android:textStyle="bold" />
|
android:textSize="12sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonRed"
|
android:id="@+id/buttonPurple"
|
||||||
style="@style/GameDayTheme"
|
style="?android:attr/buttonStyleSmall"
|
||||||
android:layout_width="85dp"
|
android:layout_width="70dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignLeft="@+id/buttonSilver"
|
android:layout_below="@id/buttonPink"
|
||||||
android:layout_below="@+id/buttonSilver"
|
android:layout_margin="5dp"
|
||||||
android:layout_marginTop="14dp"
|
android:background="#488214"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:onClick="onButtonClick"
|
android:onClick="onButtonClick"
|
||||||
android:text="@string/red_lot"
|
android:text="@string/purple_lot"
|
||||||
android:textColor="@color/black"
|
android:textColor="@color/white"
|
||||||
android:textSize="12sp"
|
android:textSize="12sp"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonYellow"
|
android:id="@+id/buttonOrange"
|
||||||
style="@style/GameDayTheme"
|
style="?android:attr/buttonStyleSmall"
|
||||||
android:layout_width="85dp"
|
android:layout_width="70dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/buttonRed"
|
android:layout_centerHorizontal="true"
|
||||||
android:layout_alignBottom="@+id/buttonRed"
|
android:layout_margin="5dp"
|
||||||
android:layout_alignLeft="@+id/buttonGold"
|
android:background="#488214"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:onClick="onButtonClick"
|
android:onClick="onButtonClick"
|
||||||
android:text="@string/yellow_lot"
|
android:text="@string/orange_lot"
|
||||||
android:textColor="@color/black"
|
android:textColor="@color/white"
|
||||||
android:textSize="12sp"
|
android:textSize="12sp"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonWhite"
|
android:id="@+id/buttonGreen"
|
||||||
style="@style/GameDayTheme"
|
style="?android:attr/buttonStyleSmall"
|
||||||
android:layout_width="85dp"
|
android:layout_width="70dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/buttonRed"
|
android:layout_below="@id/buttonOrange"
|
||||||
android:layout_alignBottom="@+id/buttonRed"
|
android:layout_centerHorizontal="true"
|
||||||
android:layout_toRightOf="@+id/buttonPurple"
|
android:layout_margin="5dp"
|
||||||
android:gravity="center"
|
android:background="#488214"
|
||||||
android:onClick="onButtonClick"
|
android:gravity="center"
|
||||||
android:text="@string/white_lot"
|
android:onClick="onButtonClick"
|
||||||
android:textColor="@color/black"
|
android:text="@string/green_lot"
|
||||||
android:textSize="12sp"
|
android:textColor="@color/white"
|
||||||
android:textStyle="bold" />
|
android:textSize="12sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonGreen"
|
android:id="@+id/buttonWhite"
|
||||||
style="@style/GameDayTheme"
|
style="?android:attr/buttonStyleSmall"
|
||||||
android:layout_width="85dp"
|
android:layout_width="70dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignLeft="@+id/buttonYellow"
|
android:layout_below="@id/buttonGreen"
|
||||||
android:layout_below="@+id/buttonYellow"
|
android:layout_centerHorizontal="true"
|
||||||
android:layout_marginTop="19dp"
|
android:layout_margin="5dp"
|
||||||
android:gravity="center"
|
android:background="#488214"
|
||||||
android:onClick="onButtonClick"
|
android:gravity="center"
|
||||||
android:text="@string/green_lot"
|
android:onClick="onButtonClick"
|
||||||
android:textColor="@color/black"
|
android:text="@string/white_lot"
|
||||||
android:textSize="12sp"
|
android:textColor="@color/white"
|
||||||
android:textStyle="bold" />
|
android:textSize="12sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonOrange"
|
android:id="@+id/buttonBlue"
|
||||||
style="@style/GameDayTheme"
|
style="?android:attr/buttonStyleSmall"
|
||||||
android:layout_width="85dp"
|
android:layout_width="70dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/buttonGreen"
|
android:layout_alignParentCenter="true"
|
||||||
android:layout_alignBottom="@+id/buttonGreen"
|
android:layout_below="@id/buttonWhite"
|
||||||
android:layout_alignLeft="@+id/buttonWhite"
|
android:layout_centerHorizontal="true"
|
||||||
android:gravity="center"
|
android:layout_margin="5dp"
|
||||||
android:onClick="onButtonClick"
|
android:layout_marginLeft="14dp"
|
||||||
android:text="@string/orange_lot"
|
android:background="#488214"
|
||||||
android:textColor="@color/black"
|
android:gravity="center"
|
||||||
android:textSize="12sp"
|
android:onClick="onButtonClick"
|
||||||
android:textStyle="bold" />
|
android:text="@string/blue_lot"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="12sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonBlack"
|
android:id="@+id/buttonGold"
|
||||||
style="@style/GameDayTheme"
|
style="?android:attr/buttonStyleSmall"
|
||||||
android:layout_width="85dp"
|
android:layout_width="70dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignBaseline="@+id/buttonOrange"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_alignBottom="@+id/buttonOrange"
|
android:layout_below="@id/buttonBlack"
|
||||||
android:layout_alignLeft="@+id/buttonRed"
|
android:layout_margin="5dp"
|
||||||
android:gravity="center"
|
android:background="#488214"
|
||||||
android:onClick="onButtonClick"
|
android:gravity="center"
|
||||||
android:text="@string/black_lot"
|
android:onClick="onButtonClick"
|
||||||
android:textColor="@color/black"
|
android:text="@string/gold_lot"
|
||||||
android:textSize="12sp"
|
android:textColor="@color/white"
|
||||||
android:textStyle="bold" />
|
android:textSize="12sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/buttonPurple"
|
android:id="@+id/buttonSilver"
|
||||||
style="@style/GameDayTheme"
|
style="?android:attr/buttonStyleSmall"
|
||||||
android:layout_width="85dp"
|
android:layout_width="70dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/buttonOrange"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_marginTop="24dp"
|
android:layout_below="@id/buttonGold"
|
||||||
android:layout_toRightOf="@+id/textViewSelectLot"
|
android:layout_margin="5dp"
|
||||||
android:gravity="center"
|
android:background="#488214"
|
||||||
android:onClick="onButtonClick"
|
android:gravity="center"
|
||||||
android:text="@string/purple_lot"
|
android:onClick="onButtonClick"
|
||||||
android:textColor="@color/black"
|
android:text="@string/silver_lot"
|
||||||
android:textSize="12sp"
|
android:textColor="@color/white"
|
||||||
android:textStyle="bold" />
|
android:textSize="12sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/buttonBlack"
|
||||||
|
style="?android:attr/buttonStyleSmall"
|
||||||
|
android:layout_width="70dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_margin="5dp"
|
||||||
|
android:background="#488214"
|
||||||
|
android:gravity="center"
|
||||||
|
android:onClick="onButtonClick"
|
||||||
|
android:text="@string/black_lot"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="12sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
|
@ -35,10 +35,6 @@
|
|||||||
android:layout_alignParentTop="true"
|
android:layout_alignParentTop="true"
|
||||||
android:padding="2dp"
|
android:padding="2dp"
|
||||||
android:paddingLeft="20dp"
|
android:paddingLeft="20dp"
|
||||||
android:shadowColor="@color/silver"
|
|
||||||
android:shadowDx="3"
|
|
||||||
android:shadowDy="-3"
|
|
||||||
android:shadowRadius="1.5"
|
|
||||||
android:text="@string/search_text"
|
android:text="@string/search_text"
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
|
Loading…
Reference in New Issue
Block a user