Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added new position in council activity #3

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions .idea/misc.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
Expand All @@ -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);
}
}
}
Expand Down
32 changes: 32 additions & 0 deletions app/src/main/res/layout/fragment_council.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Empty file added origin
Empty file.