diff options
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java | 11 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java | 27 |
2 files changed, 15 insertions, 23 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java index 08f2a5895..d1615b410 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java @@ -9,15 +9,12 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; - import com.bumptech.glide.Glide; - import com.bumptech.glide.request.RequestOptions; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.Feed; import de.danoeh.antennapod.core.feed.FeedComponent; import de.danoeh.antennapod.core.feed.FeedItem; -import de.danoeh.antennapod.core.feed.SearchResult; import de.danoeh.antennapod.core.glide.ApGlideSettings; /** @@ -40,7 +37,7 @@ public class SearchlistAdapter extends BaseAdapter { } @Override - public SearchResult getItem(int position) { + public FeedComponent getItem(int position) { return itemAccess.getItem(position); } @@ -52,8 +49,7 @@ public class SearchlistAdapter extends BaseAdapter { @Override public View getView(int position, View convertView, ViewGroup parent) { final Holder holder; - SearchResult result = getItem(position); - FeedComponent component = result.getComponent(); + FeedComponent component = getItem(position); // Inflate Layout if (convertView == null) { @@ -94,7 +90,6 @@ public class SearchlistAdapter extends BaseAdapter { final FeedItem item = (FeedItem) component; holder.title.setText(item.getTitle()); holder.subtitle.setVisibility(View.VISIBLE); - holder.subtitle.setText(result.getLocation().getDescription()); convertView.setAlpha(item.isPlayed() ? 0.5f : 1.0f); @@ -122,7 +117,7 @@ public class SearchlistAdapter extends BaseAdapter { public interface ItemAccess { int getCount(); - SearchResult getItem(int position); + FeedComponent getItem(int position); } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java index 6befa7e18..fdfa875bb 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java @@ -25,7 +25,6 @@ import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.feed.Feed; import de.danoeh.antennapod.core.feed.FeedComponent; import de.danoeh.antennapod.core.feed.FeedItem; -import de.danoeh.antennapod.core.feed.SearchResult; import de.danoeh.antennapod.core.storage.FeedSearcher; import de.danoeh.antennapod.view.EmptyViewHandler; import io.reactivex.Observable; @@ -47,9 +46,8 @@ public class SearchFragment extends Fragment implements AdapterView.OnItemClickL private static final String ARG_FEED = "feed"; private SearchlistAdapter searchAdapter; - private List<SearchResult> searchResults = new ArrayList<>(); + private List<FeedComponent> searchResults = new ArrayList<>(); private Disposable disposable; - private ListView listView; private ProgressBar progressBar; private EmptyViewHandler emptyViewHandler; @@ -57,7 +55,9 @@ public class SearchFragment extends Fragment implements AdapterView.OnItemClickL * Create a new SearchFragment that searches all feeds. */ public static SearchFragment newInstance(String query) { - if (query == null) query = ""; + if (query == null) { + query = ""; + } SearchFragment fragment = new SearchFragment(); Bundle args = new Bundle(); args.putString(ARG_QUERY, query); @@ -103,7 +103,7 @@ public class SearchFragment extends Fragment implements AdapterView.OnItemClickL ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(R.string.search_label); View layout = inflater.inflate(R.layout.search_fragment, container, false); - listView = layout.findViewById(R.id.listview); + ListView listView = layout.findViewById(R.id.listview); progressBar = layout.findViewById(R.id.progressBar); searchAdapter = new SearchlistAdapter(getActivity(), itemAccess); listView.setAdapter(searchAdapter); @@ -125,15 +125,12 @@ public class SearchFragment extends Fragment implements AdapterView.OnItemClickL @Override public void onItemClick(AdapterView<?> parent, View view, int position, long id) { - SearchResult result = (SearchResult) listView.getAdapter().getItem(position); - FeedComponent comp = result.getComponent(); + FeedComponent comp = searchAdapter.getItem(position); if (comp.getClass() == Feed.class) { ((MainActivity) getActivity()).loadFeedFragmentById(comp.getId(), null); - } else { - if (comp.getClass() == FeedItem.class) { - FeedItem item = (FeedItem) comp; - ((MainActivity) getActivity()).loadChildFragment(ItemPagerFragment.newInstance(item.getId())); - } + } else if (comp.getClass() == FeedItem.class) { + FeedItem item = (FeedItem) comp; + ((MainActivity) getActivity()).loadChildFragment(ItemPagerFragment.newInstance(item.getId())); } } @@ -167,7 +164,7 @@ public class SearchFragment extends Fragment implements AdapterView.OnItemClickL search(); } - private void onSearchResults(List<SearchResult> results) { + private void onSearchResults(List<FeedComponent> results) { progressBar.setVisibility(View.GONE); searchResults = results; searchAdapter.notifyDataSetChanged(); @@ -182,7 +179,7 @@ public class SearchFragment extends Fragment implements AdapterView.OnItemClickL } @Override - public SearchResult getItem(int position) { + public FeedComponent getItem(int position) { if (0 <= position && position < searchResults.size()) { return searchResults.get(position); } else { @@ -204,7 +201,7 @@ public class SearchFragment extends Fragment implements AdapterView.OnItemClickL } @NonNull - private List<SearchResult> performSearch() { + private List<FeedComponent> performSearch() { Bundle args = getArguments(); String query = args.getString(ARG_QUERY); long feed = args.getLong(ARG_FEED); |