yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use recyclerview for search suggestion

Browse Source
This commit is contained in:
NekoInverter committed 2020-11-11 20:14:13 +08:00
1 parent 8445ff437a
commit 85c9d83ae5
11 files changed
+120 -122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+13 -12
View File
@@ -1721,16 +1721,20 @@ public final class GalleryListScene extends BaseScene
private abstract class UrlSuggestion extends SearchBar.Suggestion {
@Override
public CharSequence getText(float textSize) {
Drawable bookImage = DrawableManager.getVectorDrawable(getContext2(), R.drawable.v_book_open_x24);
SpannableStringBuilder ssb = new SpannableStringBuilder(" ");
ssb.append(getResources2().getString(R.string.gallery_list_search_bar_open_gallery));
int imageSize = (int) (textSize * 1.25);
if (bookImage != null) {
bookImage.setBounds(0, 0, imageSize, imageSize);
ssb.setSpan(new ImageSpan(bookImage), 1, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
public CharSequence getText(TextView textView) {
if (textView.getId() == android.R.id.text1) {
Drawable bookImage = DrawableManager.getVectorDrawable(textView.getContext(), R.drawable.v_book_open_x24);
SpannableStringBuilder ssb = new SpannableStringBuilder(" ");
ssb.append(getString(R.string.gallery_list_search_bar_open_gallery));
int imageSize = (int) (textView.getTextSize() * 1.25);
if (bookImage != null) {
bookImage.setBounds(0, 0, imageSize, imageSize);
ssb.setSpan(new ImageSpan(bookImage), 1, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
}
return ssb;
} else {
return null;
}
return ssb;
}
@Override
@@ -1746,9 +1750,6 @@ public final class GalleryListScene extends BaseScene
public abstract Announcer createAnnouncer();
@Override
public void onLongClick() {
}
}
private class GalleryDetailUrlSuggestion extends UrlSuggestion {
app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
+80 -57
View File
@@ -34,21 +34,23 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import androidx.core.util.Pair;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.card.MaterialCardView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.hippo.easyrecyclerview.EasyRecyclerView;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.client.EhTagDatabase;
import com.hippo.view.ViewTransition;
import com.hippo.yorozuya.AnimationUtils;
import com.hippo.yorozuya.LayoutUtils;
import com.hippo.yorozuya.MathUtils;
import com.hippo.yorozuya.SimpleAnimatorListener;
import com.hippo.yorozuya.ViewUtils;
@@ -77,7 +79,7 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
private TextView mTitleTextView;
private ImageView mActionButton;
private SearchEditText mEditText;
private ListView mListView;
private EasyRecyclerView mListView;
private View mListContainer;
private View mListHeader;
@@ -120,7 +122,7 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
mActionButton = (ImageView) ViewUtils.$$(this, R.id.search_action);
mEditText = (SearchEditText) ViewUtils.$$(this, R.id.search_edit_text);
mListContainer = ViewUtils.$$(this, R.id.list_container);
mListView = (ListView) ViewUtils.$$(mListContainer, R.id.search_bar_list);
mListView = (EasyRecyclerView) ViewUtils.$$(mListContainer, R.id.search_bar_list);
mListHeader = ViewUtils.$$(mListContainer, R.id.list_header);
mViewTransition = new ViewTransition(mTitleTextView, mEditText);
@@ -139,11 +141,16 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
mSuggestionList = new ArrayList<>();
mSuggestionAdapter = new SuggestionAdapter(LayoutInflater.from(getContext()));
mListView.setAdapter(mSuggestionAdapter);
mListView.setOnItemClickListener((parent, view, position, id) -> mSuggestionList.get(position).onClick());
mListView.setOnItemLongClickListener((parent, view, position, id) -> {
mSuggestionList.get(position).onLongClick();
LinearLayoutManager layoutManager = new LinearLayoutManager(context);
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context,
layoutManager.getOrientation());
mListView.addItemDecoration(dividerItemDecoration);
mListView.setLayoutManager(layoutManager);
mListView.setOnItemClickListener((parent, view, position, id) -> {
mSuggestionList.get(position).onClick();
return true;
});
mListView.setOnItemLongClickListener((parent, view, position, id) -> mSuggestionList.get(position).onLongClick());
}
private void addListHeader() {
@@ -173,7 +180,7 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
EhTagDatabase ehTagDatabase = EhTagDatabase.getInstance(getContext());
if (!TextUtils.isEmpty(text) && ehTagDatabase != null && !text.endsWith(" ")) {
String[] s = text.split(" ");
if (s != null && s.length > 0) {
if (s.length > 0) {
String keyword = s[s.length - 1];
ArrayList<Pair<String, String>> searchHints = ehTagDatabase.suggest(keyword);
@@ -197,7 +204,7 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
mSuggestionAdapter.notifyDataSetChanged();
if (scrollToTop) {
mListView.setSelection(0);
mListView.scrollToPosition(0);
}
}
@@ -501,14 +508,28 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
public abstract static class Suggestion {
public abstract CharSequence getText(float textSize);
public abstract CharSequence getText(TextView textView);
public abstract void onClick();
public abstract void onLongClick();
public boolean onLongClick() {
return false;
}
}
private class SuggestionAdapter extends BaseAdapter {
private static class SuggestionHolder extends RecyclerView.ViewHolder {
TextView text1;
TextView text2;
public SuggestionHolder(@NonNull View itemView) {
super(itemView);
text1 = itemView.findViewById(android.R.id.text1);
text2 = itemView.findViewById(android.R.id.text2);
}
}
private class SuggestionAdapter extends RecyclerView.Adapter<SuggestionHolder> {
private final LayoutInflater mInflater;
@@ -516,14 +537,25 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
mInflater = inflater;
}
@NonNull
@Override
public int getCount() {
return mSuggestionList.size();
public SuggestionHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new SuggestionHolder(mInflater.inflate(R.layout.item_simple_list_2, parent, false));
}
@Override
public Object getItem(int position) {
return mSuggestionList.get(position);
public void onBindViewHolder(@NonNull SuggestionHolder holder, int position) {
Suggestion suggestion = mSuggestionList.get(position);
CharSequence text1 = suggestion.getText(holder.text1);
CharSequence text2 = suggestion.getText(holder.text2);
holder.text1.setText(text1);
if (text2 == null) {
holder.text2.setVisibility(View.GONE);
holder.text2.setText("");
} else {
holder.text2.setVisibility(View.VISIBLE);
holder.text2.setText(text2);
}
}
@Override
@@ -532,29 +564,10 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view;
if (convertView == null) {
view = mInflater.inflate(R.layout.item_simple_list_2, parent, false);
} else {
view = convertView;
}
TextView textView1 = view.findViewById(android.R.id.text1);
CharSequence text1 = mSuggestionList.get(position).getText(textView1.getTextSize());
TextView textView2 = view.findViewById(android.R.id.text2);
CharSequence text2 = mSuggestionList.get(position).getText(textView2.getTextSize());
textView1.setText(text1);
if (text1.equals(text2)) {
textView2.setVisibility(View.GONE);
textView2.setText("");
} else {
textView2.setVisibility(View.VISIBLE);
textView2.setText(text2);
}
return view;
public int getItemCount() {
return mSuggestionList.size();
}
}
public class TagSuggestion extends SearchBar.Suggestion {
@@ -567,8 +580,8 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
}
@Override
public CharSequence getText(float textSize) {
if (LayoutUtils.pix2sp(getContext(), textSize) > 15) {
public CharSequence getText(TextView textView) {
if (textView.getId() == android.R.id.text1) {
return mKeyword;
} else {
return mHint;
@@ -577,17 +590,16 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
@Override
public void onClick() {
String text = mEditText.getText().toString();
String temp = wrapTagKeyword(mKeyword) + " ";
if (text.contains(" ")) {
temp = text.substring(0, text.lastIndexOf(" ")) + " " + temp;
Editable editable = mEditText.getText();
if (editable != null) {
String text = editable.toString();
String temp = wrapTagKeyword(mKeyword) + " ";
if (text.contains(" ")) {
temp = text.substring(0, text.lastIndexOf(" ")) + " " + temp;
}
mEditText.setText(temp);
mEditText.setSelection(editable.length());
}
mEditText.setText(temp);
mEditText.setSelection(mEditText.getText().length());
}
@Override
public void onLongClick() {
}
}
@@ -600,20 +612,31 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
}
@Override
public CharSequence getText(float textSize) {
return mKeyword;
public CharSequence getText(TextView textView) {
if (textView.getId() == android.R.id.text1) {
return mKeyword;
} else {
return null;
}
}
@Override
public void onClick() {
mEditText.setText(mKeyword);
mEditText.setSelection(mEditText.getText().length());
mEditText.setSelection(mEditText.length());
}
@Override
public void onLongClick() {
mSearchDatabase.deleteQuery(mKeyword);
updateSuggestions(false);
public boolean onLongClick() {
new MaterialAlertDialogBuilder(getContext())
.setMessage(getContext().getString(R.string.delete_search_history, mKeyword))
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.delete, (dialog, which) -> {
mSearchDatabase.deleteQuery(mKeyword);
updateSuggestions(false);
})
.show();
return true;
}
}
app/src/main/java/com/hippo/scene/StageActivity.java
+2 -2
View File
@@ -269,7 +269,7 @@ public abstract class StageActivity extends EhActivity {
// Use default animation
if (horizontal) {
transaction.setCustomAnimations(R.anim.scene_open_enter_horizontal, R.anim.scene_open_exit_horizontal);
transaction.setCustomAnimations(R.anim.scene_open_enter_horizontal, R.anim.scene_open_exit);
} else {
transaction.setCustomAnimations(R.anim.scene_open_enter, R.anim.scene_open_exit);
}
@@ -361,7 +361,7 @@ public abstract class StageActivity extends EhActivity {
newScene.setExitTransition(null);
// Set default animation
if (horizontal) {
transaction.setCustomAnimations(R.anim.scene_open_enter_horizontal, R.anim.scene_open_exit_horizontal);
transaction.setCustomAnimations(R.anim.scene_open_enter_horizontal, R.anim.scene_open_exit);
} else {
transaction.setCustomAnimations(R.anim.scene_open_enter, R.anim.scene_open_exit);
}
app/src/main/res/anim/scene_open_exit_horizontal.xml
-28
View File
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<alpha
android:duration="217"
android:fillAfter="true"
android:fillBefore="false"
android:fillEnabled="true"
android:fromAlpha="1.0"
android:interpolator="@android:interpolator/accelerate_decelerate"
android:toAlpha="0.7" />
</set>
app/src/main/res/layout/item_simple_list_2.xml
+2 -1
View File
@@ -21,7 +21,8 @@
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingTop="8dp"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:paddingBottom="8dp">
android:paddingBottom="8dp"
android:background="?selectableItemBackground">
<TextView
android:id="@android:id/text1"
app/src/main/res/layout/scene_favorites.xml
+2 -3
View File
@@ -30,9 +30,8 @@
style="@style/CardView.Normal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/gallery_search_bar_margin_h"
android:layout_marginTop="@dimen/gallery_search_bar_margin_v"
android:layout_marginRight="@dimen/gallery_search_bar_margin_h" />
android:layout_marginHorizontal="@dimen/gallery_search_bar_margin_h"
android:layout_marginVertical="@dimen/gallery_search_bar_margin_v" />
<com.hippo.widget.FabLayout
android:id="@+id/fab_layout"
app/src/main/res/layout/scene_gallery_list.xml
+2 -3
View File
@@ -35,9 +35,8 @@
style="@style/CardView.Normal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/gallery_search_bar_margin_h"
android:layout_marginTop="@dimen/gallery_search_bar_margin_v"
android:layout_marginRight="@dimen/gallery_search_bar_margin_h" />
android:layout_marginHorizontal="@dimen/gallery_search_bar_margin_h"
android:layout_marginVertical="@dimen/gallery_search_bar_margin_v" />
<com.hippo.widget.FabLayout
android:id="@+id/fab_layout"
app/src/main/res/layout/widget_search_bar.xml
+14 -16
View File
@@ -24,6 +24,18 @@
android:layout_width="match_parent"
android:layout_height="48dp">
<TextView
android:id="@+id/search_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:paddingHorizontal="48dp"
android:maxLines="1"
android:singleLine="true"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_little_large" />
<ImageView
android:id="@+id/search_menu"
android:layout_width="48dp"
@@ -34,18 +46,6 @@
android:focusable="true"
android:padding="12dp" />
<TextView
android:id="@+id/search_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="48dp"
android:layout_marginRight="48dp"
android:maxLines="1"
android:singleLine="true"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_little_large" />
<ImageView
android:id="@+id/search_action"
android:layout_width="48dp"
@@ -86,12 +86,10 @@
android:layout_height="1dp"
android:background="?attr/dividerColor" />
<ListView
<com.hippo.easyrecyclerview.EasyRecyclerView
android:id="@+id/search_bar_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="?attr/dividerColor"
android:dividerHeight="1dp" />
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
app/src/main/res/values-night-v29/colors.xml
+3
View File
@@ -0,0 +1,3 @@
<resources>
<color name="colorNavigationBar">@android:color/transparent</color>
</resources>
app/src/main/res/values-zh-rCN/strings.xml
+1
View File
@@ -733,4 +733,5 @@
<string name="tag_vote_successfully">投票成功</string>
<string name="from_clipboard">从剪贴板导入</string>
<string name="from_clipboard_error">未在剪贴板中发现 Cookeis。</string>
<string name="delete_search_history">从搜索记录中删除“%s”？</string>
</resources>
app/src/main/res/values/strings.xml
+1
View File
@@ -797,4 +797,5 @@
<string name="tag_vote_successfully">Vote successfully</string>
<string name="from_clipboard">From clipboard</string>
<string name="from_clipboard_error">No cookies found in clipboard.</string>
<string name="delete_search_history">Delete \"%s\" from search history?</string>
</resources>