Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

small fixes

Browse source
This commit is contained in:
Nazar-Kutz 2020-07-02 14:26:46 +03:00
parent f5f3d28ed6
commit 9d9f0c3cf9
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/res/layout/search_banner_list_item.xml
View file

@ -66,4 +66,10 @@
</LinearLayout>
<LinearLayout
android:id="@+id/buttons_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</LinearLayout>

2
OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java
View file

@ -508,7 +508,7 @@ public class SearchDialogFragment extends DialogFragment implements DownloadEven
for (IndexItem item : g.getIndividualResources()) {
for (String fileTypeTag : downloadTypesToShow) {
DownloadActivityType type = DownloadActivityType.getIndexType(fileTypeTag);
if (type != null && type.equals(item.getType())) {
if (type != null && type == item.getType()) {
filter.add(item);
}
}

10
OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
View file

@ -30,6 +30,7 @@ import net.osmand.plus.R;
import net.osmand.plus.UiUtilities.UpdateLocationViewCache;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
import net.osmand.plus.search.listitems.QuickSearchBannerListItem;
import net.osmand.plus.search.listitems.QuickSearchFreeBannerListItem;
import net.osmand.plus.search.listitems.QuickSearchHeaderListItem;
import net.osmand.plus.search.listitems.QuickSearchListItem;
import net.osmand.plus.search.listitems.QuickSearchListItemType;
@ -207,12 +208,9 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
LinearLayout view;
if (type == QuickSearchListItemType.BANNER) {
final QuickSearchBannerListItem banner = (QuickSearchBannerListItem) listItem;
boolean newView;
if (convertView == null) {
newView = true;
view = (LinearLayout) inflater.inflate(R.layout.search_banner_list_item, null);
} else {
newView = false;
view = (LinearLayout) convertView;
}
@ -232,7 +230,9 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
}
((TextView) view.findViewById(R.id.empty_search_title)).setText(textTitle);
if (newView) {
ViewGroup buttonContainer = view.findViewById(R.id.buttons_container);
if (buttonContainer != null) {
buttonContainer.removeAllViews();
for (ButtonItem button : banner.getButtonItems()) {
View v = inflater.inflate(R.layout.search_banner_button_list_item, null);
TextView title = v.findViewById(R.id.title);
@ -245,7 +245,7 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
icon.setVisibility(View.GONE);
}
v.setOnClickListener(button.getListener());
view.addView(v);
buttonContainer.addView(v);
}
}
} else if (type == QuickSearchListItemType.FREE_VERSION_BANNER) {