Merge pull request #4 from 7oSkaaa/master

Master

Author: 7oSkaaa

out/production/Tic_Tac_Toe/Again/again_ind.class

@@ -11,10 +11,12 @@ public class again_ind extends JFrame implements ActionListener {
     JFrame frame;
     JButton yes, no;
     JLabel text_field;
+    boolean is_Hard;
 
-    public again_ind(){
+    public again_ind(boolean is_Hard){
         yes = new JButton("Yes");
         no = new JButton("No");
+        this.is_Hard = is_Hard;
         text_field = new JLabel("Do you want to play again ?");
         frame = new JFrame("Tic Tac Toe");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -46,7 +48,7 @@ public void actionPerformed(ActionEvent e) {
             window.dispose();
         }
         if(e.getSource() == yes){
-            new Tic_Tac_Toe_Individual();
+            new Tic_Tac_Toe_Individual(is_Hard);
         }else {
             new choose();
         }

out/production/Tic_Tac_Toe/Choose/choose.class

@@ -5,7 +5,7 @@
 import java.awt.event.ActionListener;
 import java.util.Objects;
 import Input.input;
-import individual.*;
+import ind_choose.*;
 
 public class choose extends JFrame implements ActionListener {
 
@@ -48,7 +48,7 @@ public void actionPerformed(ActionEvent e) {
             new input();
             frame.dispose();
         }else if(e.getSource() == individual){
-            new Tic_Tac_Toe_Individual();
+            new Ind_choose();
             frame.dispose();
         }else if(e.getSource() == quit){
             System.exit(0);

out/production/Tic_Tac_Toe/Input/input.class

@@ -1,5 +1,6 @@
 package Input;
 import javax.swing.*;
+import javax.swing.plaf.basic.BasicBorders;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -38,6 +39,10 @@ public input(){
         logo.setBounds(320, 75, 150, 150);
         user1.setFont(new Font("MV Boli", Font.PLAIN, 20));
         user2.setFont(new Font("MV Boli", Font.PLAIN, 20));
+        name1.setFont(new Font("MV Boli", Font.PLAIN, 20));
+        name2.setFont(new Font("MV Boli", Font.PLAIN, 20));
+        name1.setMargin(new Insets(2, 4, 2, 2));
+        name2.setMargin(new Insets(2, 4, 2, 2));
         user1.setForeground(Color.RED);
         user2.setForeground(Color.BLUE);
         frame.add(logo);

out/production/Tic_Tac_Toe/individual/Tic_Tac_Toe_Individual.class

@@ -0,0 +1,58 @@
+package ind_choose;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Objects;
+import individual.*;
+
+public class Ind_choose extends JFrame implements ActionListener {
+
+    JFrame frame;
+    JLabel logo;
+    ImageIcon img;
+    JButton easy, hard, quit;
+
+    public Ind_choose(){
+        frame = new JFrame("Tic Tac Toe");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setSize(600, 450);
+        frame.setBackground(new Color(50, 50, 50));
+        frame.setLayout(null);
+        frame.setLocationRelativeTo(null);
+        easy = new JButton("Easy");
+        hard = new JButton("Hard");
+        easy.setForeground(Color.BLUE);
+        hard.setForeground(Color.RED);
+        quit = new JButton("Quit");
+        img = new ImageIcon(Objects.requireNonNull(getClass().getResource("ind.png")));
+        logo = new JLabel(img);
+        quit.addActionListener(this);
+        easy.addActionListener(this);
+        hard.addActionListener(this);
+        easy.setBounds(140, 300, 150, 30);
+        hard.setBounds(310, 300, 150, 30);
+        quit.setBounds(225, 350, 150, 30);
+        logo.setBounds(240, 75, 150, 150);
+        frame.add(hard);
+        frame.add(easy);
+        frame.add(logo);
+        frame.add(quit);
+        frame.setVisible(true);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        if(e.getSource() == hard){
+            new Tic_Tac_Toe_Individual(true);
+            frame.dispose();
+        }else if(e.getSource() == easy){
+            new Tic_Tac_Toe_Individual(false);
+            frame.dispose();
+        }else if(e.getSource() == quit){
+            System.exit(0);
+        }
+    }
+
+
+}