Skip to content

[stable-3.35] fix(unified search): filename overflow issue #16385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 1 commit into from
Jan 28, 2026
Merged

[stable-3.35] fix(unified search): filename overflow issue #16385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchCurrentDirItemViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
package com.owncloud.android.ui.adapter

import android.content.Context
import android.view.View
import com.afollestad.sectionedrecyclerview.SectionedViewHolder
import com.nextcloud.android.common.ui.theme.utils.ColorRole
import com.nextcloud.client.account.User
import com.nextcloud.client.preferences.AppPreferences
import com.nextcloud.utils.extensions.setVisibleIf
import com.owncloud.android.databinding.UnifiedSearchCurrentDirectoryItemBinding
import com.owncloud.android.datamodel.FileDataStorageManager
import com.owncloud.android.datamodel.OCFile
Expand All @@ -38,10 +38,17 @@ class UnifiedSearchCurrentDirItemViewHolder(
fun bind(file: OCFile) {
val filenameWithExtension = storageManager.getFilenameConsideringOfflineOperation(file)
val isFolder = file.isFolder
val (filename, extension) = FileStorageUtils.getFilenameAndExtension(filenameWithExtension, isFolder, isRTL)
binding.extension.setVisibleIf(!isFolder)
binding.extension.text = extension
binding.filename.text = filename
val containsBidiControlCharacters = FileStorageUtils.containsBidiControlCharacters(filenameWithExtension)

if (!containsBidiControlCharacters || isFolder) {
binding.extension.visibility = View.GONE
binding.filename.text = filenameWithExtension
} else {
val (filename, extension) = FileStorageUtils.getFilenameAndExtension(filenameWithExtension, false, isRTL)
binding.extension.text = extension
binding.filename.text = filename
}

viewThemeUtils.platform.colorImageView(binding.thumbnail, ColorRole.PRIMARY)
DisplayUtils.setThumbnail(
file,
Expand Down
50 changes: 27 additions & 23 deletions app/src/main/res/layout/unified_search_current_directory_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,32 +35,36 @@
android:visibility="gone"
app:corners="8" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/filename"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/standard_margin"
app:layout_constraintStart_toEndOf="@+id/thumbnail"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:ellipsize="middle"
android:singleLine="true"
android:textColor="@color/text_color"
android:textSize="@dimen/two_line_primary_text_size"
tools:text="@string/placeholder_filename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
app:layout_constraintEnd_toStartOf="@id/more"
app:layout_constraintStart_toEndOf="@+id/thumbnail"
app:layout_constraintTop_toTopOf="parent">

<com.google.android.material.textview.MaterialTextView
android:id="@+id/extension"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@+id/filename"
app:layout_constraintBottom_toBottomOf="parent"
android:ellipsize="middle"
android:singleLine="true"
android:textColor="@color/text_color"
android:textSize="@dimen/two_line_primary_text_size"
tools:text="@string/placeholder_extension"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/filename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:singleLine="true"
android:textColor="@color/text_color"
android:textSize="@dimen/two_line_primary_text_size"
tools:text="@string/placeholder_filename" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/extension"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:singleLine="true"
android:textColor="@color/text_color"
android:textSize="@dimen/two_line_primary_text_size"
tools:text="@string/placeholder_extension" />

</LinearLayout>

<ImageButton
android:id="@+id/more"
Expand Down
Loading