From a98712986974d8555ac7381a97b6f81cbbb3cc5c Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 4 Aug 2026 14:50:19 +0200 Subject: [PATCH 1/2] fix(file-list): list mode long file names visibility Signed-off-by: alperozturk96 --- .../android/ui/adapter/OCFileListAdapter.java | 22 ++++++++++++------- app/src/main/res/layout/list_item.xml | 1 + 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java index 352bc6472b8d..281469fde0d7 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java +++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java @@ -552,7 +552,7 @@ private void setFilenameAndExtension(ListGridItemViewHolder holder, OCFile file) if (holder instanceof OCFileListGridItemViewHolder gridItemViewHolder) { handleGridMode(filename, gridItemViewHolder, pair, file); } else { - handleListMode(holder, pair, isFolder); + handleListMode(holder, filename, pair, isFolder); } } @@ -578,18 +578,24 @@ private void handleGridMode(String filename, OCFileListGridItemViewHolder holder } private void handleListMode(ListGridItemViewHolder holder, + String filename, Pair filenamePair, boolean isFolder) { - holder.getFileName().setText(filenamePair.getFirst()); - final var extension = holder.getExtension(); - if (extension != null) { - if (isFolder) { + final boolean useSeparateExtension = !isFolder && FileStorageUtils.containsBidiControlCharacters(filename); + + if (!useSeparateExtension) { + holder.getFileName().setText(filename); + if (extension != null) { extension.setVisibility(View.GONE); - } else { - extension.setVisibility(View.VISIBLE); - extension.setText(filenamePair.getSecond()); } + return; + } + + holder.getFileName().setText(filenamePair.getFirst()); + if (extension != null) { + extension.setVisibility(View.VISIBLE); + extension.setText(filenamePair.getSecond()); } } diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml index 8717f2ffc7aa..604f56d84ed5 100644 --- a/app/src/main/res/layout/list_item.xml +++ b/app/src/main/res/layout/list_item.xml @@ -86,6 +86,7 @@ android:id="@+id/Filename" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="1" android:ellipsize="middle" android:singleLine="true" android:textColor="@color/text_color" From 3e92f2b7dd9c6816bbccdb0ca0c7e170cb7bef4f Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 5 Aug 2026 08:25:13 +0200 Subject: [PATCH 2/2] fix lint Signed-off-by: alperozturk96 --- app/src/main/res/layout/list_item.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml index 604f56d84ed5..263e7e9f673d 100644 --- a/app/src/main/res/layout/list_item.xml +++ b/app/src/main/res/layout/list_item.xml @@ -84,7 +84,7 @@