diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt index 2d25e0da..edc4dcfb 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt @@ -210,6 +210,8 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide */ private fun setupAccountViews() { // Initialise the default UI states. + binding.accountAdminTextView.hide() + binding.accountModeratorTextView.hide() binding.accountFloatingActionButton.hide() binding.accountFollowButton.hide() binding.accountMuteButton.hide() @@ -478,6 +480,8 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide binding.accountLockedImageView.visible(account.locked) binding.accountBadgeTextView.visible(account.bot) + binding.accountAdminTextView.visible(account.pleroma?.isAdmin ?: false) + binding.accountModeratorTextView.visible(account.pleroma?.isModerator ?: false) updateAccountAvatar() updateToolbar() diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt index 43b9bd9c..ad3afcd9 100644 --- a/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt +++ b/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt @@ -36,8 +36,8 @@ data class Account( val bot: Boolean = false, val emojis: List? = emptyList(), // nullable for backward compatibility val fields: List? = emptyList(), // nullable for backward compatibility - val moved: Account? = null - + val moved: Account? = null, + val pleroma: PleromaAccount? = null, ) { val name: String @@ -48,6 +48,11 @@ data class Account( } fun isRemote(): Boolean = this.username != this.localUsername + + data class PleromaAccount( + @SerializedName("is_admin") val isAdmin: Boolean?, + @SerializedName("is_moderator") val isModerator: Boolean?, + ) } data class AccountSource( diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml index 9b6d4f81..9a984574 100644 --- a/app/src/main/res/layout/activity_account.xml +++ b/app/src/main/res/layout/activity_account.xml @@ -153,6 +153,32 @@ app:tint="?android:textColorSecondary" tools:visibility="visible" /> + + + + + app:constraint_referenced_ids="accountAdminTextView,accountModeratorTextView,accountFollowsYouTextView,accountBadgeTextView" /> Enable bigger custom emojis + Admin + Moderator + \ No newline at end of file