forked from commons-app/apps-android-commons
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Current status, list size is working, visibility working, filter mech…
…anism is ready
- Loading branch information
1 parent
56334af
commit 7d75c9c
Showing
13 changed files
with
279 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 0 additions & 75 deletions
75
app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchListViewAdapter.java
This file was deleted.
Oops, something went wrong.
139 changes: 139 additions & 0 deletions
139
app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| package fr.free.nrw.commons.nearby; | ||
|
|
||
| import android.content.Context; | ||
| import android.view.LayoutInflater; | ||
| import android.view.View; | ||
| import android.view.ViewGroup; | ||
| import android.widget.Filter; | ||
| import android.widget.Filterable; | ||
| import android.widget.ImageView; | ||
| import android.widget.TextView; | ||
|
|
||
| import androidx.annotation.NonNull; | ||
| import androidx.recyclerview.widget.RecyclerView; | ||
|
|
||
| import java.util.ArrayList; | ||
|
|
||
| import fr.free.nrw.commons.R; | ||
|
|
||
| public class NearbyFilterSearchRecyclerViewAdapter | ||
| extends RecyclerView.Adapter<NearbyFilterSearchRecyclerViewAdapter.RecyclerViewHolder> | ||
| implements Filterable { | ||
|
|
||
| private final LayoutInflater inflater; | ||
| private Context context; | ||
| private ArrayList<Label> labels; | ||
| private ArrayList<Label> displayedLabels; | ||
|
|
||
| public NearbyFilterSearchRecyclerViewAdapter(Context context, ArrayList<Label> labels) { | ||
| this.context = context; | ||
| this.labels = labels; | ||
| this.displayedLabels = labels; | ||
| inflater = LayoutInflater.from(context); | ||
| } | ||
|
|
||
| public class RecyclerViewHolder extends RecyclerView.ViewHolder { | ||
| public TextView placeLabel; | ||
| public ImageView placeIcon; | ||
|
|
||
| public RecyclerViewHolder(View view) { | ||
| super(view); | ||
| placeLabel = view.findViewById(R.id.place_text); | ||
| placeIcon = view.findViewById(R.id.place_icon); | ||
| } | ||
| } | ||
|
|
||
| @NonNull | ||
| @Override | ||
| public RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { | ||
| View itemView = inflater.inflate(R.layout.nearby_search_list_item, parent, false); | ||
| return new RecyclerViewHolder(itemView); | ||
| } | ||
|
|
||
| @Override | ||
| public void onBindViewHolder(@NonNull RecyclerViewHolder holder, int position) { | ||
| Label label = displayedLabels.get(position); | ||
| holder.placeIcon.setImageResource(label.getIcon()); | ||
| holder.placeLabel.setText(label.toString()); | ||
| } | ||
|
|
||
| @Override | ||
| public long getItemId(int position) { | ||
| return displayedLabels.get(position).hashCode(); | ||
| } | ||
|
|
||
| @Override | ||
| public int getItemCount() { | ||
| return displayedLabels.size(); | ||
| } | ||
|
|
||
| @Override | ||
| public Filter getFilter() { | ||
| return new Filter() { | ||
| @Override | ||
| protected FilterResults performFiltering(CharSequence constraint) { | ||
| FilterResults results = new FilterResults(); | ||
| ArrayList<Label> filteredArrayList = new ArrayList<>(); | ||
|
|
||
| if (labels == null) { | ||
| labels = new ArrayList<>(displayedLabels); | ||
| } | ||
|
|
||
| if (constraint == null || constraint.length() == 0) { | ||
| // set the Original result to return | ||
| results.count = labels.size(); | ||
| results.values = labels; | ||
| } else { | ||
| constraint = constraint.toString().toLowerCase(); | ||
|
|
||
| for (Label label : labels) { | ||
| String data = label.toString(); | ||
| if (data.toLowerCase().startsWith(constraint.toString())) { | ||
| filteredArrayList.add(Label.fromText(label.getText())); | ||
| } | ||
| } | ||
|
|
||
| // set the Filtered result to return | ||
| results.count = filteredArrayList.size(); | ||
| results.values = filteredArrayList; | ||
| } | ||
| return results; | ||
| } | ||
|
|
||
| @Override | ||
| protected void publishResults(CharSequence constraint, FilterResults results) { | ||
| displayedLabels = (ArrayList<Label>) results.values; // has the filtered values | ||
| notifyDataSetChanged(); // notifies the data with new filtered values | ||
| } | ||
| }; | ||
| } | ||
| /* | ||
| @Override | ||
| public View getView(int position, View convertView, ViewGroup parent) { | ||
| if (convertView == null) { | ||
| convertView = inflater.inflate(R.layout.nearby_search_list_item, null); | ||
| viewHolder = new RecyclerViewHolder(); | ||
| viewHolder.placeLabel = convertView.findViewById(R.id.place_text); | ||
| viewHolder.placeIcon = convertView.findViewById(R.id.place_icon); | ||
| convertView.setTag(viewHolder); | ||
| } | ||
| else{ | ||
| //Get viewholder we already created | ||
| viewHolder = (RecyclerViewHolder)convertView.getTag(); | ||
| } | ||
| Label label = displayedLabels.get(position); | ||
| if(label != null){ | ||
| viewHolder.placeIcon.setImageResource(label.getIcon()); | ||
| viewHolder.placeLabel.setText(label.toString()); | ||
| } | ||
| return convertView; | ||
| } | ||
| */ | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.