From 7b6e3719c1dcdab479859290627ab9f0fb417a11 Mon Sep 17 00:00:00 2001
From: RAKIB <rakib1807025@stud.kuet.ac.bd>
Date: Tue, 10 May 2022 23:30:34 +0600
Subject: [PATCH] java class added from branch b1

---
 .idea/compiler.xml                            |  6 +++++
 .idea/gradle.xml                              |  4 ++--
 .idea/misc.xml                                |  9 +++++++-
 .idea/runConfigurations.xml                   | 12 ----------
 .idea/vcs.xml                                 |  1 +
 Elegant_Calculator                            |  1 +
 .../java/branch/sample_branch_b1.java         |  8 +++++++
 app/src/main/java/master/master.java          | 23 +++++++++++++++++++
 8 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/runConfigurations.xml
 create mode 160000 Elegant_Calculator
 create mode 100644 app/src/androidTest/java/branch/sample_branch_b1.java
 create mode 100644 app/src/main/java/master/master.java

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..fb7f4a8
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..a0de2a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,16 +4,16 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 37a7509..0f21c7c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/GIT lab/Elegant_Calculator/app/src/main/res/layout/activity_main.xml" value="0.17708333333333334" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..bdb1927 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Elegant_Calculator" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Elegant_Calculator b/Elegant_Calculator
new file mode 160000
index 0000000..d02c9ea
--- /dev/null
+++ b/Elegant_Calculator
@@ -0,0 +1 @@
+Subproject commit d02c9eafa3cd39180ec74a2b695a4a6e041d7d21
diff --git a/app/src/androidTest/java/branch/sample_branch_b1.java b/app/src/androidTest/java/branch/sample_branch_b1.java
new file mode 100644
index 0000000..b8ad036
--- /dev/null
+++ b/app/src/androidTest/java/branch/sample_branch_b1.java
@@ -0,0 +1,8 @@
+package branch;
+
+public class sample_branch_b1
+{
+    String name, id;
+    float cgpa;
+    
+}
\ No newline at end of file
diff --git a/app/src/main/java/master/master.java b/app/src/main/java/master/master.java
new file mode 100644
index 0000000..a1a393c
--- /dev/null
+++ b/app/src/main/java/master/master.java
@@ -0,0 +1,23 @@
+package master;
+
+public class master {
+    int roll;
+    String name;
+    master(String a, int r)
+    {
+        this.name=a;
+        this.roll=r;
+    }
+
+    public int getRoll() {
+        return roll;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}