Skip to content

Commit 8fd357b

Browse files
committed
remove: file list grid controller
Signed-off-by: alperozturk <[email protected]>
1 parent 8029ded commit 8fd357b

File tree

2 files changed

+24
-48
lines changed

2 files changed

+24
-48
lines changed

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
144144

145145
private final long footerId = UUID.randomUUID().getLeastSignificantBits();
146146
private final long headerId = UUID.randomUUID().getLeastSignificantBits();
147-
private final OCFileListGridController gridController = new OCFileListGridController();
148147

149148
private ArrayList<Recommendation> recommendedFiles = new ArrayList<>();
150149

@@ -482,7 +481,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
482481
}
483482

484483
if (holder instanceof ListGridItemViewHolder gridItemViewHolder) {
485-
setFileNameAndExtension(gridItemViewHolder, file);
484+
setFilenameAndExtension(gridItemViewHolder, file);
486485
checkVisibilityOfFileFeaturesLayout(gridItemViewHolder);
487486
}
488487

@@ -562,18 +561,39 @@ private void updateLivePhotoIndicators(ListViewHolder holder, OCFile file) {
562561
}
563562
}
564563

565-
private void setFileNameAndExtension(ListGridItemViewHolder holder, OCFile file) {
564+
private void setFilenameAndExtension(ListGridItemViewHolder holder, OCFile file) {
566565
final String filename = mStorageManager.getFilenameConsideringOfflineOperation(file);
567566
final var pair = FileStorageUtils.getFilenameAndExtension(filename, file.isFolder(), isRTL);
568567
final boolean isFolder = file.isFolder();
569568

570569
if (holder instanceof OCFileListGridItemViewHolder gridItemViewHolder) {
571-
gridController.handleGridMode(filename, ocFileListFragmentInterface, gridItemViewHolder, pair, file);
570+
handleGridMode(filename, gridItemViewHolder, pair, file);
572571
} else {
573572
handleListMode(holder, pair, isFolder);
574573
}
575574
}
576575

576+
private void handleGridMode(String filename, OCFileListGridItemViewHolder holder, Pair<String, String> filenamePair, OCFile file) {
577+
boolean containsBidiControlCharacters = FileStorageUtils.containsBidiControlCharacters(filename);
578+
ViewExtensionsKt.setVisibleIf(holder.getFileName(),!containsBidiControlCharacters);
579+
ViewExtensionsKt.setVisibleIf(holder.getBinding().bidiFilenameContainer, containsBidiControlCharacters);
580+
final var extension = holder.getExtension();
581+
582+
if (containsBidiControlCharacters) {
583+
holder.getBidiFilename().setText(filenamePair.getFirst());
584+
if (extension != null) {
585+
extension.setText(filenamePair.getSecond());
586+
}
587+
holder.getBinding().more.setVisibility(View.GONE);
588+
holder.getBinding().bidiMore.setOnClickListener(v -> ocFileListFragmentInterface.onOverflowIconClicked(file, v));
589+
} else {
590+
holder.getFileName().setText(filename);
591+
if (extension != null) {
592+
extension.setVisibility(View.GONE);
593+
}
594+
}
595+
}
596+
577597
private void handleListMode(ListGridItemViewHolder holder,
578598
Pair<String, String> filenamePair,
579599
boolean isFolder) {

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListGridController.kt

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)