Merge pull request #6715 from nextcloud/fabOnSharing

hide FAB on sharing view

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -49,6 +49,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewTreeObserver;
 
+import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.snackbar.Snackbar;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.appinfo.AppInfo;
@@ -1557,11 +1558,27 @@ public class FileDisplayActivity extends FileActivity
         User currentUser = getUser().orElseThrow(RuntimeException::new);
         Fragment detailFragment = FileDetailFragment.newInstance(file, currentUser, activeTab);
         setSecondFragment(detailFragment);
+
+        OCFileListFragment listOfFiles = getListOfFilesFragment();
+        if (listOfFiles != null) {
+            resetHeaderScrollingState();
+            showSortListGroup(false);
+            listOfFiles.setFabVisible(false);
+        }
+
         updateFragmentsVisibility(true);
         updateActionBarTitleAndHomeButton(file);
         setFile(file);
     }
 
+    private void resetHeaderScrollingState() {
+        AppBarLayout appBarLayout = findViewById(R.id.appbar);
+
+        if (appBarLayout != null) {
+            appBarLayout.setExpanded(true);
+        }
+    }
+
     @Override
     public void updateActionBarTitleAndHomeButton(OCFile chosenFile) {
         if (chosenFile == null) {

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

@@ -1125,10 +1125,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
                         mActiveActionMode.finish();
                     }
 
-                    resetHeaderScrollingState();
-
                     mContainerActivity.showDetails(singleFile);
-                    setFabVisible(false);
                     mContainerActivity.showSortListGroup(false);
                     return true;
                 }