bugfix, layout improvements

app/src/main/java/com/keylesspalace/tusky/AccountActivity.java

@@ -166,7 +166,7 @@ public class AccountActivity extends BaseActivity implements ActionButtonActivit
                     ThemeUtils.setDrawableTint(context, toolbar.getOverflowIcon(), attribute);
                 }
 
-                if(floatingBtn != null && hideFab) {
+                if(floatingBtn != null && hideFab && !isSelf && !blocking) {
                     if (verticalOffset > oldOffset) {
                         floatingBtn.show();
                     }
@@ -367,10 +367,6 @@ public class AccountActivity extends BaseActivity implements ActionButtonActivit
         this.blocking = relation.blocking;
         this.muting = relation.muting;
 
-        if (followState != FollowState.NOT_FOLLOWING || !blocking || !muting) {
-            invalidateOptionsMenu();
-        }
-
         if(relation.followedBy) {
             followsYouView.setVisibility(View.VISIBLE);
         } else {
@@ -424,6 +420,9 @@ public class AccountActivity extends BaseActivity implements ActionButtonActivit
                     updateFollowButton(followBtn);
                 }
             });
+        } else {
+            floatingBtn.hide();
+            followBtn.setVisibility(View.GONE);
         }
     }
 
@@ -668,7 +667,10 @@ public class AccountActivity extends BaseActivity implements ActionButtonActivit
     @Nullable
     @Override
     public FloatingActionButton getActionButton() {
+        if(!isSelf && !blocking) {
             return floatingBtn;
         }
+        return null;
+    }
 
 }

app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java

@@ -178,15 +178,16 @@ public class AccountListFragment extends BaseFragment implements AccountActionLi
         if (actionButtonPresent()) {
             /* Use a modified scroll listener that both loads more statuses as it goes, and hides
              * the follow button on down-scroll. */
-            ActionButtonActivity actionButtonActivity = (ActionButtonActivity) getActivity();
+            SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
-            final FloatingActionButton composeButton = actionButtonActivity.getActionButton();
-            final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
             hideFab = preferences.getBoolean("fabHide", false);
             scrollListener = new EndlessOnScrollListener(layoutManager) {
                 @Override
                 public void onScrolled(RecyclerView view, int dx, int dy) {
                     super.onScrolled(view, dx, dy);
 
+                    ActionButtonActivity actionButtonActivity = (ActionButtonActivity) getActivity();
+                    FloatingActionButton composeButton = actionButtonActivity.getActionButton();
+
                     if (composeButton != null) {
                         if (hideFab) {
                             if (dy > 0 && composeButton.isShown()) {

app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java

@@ -40,6 +40,7 @@ import com.keylesspalace.tusky.adapter.NotificationsAdapter;
 import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.entity.Notification;
 import com.keylesspalace.tusky.entity.Status;
+import com.keylesspalace.tusky.interfaces.ActionButtonActivity;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.receiver.TimelineReceiver;
 import com.keylesspalace.tusky.util.HttpHeaderLink;
@@ -172,9 +173,7 @@ public class NotificationsFragment extends SFragment implements
          * guaranteed to be set until then.
          * Use a modified scroll listener that both loads more notifications as it goes, and hides
          * the compose button on down-scroll. */
-        final FloatingActionButton composeButton = activity.getActionButton();
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(
-                activity);
         preferences.registerOnSharedPreferenceChangeListener(this);
         hideFab = preferences.getBoolean("fabHide", false);
         scrollListener = new EndlessOnScrollListener(layoutManager) {
@@ -182,6 +181,9 @@ public class NotificationsFragment extends SFragment implements
             public void onScrolled(RecyclerView view, int dx, int dy) {
                 super.onScrolled(view, dx, dy);
 
+                ActionButtonActivity activity = (ActionButtonActivity) getActivity();
+                FloatingActionButton composeButton = activity.getActionButton();
+
                 if(composeButton != null) {
                     if (hideFab) {
                         if (dy > 0 && composeButton.isShown()) {

app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java

@@ -198,15 +198,16 @@ public class TimelineFragment extends SFragment implements
         if (actionButtonPresent()) {
             /* Use a modified scroll listener that both loads more statuses as it goes, and hides
              * the follow button on down-scroll. */
-            ActionButtonActivity activity = (ActionButtonActivity) getActivity();
+            SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
-            final FloatingActionButton composeButton = activity.getActionButton();
-            final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
             hideFab = preferences.getBoolean("fabHide", false);
             scrollListener = new EndlessOnScrollListener(layoutManager) {
                 @Override
                 public void onScrolled(RecyclerView view, int dx, int dy) {
                     super.onScrolled(view, dx, dy);
 
+                    ActionButtonActivity activity = (ActionButtonActivity) getActivity();
+                    FloatingActionButton composeButton = activity.getActionButton();
+
                     if (composeButton != null) {
                         if (hideFab) {
                             if (dy > 0 && composeButton.isShown()) {

app/src/main/java/com/keylesspalace/tusky/interfaces/ActionButtonActivity.java

@@ -19,6 +19,8 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
 
 public interface ActionButtonActivity {
+
+    /* return the ActionButton of the Activity to hide or show it on scroll */
     @Nullable
     FloatingActionButton getActionButton();
 }

app/src/main/res/layout/activity_account.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_account"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -39,21 +40,16 @@
                     android:scaleType="centerCrop"
                     app:layout_collapseMode="pin" />
 
-                <LinearLayout
+                <RelativeLayout
                     android:id="@+id/account_header_info"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/account_header_gradient"
-                    android:orientation="vertical"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
                     android:paddingTop="?attr/actionBarSize"
                     app:layout_collapseMode="parallax">
 
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingLeft="16dp"
-                        android:paddingRight="16dp">
-
                     <com.pkmmte.view.CircularImageView
                         android:id="@+id/account_avatar"
                         android:layout_width="80dp"
@@ -96,7 +92,8 @@
                         android:maxLines="1"
                         android:textColor="?android:textColorPrimary"
                         android:textSize="18sp"
-                            android:textStyle="normal|bold" />
+                        android:textStyle="normal|bold"
+                        tools:text="Tusky Mastodon Client" />
 
                     <TextView
                         android:id="@+id/account_username"
@@ -105,13 +102,14 @@
                         android:layout_below="@id/account_display_name"
                         android:ellipsize="end"
                         android:maxLines="1"
-                            android:textColor="?android:textColorSecondary" />
+                        android:textColor="?android:textColorSecondary"
+                        tools:text="\@Tusky" />
 
                     <ImageView
                         android:id="@+id/account_locked"
                         android:layout_width="16sp"
                         android:layout_height="16sp"
-                            android:layout_alignBaseline="@+id/account_username"
+                        android:layout_alignBottom="@id/account_username"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="4dp"
                         android:layout_marginStart="4dp"
@@ -122,17 +120,17 @@
                         android:visibility="gone"
                         app:srcCompat="@drawable/reblog_disabled_light" />
 
-                    </RelativeLayout>
-
                     <TextView
                         android:id="@+id/account_note"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:padding="16dp"
+                        android:layout_below="@id/account_username"
+                        android:paddingBottom="16dp"
                         android:paddingTop="10dp"
-                        android:textColor="?android:textColorTertiary" />
+                        android:textColor="?android:textColorTertiary"
+                        tools:text="This is a test description" />
 
-                </LinearLayout>
+                </RelativeLayout>
 
             </RelativeLayout>
 
@@ -179,11 +177,6 @@
 
     </android.support.v4.view.ViewPager>
 
-    <FrameLayout
-        android:id="@+id/overlay_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <View
         android:id="@+id/tab_bottom_shadow"
         android:layout_width="match_parent"
@@ -202,4 +195,9 @@
         android:contentDescription="@string/action_mention"
         app:srcCompat="@drawable/ic_create_24dp" />
 
+    <FrameLayout
+        android:id="@+id/overlay_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
 </android.support.design.widget.CoordinatorLayout>