소스 검색

Hide more button when multi select enabled

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 년 전
부모
커밋
ee520598b5

+ 17 - 0
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -39,6 +39,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 
 import com.elyeproj.loaderviewlibrary.LoaderImageView;
@@ -429,6 +430,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
             ocFileListDelegate.bindGridViewHolder(gridViewHolder, file, searchType);
             gridViewHolder.checkVisibilityOfFileFeaturesLayout();
+            checkVisibilityOfMoreButtons(gridViewHolder);
 
             if (holder instanceof ListItemViewHolder) {
                 bindListItemViewHolder((ListItemViewHolder) gridViewHolder, file);
@@ -436,12 +438,27 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
             if (holder instanceof ListGridItemViewHolder) {
                 bindListGridItemViewHolder((ListGridItemViewHolder) holder, file);
+                ((ListGridItemViewHolder) holder).checkVisibilityOfFileFeaturesLayout();
+                checkVisibilityOfMoreButtons((ListGridItemViewHolder) holder);
             }
 
             updateLivePhotoIndicators(gridViewHolder, file);
         }
     }
 
+    private void checkVisibilityOfMoreButtons(ListGridImageViewHolder holder) {
+        ImageButton moreButton = holder.getMore();
+        if (moreButton == null) {
+            return;
+        }
+
+        if (isMultiSelect()) {
+            moreButton.setVisibility(View.GONE);
+        } else {
+            moreButton.setVisibility(View.VISIBLE);
+        }
+    }
+
     private void mergeOCFilesForLivePhoto() {
         List<OCFile> filesToRemove = new ArrayList<>();
 

+ 3 - 2
app/src/main/res/layout/grid_image.xml

@@ -154,8 +154,8 @@
             android:id="@+id/Filename"
             android:layout_width="@dimen/grid_filename_width"
             android:layout_height="@dimen/grid_bottom_view_height"
-            android:layout_marginBottom="@dimen/grid_bottom_view_margin_bottom"
             android:layout_gravity="center"
+            android:layout_marginBottom="@dimen/grid_bottom_view_margin_bottom"
             android:ellipsize="middle"
             android:gravity="center"
             android:singleLine="true"
@@ -163,7 +163,8 @@
             android:textColor="@color/text_color"
             android:textSize="@dimen/grid_item_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/more"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             tools:visibility="visible" />
 
         <ImageButton

+ 3 - 2
app/src/main/res/layout/grid_item.xml

@@ -141,8 +141,8 @@
             android:id="@+id/Filename"
             android:layout_width="@dimen/grid_filename_width"
             android:layout_height="@dimen/grid_bottom_view_height"
-            android:layout_marginBottom="@dimen/grid_bottom_view_margin_bottom"
             android:layout_gravity="center"
+            android:layout_marginBottom="@dimen/grid_bottom_view_margin_bottom"
             android:ellipsize="middle"
             android:gravity="center"
             android:singleLine="true"
@@ -150,7 +150,8 @@
             android:textColor="@color/text_color"
             android:textSize="@dimen/grid_item_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/more"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             tools:visibility="visible" />
 
         <ImageButton