Merge branch 'theZacAttacks-FAB_fix'
This commit is contained in:
commit
19e1746049
@ -44,6 +44,7 @@ dependencies {
|
||||
compile 'com.jakewharton:butterknife:8.4.0'
|
||||
compile 'com.google.firebase:firebase-messaging: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'
|
||||
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
|
||||
}
|
||||
|
@ -292,7 +292,7 @@ public class AccountActivity extends BaseActivity {
|
||||
private void updateButtons() {
|
||||
invalidateOptionsMenu();
|
||||
|
||||
FloatingActionButton floatingBtn = (FloatingActionButton) findViewById(R.id.floating_btn);
|
||||
final FloatingActionButton floatingBtn = (FloatingActionButton) findViewById(R.id.floating_btn);
|
||||
|
||||
if(!isSelf && !blocking && !following) {
|
||||
floatingBtn.show();
|
||||
@ -301,6 +301,7 @@ public class AccountActivity extends BaseActivity {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
follow(accountId);
|
||||
floatingBtn.hide();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user