Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Add FAB to self account view (#3067) 

Fixes 3058
This commit is contained in:
Eric Frohnhoefer 2022-12-30 02:22:01 -08:00 committed by GitHub
parent c7254bfc19
commit 65e95a7858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
View File

@ -318,7 +318,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
supportActionBar?.setDisplayShowTitleEnabled(false)
}
if (hideFab && !viewModel.isSelf && !blocking) {
if (hideFab && !blocking) {
if (verticalOffset > oldOffset) {
binding.accountFloatingActionButton.show()
}
@ -665,7 +665,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
binding.accountFollowButton.show()
updateFollowButton()
if (blocking || viewModel.isSelf) {
if (blocking) {
binding.accountFloatingActionButton.hide()
binding.accountMuteButton.hide()
binding.accountSubscribeButton.hide()
@ -810,10 +810,12 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
private fun mention() {
loadedAccount?.let {
val intent = ComposeActivity.startIntent(
this,
val options = if (viewModel.isSelf) {
ComposeActivity.ComposeOptions()
} else {
ComposeActivity.ComposeOptions(mentionedUsernames = setOf(it.username))
)
}
val intent = ComposeActivity.startIntent(this, options)
startActivity(intent)
}
}
@ -885,7 +887,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
}
override fun getActionButton(): FloatingActionButton? {
return if (!viewModel.isSelf && !blocking) {
return if (!blocking) {
binding.accountFloatingActionButton
} else null
}