nsuhover · Jul 27, 2022 · Jul 27, 2022 · Dec 3, 2022 · Dec 6, 2022
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/settings.gradle b/settings.gradle
@@ -12,4 +12,4 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "BillCalculator"
+rootProject.name = "Java-Module-Project"
diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java
@@ -1,22 +1,37 @@
-class Calculator {
+public class Calculator {
+    static float itemsSum;
+    static float costPerPerson;
 
-    int friendsCount;
-
-    String cart = "Добавленные товары:";
-    double totalPrice = 0;
-
-    Calculator(int friendsCount) {
-        this.friendsCount = friendsCount;
+    public static void sumCostsOfItems(float cost) {
+        itemsSum = itemsSum + cost;
     }
 
-    void addItem(Item item) {
-        totalPrice += item.price;
-        cart = cart + "\n" + item.name;
-
-        System.out.println(item.name + " в корзине");
+    public static float calculateCostPerPerson(int personsQuantity) {
+        costPerPerson = itemsSum / (float) personsQuantity;
+        return costPerPerson;
     }
 
-    double divideSum() {
-        return totalPrice / friendsCount;
+    public static String findRightRoubleWord(int roubles) {
+        String roubleName;
+        int lastDigit;
+        int lastTwoDigits;
+        lastTwoDigits = roubles % 100;
+        if (lastTwoDigits >= 11 && lastTwoDigits <= 14) {
+            roubleName = "рублей";
+            return roubleName;
+        }
+        lastDigit = roubles % 10;
+        if (lastDigit == 1) {
+            roubleName = "рубль";
+            return roubleName;
+        } else if (lastDigit >= 2 && lastDigit <= 4) {
+            roubleName = "рубля";
+            return roubleName;
+        } else {
+            roubleName = "рублей";
+            return roubleName;
+        }
     }
+
 }
+
diff --git a/src/main/java/Formatter.java b/src/main/java/Formatter.java
diff --git a/src/main/java/Item.java b/src/main/java/Item.java
diff --git a/src/main/java/ItemsBasket.java b/src/main/java/ItemsBasket.java
@@ -0,0 +1,16 @@
+public class ItemsBasket {
+    static String itemsNames = "None";
+
+    public static void addItemInBasket(String name) {
+        if (itemsNames.equals("None")) {
+            itemsNames = name;
+        } else {
+            itemsNames = itemsNames + ", " + name;
+        }
+    }
+
+    public static void writeItemsFromBasket() {
+        System.out.println("Добавленные товары:\n" + itemsNames.replaceAll(", ", "\n"));
+    }
+}
+