From 23c3134327b2d045339d3ebb0e0e3572cf952e72 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Thu, 2 Mar 2023 16:39:14 +0100 Subject: [PATCH] Fix negative subscriber and views count for channels --- .../libretube/ui/adapters/SearchAdapter.kt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt index 05f5f11f1..4de28b49b 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt @@ -109,13 +109,18 @@ class SearchAdapter : ListAdapter(SearchCallback) binding.apply { ImageHelper.loadImage(item.thumbnail, searchChannelImage) searchChannelName.text = item.name - searchViews.text = root.context.getString( - R.string.subscribers, - item.subscribers.formatShort() - ) + TextUtils.SEPARATOR + root.context.getString( - R.string.videoCount, - item.videos.toString() - ) + + searchViews.text = listOfNotNull( + root.context.getString( + R.string.subscribers, + item.subscribers.formatShort() + ).takeIf { item.subscribers >= 0 }, + root.context.getString( + R.string.videoCount, + item.videos.toString() + ).takeIf { item.videos >= 0 } + ).joinToString(TextUtils.SEPARATOR) + root.setOnClickListener { NavigationHelper.navigateChannel(root.context, item.url) }