From 7a542dfac9fe5e3651449d22631a07719ebf1a8b Mon Sep 17 00:00:00 2001
From: DevanshBatra20 <devanshbatra15@gmail.com>
Date: Mon, 8 Nov 2021 15:59:19 +0530
Subject: [PATCH 1/2] Added new position in council activity

---
 .idea/gradle.xml                              |  3 +-
 .idea/misc.xml                                |  7 ++++
 .idea/runConfigurations.xml                   | 12 -------
 app/src/main/AndroidManifest.xml              |  3 +-
 .../acm/omnia/fragment/CouncilFragment.java   |  4 ++-
 app/src/main/res/layout/fragment_council.xml  | 32 +++++++++++++++++++
 origin                                        |  0
 7 files changed, 45 insertions(+), 16 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml
 create mode 100644 origin

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 23a89bb..2c7e034 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <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="1.8" />
@@ -15,7 +15,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec..bf03ac4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/App_Dev/ACM-Omnia/app/src/main/res/layout/fragment_council.xml" value="0.1" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
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/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 210f3fb..156ec2f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,7 +31,8 @@
             android:screenOrientation="portrait"/>
         <activity
             android:name=".activity.MainActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait" >
+        </activity>
         <service
             android:name="com.google.firebase.messaging.FirebaseMessagingService"
             android:exported="false">
diff --git a/app/src/main/java/com/acm/omnia/fragment/CouncilFragment.java b/app/src/main/java/com/acm/omnia/fragment/CouncilFragment.java
index d7ae218..606aff1 100644
--- a/app/src/main/java/com/acm/omnia/fragment/CouncilFragment.java
+++ b/app/src/main/java/com/acm/omnia/fragment/CouncilFragment.java
@@ -30,7 +30,7 @@ public CouncilFragment() {
     Toolbar toolbar;
     DrawerLayout drawerLayout;
     FirebaseFirestore db = FirebaseFirestore.getInstance();
-    ImageView imgChair, imgViceChair, imgSecretary, imgTreasurer, imgWebmaster, imgMemberChair;
+    ImageView imgChair, imgViceChair, imgSecretary, imgTreasurer, imgWebmaster, imgMemberChair, imgTechnicalHead;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -43,6 +43,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         imgTreasurer = view.findViewById(R.id.imgTreasurer);
         imgWebmaster = view.findViewById(R.id.imgWebmaster);
         imgMemberChair = view.findViewById(R.id.imgMemberChair);
+        imgTechnicalHead = view.findViewById(R.id.imgTechnicalHead);
         setupToolbar();
         setupCouncilImages();
         return view;
@@ -62,6 +63,7 @@ public void onComplete(@NonNull Task<DocumentSnapshot> task) {
                         Picasso.get().load(document.getString("treasurer")).into(imgTreasurer);
                         Picasso.get().load(document.getString("webmaster")).into(imgWebmaster);
                         Picasso.get().load(document.getString("secretary")).into(imgSecretary);
+                        Picasso.get().load(document.getString("technicalHead")).into(imgTechnicalHead);
                     }
                 }
             }
diff --git a/app/src/main/res/layout/fragment_council.xml b/app/src/main/res/layout/fragment_council.xml
index 7c7f2c2..001fcda 100644
--- a/app/src/main/res/layout/fragment_council.xml
+++ b/app/src/main/res/layout/fragment_council.xml
@@ -250,6 +250,38 @@
 
                 </RelativeLayout>
 
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="200dp"
+                    android:layout_gravity="start">
+
+                    <de.hdodenhof.circleimageview.CircleImageView
+                        android:id="@+id/imgTechnicalHead"
+                        android:layout_width="180dp"
+                        android:layout_height="180dp"
+                        android:src="@drawable/blug_council" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Technical Head"
+                        android:layout_alignParentBottom="true"
+                        android:textColor="@android:color/white"
+                        android:layout_gravity="bottom"
+                        android:textSize="18sp"
+                        android:textAllCaps="true"
+                        android:textStyle="bold"
+                        android:layout_marginBottom="20dp"
+                        android:fontFamily="@font/montserrat_medium" />
+
+                    <ImageView
+                        android:layout_width="70dp"
+                        android:layout_height="70dp"
+                        android:layout_alignEnd="@id/imgTechnicalHead"
+                        android:src="@drawable/ring"/>
+
+                </RelativeLayout>
+
             </LinearLayout>
 
         </androidx.core.widget.NestedScrollView>
diff --git a/origin b/origin
new file mode 100644
index 0000000..e69de29

From 2e7bb2b30b96e826e08b7f49db31a879fb9f02b0 Mon Sep 17 00:00:00 2001
From: Dev Tyagi <56474716+devptyagi@users.noreply.github.com>
Date: Sat, 25 Dec 2021 23:32:47 +0530
Subject: [PATCH 2/2] Delete misc.xml

---
 .idea/misc.xml | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 .idea/misc.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index bf03ac4..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="..\:/App_Dev/ACM-Omnia/app/src/main/res/layout/fragment_council.xml" value="0.1" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" 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