From 785180c64ff3818ce3692eaec2e2878772b66d9f Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 19 Dec 2022 17:13:50 +0100
Subject: [PATCH] fix the search when no results were found

---
 .../ui/fragments/SearchResultFragment.kt      |  15 ++-
 .../res/layout/fragment_search_result.xml     | 124 +++++++++---------
 2 files changed, 67 insertions(+), 72 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
index 91eed4f95..b36382665 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
@@ -18,8 +18,8 @@ import com.github.libretube.extensions.hideKeyboard
 import com.github.libretube.ui.adapters.SearchAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.util.PreferenceHelper
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class SearchResultFragment : BaseFragment() {
     private lateinit var binding: FragmentSearchResultBinding
@@ -47,6 +47,8 @@ class SearchResultFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        binding.searchRecycler.layoutManager = LinearLayoutManager(requireContext())
+
         // add the query to the history
         addToHistory(query)
 
@@ -92,13 +94,12 @@ class SearchResultFragment : BaseFragment() {
                 return@launchWhenCreated
             }
             runOnUiThread {
-                if (response.items?.isNotEmpty() == true) {
-                    binding.searchRecycler.layoutManager = LinearLayoutManager(requireContext())
-                    searchAdapter = SearchAdapter(response.items)
-                    binding.searchRecycler.adapter = searchAdapter
+                searchAdapter = SearchAdapter(response.items.orEmpty().toMutableList())
+                binding.searchRecycler.adapter = searchAdapter
+                binding.noSearchResult.visibility = if (response.items.orEmpty().isEmpty()) {
+                    View.VISIBLE
                 } else {
-                    binding.searchContainer.visibility = View.GONE
-                    binding.noSearchResult.visibility = View.VISIBLE
+                    View.GONE
                 }
             }
             nextPage = response.nextpage
diff --git a/app/src/main/res/layout/fragment_search_result.xml b/app/src/main/res/layout/fragment_search_result.xml
index 85aa8028b..536b4714f 100644
--- a/app/src/main/res/layout/fragment_search_result.xml
+++ b/app/src/main/res/layout/fragment_search_result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,87 +7,81 @@
     android:orientation="vertical"
     tools:context=".ui.fragments.SearchFragment">
 
-    <LinearLayout
-        android:id="@+id/search_container"
+    <HorizontalScrollView
+        android:id="@+id/filter_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:paddingHorizontal="10dp"
+        android:scrollbars="none"
+        app:layout_constraintBottom_toTopOf="@id/recycler_view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <HorizontalScrollView
-            android:id="@+id/filter_bar"
-            android:layout_width="match_parent"
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/filter_chip_group"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingHorizontal="10dp"
-            android:scrollbars="none"
-            app:layout_constraintBottom_toTopOf="@id/recycler_view"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:checkedChip="@id/chip_all"
+            app:selectionRequired="true"
+            app:singleLine="true"
+            app:singleSelection="true">
 
-            <com.google.android.material.chip.ChipGroup
-                android:id="@+id/filter_chip_group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:checkedChip="@id/chip_all"
-                app:selectionRequired="true"
-                app:singleLine="true"
-                app:singleSelection="true">
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_all"
+                style="@style/Chip"
+                android:text="@string/all" />
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_all"
-                    style="@style/Chip"
-                    android:text="@string/all" />
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_videos"
+                style="@style/Chip"
+                android:text="@string/videos" />
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_videos"
-                    style="@style/Chip"
-                    android:text="@string/videos" />
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_channels"
+                style="@style/Chip"
+                android:text="@string/channels" />
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_channels"
-                    style="@style/Chip"
-                    android:text="@string/channels" />
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_playlists"
+                style="@style/Chip"
+                android:text="@string/playlists" />
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_playlists"
-                    style="@style/Chip"
-                    android:text="@string/playlists" />
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_music_songs"
+                style="@style/Chip"
+                android:text="@string/music_songs" />
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_music_songs"
-                    style="@style/Chip"
-                    android:text="@string/music_songs" />
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_music_videos"
+                style="@style/Chip"
+                android:text="@string/music_videos" />
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_music_videos"
-                    style="@style/Chip"
-                    android:text="@string/music_videos" />
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_music_albums"
+                style="@style/Chip"
+                android:text="@string/music_albums" />
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_music_albums"
-                    style="@style/Chip"
-                    android:text="@string/music_albums" />
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_music_playlists"
+                style="@style/Chip"
+                android:text="@string/music_playlists" />
+        </com.google.android.material.chip.ChipGroup>
+    </HorizontalScrollView>
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_music_playlists"
-                    style="@style/Chip"
-                    android:text="@string/music_playlists" />
-            </com.google.android.material.chip.ChipGroup>
-        </HorizontalScrollView>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/search_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginVertical="10dp" />
-
-    </LinearLayout>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/search_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="10dp" />
 
     <LinearLayout
         android:id="@+id/no_search_result"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_gravity="center"
+        android:layout_weight="1"
+        android:paddingTop="150dp"
         android:orientation="vertical"
         android:visibility="gone">
 
@@ -108,4 +102,4 @@
 
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file