From 9b6e4e9b2864eec367fe5cb03cebbb9b46c374bc Mon Sep 17 00:00:00 2001
From: Abdus Shafi <abdusshsfi99@gmail.com>
Date: Thu, 18 Nov 2021 01:32:56 +0600
Subject: [PATCH 1/3] master branch commit

---
 .idea/compiler.xml                            |  2 +-
 .idea/gradle.xml                              |  4 +++-
 .idea/misc.xml                                |  2 +-
 .idea/runConfigurations.xml                   | 10 --------
 .../multiple_screens_appjava/class1.java      | 24 +++++++++++++++++++
 5 files changed, 29 insertions(+), 13 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml
 create mode 100644 app/src/main/java/com/example/multiple_screens_appjava/class1.java

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b73660a..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="15" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 440480e..35ffc65 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,11 +1,13 @@
 <?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="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$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2484353..1b6dac9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15_PREVIEW" default="false" project-jdk-name="15" project-jdk-type="JavaSDK">
+  <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 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/multiple_screens_appjava/class1.java b/app/src/main/java/com/example/multiple_screens_appjava/class1.java
new file mode 100644
index 0000000..7f06683
--- /dev/null
+++ b/app/src/main/java/com/example/multiple_screens_appjava/class1.java
@@ -0,0 +1,24 @@
+package com.example.multiple_screens_appjava;
+
+public class class1 {
+
+    int a,b;
+    public class1() {
+    }
+
+    public int getA() {
+        return a;
+    }
+
+    public int getB() {
+        return b;
+    }
+
+    public void setA(int a) {
+        this.a = a;
+    }
+
+    public void setB(int b) {
+        this.b = b;
+    }
+}

From 618064dbbe7cfbf78f4e69d7d121a4e0be15aa08 Mon Sep 17 00:00:00 2001
From: Abdus Shafi <abdusshsfi99@gmail.com>
Date: Thu, 18 Nov 2021 01:40:12 +0600
Subject: [PATCH 2/3] Branch 2 text file

---
 readme.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 readme.txt

diff --git a/readme.txt b/readme.txt
new file mode 100644
index 0000000..e69de29

From dd3b6a451331a7f7fba9aea1b6050e7954de85e7 Mon Sep 17 00:00:00 2001
From: Shafi056 <78344997+Shafi056@users.noreply.github.com>
Date: Thu, 18 Nov 2021 01:49:50 +0600
Subject: [PATCH 3/3] Commit in Branch2

Commit in Branch2
---
 .../com/example/multiple_screens_appjava/class1.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/multiple_screens_appjava/class1.java b/app/src/main/java/com/example/multiple_screens_appjava/class1.java
index 7f06683..3b3185d 100644
--- a/app/src/main/java/com/example/multiple_screens_appjava/class1.java
+++ b/app/src/main/java/com/example/multiple_screens_appjava/class1.java
@@ -2,7 +2,7 @@
 
 public class class1 {
 
-    int a,b;
+    int a,b,x,y;
     public class1() {
     }
 
@@ -13,6 +13,14 @@ public int getA() {
     public int getB() {
         return b;
     }
+    
+    public int getX() {
+        return x;
+    }
+    
+    public int getY() {
+        return y;
+    }
 
     public void setA(int a) {
         this.a = a;