Merge pull request #6145 from nextcloud/feature/newDesign-gridmode-hide-share

New design (UI) - Feature/new design gridmode hide share

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

@@ -571,7 +571,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                 }
             }
 
-            if (hideItemOptions || (file.isFolder() && !file.canReshare())) {
+            if (gridView || hideItemOptions || (file.isFolder() && !file.canReshare())) {
                 gridViewHolder.shared.setVisibility(View.GONE);
             } else {
                 showShareIcon(gridViewHolder, file);

src/main/res/layout/grid_item.xml

@@ -24,26 +24,9 @@
     android:gravity="center"
     android:orientation="vertical">
 
-    <FrameLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal">
-
-        <com.elyeproj.loaderviewlibrary.LoaderImageView
-            android:id="@+id/thumbnail_shimmer"
-            android:layout_width="@dimen/standard_list_item_size"
-            android:layout_height="@dimen/standard_list_item_size"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            app:corners="8" />
-
-        <ImageView
-            android:id="@+id/thumbnail"
-            android:layout_width="@dimen/standard_list_item_size"
-            android:layout_height="@dimen/standard_list_item_size"
-            android:layout_gravity="center"
-            android:contentDescription="@null"
-            android:src="@drawable/folder" />
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/favorite_action"
@@ -52,53 +35,80 @@
             android:layout_gravity="top|end"
             android:layout_margin="@dimen/standard_quarter_margin"
             android:src="@drawable/favorite"
-            android:contentDescription="@string/favorite_icon"/>
+            android:contentDescription="@string/favorite_icon"
+            app:layout_constraintEnd_toEndOf="@+id/frameLayout"
+            app:layout_constraintTop_toTopOf="@id/frameLayout"
+            app:layout_constraintBottom_toTopOf="@id/frameLayout"/>
 
-        <ImageView
-            android:id="@+id/sharedIcon"
-            android:layout_width="wrap_content"
+        <FrameLayout
+            android:id="@+id/frameLayout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="top|end"
-            android:layout_marginTop="@dimen/grid_item_shared_icon_layout_top_margin"
-            android:layout_marginEnd="@dimen/standard_quarter_margin"
-            android:src="@drawable/shared_via_link"
-            android:contentDescription="@string/shared_icon_shared_via_link"/>
+            android:layout_gravity="center_horizontal"
+            app:layout_constraintBottom_toBottomOf="parent">
 
-        <ImageView
-            android:id="@+id/unreadComments"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clickable="true"
-            android:contentDescription="@string/unread_comments"
-            android:focusable="true"
-            android:layout_gravity="top|end"
-            android:layout_marginTop="@dimen/grid_item_shared_icon_layout_top_margin"
-            android:layout_marginEnd="@dimen/standard_quarter_margin"
-            android:src="@drawable/ic_comment_grid"
-            android:visibility="gone" />
+            <com.elyeproj.loaderviewlibrary.LoaderImageView
+                android:id="@+id/thumbnail_shimmer"
+                android:layout_width="@dimen/standard_list_item_size"
+                android:layout_height="@dimen/standard_list_item_size"
+                android:layout_gravity="center"
+                android:visibility="gone"
+                app:corners="8" />
 
-        <ImageView
-            android:id="@+id/localFileIndicator"
-            android:layout_width="@dimen/grid_item_local_file_indicator_layout_width"
-            android:layout_height="@dimen/grid_item_local_file_indicator_layout_height"
-            android:layout_gravity="bottom|end"
-            android:layout_marginBottom="@dimen/standard_quarter_margin"
-            android:layout_marginEnd="@dimen/standard_quarter_margin"
-            android:layout_marginTop="@dimen/standard_quarter_margin"
-            android:src="@drawable/ic_synced"
-            android:contentDescription="@string/synced_icon"/>
+            <ImageView
+                android:id="@+id/thumbnail"
+                android:layout_width="@dimen/standard_list_item_size"
+                android:layout_height="@dimen/standard_list_item_size"
+                android:layout_gravity="center"
+                android:contentDescription="@null"
+                android:src="@drawable/folder" />
 
-        <ImageView
-            android:id="@+id/custom_checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/standard_quarter_margin"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
-            android:layout_gravity="center_vertical|top"
-            android:src="@android:drawable/checkbox_off_background"
-            android:contentDescription="@string/checkbox"/>
+            <ImageView
+                android:id="@+id/sharedIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|end"
+                android:layout_marginTop="@dimen/grid_item_shared_icon_layout_top_margin"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"
+                android:src="@drawable/shared_via_link"
+                android:contentDescription="@string/shared_icon_shared_via_link"/>
+
+            <ImageView
+                android:id="@+id/unreadComments"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:contentDescription="@string/unread_comments"
+                android:focusable="true"
+                android:layout_gravity="top|end"
+                android:layout_marginTop="@dimen/grid_item_shared_icon_layout_top_margin"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"
+                android:src="@drawable/ic_comment_grid"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/localFileIndicator"
+                android:layout_width="@dimen/grid_item_local_file_indicator_layout_width"
+                android:layout_height="@dimen/grid_item_local_file_indicator_layout_height"
+                android:layout_gravity="bottom|end"
+                android:layout_marginBottom="@dimen/standard_quarter_margin"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"
+                android:layout_marginTop="@dimen/standard_quarter_margin"
+                android:src="@drawable/ic_synced"
+                android:contentDescription="@string/synced_icon"/>
+
+            <ImageView
+                android:id="@+id/custom_checkbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/standard_quarter_margin"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
+                android:layout_gravity="center_vertical|top"
+                android:src="@android:drawable/checkbox_off_background"
+                android:contentDescription="@string/checkbox"/>
 
-    </FrameLayout>
+        </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
         android:id="@+id/Filename"