Skip to content

Commit f945e9d

Browse files
committed
fix(file-list): list mode long file names visibility
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 391e1e6 commit f945e9d

2 files changed

Lines changed: 15 additions & 8 deletions

File tree

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ private void setFilenameAndExtension(ListGridItemViewHolder holder, OCFile file)
552552
if (holder instanceof OCFileListGridItemViewHolder gridItemViewHolder) {
553553
handleGridMode(filename, gridItemViewHolder, pair, file);
554554
} else {
555-
handleListMode(holder, pair, isFolder);
555+
handleListMode(holder, filename, pair, isFolder);
556556
}
557557
}
558558

@@ -578,18 +578,24 @@ private void handleGridMode(String filename, OCFileListGridItemViewHolder holder
578578
}
579579

580580
private void handleListMode(ListGridItemViewHolder holder,
581+
String filename,
581582
Pair<String, String> filenamePair,
582583
boolean isFolder) {
583-
holder.getFileName().setText(filenamePair.getFirst());
584-
585584
final var extension = holder.getExtension();
586-
if (extension != null) {
587-
if (isFolder) {
585+
final boolean useSeparateExtension = !isFolder && FileStorageUtils.containsBidiControlCharacters(filename);
586+
587+
if (!useSeparateExtension) {
588+
holder.getFileName().setText(filename);
589+
if (extension != null) {
588590
extension.setVisibility(View.GONE);
589-
} else {
590-
extension.setVisibility(View.VISIBLE);
591-
extension.setText(filenamePair.getSecond());
592591
}
592+
return;
593+
}
594+
595+
holder.getFileName().setText(filenamePair.getFirst());
596+
if (extension != null) {
597+
extension.setVisibility(View.VISIBLE);
598+
extension.setText(filenamePair.getSecond());
593599
}
594600
}
595601

app/src/main/res/layout/list_item.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
android:id="@+id/Filename"
8787
android:layout_width="wrap_content"
8888
android:layout_height="wrap_content"
89+
android:layout_weight="1"
8990
android:ellipsize="middle"
9091
android:singleLine="true"
9192
android:textColor="@color/text_color"

0 commit comments

Comments
 (0)