From df17588409a39378610c4956d1098b27621105c5 Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Tue, 5 Jan 2021 17:09:06 +0800
Subject: [PATCH] Fix searchbar divider

---
 .../com/hippo/ehviewer/widget/SearchBar.java     | 16 +++++++++++++++-
 app/src/main/res/layout/widget_search_bar.xml    |  6 ++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
index f88398e3b..6ea02bc8d 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
@@ -83,6 +83,7 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
     private SearchEditText mEditText;
     private EasyRecyclerView mListView;
     private View mListContainer;
+    private View mListHeader;
 
     private ViewTransition mViewTransition;
 
@@ -124,6 +125,7 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
         mEditText = (SearchEditText) ViewUtils.$$(this, R.id.search_edit_text);
         mListContainer = ViewUtils.$$(this, R.id.list_container);
         mListView = (EasyRecyclerView) ViewUtils.$$(mListContainer, R.id.search_bar_list);
+        mListHeader = ViewUtils.$$(mListContainer, R.id.list_header);
 
         mViewTransition = new ViewTransition(mTitleTextView, mEditText);
 
@@ -146,12 +148,19 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
                 LinearDividerItemDecoration.VERTICAL,
                 AttrResources.getAttrColor(context, R.attr.dividerColor),
                 LayoutUtils.dp2pix(context, 1));
-        decoration.setShowFirstDivider(true);
         decoration.setShowLastDivider(false);
         mListView.addItemDecoration(decoration);
         mListView.setLayoutManager(layoutManager);
     }
 
+    private void addListHeader() {
+        mListHeader.setVisibility(VISIBLE);
+    }
+
+    private void removeListHeader() {
+        mListHeader.setVisibility(GONE);
+    }
+
     private void updateSuggestions() {
         updateSuggestions(true);
     }
@@ -188,6 +197,11 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
         }
 
         mSuggestionList = suggestions;
+        if (mSuggestionList.size() == 0) {
+            removeListHeader();
+        } else {
+            addListHeader();
+        }
         mSuggestionAdapter.notifyDataSetChanged();
 
         if (scrollToTop) {
diff --git a/app/src/main/res/layout/widget_search_bar.xml b/app/src/main/res/layout/widget_search_bar.xml
index 2969e9d32..9ed29ac33 100644
--- a/app/src/main/res/layout/widget_search_bar.xml
+++ b/app/src/main/res/layout/widget_search_bar.xml
@@ -80,6 +80,12 @@
             android:orientation="vertical"
             android:visibility="gone">
 
+            <View
+                android:id="@+id/list_header"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?attr/dividerColor" />
+
             <com.hippo.easyrecyclerview.EasyRecyclerView
                 android:id="@+id/search_bar_list"
                 android:layout_width="match_parent"