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

Merge branch 'FAB_fix' of https://github.com/theZacAttacks/Tusky into theZacAttacks-FAB_fix

This commit is contained in:
Vavassor 2017-04-06 03:18:58 -04:00
parent cafe9edfd4 42d6b0a01e
commit 4deb0b3b84
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@ -44,6 +44,7 @@ dependencies {
compile 'com.jakewharton:butterknife:8.4.0' compile 'com.jakewharton:butterknife:8.4.0'
compile 'com.google.firebase:firebase-messaging:10.0.1' compile 'com.google.firebase:firebase-messaging:10.0.1'
compile 'com.google.firebase:firebase-crash:10.0.1' compile 'com.google.firebase:firebase-crash:10.0.1'
compile 'com.github.bluzwong:swipeback:0.2.0@aar'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
} }

3
app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
View File

@ -292,7 +292,7 @@ public class AccountActivity extends BaseActivity {
private void updateButtons() { private void updateButtons() {
invalidateOptionsMenu(); invalidateOptionsMenu();
FloatingActionButton floatingBtn = (FloatingActionButton) findViewById(R.id.floating_btn); final FloatingActionButton floatingBtn = (FloatingActionButton) findViewById(R.id.floating_btn);
if(!isSelf && !blocking && !following) { if(!isSelf && !blocking && !following) {
floatingBtn.show(); floatingBtn.show();
@ -301,6 +301,7 @@ public class AccountActivity extends BaseActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
follow(accountId); follow(accountId);
floatingBtn.hide();
} }
}); });
} }