From 4194ac2226a35aefc2df3fca33dbf635059b88e2 Mon Sep 17 00:00:00 2001 From: Roy Yosef Date: Tue, 21 Apr 2020 02:06:10 +0300 Subject: [PATCH 1/6] Display search suggestion: did you mean & showing result for --- .../fragments/list/search/SearchFragment.java | 36 +++++++++++++++++-- app/src/main/res/layout/fragment_search.xml | 26 ++++++++++++-- app/src/main/res/values-land/dimens.xml | 2 ++ app/src/main/res/values-sw600dp/dimens.xml | 1 + app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/strings.xml | 1 + 6 files changed, 63 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java index 9bfead4f0..a5c3d0bb8 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java @@ -143,6 +143,9 @@ public class SearchFragment extends BaseListFragment()); showKeyboardSearch(); @@ -554,11 +562,13 @@ public class SearchFragment extends BaseListFragment { + correctSuggestionPanel.setVisibility(View.GONE); + search(result.getSearchSuggestion(), contentFilter, sortFilter); + searchEditText.setText(result.getSearchSuggestion()); + }); + + correctSuggestionPanel.setVisibility(View.VISIBLE); + } else { + correctSuggestionPanel.setVisibility(View.GONE); + } + } + @Override public void handleNextItems(final ListExtractor.InfoItemsPage result) { showListFooter(false); diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 651229f10..ca6a2eaf8 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -6,13 +6,34 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + tools:listitem="@layout/list_stream_item" /> @@ -68,7 +90,7 @@ android:layout_height="match_parent" android:scrollbars="vertical" app:layoutManager="LinearLayoutManager" - tools:listitem="@layout/item_search_suggestion"/> + tools:listitem="@layout/item_search_suggestion" /> diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index e097fb035..b152fb1ae 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -51,4 +51,6 @@ 16sp + + 14sp diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml index 15b6d214e..89bc53111 100644 --- a/app/src/main/res/values-sw600dp/dimens.xml +++ b/app/src/main/res/values-sw600dp/dimens.xml @@ -21,4 +21,5 @@ 10dp + 14sp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 5f58f4c90..d3feb0ea8 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -115,4 +115,5 @@ 2dp 4dp + 16sp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 79624032b..654f2ef9a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,6 +16,7 @@ Search Settings Did you mean: %1$s? + Showing results for: %s Share with Choose browser rotation From 0711650ff8c7827bdfee8d0b6b5fcb24b412903d Mon Sep 17 00:00:00 2001 From: Roy Yosef Date: Sat, 6 Jun 2020 23:44:04 +0300 Subject: [PATCH 2/6] Fix search suggestions not working on resume * add searchSuggestionString, isCorrectedSearch fields to state and load onResume --- .../fragments/list/search/SearchFragment.java | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java index a5c3d0bb8..aa2ad8340 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java @@ -118,6 +118,12 @@ public class SearchFragment extends BaseListFragment { correctSuggestionPanel.setVisibility(View.GONE); - search(result.getSearchSuggestion(), contentFilter, sortFilter); - searchEditText.setText(result.getSearchSuggestion()); + search(searchSuggestion, contentFilter, sortFilter); + searchEditText.setText(searchSuggestion); }); correctSuggestionPanel.setVisibility(View.VISIBLE); From ccd82fb8b8dccddafa47a176d969a5eeee8297a2 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Sun, 28 Jun 2020 15:15:51 +0200 Subject: [PATCH 3/6] Improve search suggestion code --- .../fragments/list/search/SearchFragment.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java index aa2ad8340..5457369e5 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java @@ -119,7 +119,7 @@ public class SearchFragment extends BaseListFragment Date: Sun, 5 Jul 2020 00:39:36 +0200 Subject: [PATCH 4/6] Improve suggestion panel --- .../fragments/list/search/SearchFragment.java | 18 ++++++------- app/src/main/res/layout/fragment_search.xml | 25 ++++++------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java index 5457369e5..6d2b9ca37 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java @@ -149,8 +149,7 @@ public class SearchFragment extends BaseListFragment()); @@ -1007,17 +1005,17 @@ public class SearchFragment extends BaseListFragment { - correctSuggestionPanel.setVisibility(View.GONE); + correctSuggestion.setOnClickListener(v -> { + correctSuggestion.setVisibility(View.GONE); search(searchSuggestion, contentFilter, sortFilter); searchEditText.setText(searchSuggestion); }); - correctSuggestionPanel.setVisibility(View.VISIBLE); + correctSuggestion.setVisibility(View.VISIBLE); } else { - correctSuggestionPanel.setVisibility(View.GONE); + correctSuggestion.setVisibility(View.GONE); } } diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index ca6a2eaf8..9412e8c43 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -6,31 +6,22 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - + android:background="?attr/selectableItemBackground" + android:padding="10dp" + android:textColor="@color/background_title_color" + android:textSize="@dimen/search_suggestion_text_size" + tools:text="Showing results for lorem ipsum dolor sit amet consectetur adipisci elit" /> From 13a0d1de70b664bc1548845268f2689d912ae303 Mon Sep 17 00:00:00 2001 From: Stypox Date: Sun, 5 Jul 2020 00:44:40 +0200 Subject: [PATCH 5/6] Replace search query without searching on suggestion panel long click --- .../fragments/list/search/SearchFragment.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java index 6d2b9ca37..ade536c3f 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java @@ -704,10 +704,6 @@ public class SearchFragment extends BaseListFragment { + searchEditText.setText(searchSuggestion); + searchEditText.setSelection(searchSuggestion.length()); + showKeyboardSearch(); + return true; + }); + correctSuggestion.setVisibility(View.VISIBLE); - } else { - correctSuggestion.setVisibility(View.GONE); } } From b96d1714b50728bdde81eff125174ba220d697e9 Mon Sep 17 00:00:00 2001 From: TobiGr Date: Tue, 7 Jul 2020 20:23:37 +0200 Subject: [PATCH 6/6] Highlight search suggestion --- .../newpipe/fragments/list/search/SearchFragment.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java index ade536c3f..71bf0f8cd 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java @@ -7,6 +7,7 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.text.Editable; +import android.text.Html; import android.text.TextUtils; import android.text.TextWatcher; import android.util.Log; @@ -71,6 +72,7 @@ import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; import io.reactivex.subjects.PublishSubject; +import static android.text.Html.escapeHtml; import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags; import static java.util.Arrays.asList; import static org.schabi.newpipe.util.AnimationUtils.animateView; @@ -1003,7 +1005,11 @@ public class SearchFragment extends BaseListFragment" + escapeHtml(searchSuggestion) + ""; + correctSuggestion.setText( + Html.fromHtml(String.format(helperText, highlightedSearchSuggestion))); + correctSuggestion.setOnClickListener(v -> { correctSuggestion.setVisibility(View.GONE);