|
@@ -41,6 +41,7 @@ import android.view.View;
|
|
import android.view.ViewGroup;
|
|
import android.view.ViewGroup;
|
|
import android.widget.ImageButton;
|
|
import android.widget.ImageButton;
|
|
import android.widget.ImageView;
|
|
import android.widget.ImageView;
|
|
|
|
+import android.widget.LinearLayout;
|
|
|
|
|
|
import com.elyeproj.loaderviewlibrary.LoaderImageView;
|
|
import com.elyeproj.loaderviewlibrary.LoaderImageView;
|
|
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
|
|
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
|
|
@@ -430,6 +431,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
|
|
|
|
|
|
ocFileListDelegate.bindGridViewHolder(gridViewHolder, file, searchType);
|
|
ocFileListDelegate.bindGridViewHolder(gridViewHolder, file, searchType);
|
|
checkVisibilityOfMoreButtons(gridViewHolder);
|
|
checkVisibilityOfMoreButtons(gridViewHolder);
|
|
|
|
+ checkVisibilityOfFileFeaturesLayout(gridViewHolder);
|
|
|
|
|
|
if (holder instanceof ListItemViewHolder) {
|
|
if (holder instanceof ListItemViewHolder) {
|
|
bindListItemViewHolder((ListItemViewHolder) gridViewHolder, file);
|
|
bindListItemViewHolder((ListItemViewHolder) gridViewHolder, file);
|
|
@@ -438,12 +440,31 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
|
|
if (holder instanceof ListGridItemViewHolder) {
|
|
if (holder instanceof ListGridItemViewHolder) {
|
|
bindListGridItemViewHolder((ListGridItemViewHolder) holder, file);
|
|
bindListGridItemViewHolder((ListGridItemViewHolder) holder, file);
|
|
checkVisibilityOfMoreButtons((ListGridItemViewHolder) holder);
|
|
checkVisibilityOfMoreButtons((ListGridItemViewHolder) holder);
|
|
|
|
+ checkVisibilityOfFileFeaturesLayout((ListGridItemViewHolder) holder);
|
|
}
|
|
}
|
|
|
|
|
|
updateLivePhotoIndicators(gridViewHolder, file);
|
|
updateLivePhotoIndicators(gridViewHolder, file);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private void checkVisibilityOfFileFeaturesLayout(ListGridImageViewHolder holder) {
|
|
|
|
+ int fileFeaturesVisibility = View.GONE;
|
|
|
|
+ LinearLayout fileFeaturesLayout = holder.getFileFeaturesLayout();
|
|
|
|
+
|
|
|
|
+ if (fileFeaturesLayout == null) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ for (int i = 0; i < fileFeaturesLayout.getChildCount(); i++) {
|
|
|
|
+ View child = fileFeaturesLayout.getChildAt(i);
|
|
|
|
+ if (child.getVisibility() == View.VISIBLE) {
|
|
|
|
+ fileFeaturesVisibility = View.VISIBLE;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ fileFeaturesLayout.setVisibility(fileFeaturesVisibility);
|
|
|
|
+ }
|
|
|
|
+
|
|
private void checkVisibilityOfMoreButtons(ListGridImageViewHolder holder) {
|
|
private void checkVisibilityOfMoreButtons(ListGridImageViewHolder holder) {
|
|
ImageButton moreButton = holder.getMore();
|
|
ImageButton moreButton = holder.getMore();
|
|
if (moreButton == null) {
|
|
if (moreButton == null) {
|