Merge pull request #6441 from nextcloud/previewText

fix wrong show of sort/list group and FAB in details or text preview

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

@@ -1046,6 +1046,8 @@ public class FileDisplayActivity extends FileActivity
             }
             if (listOfFiles != null) {  // should never be null, indeed
                 setFile(listOfFiles.getCurrentFile());
+                listOfFiles.setFabVisible(true);
+                showSortListGroup(true);
             }
             cleanSecondFragment();
         }
@@ -2159,6 +2161,7 @@ public class FileDisplayActivity extends FileActivity
      */
     public void startTextPreview(OCFile file, boolean showPreview) {
         if (showPreview) {
+            showSortListGroup(false);
             Bundle args = new Bundle();
             args.putParcelable(EXTRA_FILE, file);
             args.putParcelable(EXTRA_ACCOUNT, getAccount());

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

@@ -246,6 +246,10 @@ public abstract class ToolbarActivity extends BaseActivity {
         setPreviewImageVisibility(false);
     }
 
+    public void showSortListGroup(boolean show) {
+        findViewById(R.id.sort_list_button_group).setVisibility(show ? View.VISIBLE : View.GONE);
+    }
+
     /**
      * Change the bitmap for the toolbar's preview image.
      *

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

@@ -171,6 +171,7 @@ public class FileFragment extends Fragment {
          */
         void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading);
 
+        void showSortListGroup(boolean show);
     }
 
 }

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

@@ -123,7 +123,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.core.content.ContextCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.GridLayoutManager;
@@ -994,6 +993,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
                     } else if (file.isDown() && MimeTypeUtil.isVCard(file)) {
                         ((FileDisplayActivity) mContainerActivity).startContactListFragment(file);
                     } else if (PreviewTextFileFragment.canBePreviewed(file)) {
+                        setFabVisible(false);
                         ((FileDisplayActivity) mContainerActivity).startTextPreview(file, false);
                     } else if (file.isDown()) {
                         if (PreviewMediaFragment.canBePreviewed(file)) {
@@ -1112,6 +1112,8 @@ public class OCFileListFragment extends ExtendedListFragment implements
                         mActiveActionMode.finish();
                     }
                     mContainerActivity.showDetails(singleFile);
+                    setFabVisible(false);
+                    mContainerActivity.showSortListGroup(false);
                     return true;
                 }
                 case R.id.action_set_as_wallpaper: {
@@ -1750,7 +1752,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
      *
      * @param visible Desired visibility for the FAB.
      */
-    void setFabVisible(final boolean visible) {
+    public void setFabVisible(final boolean visible) {
         if (mFabMain == null) {
             // is not available in FolderPickerActivity
             return;