mirror of
https://github.com/bspeice/UNCCGameDay
synced 2024-12-04 13:58:11 -05:00
Merge branch 'master' of https://github.com/DjBushido/UNCCGameDay.git
This commit is contained in:
commit
7606f490af
@ -36,6 +36,7 @@
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<service android:name="com.uncc.gameday.alerts.AlertService"/>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
|
@ -35,8 +35,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@android:color/transparent"
|
||||
>
|
||||
android:background="@color/pressed_unccgameday" >
|
||||
|
||||
</ListView>
|
||||
|
||||
@ -57,8 +56,7 @@
|
||||
android:layout_span="1"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/button_clear_alerts"
|
||||
android:textColor="@color/black"
|
||||
android:gravity="left|center_vertical"/>
|
||||
android:textColor="@color/black" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/refreshAlertsButton"
|
||||
@ -67,7 +65,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_span="1"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left|center_vertical"
|
||||
android:text="@string/button_refresh_alerts"
|
||||
android:textColor="@color/black" />
|
||||
</TableRow>
|
||||
|
@ -32,7 +32,8 @@
|
||||
android:text="@string/silver_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonOrange"
|
||||
@ -46,7 +47,8 @@
|
||||
android:text="@string/orange_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonRed"
|
||||
@ -59,7 +61,8 @@
|
||||
android:text="@string/red_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonPurple"
|
||||
@ -72,7 +75,8 @@
|
||||
android:text="@string/purple_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView1"
|
||||
@ -99,7 +103,8 @@
|
||||
android:text="@string/white_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonPink"
|
||||
@ -112,7 +117,8 @@
|
||||
android:text="@string/pink_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonYellow"
|
||||
@ -125,7 +131,8 @@
|
||||
android:text="@string/yellow_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonBlack"
|
||||
@ -139,7 +146,8 @@
|
||||
android:text="@string/black_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonBlue"
|
||||
@ -152,7 +160,8 @@
|
||||
android:text="@string/blue_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonGold"
|
||||
@ -165,7 +174,8 @@
|
||||
android:text="@string/gold_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonGreen"
|
||||
@ -178,6 +188,7 @@
|
||||
android:text="@string/green_lot"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
android:onClick="onButtonClick" />
|
||||
|
||||
</RelativeLayout>
|
@ -31,7 +31,8 @@
|
||||
android:layout_marginBottom="15dp"
|
||||
android:gravity="center_horizontal|center_vertical"
|
||||
android:text="@string/button_register"
|
||||
android:textColor="@color/black" />
|
||||
android:textColor="@color/black"
|
||||
android:onClick="onClick" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/editRowNumber"
|
||||
|
Loading…
Reference in New Issue
Block a user