From 95bee4c30df7769e1f92a7a92f3365838e755791 Mon Sep 17 00:00:00 2001 From: nasim hridoy Date: Sat, 11 Mar 2023 22:45:31 +0600 Subject: [PATCH 1/8] git.java is commited --- .gradle/6.5/fileHashes/fileHashes.bin | Bin 80615 -> 80665 bytes .gradle/6.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/outputFiles.bin | Bin 23195 -> 57083 bytes .gradle/checksums/checksums.lock | Bin 17 -> 17 bytes .gradle/checksums/md5-checksums.bin | Bin 0 -> 20247 bytes .gradle/checksums/sha1-checksums.bin | Bin 0 -> 25139 bytes .idea/compiler.xml | 2 +- .idea/gradle.xml | 6 +- .idea/libraries/Gradle__junit_junit_4_12.xml | 3 + .../libraries/Gradle__junit_junit_4_13_1.xml | 3 + .idea/misc.xml | 2 +- .idea/modules.xml | 3 + .idea/modules/NewsApp.iml | 8 -- .idea/modules/app/NewsApp.app.androidTest.iml | 106 ++++++++++++++++++ .idea/modules/app/NewsApp.app.iml | 77 ------------- .idea/modules/app/NewsApp.app.main.iml | 93 +++++++++++++++ .idea/modules/app/NewsApp.app.unitTest.iml | 90 +++++++++++++++ .../java/com/project/newsapp/model/git.java | 27 +++++ local.properties | 8 +- 20 files changed, 332 insertions(+), 96 deletions(-) create mode 100644 .gradle/checksums/md5-checksums.bin create mode 100644 .gradle/checksums/sha1-checksums.bin create mode 100644 .idea/modules/app/NewsApp.app.androidTest.iml create mode 100644 .idea/modules/app/NewsApp.app.main.iml create mode 100644 .idea/modules/app/NewsApp.app.unitTest.iml create mode 100644 app/src/main/java/com/project/newsapp/model/git.java diff --git a/.gradle/6.5/fileHashes/fileHashes.bin b/.gradle/6.5/fileHashes/fileHashes.bin index f1a9986c7ad4fcfb35ecb98b8a6928aa2e449c98..35e64247d5a4ea8b08b827cb9479e790ab46272a 100644 GIT binary patch delta 76 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 YrV5xUV5)$r0;UR>DqyPMPgTMH0zmOtU;qFB delta 754 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 NPMc)$#T-Vge*rEW6nX#v literal 0 HcmV?d00001 diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 23a89bb..a0de2a1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,18 +4,16 @@ diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml index 6c078d6..f7d27c4 100644 --- a/.idea/libraries/Gradle__junit_junit_4_12.xml +++ b/.idea/libraries/Gradle__junit_junit_4_12.xml @@ -1,5 +1,8 @@ + + + diff --git a/.idea/libraries/Gradle__junit_junit_4_13_1.xml b/.idea/libraries/Gradle__junit_junit_4_13_1.xml index 4405e64..4be8bb6 100644 --- a/.idea/libraries/Gradle__junit_junit_4_13_1.xml +++ b/.idea/libraries/Gradle__junit_junit_4_13_1.xml @@ -1,5 +1,8 @@ + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..ef61796 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 95e9698..51a3536 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,6 +4,9 @@ + + + \ No newline at end of file diff --git a/.idea/modules/NewsApp.iml b/.idea/modules/NewsApp.iml index fc44a28..60506ed 100644 --- a/.idea/modules/NewsApp.iml +++ b/.idea/modules/NewsApp.iml @@ -1,13 +1,5 @@ - - - - - - diff --git a/.idea/modules/app/NewsApp.app.androidTest.iml b/.idea/modules/app/NewsApp.app.androidTest.iml new file mode 100644 index 0000000..1c279e2 --- /dev/null +++ b/.idea/modules/app/NewsApp.app.androidTest.iml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/app/NewsApp.app.iml b/.idea/modules/app/NewsApp.app.iml index 86fa5b5..2099d5c 100644 --- a/.idea/modules/app/NewsApp.app.iml +++ b/.idea/modules/app/NewsApp.app.iml @@ -30,87 +30,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/app/NewsApp.app.main.iml b/.idea/modules/app/NewsApp.app.main.iml new file mode 100644 index 0000000..23267e8 --- /dev/null +++ b/.idea/modules/app/NewsApp.app.main.iml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/app/NewsApp.app.unitTest.iml b/.idea/modules/app/NewsApp.app.unitTest.iml new file mode 100644 index 0000000..a2e5b8c --- /dev/null +++ b/.idea/modules/app/NewsApp.app.unitTest.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/project/newsapp/model/git.java b/app/src/main/java/com/project/newsapp/model/git.java new file mode 100644 index 0000000..4b4ad8d --- /dev/null +++ b/app/src/main/java/com/project/newsapp/model/git.java @@ -0,0 +1,27 @@ +package com.project.newsapp.model; + +public class git { + int roll; + String name; + + public git(int roll, String name) { + this.roll = roll; + this.name = name; + } + + public int getRoll() { + return roll; + } + + public void setRoll(int roll) { + this.roll = roll; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/local.properties b/local.properties index 475eab1..946b8e1 100644 --- a/local.properties +++ b/local.properties @@ -1,10 +1,8 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file should *NOT* be checked into Version Control Systems, +## This file must *NOT* be checked into Version Control Systems, # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -sdk.dir=/Users/apple/Library/Android/sdk \ No newline at end of file +#Sat Mar 11 22:07:03 BDT 2023 +sdk.dir=C\:\\Users\\Lenovo\\AppData\\Local\\Android\\Sdk From d9869ef05886270fe8ba815c4ebafff154073b0c Mon Sep 17 00:00:00 2001 From: nasim hridoy Date: Sat, 11 Mar 2023 23:04:27 +0600 Subject: [PATCH 2/8] git2.java is commited --- .../java/com/project/newsapp/model/git2.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 app/src/main/java/com/project/newsapp/model/git2.java diff --git a/app/src/main/java/com/project/newsapp/model/git2.java b/app/src/main/java/com/project/newsapp/model/git2.java new file mode 100644 index 0000000..9491bc3 --- /dev/null +++ b/app/src/main/java/com/project/newsapp/model/git2.java @@ -0,0 +1,18 @@ +package com.project.newsapp.model; + +public class git2 { + String dept; + + public git2(String dept) { + this.dept = dept; + } + + public String getDept() { + return dept; + } + + public void setDept(String dept) { + this.dept = dept; + } +} + From e772e2c8e49d16514ca5e09da8026018bb0a10a6 Mon Sep 17 00:00:00 2001 From: nasimhridoy695 <69071704+nasimhridoy695@users.noreply.github.com> Date: Sat, 11 Mar 2023 23:12:54 +0600 Subject: [PATCH 3/8] Create mergeconflict.txt --- app/src/main/java/com/project/newsapp/model/mergeconflict.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/src/main/java/com/project/newsapp/model/mergeconflict.txt diff --git a/app/src/main/java/com/project/newsapp/model/mergeconflict.txt b/app/src/main/java/com/project/newsapp/model/mergeconflict.txt new file mode 100644 index 0000000..9508518 --- /dev/null +++ b/app/src/main/java/com/project/newsapp/model/mergeconflict.txt @@ -0,0 +1 @@ +merge not possible. From f4e0faa9406a927506f333c5ec95f4e3f2196e18 Mon Sep 17 00:00:00 2001 From: nasimhridoy695 <69071704+nasimhridoy695@users.noreply.github.com> Date: Sat, 11 Mar 2023 23:18:19 +0600 Subject: [PATCH 4/8] Delete mergeconflict.txt --- app/src/main/java/com/project/newsapp/model/mergeconflict.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 app/src/main/java/com/project/newsapp/model/mergeconflict.txt diff --git a/app/src/main/java/com/project/newsapp/model/mergeconflict.txt b/app/src/main/java/com/project/newsapp/model/mergeconflict.txt deleted file mode 100644 index 9508518..0000000 --- a/app/src/main/java/com/project/newsapp/model/mergeconflict.txt +++ /dev/null @@ -1 +0,0 @@ -merge not possible. From 4c70423dabad730801461f69717c30380d87c86d Mon Sep 17 00:00:00 2001 From: nasimhridoy695 <69071704+nasimhridoy695@users.noreply.github.com> Date: Sat, 11 Mar 2023 23:19:10 +0600 Subject: [PATCH 5/8] Create conflict.txt --- app/src/main/java/com/project/newsapp/model/conflict.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/src/main/java/com/project/newsapp/model/conflict.txt diff --git a/app/src/main/java/com/project/newsapp/model/conflict.txt b/app/src/main/java/com/project/newsapp/model/conflict.txt new file mode 100644 index 0000000..c85f045 --- /dev/null +++ b/app/src/main/java/com/project/newsapp/model/conflict.txt @@ -0,0 +1 @@ +merge not possible From 8899cddd42e1be1f0021e0cd4b438cf67c3eca99 Mon Sep 17 00:00:00 2001 From: nasim hridoy Date: Sat, 11 Mar 2023 23:20:20 +0600 Subject: [PATCH 6/8] conflict commited from terminal --- app/src/main/java/com/project/newsapp/model/conflict.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/src/main/java/com/project/newsapp/model/conflict.txt diff --git a/app/src/main/java/com/project/newsapp/model/conflict.txt b/app/src/main/java/com/project/newsapp/model/conflict.txt new file mode 100644 index 0000000..e69de29 From 4fa9dc08eca2b96f57d70881252c9b6012b3c1bb Mon Sep 17 00:00:00 2001 From: nasim hridoy Date: Sat, 11 Mar 2023 23:32:53 +0600 Subject: [PATCH 7/8] commited --- app/src/main/java/com/project/newsapp/model/git2.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/project/newsapp/model/git2.java b/app/src/main/java/com/project/newsapp/model/git2.java index 9491bc3..fa4ab31 100644 --- a/app/src/main/java/com/project/newsapp/model/git2.java +++ b/app/src/main/java/com/project/newsapp/model/git2.java @@ -1,18 +1,18 @@ package com.project.newsapp.model; public class git2 { - String dept; + String dep; public git2(String dept) { - this.dept = dept; + this.dep = dept; } public String getDept() { - return dept; + return dep; } public void setDept(String dept) { - this.dept = dept; + this.dep = dept; } } From 6115610962b816920504ff540be3b008595163ca Mon Sep 17 00:00:00 2001 From: nasim hridoy Date: Sat, 11 Mar 2023 23:41:20 +0600 Subject: [PATCH 8/8] com --- app/src/main/java/com/project/newsapp/model/git2.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/project/newsapp/model/git2.java b/app/src/main/java/com/project/newsapp/model/git2.java index fa4ab31..9491bc3 100644 --- a/app/src/main/java/com/project/newsapp/model/git2.java +++ b/app/src/main/java/com/project/newsapp/model/git2.java @@ -1,18 +1,18 @@ package com.project.newsapp.model; public class git2 { - String dep; + String dept; public git2(String dept) { - this.dep = dept; + this.dept = dept; } public String getDept() { - return dep; + return dept; } public void setDept(String dept) { - this.dep = dept; + this.dept = dept; } }