mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-05-19 20:29:02 +00:00
Merge pull request #1988 from Hafizzle/Fiz/check-is-users-profile-choose-class
Hide "Choose Class" if not current users profile
This commit is contained in:
commit
9356d68dce
2 changed files with 8 additions and 3 deletions
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -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<Member>? = 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,
|
||||
|
|
|
|||
Loading…
Reference in a new issue