From e3e1567649d099c10b122b87d5b1dd4f588e4523 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Mon, 30 Mar 2026 11:05:42 +0200 Subject: [PATCH 1/3] fix(unified-search): listing Signed-off-by: alperozturk96 --- .../adapter/UnifiedSearchHeaderViewHolder.kt | 2 +- .../ui/adapter/UnifiedSearchItemViewHolder.kt | 19 ++- .../ui/adapter/UnifiedSearchListAdapter.kt | 2 +- .../main/res/layout/unified_search_footer.xml | 34 ++---- .../main/res/layout/unified_search_header.xml | 31 ++--- .../main/res/layout/unified_search_item.xml | 108 ++++++++---------- 6 files changed, 76 insertions(+), 120 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchHeaderViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchHeaderViewHolder.kt index e70cc9a97b37..36b0a01e6cea 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchHeaderViewHolder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchHeaderViewHolder.kt @@ -21,6 +21,6 @@ class UnifiedSearchHeaderViewHolder( fun bind(section: UnifiedSearchSection) { binding.title.text = section.name - viewThemeUtils.platform.colorPrimaryTextViewElement(binding.title) + viewThemeUtils.platform.colorTextView(binding.title) } } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt index 174fdeff666e..97c32785c018 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt @@ -9,6 +9,7 @@ package com.owncloud.android.ui.adapter import android.content.Context import android.view.View +import android.widget.TextView import androidx.core.content.ContextCompat import androidx.core.widget.ImageViewCompat import com.afollestad.sectionedrecyclerview.SectionedViewHolder @@ -57,8 +58,8 @@ class UnifiedSearchItemViewHolder( private val calendarEventManager = CalendarEventManager(context) fun bind(entry: SearchResultEntry) { - binding.title.text = entry.title - bindSubline(entry) + bindTextView(binding.title, entry.title) + bindTextView(binding.subline, entry.subline) bindLocalFileIndicator(entry) val entryType = entry.getType() @@ -69,16 +70,12 @@ class UnifiedSearchItemViewHolder( } } - private fun bindSubline(entry: SearchResultEntry) { - if (entry.subline.isNotBlank()) { - binding.subline.visibility = View.VISIBLE - binding.subline.text = entry.subline + private fun bindTextView(view: TextView, text: String?) { + if (text.isNullOrEmpty()) { + view.visibility = View.GONE } else { - binding.subline.visibility = View.GONE - - val paddingInDp = context.resources.getDimension(R.dimen.standard_padding) - val paddingInPx = DisplayUtils.convertDpToPixel(paddingInDp, context) - binding.titleContainer.setPadding(0, paddingInPx, 0, 0) + view.visibility = View.VISIBLE + view.text = text } } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt index 90525138b29d..77cad5160a50 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt +++ b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt @@ -62,7 +62,7 @@ class UnifiedSearchListAdapter( init { setHasStableIds(true) - // initialise thumbnails cache on background thread + // initialize thumbnails cache on background thread ThumbnailsCacheManager.initDiskCacheAsync() } diff --git a/app/src/main/res/layout/unified_search_footer.xml b/app/src/main/res/layout/unified_search_footer.xml index f4a96023d104..40de654999bb 100755 --- a/app/src/main/res/layout/unified_search_footer.xml +++ b/app/src/main/res/layout/unified_search_footer.xml @@ -2,31 +2,15 @@ - + ~ SPDX-License-Identifier: AGPL-3.0-or-later + --> + - - - - - - - + android:gravity="center_vertical" + android:paddingStart="@dimen/standard_list_item_size" + android:paddingEnd="@dimen/standard_quarter_padding" + android:text="@string/load_more_results" + android:textColor="@color/secondary_text_color" /> diff --git a/app/src/main/res/layout/unified_search_header.xml b/app/src/main/res/layout/unified_search_header.xml index f37cd7c84961..0f3c4aba0268 100755 --- a/app/src/main/res/layout/unified_search_header.xml +++ b/app/src/main/res/layout/unified_search_header.xml @@ -2,26 +2,17 @@ - + ~ SPDX-License-Identifier: AGPL-3.0-or-later + --> + - - - + android:ellipsize="middle" + android:paddingHorizontal="@dimen/standard_padding" + android:paddingVertical="@dimen/standard_padding" + android:textColor="@color/color_accent" + tools:text="@string/placeholder_files" /> diff --git a/app/src/main/res/layout/unified_search_item.xml b/app/src/main/res/layout/unified_search_item.xml index 515f88bcf270..09353085c020 100755 --- a/app/src/main/res/layout/unified_search_item.xml +++ b/app/src/main/res/layout/unified_search_item.xml @@ -1,5 +1,4 @@ - - - + android:layout_height="@dimen/standard_list_item_size" + android:baselineAligned="false" + android:gravity="center_vertical" + android:orientation="horizontal"> + + - + - + + + + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="horizontal"> - + app:icon="@drawable/ic_dots_vertical" + app:iconGravity="textStart" + app:iconTint="@color/secondary_text_color" /> - + diff --git a/app/src/main/res/layout/unified_search_item.xml b/app/src/main/res/layout/unified_search_item.xml index 17365a7fd010..74b89d93fc6d 100755 --- a/app/src/main/res/layout/unified_search_item.xml +++ b/app/src/main/res/layout/unified_search_item.xml @@ -13,9 +13,7 @@ android:layout_height="@dimen/standard_list_item_size" android:baselineAligned="false" android:gravity="center_vertical" - android:orientation="horizontal" - android:paddingStart="0dp" - android:paddingEnd="@dimen/standard_padding"> + android:orientation="horizontal"> - + app:icon="@drawable/ic_dots_vertical" + app:iconGravity="textStart" + app:iconTint="@color/secondary_text_color" /> - \ No newline at end of file +