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 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index d5d35ec..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file 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 @@ - - - - - - \ 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"/> + android:screenOrientation="portrait" > + 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 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 @@ + + + + + + + + + + diff --git a/origin b/origin new file mode 100644 index 0000000..e69de29