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

Remove specify gallery search

Browse Source
This commit is contained in:
seven332 committed 2018-12-16 02:08:56 +08:00
1 parent 24d386da44
commit af771c7086
12 files changed
+13 -66
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
+4 -29
View File
@@ -1193,36 +1193,11 @@ public final class GalleryListScene extends BaseScene
}
if (mState == STATE_SEARCH || mState == STATE_SEARCH_SHOW_LIST) {
if (mSearchLayout.isSpecifyGallery()) {
int index = query.indexOf(' ');
if (index <= 0 || index >= query.length() - 1) {
showTip(R.string.error_invalid_specify_gallery, LENGTH_LONG);
return;
}
long gid;
String token;
try {
gid = Long.parseLong(query.substring(0, index));
} catch (NumberFormatException e) {
showTip(R.string.error_invalid_specify_gallery, LENGTH_LONG);
return;
}
token = query.substring(index + 1);
Bundle args = new Bundle();
args.putString(GalleryDetailScene.KEY_ACTION, GalleryDetailScene.ACTION_GID_TOKEN);
args.putLong(GalleryDetailScene.KEY_GID, gid);
args.putString(GalleryDetailScene.KEY_TOKEN, token);
startScene(new Announcer(GalleryDetailScene.class).setArgs(args));
try {
mSearchLayout.formatListUrlBuilder(mUrlBuilder, query);
} catch (EhException e) {
showTip(e.getMessage(), LENGTH_LONG);
return;
} else {
try {
mSearchLayout.formatListUrlBuilder(mUrlBuilder, query);
} catch (EhException e) {
showTip(e.getMessage(), LENGTH_LONG);
return;
}
}
} else {
mUrlBuilder.reset();
app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java
-4
View File
@@ -232,10 +232,6 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC
}
}
public boolean isSpecifyGallery() {
return R.id.search_specify_gallery == mNormalSearchMode.getCheckedRadioButtonId();
}
public void formatListUrlBuilder(ListUrlBuilder urlBuilder, String query) throws EhException {
urlBuilder.reset();