diff --git a/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Fragments/BaseProfileFragment.java b/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Fragments/BaseProfileFragment.java
index 88b3fca..64be48e 100644
--- a/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Fragments/BaseProfileFragment.java
+++ b/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Fragments/BaseProfileFragment.java
@@ -89,9 +89,9 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
scrollView = baseView.findViewById(R.id.profile_scroll_view);
scrollView.smoothScrollTo(0,0);
- if(cacheManager.getPermissionLevel() != UserPermissionLevel.FHP && cacheManager.getPermissionLevel() != UserPermissionLevel.PROFESSIONAL_STAFF) {
+ //if(cacheManager.getPermissionLevel() != UserPermissionLevel.FHP && cacheManager.getPermissionLevel() != UserPermissionLevel.PROFESSIONAL_STAFF) {
setupCards(baseView);
- }
+ //}
return baseView;
}
diff --git a/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Fragments/FHPProfileFragment.java b/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Fragments/FHPProfileFragment.java
index 4c43400..551d8eb 100644
--- a/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Fragments/FHPProfileFragment.java
+++ b/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Fragments/FHPProfileFragment.java
@@ -56,10 +56,8 @@ protected int getFragmentLayoutId() {
@Override
protected void setupCards(View view) {
- if(cacheManager.getPermissionLevel() != UserPermissionLevel.FHP && cacheManager.getPermissionLevel() != UserPermissionLevel.PROFESSIONAL_STAFF) {
- residentProfileToolbar = new ResidentProfileToolbar(context, view);
- houseCompetitionCard = new HouseCompetitionCard(context, view);
- }
+ residentProfileToolbar = new ResidentProfileToolbar(context, view);
+ houseCompetitionCard = new HouseCompetitionCard(context, view);
}
diff --git a/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Views/ResidentProfileToolbar.java b/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Views/ResidentProfileToolbar.java
index e6341ea..5ae7d83 100644
--- a/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Views/ResidentProfileToolbar.java
+++ b/app/src/main/java/com/hcrpurdue/jason/hcrhousepoints/Views/ResidentProfileToolbar.java
@@ -17,6 +17,10 @@ public class ResidentProfileToolbar {
private TextView userPointTotalTextView;
private TextView userHouseRankTextView;
private TextView semesterRankTextView;
+ private TextView yourPointsTitle;
+ private TextView houseRankTitle;
+ private TextView overallLabel;
+ private TextView semesterLabel;
private final TextView houseNameTextView;
private final ImageView houseImageView;
@@ -33,12 +37,16 @@ public ResidentProfileToolbar(Context context, View parentView) {
System.out.println("INIT TOOLBAR");
this.cacheManager = CacheManager.getInstance(context);
houseNameTextView = parentView.findViewById(R.id.house_name_text_view);
- if (cacheManager.getPermissionLevel() != UserPermissionLevel.FHP || cacheManager.getPermissionLevel() != UserPermissionLevel.PROFESSIONAL_STAFF) {
+ //not needed if (cacheManager.getPermissionLevel() != UserPermissionLevel.FHP && cacheManager.getPermissionLevel() != UserPermissionLevel.PROFESSIONAL_STAFF) {
userPointTotalTextView = parentView.findViewById(R.id.your_points_text_view);
userHouseRankTextView = parentView.findViewById(R.id.house_rank_text_view);
semesterRankTextView = parentView.findViewById(R.id.semester_rank_text_view);
- }
+ //}
+ yourPointsTitle = parentView.findViewById(R.id.CONSTANT_TOTAL_POINTS);
+ houseRankTitle = parentView.findViewById(R.id.CONSTANT_TOTAL_POINTS2);
+ overallLabel = parentView.findViewById(R.id.CONSTANT_HOUSE_RANK);
+ semesterLabel = parentView.findViewById(R.id.CONSTANT_SEMESTER_RANK);
houseImageView = parentView.findViewById(R.id.profile_house_image_view);
this.context = context;
@@ -46,7 +54,7 @@ public ResidentProfileToolbar(Context context, View parentView) {
this.resources = context.getResources();
this.packageName = context.getPackageName();
imageCacheManager = ImageCacheManager.getInstance();
- if (cacheManager.getPermissionLevel() != UserPermissionLevel.FHP || cacheManager.getPermissionLevel() != UserPermissionLevel.PROFESSIONAL_STAFF) {
+ if (cacheManager.getPermissionLevel() != UserPermissionLevel.FHP && cacheManager.getPermissionLevel() != UserPermissionLevel.PROFESSIONAL_STAFF) {
refreshRank();
}
@@ -70,6 +78,14 @@ private void populateTopBar() {
userPointTotalTextView.setText(userPointsText);
userHouseRankTextView.setText(houseRankText);
semesterRankTextView.setText(semesterRankText);
+ } else {
+ yourPointsTitle.setVisibility(View.INVISIBLE);
+ houseRankTitle.setVisibility(View.INVISIBLE);
+ overallLabel.setVisibility(View.INVISIBLE);
+ semesterLabel.setVisibility(View.INVISIBLE);
+ userPointTotalTextView.setVisibility(View.INVISIBLE);
+ userHouseRankTextView.setVisibility(View.INVISIBLE);
+ semesterRankTextView.setVisibility(View.INVISIBLE);
}
if (cacheManager.getUserHouse() != null && cacheManager.getUserHouse().getDownloadURL() != null) {
diff --git a/app/src/main/res/layout/fragment_fhp_profile.xml b/app/src/main/res/layout/fragment_fhp_profile.xml
index 6337de2..8d08705 100644
--- a/app/src/main/res/layout/fragment_fhp_profile.xml
+++ b/app/src/main/res/layout/fragment_fhp_profile.xml
@@ -7,7 +7,14 @@
+ layout="@layout/toolbar_profile"
+ android:layout_width="0dp"
+ android:layout_height="93dp"
+ android:layout_marginStart="1dp"
+ android:layout_marginEnd="1dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />