From 56d74c21a16e24e43cd94db8139db83f706ea42c Mon Sep 17 00:00:00 2001 From: arshiammz Date: Fri, 15 Mar 2024 10:46:28 +0330 Subject: [PATCH 01/15] first function and features --- Answers/SecondProject | 1 + 1 file changed, 1 insertion(+) create mode 160000 Answers/SecondProject diff --git a/Answers/SecondProject b/Answers/SecondProject new file mode 160000 index 0000000..2e05477 --- /dev/null +++ b/Answers/SecondProject @@ -0,0 +1 @@ +Subproject commit 2e0547703e6625720484775b5acda915346427ee From eba57d52e7e33d328ad2111cac48825ddfbba0ae Mon Sep 17 00:00:00 2001 From: arshiammz Date: Fri, 15 Mar 2024 13:53:58 +0330 Subject: [PATCH 02/15] submodule deleted --- Answers/SecondProject | 1 - 1 file changed, 1 deletion(-) delete mode 160000 Answers/SecondProject diff --git a/Answers/SecondProject b/Answers/SecondProject deleted file mode 160000 index 2e05477..0000000 --- a/Answers/SecondProject +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2e0547703e6625720484775b5acda915346427ee From 26310cc697c618b0e3a20e8687cebf54b08cd21f Mon Sep 17 00:00:00 2001 From: arshiammz Date: Fri, 15 Mar 2024 13:59:10 +0330 Subject: [PATCH 03/15] first function and feature --- Answers/SecondProject | 1 + 1 file changed, 1 insertion(+) create mode 160000 Answers/SecondProject diff --git a/Answers/SecondProject b/Answers/SecondProject new file mode 160000 index 0000000..2e05477 --- /dev/null +++ b/Answers/SecondProject @@ -0,0 +1 @@ +Subproject commit 2e0547703e6625720484775b5acda915346427ee From 9f7e6dcd8ea38cd4d7f908ce22cb281b7b28a1d0 Mon Sep 17 00:00:00 2001 From: arshiammz Date: Fri, 15 Mar 2024 23:22:26 +0330 Subject: [PATCH 04/15] first function and features --- Answers/SecondProject | 1 - 1 file changed, 1 deletion(-) delete mode 160000 Answers/SecondProject diff --git a/Answers/SecondProject b/Answers/SecondProject deleted file mode 160000 index 2e05477..0000000 --- a/Answers/SecondProject +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2e0547703e6625720484775b5acda915346427ee From b3deb2d1af1d201626f86322d9759c8f84b02377 Mon Sep 17 00:00:00 2001 From: arshiammz Date: Sat, 16 Mar 2024 00:14:42 +0330 Subject: [PATCH 05/15] finall first function and features --- Answers/40230112117 | 1 + 1 file changed, 1 insertion(+) create mode 160000 Answers/40230112117 diff --git a/Answers/40230112117 b/Answers/40230112117 new file mode 160000 index 0000000..2e05477 --- /dev/null +++ b/Answers/40230112117 @@ -0,0 +1 @@ +Subproject commit 2e0547703e6625720484775b5acda915346427ee From 8f6ad21f69d8bca2039381799d4e46ff4c1bcbbb Mon Sep 17 00:00:00 2001 From: arshiammz Date: Sat, 16 Mar 2024 00:28:16 +0330 Subject: [PATCH 06/15] delete history --- Answers/40230112117 | 1 - 1 file changed, 1 deletion(-) delete mode 160000 Answers/40230112117 diff --git a/Answers/40230112117 b/Answers/40230112117 deleted file mode 160000 index 2e05477..0000000 --- a/Answers/40230112117 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2e0547703e6625720484775b5acda915346427ee From 0d7a792fd10684e890a2348bdb25e441352c7e78 Mon Sep 17 00:00:00 2001 From: arshiammz Date: Sat, 16 Mar 2024 10:48:14 +0330 Subject: [PATCH 07/15] Re-added project files --- Answers/40230112117/.gitignore | 38 +++++++++++++++++++ Answers/40230112117/.idea/.gitignore | 3 ++ Answers/40230112117/.idea/.name | 1 + Answers/40230112117/.idea/encodings.xml | 7 ++++ Answers/40230112117/.idea/misc.xml | 14 +++++++ Answers/40230112117/.idea/vcs.xml | 6 +++ Answers/40230112117/pom.xml | 17 +++++++++ .../40230112117/src/main/java/Functions.java | 21 ++++++++++ 8 files changed, 107 insertions(+) create mode 100644 Answers/40230112117/.gitignore create mode 100644 Answers/40230112117/.idea/.gitignore create mode 100644 Answers/40230112117/.idea/.name create mode 100644 Answers/40230112117/.idea/encodings.xml create mode 100644 Answers/40230112117/.idea/misc.xml create mode 100644 Answers/40230112117/.idea/vcs.xml create mode 100644 Answers/40230112117/pom.xml create mode 100644 Answers/40230112117/src/main/java/Functions.java diff --git a/Answers/40230112117/.gitignore b/Answers/40230112117/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/Answers/40230112117/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/Answers/40230112117/.idea/.gitignore b/Answers/40230112117/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/Answers/40230112117/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/Answers/40230112117/.idea/.name b/Answers/40230112117/.idea/.name new file mode 100644 index 0000000..5d29ce7 --- /dev/null +++ b/Answers/40230112117/.idea/.name @@ -0,0 +1 @@ +Functions.java \ No newline at end of file diff --git a/Answers/40230112117/.idea/encodings.xml b/Answers/40230112117/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/Answers/40230112117/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Answers/40230112117/.idea/misc.xml b/Answers/40230112117/.idea/misc.xml new file mode 100644 index 0000000..fdc35ea --- /dev/null +++ b/Answers/40230112117/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Answers/40230112117/.idea/vcs.xml b/Answers/40230112117/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/Answers/40230112117/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Answers/40230112117/pom.xml b/Answers/40230112117/pom.xml new file mode 100644 index 0000000..28378dd --- /dev/null +++ b/Answers/40230112117/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + org.example + SecondProject + 1.0-SNAPSHOT + + + 21 + 21 + UTF-8 + + + \ No newline at end of file diff --git a/Answers/40230112117/src/main/java/Functions.java b/Answers/40230112117/src/main/java/Functions.java new file mode 100644 index 0000000..b726f71 --- /dev/null +++ b/Answers/40230112117/src/main/java/Functions.java @@ -0,0 +1,21 @@ +import java.util.Scanner; + +public class Functions { + public static void main(String[] args) { + Scanner sc = new Scanner(System.in); + String firstname = sc.nextLine(); + String lastname = sc.nextLine(); + //avalin commit + } + public static String fullName(String firstName, String lastName){ + + String fs = firstName.toLowerCase(); + String ls = lastName.toLowerCase(); + String fc = fs.substring(0,1).toUpperCase() + fs.substring(1); + String lc = ls.substring(0,1).toUpperCase() + ls.substring(1); + String output = fc + " " + lc; + return output; + } + //avalin commit + +} From c4fded3443bd73ba2efe61872c89e050fcc009c3 Mon Sep 17 00:00:00 2001 From: arshiammz Date: Sun, 17 Mar 2024 00:01:23 +0330 Subject: [PATCH 08/15] second function and features --- Answers/40230112117/.idea/vcs.xml | 1 + .../40230112117/src/main/java/Functions.java | 30 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Answers/40230112117/.idea/vcs.xml b/Answers/40230112117/.idea/vcs.xml index 94a25f7..fdf1fc8 100644 --- a/Answers/40230112117/.idea/vcs.xml +++ b/Answers/40230112117/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/Answers/40230112117/src/main/java/Functions.java b/Answers/40230112117/src/main/java/Functions.java index b726f71..4bdc5b0 100644 --- a/Answers/40230112117/src/main/java/Functions.java +++ b/Answers/40230112117/src/main/java/Functions.java @@ -3,9 +3,26 @@ public class Functions { public static void main(String[] args) { Scanner sc = new Scanner(System.in); + //get first name and last name + System.out.println("Please enter your first name: "); String firstname = sc.nextLine(); + System.out.println("Please enter your last name: "); String lastname = sc.nextLine(); //avalin commit + + //get phone number + long phone; + while (true){ + System.out.println("Please enter your phone number: "); + phone = sc.nextLong(); + if (phone/1000000000 != 9){ + System.out.println("Wrong entry. Try again."); + continue; + } + break; + } + //commit 2 + } public static String fullName(String firstName, String lastName){ @@ -17,5 +34,16 @@ public static String fullName(String firstName, String lastName){ return output; } //avalin commit - + public static void phonenumber(long num){ + long[] arr = new long[11]; + arr[0] = 0; + for (int i=10; i>0; i--){ + arr[i] = num%10; + num /= 10; + } + for (int i=0; i<11; i++){ + System.out.print(arr[i]); + } + } + //commit 2 } From f16a9e9424c3905719ae9db75d8f10c2cb1ce03a Mon Sep 17 00:00:00 2001 From: arshiammz Date: Mon, 18 Mar 2024 00:11:52 +0330 Subject: [PATCH 09/15] get input transferd from main to method+userid --- .../40230112117/src/main/java/Functions.java | 69 ++++++++++++------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/Answers/40230112117/src/main/java/Functions.java b/Answers/40230112117/src/main/java/Functions.java index 4bdc5b0..b4d68f1 100644 --- a/Answers/40230112117/src/main/java/Functions.java +++ b/Answers/40230112117/src/main/java/Functions.java @@ -3,28 +3,17 @@ public class Functions { public static void main(String[] args) { Scanner sc = new Scanner(System.in); - //get first name and last name + System.out.println(fullName()); + phonenumber(); + userid(); + } + + public static String fullName(){ + Scanner sc = new Scanner(System.in); System.out.println("Please enter your first name: "); - String firstname = sc.nextLine(); + String firstName = sc.nextLine(); System.out.println("Please enter your last name: "); - String lastname = sc.nextLine(); - //avalin commit - - //get phone number - long phone; - while (true){ - System.out.println("Please enter your phone number: "); - phone = sc.nextLong(); - if (phone/1000000000 != 9){ - System.out.println("Wrong entry. Try again."); - continue; - } - break; - } - //commit 2 - - } - public static String fullName(String firstName, String lastName){ + String lastName = sc.nextLine(); String fs = firstName.toLowerCase(); String ls = lastName.toLowerCase(); @@ -34,16 +23,50 @@ public static String fullName(String firstName, String lastName){ return output; } //avalin commit - public static void phonenumber(long num){ + public static void phonenumber(){ + Scanner sc = new Scanner(System.in); + long phone; + while (true) { + System.out.println("Please enter your phone number: "); + phone = sc.nextLong(); + if (phone / 1000000000 != 9) { + System.out.println("Wrong entry. Try again."); + continue; + } + break; + } long[] arr = new long[11]; arr[0] = 0; for (int i=10; i>0; i--){ - arr[i] = num%10; - num /= 10; + arr[i] = phone%10; + phone /= 10; } for (int i=0; i<11; i++){ System.out.print(arr[i]); } + System.out.println(); } //commit 2 + public static void userid(){ + Scanner sc = new Scanner(System.in); + String id ; + while (true) { + System.out.println("Please enter your id: "); + id = sc.nextLine(); + char[] characters = id.toCharArray(); + boolean format = false; + for (int i=0; i 57 ){ + format = true; + break; + } + } + if (id.length() < 4 || id.length() > 13 || format) { + System.out.println("invalid format! please try again. "); + continue; + } + break; + } + System.out.println(id); + } } From 6a7fb703a2737912920fd17795566941e374925a Mon Sep 17 00:00:00 2001 From: arshiammz Date: Mon, 18 Mar 2024 14:41:26 +0330 Subject: [PATCH 10/15] function getInterests added --- .../40230112117/src/main/java/Functions.java | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/Answers/40230112117/src/main/java/Functions.java b/Answers/40230112117/src/main/java/Functions.java index b4d68f1..2d8a204 100644 --- a/Answers/40230112117/src/main/java/Functions.java +++ b/Answers/40230112117/src/main/java/Functions.java @@ -1,11 +1,10 @@ import java.util.Scanner; +import java.util.ArrayList; public class Functions { public static void main(String[] args) { Scanner sc = new Scanner(System.in); - System.out.println(fullName()); - phonenumber(); - userid(); + } public static String fullName(){ @@ -69,4 +68,38 @@ public static void userid(){ } System.out.println(id); } + public static void getinterests(){ + Scanner sc = new Scanner(System.in); + ArrayList interests = new ArrayList<>(); + String input; + System.out.println("Please enter your interrests then enter esc :"); + + while (interests.size() < 10) { + input = sc.nextLine(); + if ("esc".equals(input)) { + break; + } + interests.add(input); + // when 10 interests added method stops + if (interests.size() == 10) { + System.out.println("maximum of interests added ! "); + break; + } + } + + // convert arraylist to array of strings + String[] interestsArray = interests.toArray(new String[0]); + + System.out.print("{"); + for (int i=0; i Date: Mon, 18 Mar 2024 20:58:31 +0330 Subject: [PATCH 11/15] function userFullInformation added ! --- .../40230112117/src/main/java/Functions.java | 56 +++++++++++-------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/Answers/40230112117/src/main/java/Functions.java b/Answers/40230112117/src/main/java/Functions.java index 2d8a204..3249fa4 100644 --- a/Answers/40230112117/src/main/java/Functions.java +++ b/Answers/40230112117/src/main/java/Functions.java @@ -4,6 +4,7 @@ public class Functions { public static void main(String[] args) { Scanner sc = new Scanner(System.in); + userFullinformation(); } @@ -22,31 +23,23 @@ public static String fullName(){ return output; } //avalin commit - public static void phonenumber(){ + public static String phonenumber(){ Scanner sc = new Scanner(System.in); - long phone; + String phone; while (true) { System.out.println("Please enter your phone number: "); - phone = sc.nextLong(); - if (phone / 1000000000 != 9) { + phone = sc.nextLine(); + if (phone.length() > 10 || !phone.startsWith("9")) { System.out.println("Wrong entry. Try again."); continue; } break; } - long[] arr = new long[11]; - arr[0] = 0; - for (int i=10; i>0; i--){ - arr[i] = phone%10; - phone /= 10; - } - for (int i=0; i<11; i++){ - System.out.print(arr[i]); - } - System.out.println(); + String output = "0" + phone; + return output; } //commit 2 - public static void userid(){ + public static String userid(){ Scanner sc = new Scanner(System.in); String id ; while (true) { @@ -66,13 +59,13 @@ public static void userid(){ } break; } - System.out.println(id); + return id; } - public static void getinterests(){ + public static String getinterests(){ Scanner sc = new Scanner(System.in); ArrayList interests = new ArrayList<>(); String input; - System.out.println("Please enter your interrests then enter esc :"); + System.out.println("Please enter your interests then enter esc :"); while (interests.size() < 10) { input = sc.nextLine(); @@ -90,16 +83,31 @@ public static void getinterests(){ // convert arraylist to array of strings String[] interestsArray = interests.toArray(new String[0]); - System.out.print("{"); + String output = ""; + output += "{"; for (int i=0; i Date: Mon, 18 Mar 2024 23:57:54 +0330 Subject: [PATCH 12/15] im showing interests in another format --- .../40230112117/src/main/java/Functions.java | 54 +++++++++---------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/Answers/40230112117/src/main/java/Functions.java b/Answers/40230112117/src/main/java/Functions.java index 3249fa4..2646c5f 100644 --- a/Answers/40230112117/src/main/java/Functions.java +++ b/Answers/40230112117/src/main/java/Functions.java @@ -62,39 +62,35 @@ public static String userid(){ return id; } public static String getinterests(){ - Scanner sc = new Scanner(System.in); - ArrayList interests = new ArrayList<>(); - String input; - System.out.println("Please enter your interests then enter esc :"); + Scanner sc = new Scanner(System.in); + ArrayList interests = new ArrayList<>(); + String input; + System.out.println("Please enter your interests then enter 'esc':"); - while (interests.size() < 10) { - input = sc.nextLine(); - if ("esc".equals(input)) { - break; - } - interests.add(input); - // when 10 interests added method stops - if (interests.size() == 10) { - System.out.println("maximum of interests added ! "); - break; - } + while (interests.size() < 10) { + input = sc.nextLine(); + if ("esc".equals(input)) { + break; } - - // convert arraylist to array of strings - String[] interestsArray = interests.toArray(new String[0]); - - String output = ""; - output += "{"; - for (int i=0; i Date: Tue, 19 Mar 2024 03:47:23 +0330 Subject: [PATCH 13/15] information func changed to string+informationDecoder added --- .../40230112117/src/main/java/Functions.java | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/Answers/40230112117/src/main/java/Functions.java b/Answers/40230112117/src/main/java/Functions.java index 2646c5f..e57c848 100644 --- a/Answers/40230112117/src/main/java/Functions.java +++ b/Answers/40230112117/src/main/java/Functions.java @@ -4,7 +4,7 @@ public class Functions { public static void main(String[] args) { Scanner sc = new Scanner(System.in); - userFullinformation(); + informationDecoder(userFullinformation()); } @@ -93,17 +93,32 @@ public static String getinterests(){ } // commit 4 - public static void userFullinformation(){ - String x ="Hello! My name is " + fullName() + "."; - x +=" My ID is " + userid() + "."; - x +=" Here are some of my interests:"; + public static String userFullinformation() { + String x = "Hello! My name is " + fullName() + "."; + x += " My ID is " + userid() + "."; + x += " Here are some of my interests:"; String y = getinterests(); String z = phonenumber(); - System.out.println(x); - System.out.println(y); - System.out.println(); - System.out.print("You can reach me via my phone number " + z + "." ); + String fullInfo = x + "\n" + y + "\n\n" + "You can reach me via my phone number " + z + "."; + return fullInfo; } + // commit 5 + public static void informationDecoder(String sentence) { + Scanner sc = new Scanner(System.in); + System.out.println("Please enter amount of shift: "); + int shift = sc.nextInt(); + char[] letter = sentence.toCharArray(); + for (int i = 0; i < letter.length; i++) { + if ((int) letter[i] > 64 && (int) letter[i] < 91) { + letter[i] = (char) ((((int) letter[i] - 65 + shift) % 26) + 65); + } else if ((int) letter[i] > 96 && (int) letter[i] < 123) { + letter[i] = (char) ((((int) letter[i] - 97 + shift) % 26) + 97); + } + System.out.print(letter[i]); + } + } + + } From 9356ace2edd1cd044d55aa9c551ccb0d0cd1a202 Mon Sep 17 00:00:00 2001 From: arshiammz Date: Tue, 19 Mar 2024 13:36:09 +0330 Subject: [PATCH 14/15] last commit --- .../40230112117/src/main/java/Functions.java | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/Answers/40230112117/src/main/java/Functions.java b/Answers/40230112117/src/main/java/Functions.java index e57c848..7f5e45a 100644 --- a/Answers/40230112117/src/main/java/Functions.java +++ b/Answers/40230112117/src/main/java/Functions.java @@ -2,10 +2,16 @@ import java.util.ArrayList; public class Functions { + public static int shift; public static void main(String[] args) { Scanner sc = new Scanner(System.in); - informationDecoder(userFullinformation()); - + String output = informationEncoder(userFullinformation()); + System.out.println(output); + System.out.println("Do you want see original information? (press y) else (press n). "); + char a = sc.next().charAt(0); + if (a == 'y'){ + System.out.println(informationDecoder(output)); + } } public static String fullName(){ @@ -105,10 +111,11 @@ public static String userFullinformation() { // commit 5 - public static void informationDecoder(String sentence) { + public static String informationEncoder(String sentence) { Scanner sc = new Scanner(System.in); System.out.println("Please enter amount of shift: "); - int shift = sc.nextInt(); + shift = sc.nextInt(); + StringBuilder encoded = new StringBuilder(); char[] letter = sentence.toCharArray(); for (int i = 0; i < letter.length; i++) { if ((int) letter[i] > 64 && (int) letter[i] < 91) { @@ -116,9 +123,28 @@ public static void informationDecoder(String sentence) { } else if ((int) letter[i] > 96 && (int) letter[i] < 123) { letter[i] = (char) ((((int) letter[i] - 97 + shift) % 26) + 97); } - System.out.print(letter[i]); + encoded.append(letter[i]); } + return encoded.toString(); } + // commmit 7 + public static String informationDecoder(String encodedSentence) { + Scanner sc = new Scanner(System.in); - + char[] letter = encodedSentence.toCharArray(); + StringBuilder decoded = new StringBuilder(); + for (int i = 0; i < letter.length; i++) { + if ((int) letter[i] > 64 && (int) letter[i] < 91) { + letter[i] = (char) ((((int) letter[i] - 65 - shift + 26) % 26) + 65); + } else if ((int) letter[i] > 96 && (int) letter[i] < 123) { + letter[i] = (char) ((((int) letter[i] - 97 - shift + 26) % 26) + 97); + } + decoded.append(letter[i]); + } + return decoded.toString(); + } + //commit 8 } + + + From 0a21b41383ed22ce04a9027d9b3c9c842ee5a268 Mon Sep 17 00:00:00 2001 From: arshiammz Date: Thu, 21 Mar 2024 14:30:40 +0330 Subject: [PATCH 15/15] final commit --- Answers/40230112117/src/main/java/Functions.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Answers/40230112117/src/main/java/Functions.java b/Answers/40230112117/src/main/java/Functions.java index 7f5e45a..3d71cec 100644 --- a/Answers/40230112117/src/main/java/Functions.java +++ b/Answers/40230112117/src/main/java/Functions.java @@ -130,6 +130,8 @@ public static String informationEncoder(String sentence) { // commmit 7 public static String informationDecoder(String encodedSentence) { Scanner sc = new Scanner(System.in); + //bray inke agar shift>26 ono biarim zir 26 + shift = shift%26; char[] letter = encodedSentence.toCharArray(); StringBuilder decoded = new StringBuilder();