Merge pull request #6216 from nextcloud/richworkspacesFirstRow

show rich workspace in grid spanned across first row

src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -821,7 +821,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         return mFiles.get(newPosition);
     }
 
-    private boolean shouldShowHeader() {
+    public boolean shouldShowHeader() {
         if (currentDirectory == null) {
             return false;
         }
@@ -833,10 +833,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         return !TextUtils.isEmpty(currentDirectory.getRichWorkspace());
     }
 
-    public boolean isHeader(OCFile file) {
-        return VIEWTYPE_HEADER == getItemViewType(getItemPosition(file));
-    }
-
     @Override
     public int getItemViewType(int position) {
         if (shouldShowHeader()) {

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

@@ -1382,7 +1382,8 @@ public class OCFileListFragment extends ExtendedListFragment implements
             ((GridLayoutManager) layoutManager).setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
                 @Override
                 public int getSpanSize(int position) {
-                    if (position == getAdapter().getItemCount() - 1) {
+                    if (position == getAdapter().getItemCount() - 1 ||
+                        position == 0 && getAdapter().shouldShowHeader()) {
                         return ((GridLayoutManager) layoutManager).getSpanCount();
                     } else {
                         return 1;