diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..962e712
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Java-Module-Project
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..7643783
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,123 @@
+<component name="ProjectCodeStyleConfiguration">
+ <code_scheme name="Project" version="173">
+ <jetcodestylesettings>
+ <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+ </jetcodestylesettings>
+ <codestylesettings language="XML">
+ <option name="FORCE_REARRANGE_MODE" value="1" />
+ <indentoptions>
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ </indentoptions>
+ <arrangement>
+ <rules>
+ <section>
+ <rule>
+ <match>
+ <and>
+ <name>xmlns:android</name>
+ <xml_attribute />
+ <xml_namespace>^$</xml_namespace>
+ </and>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <and>
+ <name>xmlns:.*</name>
+ <xml_attribute />
+ <xml_namespace>^$</xml_namespace>
+ </and>
+ </match>
+ <order>BY_NAME</order>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <and>
+ <name>.*:id</name>
+ <xml_attribute />
+ <xml_namespace>http://schemas.android.com/apk/res/android</xml_namespace>
+ </and>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <and>
+ <name>.*:name</name>
+ <xml_attribute />
+ <xml_namespace>http://schemas.android.com/apk/res/android</xml_namespace>
+ </and>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <and>
+ <name>name</name>
+ <xml_attribute />
+ <xml_namespace>^$</xml_namespace>
+ </and>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <and>
+ <name>style</name>
+ <xml_attribute />
+ <xml_namespace>^$</xml_namespace>
+ </and>
+ </match>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <and>
+ <name>.*</name>
+ <xml_attribute />
+ <xml_namespace>^$</xml_namespace>
+ </and>
+ </match>
+ <order>BY_NAME</order>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <and>
+ <name>.*</name>
+ <xml_attribute />
+ <xml_namespace>http://schemas.android.com/apk/res/android</xml_namespace>
+ </and>
+ </match>
+ <order>ANDROID_ATTRIBUTE_ORDER</order>
+ </rule>
+ </section>
+ <section>
+ <rule>
+ <match>
+ <and>
+ <name>.*</name>
+ <xml_attribute />
+ <xml_namespace>.*</xml_namespace>
+ </and>
+ </match>
+ <order>BY_NAME</order>
+ </rule>
+ </section>
+ </rules>
+ </arrangement>
+ </codestylesettings>
+ <codestylesettings language="kotlin">
+ <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+ </codestylesettings>
+ </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+ <state>
+ <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+ </state>
+</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <bytecodetargetlevel />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..6cec569
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="GradleMigrationSettings" migrationVersion="1" />
+ <component name="GradleSettings">
+ <option name="linkedExternalProjectsSettings">
+ <gradleprojectsettings>
+ <option name="testRunner" value="GRADLE" />
+ <option name="distributionType" value="DEFAULT_WRAPPED" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="modules">
+ <set>
+ <option value="$PROJECT_DIR$" />
+ </set>
+ </option>
+ </gradleprojectsettings>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..64298bb
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/build/classes" />
+ </component>
+ <component name="ProjectType">
+ <option name="id" value="Android" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <ul class="image_map">
+ </component>
+</project>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 716abf2..be110bf 100644
--- 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/Calculate.java b/src/main/java/Calculate.java
new file mode 100644
index 0000000..7f38391
--- /dev/null
+++ b/src/main/java/Calculate.java
@@ -0,0 +1,60 @@
+import java.util.Scanner;
+
+public class Calculate {
+
+ public static void product(double person) {
+
+ String food = "";
+ double price = 0.0;
+
+ while (true) {
+ System.out.println("Для добавления товара введите название продукта\nДля завершения программы введите \"Завершить\"");
+ Scanner scanner = new Scanner(System.in);
+ String inputFood = scanner.next();
+ double itog = 0;
+
+ if (inputFood.equalsIgnoreCase("Завершить")) {
+ itog = (int) (price / person);
+ System.out.println("Покупка завершена, " + String.format("%.0f", person) + " персоны заплатят по " + itog + " " + Matsh.floover(itog));
+ break;
+
+ } else {
+ System.out.println("Введите стоимость продукта в формате \"'рубли.копейки' [10.45, 11.40]\"");
+ while (!scanner.hasNextInt()) {
+ System.out.println("Некорректное значение, введите стоимость продукта в формате \"'рубли.копейки' [10.45, 11.40]\"");
+ scanner.next();
+ }
+ float inputPrice = (float) scanner.nextDouble();
+ food = food + "\n" + inputFood;
+ price = price + inputPrice;
+
+ System.out.println("Вы успешно добавили продукт:" + food + "\nИтог: " + String.format("%.2f", price) + " " + Matsh.floover(itog));
+ }
+ }
+ }
+
+static class Matsh {
+
+ public static String floover(double price) {
+
+ int amount = (int) price;
+
+ if (amount> 100)
+ amount %= 100;
+
+ if (amount> 20)
+ amount %= 10;
+
+ switch (amount) {
+ case 1:
+ return "Рублю";
+ case 2:
+ case 3:
+ case 4:
+ return "Рубля";
+ default:
+ return "Рублей";
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java
deleted file mode 100644
index 2fbc00d..0000000
--- a/src/main/java/Calculator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-class Calculator {
-
- int friendsCount;
-
- String cart = "Добавленные товары:";
- double totalPrice = 0;
-
- Calculator(int friendsCount) {
- this.friendsCount = friendsCount;
- }
-
- void addItem(Item item) {
- totalPrice += item.price;
- cart = cart + "\n" + item.name;
-
- System.out.println(item.name + " в корзине");
- }
-
- double divideSum() {
- return totalPrice / friendsCount;
- }
-}
diff --git a/src/main/java/Formatter.java b/src/main/java/Formatter.java
deleted file mode 100644
index 3f915b7..0000000
--- a/src/main/java/Formatter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-public class Formatter {
-
- String formatValue(double price) {
- double roundedValue = Math.floor(price);
- if (roundedValue == 1) {
- return "рубль";
- } else if (roundedValue>= 2 && roundedValue <= 4) { - return "рубля"; - } else { - return "рублей"; - } - } - - String roundResult(final double result) { - return String.format("%.2f", result); - } -} diff --git a/src/main/java/Item.java b/src/main/java/Item.java deleted file mode 100644 index fad8a4e..0000000 --- a/src/main/java/Item.java +++ /dev/null @@ -1,10 +0,0 @@ -class Item { - - String name; - double price; - - Item(String name, double price) { - this.name = name; - this.price = price; - } -} diff --git a/src/main/java/Main.java b/src/main/java/Main.java deleted file mode 100644 index 11ba5d3..0000000 --- a/src/main/java/Main.java +++ /dev/null @@ -1,49 +0,0 @@ -import java.util.Scanner; - -public class Main { - - public static void main(String[] args) { - Scanner scanner = new Scanner(System.in); - - int friendCount; - while (true) { - System.out.println("На сколько человек необходимо разделить счет?"); - friendCount = scanner.nextInt(); - - if (friendCount> 1) {
- break;
- } else if (friendCount == 1) {
- System.out.println(
- "Нет смысла делить сумму на одного человека. Давайте попробуем ввести другое значение, которое будет больше единицы.");
- } else {
- System.out.println("Неверное количество друзей. Значение должно быть болье единицы, давайте попробуем еще раз.");
- }
- }
-
- Calculator calculator = new Calculator(friendCount);
-
- while (true) {
- System.out.println("Введите название товара");
- String name = scanner.next();
-
- System.out.println("Введите стоимость товара в формате: 'рубли.копейки' [10.45, 11.40]");
- double price = scanner.nextDouble();
-
- calculator.addItem(new Item(name, price));
-
- System.out.println(
- "Хотите добавить еще один товар? Введите любой символ для продолжения, либо 'Завершить' если больше нет товаров для добавления");
- String answer = scanner.next();
-
- if (answer.equalsIgnoreCase("Завершить")) {
- break;
- }
- }
-
- double result = calculator.divideSum();
- Formatter formatter = new Formatter();
-
- System.out.println(calculator.cart);
- System.out.println("Каждому человеку к оплате: " + formatter.roundResult(result) + " " + formatter.formatValue(result));
- }
-}
diff --git a/src/main/java/Menu.java b/src/main/java/Menu.java
new file mode 100644
index 0000000..86b6c0f
--- /dev/null
+++ b/src/main/java/Menu.java
@@ -0,0 +1,34 @@
+import java.util.Scanner;
+
+public class Menu {
+ public static void main(String[] args) {
+inputParameters();
+
+ }
+ public static void inputParameters(){
+ Scanner scanner = new Scanner(System.in);
+ System.out.println("На сколько персон делить чек?");
+ int person = 0;
+
+ while (!scanner.hasNextInt()) {
+ System.out.println("Некорректное значение для подсчёта, попробуйте еще раз");
+ scanner.next();
+ }
+ while (true) {
+ person = scanner.nextInt();
+ if (person> 1) {
+ System.out.println("Давайте посчитаем!");
+ Calculate.product(person);
+ }
+ if (person == 1) {
+ System.out.println("Вы оплачиваете счет сами");
+ Calculate.product(person);
+ }
+ if (person < 1) {
+ System.out.println("Некорректное значение для подсчёта, попробуйте еще раз");
+
+
+ }
+ }
+ }
+}
\ No newline at end of file
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://patch-diff.githubusercontent.com/raw/TelenkovAleksey/Java-Module-Project/pull/1.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://patch-diff.githubusercontent.com/raw/TelenkovAleksey/Java-Module-Project/pull/1.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>