diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java index 1448dae78b3..167b939f9c2 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java @@ -420,7 +420,7 @@ private CollapsableView getWithinCollapsableView(@NonNull List menuO LinearLayout llv = buildCollapsableContentView(mapActivity, true, true); for (int i = 0; i < menuObjects.size(); i++) { MenuObject menuObject = menuObjects.get(i); - View container = createRowContainer(app, null); + View container = createRowContainer(mapActivity, null); String rowTextPrefix, rowText; String title = menuObject.getTitleStr(); if (title.contains(":")) { @@ -1423,7 +1423,7 @@ protected void buildNearestWikiRow(ViewGroup viewGroup, SearchAmenitiesListener private void buildGetWikipediaBanner(ViewGroup viewGroup) { boolean light = isLightContent(); OsmAndFeature feature = OsmAndFeature.WIKIPEDIA; - LinearLayout view = buildCollapsableContentView(app, false, true); + LinearLayout view = buildCollapsableContentView(viewGroup.getContext(), false, true); View banner = UiUtilities.getInflater(mapActivity, !light) .inflate(R.layout.get_wikipedia_context_menu_banner, view, false); @@ -1439,7 +1439,7 @@ private void buildGetWikipediaBanner(ViewGroup viewGroup) { } }); - View row = createRowContainer(app, NEAREST_WIKI_KEY); + View row = createRowContainer(viewGroup.getContext(), NEAREST_WIKI_KEY); view.addView(banner); String text = app.getString(R.string.wiki_around); CollapsableView collapsableView = new CollapsableView(view, this, false); diff --git a/OsmAnd/src/net/osmand/plus/search/NearbyPlacesAdapter.kt b/OsmAnd/src/net/osmand/plus/search/NearbyPlacesAdapter.kt index e309693ec8e..8b41a57469a 100644 --- a/OsmAnd/src/net/osmand/plus/search/NearbyPlacesAdapter.kt +++ b/OsmAnd/src/net/osmand/plus/search/NearbyPlacesAdapter.kt @@ -29,8 +29,7 @@ class NearbyPlacesAdapter( } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NearbyViewHolder { - val app = parent.context.applicationContext as OsmandApplication - val inflater = UiUtilities.getInflater(app, isNightMode()) + val inflater = UiUtilities.getInflater(parent.context, isNightMode()) val view = inflater.inflate( if (isVertical) R.layout.search_nearby_item_vertical else R.layout.search_nearby_item, parent, diff --git a/OsmAnd/src/net/osmand/plus/search/dialogs/QuickSearchListFragment.java b/OsmAnd/src/net/osmand/plus/search/dialogs/QuickSearchListFragment.java index 1ec2f86025f..b374ff711a1 100644 --- a/OsmAnd/src/net/osmand/plus/search/dialogs/QuickSearchListFragment.java +++ b/OsmAnd/src/net/osmand/plus/search/dialogs/QuickSearchListFragment.java @@ -83,7 +83,7 @@ protected int getLayoutId() { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - LayoutInflater themedInflater = UiUtilities.getInflater(app, !app.getSettings().isLightContent()); + LayoutInflater themedInflater = UiUtilities.getInflater(requireContext(), !app.getSettings().isLightContent()); return themedInflater.inflate(getLayoutId(), container, false); }