Skip to content

Commit caea4aa

Browse files
pangilinanervin22pangilinanervin22
committed
no bug commit
1 parent 9dd638d commit caea4aa

File tree

5 files changed

+80
-76
lines changed

5 files changed

+80
-76
lines changed

‎.idea/misc.xml

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

‎app/src/main/java/com/example/scrathandroid/MainActivity.java

+55-43
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package com.example.scrathandroid;
33

44
import android.os.Bundle;
5-
import android.view.View;
5+
import android.os.SystemClock;
66
import android.widget.Button;
77
import android.widget.ImageView;
88
import android.widget.TextView;
@@ -13,80 +13,92 @@
1313

1414
public class MainActivity extends AppCompatActivity {
1515

16-
private Button player1, player2, startBtn;
16+
private Button playerOne, playerTwo;
1717
private ImageView firstImage, secondImage;
1818
private TextView winnerText;
19+
int scoreOne, scoreTwo = 0;
1920

2021
final int[] diceArray = {
22+
0,
2123
R.drawable.dice1,
2224
R.drawable.dice2,
2325
R.drawable.dice3,
2426
R.drawable.dice4,
2527
R.drawable.dice5,
2628
R.drawable.dice6
2729
};
28-
int scoreOne, scoreTwo = 0;
2930

3031
@Override
3132
protected void onCreate(Bundle savedInstanceState) {
3233
super.onCreate(savedInstanceState);
3334
setContentView(R.layout.activity_main);
3435

3536
System.out.println("WEW");
36-
player1 = findViewById(R.id.player1);
37-
player2 = findViewById(R.id.player2);
37+
playerOne = findViewById(R.id.player1);
38+
playerTwo = findViewById(R.id.player2);
3839
firstImage = findViewById(R.id.firstDice);
3940
secondImage = findViewById(R.id.SecondDice);
4041
winnerText = findViewById(R.id.winner);
41-
startBtn = findViewById(R.id.startBtn);
42-
4342

4443

45-
player1.setOnClickListener(new View.OnClickListener() {
46-
@Override
47-
public void onClick(View v) {
48-
winnerText.setText("");
49-
Random rng1ST = new Random();
50-
int randonNum1 = rng1ST.nextInt(6);
51-
scoreOne = randonNum1;
52-
firstImage.setImageResource(diceArray[randonNum1]);
53-
getWinnerText(scoreOne,scoreTwo);
54-
}
44+
playerOne.setOnClickListener(v -> {
45+
winnerText.setText("");
46+
scoreOne = getRandomNumber();
47+
firstImage.setImageResource(diceArray[scoreOne]);
48+
getWinner();
5549
});
56-
player2.setOnClickListener(new View.OnClickListener() {
57-
@Override
58-
public void onClick(View v) {
59-
Random rng2ND = new Random();
60-
int randonNum2 = rng2ND.nextInt(6);
61-
scoreTwo = randonNum2;
62-
secondImage.setImageResource(diceArray[randonNum2]);
63-
getWinnerText(scoreOne,scoreTwo);
64-
}
65-
});
66-
startBtn.setOnClickListener(new View.OnClickListener() {
67-
@Override
68-
public void onClick(View v) {
69-
winnerText.setText("");
70-
firstImage.setImageResource(R.drawable.dice);
71-
secondImage.setImageResource(R.drawable.dice);
72-
scoreOne = 0;
73-
scoreTwo = 0;
74-
}
50+
51+
playerTwo.setOnClickListener(v -> {
52+
winnerText.setText("");
53+
scoreTwo = getRandomNumber();
54+
secondImage.setImageResource(diceArray[scoreTwo]);
55+
getWinner();
7556
});
7657

7758
}
7859

79-
public void getWinnerText(int scoreOne, int scoreTwo){
80-
if (scoreOne > scoreTwo) {
60+
61+
public int getRandomNumber(){
62+
Random random = new Random();
63+
int randomNumber = random.nextInt(6-1)+1;
64+
return randomNumber;
65+
}
66+
67+
68+
public void getWinner() {
69+
System.out.println(scoreOne +" | " + scoreTwo);
70+
if (scoreOne == 0 || scoreTwo == 0){
71+
winnerText.setText("");
72+
return;
73+
}else if(scoreOne == scoreTwo){
74+
winnerText.setText(R.string.draw);
75+
}else if(scoreOne > scoreTwo){
8176
winnerText.setText(R.string.winnerOne);
82-
} else if (scoreTwo > scoreOne) {
77+
}else {
8378
winnerText.setText(R.string.winnerTwo);
84-
} else if(scoreOne == 1 || scoreTwo == 1){
85-
86-
}else if (scoreOne == scoreTwo){
87-
winnerText.setText("Draw");
8879
}
80+
restartDelay();
81+
82+
}
83+
84+
public void restartAll(){
85+
firstImage.setImageResource(R.drawable.dice);
86+
secondImage.setImageResource(R.drawable.dice);
87+
winnerText.setText("");
88+
scoreOne = 0;
89+
scoreTwo = 0;
8990
}
9091

92+
public void restartDelay() {
93+
new Thread(() -> {
94+
SystemClock.sleep(1500);
95+
runOnUiThread(() -> {
96+
restartAll();
97+
});
98+
}).start();
99+
}
100+
101+
102+
91103

92104
}

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

+20-29
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88

99
<TextView
1010
android:id="@+id/winner"
11-
android:layout_width="wrap_content"
11+
android:layout_width="200dp"
1212
android:layout_height="wrap_content"
13-
android:layout_below="@+id/diceContain"
14-
android:layout_centerInParent="true"
15-
android:layout_marginTop="100dp"
16-
android:text="wew"
13+
android:layout_alignParentBottom="true"
14+
android:layout_centerHorizontal="true"
1715
android:textColor="#FFC107"
18-
19-
android:textSize="60dp" />
16+
android:textSize="45sp"
17+
android:textAlignment="center"/>
2018

2119
<ImageView
2220
android:id="@+id/logoCasino"
@@ -25,17 +23,6 @@
2523
android:layout_centerHorizontal="true"
2624
android:src="@drawable/wew" />
2725

28-
<Button
29-
android:id="@+id/startBtn"
30-
android:layout_width="50dp"
31-
android:layout_height="50dp"
32-
android:layout_below="@+id/diceContain"
33-
android:layout_centerHorizontal="true"
34-
android:layout_marginTop="40dp"
35-
android:background="@drawable/restart"
36-
37-
/>
38-
3926

4027
<LinearLayout
4128
android:id="@+id/diceContain"
@@ -61,36 +48,40 @@
6148

6249
</LinearLayout>
6350

64-
<ImageView
65-
android:layout_width="match_parent"
66-
android:layout_height="match_parent"
67-
android:layout_below="@+id/startBtn"
68-
android:src="@drawable/rain"/>
51+
6952

7053
<LinearLayout
7154
android:layout_width="wrap_content"
7255
android:layout_height="wrap_content"
7356
android:layout_below="@+id/diceContain"
7457
android:layout_centerHorizontal="true"
75-
android:layout_marginTop="50dp">
58+
android:layout_marginTop="30dp">
7659

77-
<Button
60+
<androidx.appcompat.widget.AppCompatButton
7861
android:id="@+id/player1"
7962
android:layout_width="wrap_content"
8063
android:layout_height="wrap_content"
8164
android:layout_centerHorizontal="true"
8265
android:layout_marginRight="100dp"
8366
android:text="@string/button1"
84-
android:background="@drawable/buttonradius"/>
67+
android:background="@drawable/buttonradius"
68+
android:backgroundTint="@color/teal_200"/>
8569

86-
<Button
70+
<androidx.appcompat.widget.AppCompatButton
8771
android:id="@+id/player2"
8872
android:layout_width="wrap_content"
8973
android:layout_height="wrap_content"
9074
android:text="@string/button2"
91-
android:background="@drawable/buttonradius"/>
92-
75+
android:background="@drawable/buttonradius"
76+
android:backgroundTint="#FF9800"/>
9377
</LinearLayout>
9478

79+
<ImageView
80+
android:layout_width="match_parent"
81+
android:layout_height="match_parent"
82+
android:layout_marginTop="500dp"
83+
android:layout_alignParentBottom="true"
84+
android:src="@drawable/rain"/>
85+
9586

9687
</RelativeLayout>

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<string name="button1">Player 1</string>
44
<string name="button2">Player 2</string>
55
<string name="test">wew</string>
6-
<string name="winnerOne">One Win</string>
7-
<string name="winnerTwo">Two Win</string>
6+
<string name="winnerOne">Player One Win</string>
7+
<string name="winnerTwo">Player Two Win</string>
8+
<string name="draw">draw</string>
89
</resources>

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath "com.android.tools.build:gradle:4.1.1"
8+
classpath 'com.android.tools.build:gradle:4.1.2'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

0 commit comments

Comments
 (0)