Search working

This commit is contained in:
inorichi 2015-09-30 19:35:27 +02:00
parent 289e53a7f5
commit e175a75031
4 changed files with 82 additions and 3 deletions

View file

@ -59,7 +59,9 @@ public class LibraryPresenter extends BasePresenter {
searchViewSubscription = Observable.switchOnNext(searchViewPublishSubject) searchViewSubscription = Observable.switchOnNext(searchViewPublishSubject)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(Timber::w); .subscribe(
query -> view.getAdapter().getFilter().filter(query)
);
} }
public void initializeMangas() { public void initializeMangas() {

View file

@ -0,0 +1,70 @@
/*
* Copyright (C) 2014 Ribot Ltd.
*
* 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.
*/
package eu.kanade.mangafeed.ui.adapter;
import android.content.Context;
import android.widget.Filter;
import android.widget.Filterable;
import java.util.ArrayList;
import java.util.List;
import eu.kanade.mangafeed.data.models.Manga;
import uk.co.ribot.easyadapter.EasyAdapter;
import uk.co.ribot.easyadapter.ItemViewHolder;
public class CatalogueArrayAdapter<T> extends EasyAdapter<T> implements Filterable {
List<Manga> mangas;
public CatalogueArrayAdapter(Context context, Class<? extends ItemViewHolder> itemViewHolderClass, List<T> listItems) {
super(context, itemViewHolderClass, listItems);
mangas = (List<Manga>)getItems();
}
@Override
public Filter getFilter() {
return new Filter() {
@Override
protected FilterResults performFiltering(CharSequence charSequence) {
FilterResults results = new FilterResults();
String query = charSequence.toString().toLowerCase();
if (query == null || query.length() == 0) {
results.values = mangas;
results.count = mangas.size();
} else {
ArrayList<Manga> filterResultsData = new ArrayList<>();
for (Manga manga: mangas) {
if (manga.title.toLowerCase().contains(query) ||
manga.author.toLowerCase().contains(query) ||
manga.artist.toLowerCase().contains(query)) {
filterResultsData.add(manga);
}
}
results.values = filterResultsData;
results.count = filterResultsData.size();
}
return results;
}
@Override
protected void publishResults(CharSequence constraint, FilterResults results) {
setItems((List<T>) results.values);
}
};
}
}

View file

@ -17,6 +17,7 @@ import eu.kanade.mangafeed.R;
import eu.kanade.mangafeed.data.models.Manga; import eu.kanade.mangafeed.data.models.Manga;
import eu.kanade.mangafeed.presenter.LibraryPresenter; import eu.kanade.mangafeed.presenter.LibraryPresenter;
import eu.kanade.mangafeed.ui.activity.MainActivity; import eu.kanade.mangafeed.ui.activity.MainActivity;
import eu.kanade.mangafeed.ui.adapter.CatalogueArrayAdapter;
import eu.kanade.mangafeed.ui.adapter.MangaLibraryHolder; import eu.kanade.mangafeed.ui.adapter.MangaLibraryHolder;
import eu.kanade.mangafeed.view.LibraryView; import eu.kanade.mangafeed.view.LibraryView;
import timber.log.Timber; import timber.log.Timber;
@ -27,7 +28,7 @@ public class LibraryFragment extends BaseFragment implements LibraryView {
@Bind(R.id.gridView) GridView grid; @Bind(R.id.gridView) GridView grid;
LibraryPresenter presenter; LibraryPresenter presenter;
EasyAdapter<Manga> adapter; CatalogueArrayAdapter<Manga> adapter;
MainActivity activity; MainActivity activity;
public static LibraryFragment newInstance() { public static LibraryFragment newInstance() {
@ -93,7 +94,7 @@ public class LibraryFragment extends BaseFragment implements LibraryView {
public void setMangas(List<Manga> mangas) { public void setMangas(List<Manga> mangas) {
if (adapter == null) { if (adapter == null) {
adapter = new EasyAdapter<>( adapter = new CatalogueArrayAdapter<>(
getActivity(), getActivity(),
MangaLibraryHolder.class, MangaLibraryHolder.class,
mangas mangas
@ -116,4 +117,8 @@ public class LibraryFragment extends BaseFragment implements LibraryView {
//activity.getSupportActionBar(). //activity.getSupportActionBar().
} }
public CatalogueArrayAdapter getAdapter() {
return adapter;
}
} }

View file

@ -4,8 +4,10 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import eu.kanade.mangafeed.data.models.Manga; import eu.kanade.mangafeed.data.models.Manga;
import eu.kanade.mangafeed.ui.adapter.CatalogueArrayAdapter;
public interface LibraryView extends BaseView { public interface LibraryView extends BaseView {
void setMangas(List<Manga> mangas); void setMangas(List<Manga> mangas);
CatalogueArrayAdapter getAdapter();
} }