done?

src/main/java/core/basesyntax/Circle.java

@@ -18,7 +18,7 @@ public double area() {
     @Override
     public void draw() {
         System.out.println("Figure: " + getName() + ", area: "
-                + area() + ", radius: "
-                + radius + ", color: " + getColor());
+                + area() + " sq. units, radius: "
+                + radius + " units, color: " + getColor());
     }
 }

src/main/java/core/basesyntax/ColorSupplier.java

@@ -3,9 +3,9 @@
 import java.util.Random;
 
 public class ColorSupplier {
-    Random picker = new Random();
+    private final static Random picker = new Random();
 
-    public Colors getRandomColor() {
+    public static Colors getRandomColor() {
         return Colors.values()[picker.nextInt(Colors.values().length)];
     }
 }

src/main/java/core/basesyntax/Figure.java

@@ -4,6 +4,8 @@ public abstract class Figure {
     private Colors color;
     private String name;
 
+    public abstract void draw();
+
     public Figure(Colors color, String name) {
         this.color = color;
         this.name = name;

src/main/java/core/basesyntax/FigureMethods.java

@@ -2,5 +2,4 @@
 
 public interface FigureMethods {
     double area();
-    void draw();
 }

src/main/java/core/basesyntax/FigureSupplier.java

@@ -1,11 +1,21 @@
 package core.basesyntax;
 
-public class FigureSupplier {
-    public Figure getRandomFigure() {
+import java.util.Random;
 
-    }
+public class FigureSupplier extends ColorSupplier {
+    private final static Random picker = new Random();
 
-    public Figure getDefaultFigure() {
+    public static Figure getRandomFigure() {
+        return switch(picker.nextInt(4)) {
+            case 0 -> new Circle(getRandomColor(), picker.nextInt(1, 50));
+            case 1 -> new Rectangle(getRandomColor(), picker.nextInt(1, 50), picker.nextInt(1, 50));
+            case 2 -> new RightTriangle(getRandomColor(), picker.nextInt(1, 50), picker.nextInt(1, 50));
+            case 3 -> new Square(getRandomColor(), picker.nextInt(1, 50));
+            default -> new Circle(Colors.WHITE, 10);
+        };
+    }
 
+    public static Figure getDefaultFigure() {
+        return new Circle(Colors.WHITE, 10);
     }
 }

src/main/java/core/basesyntax/Main.java

@@ -2,6 +2,26 @@
 
 public class Main {
     public static void main(String args[]) {
+        printArray();
+    }
+
+    public static Figure[] listOfRandomFigures() {
+        Figure[] array = new Figure[6];
+
+        for(int i = 0; i < 3; i++) {
+            array[i] = FigureSupplier.getRandomFigure();
+        }
+
+        for(int i = 3; i < 6; i++) {
+            array[i] = FigureSupplier.getDefaultFigure();
+        }
+
+        return array;
+    }
 
+    public static void printArray() {
+        for(Figure i : listOfRandomFigures()) {
+            i.draw();
+        }
     }
 }

src/main/java/core/basesyntax/Rectangle.java

@@ -18,8 +18,8 @@ public double area() {
     @Override
     public void draw() {
         System.out.println("Figure: " + getName() + ", area: "
-                + area() + ", firstSide: "
-                + firstSide + ", secondSide: "
-                + secondSide + ", color: " + getColor());
+                + area() + " sq. units, firstSide: "
+                + firstSide + " units, secondSide: "
+                + secondSide + " units, color: " + getColor());
     }
 }