Skip to content

Commit 04fc5e4

Browse files
author
TheAlgo
committedJul 24, 2017
UI Complete
1 parent f2bf452 commit 04fc5e4

File tree

6 files changed

+65
-13
lines changed

6 files changed

+65
-13
lines changed
 

‎.idea/misc.xml

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/example/android/connect/MainActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void dropIn(View view) {
4242
gameActive=false;
4343
String winner = "Red";
4444
if (gamestate[winning[0]] == 0)
45-
winner = "yellow";
45+
winner = "Yellow";
4646
TextView winmsg = (TextView) findViewById(R.id.winmsg);
4747
winmsg.setText(winner + " has won!!");
4848
LinearLayout layout = (LinearLayout) findViewById(R.id.playagainlayout);

‎app/src/main/res/layout/activity_main.xml

+28-9
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,26 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/activity_main"
66
android:layout_width="match_parent"
7+
android:background="#B9F6CA"
78
android:layout_height="match_parent"
89
android:paddingBottom="@dimen/activity_vertical_margin"
910
android:paddingLeft="@dimen/activity_horizontal_margin"
1011
android:paddingRight="@dimen/activity_horizontal_margin"
1112
android:paddingTop="@dimen/activity_vertical_margin"
1213
tools:context="com.example.android.connect.MainActivity">
1314

15+
<TextView
16+
android:id="@+id/textView"
17+
android:layout_width="match_parent"
18+
android:layout_height="wrap_content"
19+
android:layout_above="@+id/playagain"
20+
android:layout_centerHorizontal="true"
21+
android:layout_marginBottom="39dp"
22+
android:textStyle="bold"
23+
android:layout_centerInParent="true"
24+
android:text="The Complete Developer Workshop 2017"
25+
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
26+
1427
<GridLayout
1528
android:layout_width="wrap_content"
1629
android:layout_height="360dp"
@@ -158,25 +171,31 @@
158171
android:layout_height="wrap_content"
159172
android:padding="30dp"
160173
android:id="@+id/playagainlayout"
161-
android:background="@android:color/holo_green_light"
162-
android:layout_alignTop="@+id/playagain"
163-
android:layout_centerHorizontal="true"
164-
android:visibility="invisible">
174+
android:background="#FFAB00"
175+
android:visibility="invisible"
176+
android:layout_centerVertical="true"
177+
android:layout_centerInParent="true"
178+
>
165179

166180
<TextView
167181
android:text="TextView"
168182
android:layout_width="wrap_content"
169183
android:layout_height="wrap_content"
170184
android:textSize="30sp"
185+
android:textStyle="bold"
186+
android:textColor="#33691E"
171187
android:id="@+id/winmsg" />
172188

173189
<Button
174-
android:text="Play Again"
175-
android:layout_width="wrap_content"
190+
android:id="@+id/buttonagain"
191+
android:layout_width="match_parent"
176192
android:layout_height="wrap_content"
177193
android:layout_centerVertical="true"
178-
194+
android:backgroundTint="@color/colorPrimaryDark"
179195
android:onClick="playAgain"
180-
android:id="@+id/buttonagain" />
196+
android:text="Play Again"
197+
android:textStyle="bold"
198+
android:textColor="#FFC107"/>
181199
</LinearLayout>
182-
</RelativeLayout>
200+
201+
</RelativeLayout>

‎app/src/main/res/values/colors.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="colorPrimary">#3F51B5</color>
4-
<color name="colorPrimaryDark">#303F9F</color>
3+
<color name="colorPrimary">#C62828</color>
4+
<color name="colorPrimaryDark">#D50000</color>
55
<color name="colorAccent">#FF4081</color>
66
</resources>

‎app/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<resources>
2-
<string name="app_name">connect</string>
2+
<string name="app_name">Tic Tac Toe</string>
33
</resources>

0 commit comments

Comments
 (0)
Please sign in to comment.