Merge pull request #5179 from osmandapp/WebPCheckFix

check for webP images

OsmAnd/res/layout/fragment_direction_indication_dialog.xml

@@ -69,6 +69,7 @@
                 android:orientation="vertical">
 
                 <FrameLayout
+                    android:id="@+id/action_bar_image_container"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/action_bar_image_height"
                     android:background="?attr/actionModeBackground">

OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java

@@ -8,6 +8,7 @@ import android.graphics.PorterDuff;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.FileProvider;
@@ -162,7 +163,11 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		}
 		View emptyView = view.findViewById(android.R.id.empty);
 		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
+		if (Build.VERSION.SDK_INT >= 18) {
 			emptyImageView.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_empty_state_favorites_day : R.drawable.ic_empty_state_favorites_night);
+		} else {
+			emptyImageView.setVisibility(View.INVISIBLE);
+		}
 		Button importButton = (Button) emptyView.findViewById(R.id.import_button);
 		importButton.setOnClickListener(new View.OnClickListener() {
 			@Override

OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java

@@ -99,12 +99,17 @@ public class NotesFragment extends OsmAndListFragment {
 		ViewStub emptyStub = (ViewStub) view.findViewById(R.id.empty_view_stub);
 		emptyStub.setLayoutResource(R.layout.empty_state_av_notes);
 		emptyView = emptyStub.inflate();
-		int icRes = getMyApplication().getSettings().isLightContent()
-				? R.drawable.ic_empty_state_av_notes_day : R.drawable.ic_empty_state_av_notes_night;
-		((ImageView) emptyView.findViewById(R.id.empty_state_image_view)).setImageResource(icRes);
 		emptyView.setBackgroundColor(getResources().getColor(getMyApplication().getSettings()
 				.isLightContent() ? R.color.ctx_menu_info_view_bg_light : R.color.ctx_menu_info_view_bg_dark));
+		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
 
+		if (Build.VERSION.SDK_INT >= 18) {
+			int icRes = getMyApplication().getSettings().isLightContent()
+					? R.drawable.ic_empty_state_av_notes_day : R.drawable.ic_empty_state_av_notes_night;
+			emptyImageView.setImageResource(icRes);
+		} else {
+			emptyImageView.setVisibility(View.INVISIBLE);
+		}
 		return view;
 	}
 

OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java

@@ -5,6 +5,7 @@ import android.content.res.ColorStateList;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
@@ -222,6 +223,7 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
 	}
 
 	private void updateHelpImage() {
+		if (Build.VERSION.SDK_INT >= 18) {
 			OsmandSettings settings = getSettings();
 			int count = settings.DISPLAYED_MARKERS_WIDGETS_COUNT.get();
 			LinkedList<Drawable> imgList = new LinkedList<>();
@@ -253,6 +255,9 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
 			}
 			((ImageView) mainView.findViewById(R.id.action_bar_image))
 					.setImageDrawable(new LayerDrawable(imgList.toArray(new Drawable[imgList.size()])));
+		} else {
+			mainView.findViewById(R.id.action_bar_image_container).setVisibility(View.GONE);
+		}
 	}
 
 	private Drawable getTopBar2Img() {

OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersActiveFragment.java

@@ -1,5 +1,6 @@
 package net.osmand.plus.mapmarkers;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
@@ -126,7 +127,11 @@ public class MapMarkersActiveFragment extends Fragment implements OsmAndCompassL
 
 		final View emptyView = mainView.findViewById(R.id.empty_view);
 		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
+		if (Build.VERSION.SDK_INT >= 18) {
 			emptyImageView.setImageResource(mapActivity.getMyApplication().getSettings().isLightContent() ? R.drawable.ic_empty_state_marker_list_day : R.drawable.ic_empty_state_marker_list_night);
+		} else {
+			emptyImageView.setVisibility(View.INVISIBLE);
+		}
 		recyclerView.setEmptyView(emptyView);
 		recyclerView.setAdapter(adapter);
 		recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {

OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroupsFragment.java

@@ -7,6 +7,7 @@ import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
@@ -304,7 +305,11 @@ public class MapMarkersGroupsFragment extends Fragment implements OsmAndCompassL
 			}
 		});
 		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
+		if (Build.VERSION.SDK_INT >= 18) {
 			emptyImageView.setImageResource(night ? R.drawable.ic_empty_state_marker_group_night : R.drawable.ic_empty_state_marker_group_day);
+		} else {
+			emptyImageView.setVisibility(View.INVISIBLE);
+		}
 		recyclerView.setEmptyView(emptyView);
 		recyclerView.setAdapter(adapter);
 

OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHistoryFragment.java

@@ -7,6 +7,7 @@ import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
@@ -203,7 +204,11 @@ public class MapMarkersHistoryFragment extends Fragment implements MapMarkersHel
 		});
 		final View emptyView = mainView.findViewById(R.id.empty_view);
 		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
+		if (Build.VERSION.SDK_INT >= 18) {
 			emptyImageView.setImageResource(night ? R.drawable.ic_empty_state_marker_history_night : R.drawable.ic_empty_state_marker_history_day);
+		} else {
+			emptyImageView.setVisibility(View.INVISIBLE);
+		}
 		recyclerView.setEmptyView(emptyView);
 		recyclerView.setAdapter(adapter);
 

OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java

@@ -30,7 +30,7 @@ public class SaveAsNewTrackBottomSheetDialogFragment extends MenuBottomSheetDial
 
 		items.add(new DescriptionItem(getString(R.string.measurement_tool_save_as_new_track_descr)));
 
-		if (Build.VERSION.SDK_INT >= 17) {
+		if (Build.VERSION.SDK_INT >= 18) {
 			final int themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
 			View imagesRow = View.inflate(new ContextThemeWrapper(getContext(), themeRes),
 					R.layout.fragment_save_as_new_track_images_row, null);

OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java

@@ -333,7 +333,11 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		listView.addFooterView(footerView);
 		emptyView = v.findViewById(android.R.id.empty);
 		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
+		if (Build.VERSION.SDK_INT >= 18) {
 			emptyImageView.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_empty_state_trip_day : R.drawable.ic_empty_state_trip_night);
+		} else {
+			emptyImageView.setVisibility(View.INVISIBLE);
+		}
 		Button importButton = (Button) emptyView.findViewById(R.id.import_button);
 		importButton.setOnClickListener(new View.OnClickListener() {
 			@Override

OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java

@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
@@ -140,12 +141,16 @@ public class OsmEditsFragment extends OsmAndListFragment implements SendPoiDialo
 		ViewStub emptyStub = (ViewStub) view.findViewById(R.id.empty_view_stub);
 		emptyStub.setLayoutResource(R.layout.empty_state_osm_edits);
 		emptyView = emptyStub.inflate();
-		int icRes = getMyApplication().getSettings().isLightContent()
-				? R.drawable.ic_empty_state_osm_edits_day : R.drawable.ic_empty_state_osm_edits_night;
-		((ImageView) emptyView.findViewById(R.id.empty_state_image_view)).setImageResource(icRes);
 		emptyView.setBackgroundColor(getResources().getColor(getMyApplication().getSettings()
 				.isLightContent() ? R.color.ctx_menu_info_view_bg_light : R.color.ctx_menu_info_view_bg_dark));
-
+		ImageView emptyImageView = emptyView.findViewById(R.id.empty_state_image_view);
+		if (Build.VERSION.SDK_INT >= 18) {
+			int icRes = getMyApplication().getSettings().isLightContent()
+					? R.drawable.ic_empty_state_osm_edits_day : R.drawable.ic_empty_state_osm_edits_night;
+			emptyImageView.setImageResource(icRes);
+		} else {
+			emptyImageView.setVisibility(View.INVISIBLE);
+		}
 		FragmentManager fm = getChildFragmentManager();
 		Fragment optionsFragment = fm.findFragmentByTag(OsmEditOptionsBottomSheetDialogFragment.TAG);
 		if (optionsFragment != null) {