From 82ab2d9cf657d17e3cad910dc3d4fd22642d5828 Mon Sep 17 00:00:00 2001 From: Hafiz Date: Thu, 25 May 2023 03:23:19 -0400 Subject: [PATCH] Hide choose class if not current user profile --- .../android/habitica/ui/activities/FullProfileActivity.kt | 6 +++++- .../com/habitrpg/android/habitica/ui/views/AppHeaderView.kt | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt index c0d3aabbb..7d041d774 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt @@ -104,7 +104,7 @@ class FullProfileActivity : BaseActivity() { binding.avatarWithBars.setContent { HabiticaTheme { - AppHeaderView(member.value) { + AppHeaderView(member.value, isMyProfile = isMyProfile()) { } } } @@ -145,6 +145,10 @@ class FullProfileActivity : BaseActivity() { invalidateOptionsMenu() } } + + if (!isMyProfile()) { + + } } private suspend fun refresh() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt index 0c720238f..ddd694b8e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt @@ -104,9 +104,10 @@ fun getTranslatedClassName(resources : Resources, className : String?) : String fun AppHeaderView( user : Avatar?, modifier : Modifier = Modifier, + isMyProfile : Boolean = false, teamPlan : TeamPlan? = null, teamPlanMembers : List? = null, - onMemberRowClicked : () -> Unit + onMemberRowClicked : () -> Unit, ) { Column(modifier) { Row { @@ -175,7 +176,7 @@ fun AppHeaderView( disabled = true, modifier = Modifier.weight(1f) ) - } else if (user?.preferences?.disableClasses != true && user?.flags?.classSelected == false) { + } else if (user?.preferences?.disableClasses != true && user?.flags?.classSelected == false && isMyProfile) { HabiticaButton( background = HabiticaTheme.colors.basicButtonColor(), color = MaterialTheme.colors.onPrimary,