Merge pull request #6056 from nextcloud/fixHideFab

Fix fab behavior hide and ripple color

src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -54,6 +54,7 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.nextcloud.client.account.UserAccountManager;
@@ -85,6 +86,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.SearchView;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
@@ -381,7 +383,8 @@ public class ExtendedListFragment extends Fragment implements
         mSwitchGridViewButton = v.findViewById(R.id.switch_grid_view_button);
 
         mFabMain = v.findViewById(R.id.fab_main);
-        ThemeUtils.tintFloatingActionButton(mFabMain, R.drawable.ic_plus, getContext());
+        ThemeUtils.tintFloatingActionButton(mFabMain, requireContext());
+        ThemeUtils.drawableFloatingActionButton(mFabMain, R.drawable.ic_plus, requireContext());
 
         return v;
     }
@@ -584,16 +587,39 @@ public class ExtendedListFragment extends Fragment implements
             getActivity().runOnUiThread(() -> {
                 if (visible) {
                     mFabMain.show();
-                    int primaryColor = ThemeUtils.primaryColor(getContext());
-                    mFabMain.setBackgroundTintList(ColorStateList.valueOf(primaryColor));
-                    mFabMain.setRippleColor(primaryColor);
+                    ThemeUtils.tintFloatingActionButton(mFabMain, requireContext());
                 } else {
                     mFabMain.hide();
                 }
+
+                showFabWithBehavior(visible);
             });
         }
     }
 
+    /**
+     * Remove this, if HideBottomViewOnScrollBehavior is fix by Google
+     *
+     * @param visible
+     */
+    private void showFabWithBehavior(boolean visible) {
+        ViewGroup.LayoutParams layoutParams = mFabMain.getLayoutParams();
+        if (layoutParams instanceof CoordinatorLayout.LayoutParams) {
+            CoordinatorLayout.Behavior coordinatorLayoutBehavior =
+                ((CoordinatorLayout.LayoutParams) layoutParams).getBehavior();
+            if (coordinatorLayoutBehavior instanceof HideBottomViewOnScrollBehavior) {
+                @SuppressWarnings("unchecked")
+                HideBottomViewOnScrollBehavior<FloatingActionButton> behavior =
+                    (HideBottomViewOnScrollBehavior<FloatingActionButton>) coordinatorLayoutBehavior;
+                if (visible) {
+                    behavior.slideUp(mFabMain);
+                } else {
+                    behavior.slideDown(mFabMain);
+                }
+            }
+        }
+    }
+
     /**
      * Sets the 'visibility' state of the FAB contained in the fragment.
      * <p>
@@ -606,9 +632,7 @@ public class ExtendedListFragment extends Fragment implements
             getActivity().runOnUiThread(() -> {
                 if (enabled) {
                     mFabMain.setEnabled(true);
-                    int primaryColor = ThemeUtils.primaryColor(getContext());
-                    mFabMain.setBackgroundTintList(ColorStateList.valueOf(primaryColor));
-                    mFabMain.setRippleColor(primaryColor);
+                    ThemeUtils.tintFloatingActionButton(mFabMain, requireContext());
                 } else {
                     mFabMain.setEnabled(false);
                     mFabMain.setBackgroundTintList(ColorStateList.valueOf(Color.GRAY));
@@ -680,12 +704,10 @@ public class ExtendedListFragment extends Fragment implements
             public void run() {
 
                 if (searchType == SearchType.NO_SEARCH) {
-                    setMessageForEmptyList(
-                        R.string.file_list_empty_headline,
-                        R.string.file_list_empty,
-                        R.drawable.ic_list_empty_folder,
-                        true
-                    );
+                    setMessageForEmptyList(R.string.file_list_empty_headline,
+                                           R.string.file_list_empty,
+                                           R.drawable.ic_list_empty_folder,
+                                           true);
                 } else if (searchType == SearchType.FILE_SEARCH) {
                     setMessageForEmptyList(R.string.file_list_empty_headline_server_search,
                                            R.string.file_list_empty,

src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java

@@ -113,7 +113,8 @@ public class PreviewTextStringFragment extends PreviewTextFragment {
             fabMain.setVisibility(View.VISIBLE);
             fabMain.setEnabled(true);
             fabMain.setOnClickListener(v -> edit());
-            ThemeUtils.tintFloatingActionButton(fabMain, R.drawable.ic_edit, getContext());
+            ThemeUtils.tintFloatingActionButton(fabMain, requireContext());
+            ThemeUtils.drawableFloatingActionButton(fabMain, R.drawable.ic_edit, requireContext());
         }
 
         return view;

src/main/java/com/owncloud/android/utils/ThemeUtils.java

@@ -628,10 +628,13 @@ public final class ThemeUtils {
         return String.format("#%06X", 0xFFFFFF & color);
     }
 
-    public static void tintFloatingActionButton(FloatingActionButton button, @DrawableRes int
-        drawable, Context context) {
+    public static void tintFloatingActionButton(FloatingActionButton button, Context context) {
         button.setBackgroundTintList(ColorStateList.valueOf(ThemeUtils.primaryColor(context)));
         button.setRippleColor(ThemeUtils.primaryDarkColor(context));
+    }
+
+    public static void drawableFloatingActionButton(FloatingActionButton button, @DrawableRes int
+        drawable, Context context) {
         button.setImageDrawable(ThemeUtils.tintDrawable(drawable, ThemeUtils.fontColor(context)));
     }