Merge remote-tracking branch 'origin/master'

OsmAnd/res/layout/change_order_item.xml

@@ -11,7 +11,7 @@
     android:background="@color/color_white">
 
     <ImageButton
-        android:src="@drawable/av_download"
+        android:src="@drawable/ic_action_down_dark"
         android:id="@+id/down"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
@@ -28,7 +28,7 @@
         android:layout_weight="1" />
 
     <ImageButton
-        android:src="@drawable/av_upload"
+        android:src="@drawable/ic_action_up_dark"
         android:id="@+id/up"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />

OsmAnd/res/layout/dash_error_fragment.xml

@@ -17,10 +17,12 @@
 		<ImageView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="top"
+			android:layout_gravity="center"
+			android:id="@+id/error_icon"
+			android:scaleType="center"
 			android:layout_marginLeft="@dimen/dashFavIconMargin"
 			android:layout_marginRight="@dimen/dashFavIconMargin"
-			android:src="@drawable/ic_crashlog"/>
+			android:src="@drawable/ic_action_remove_dark"/>
 
 		<TextView
 			android:id="@+id/error_header"

OsmAnd/res/layout/parking_set_type.xml

@@ -18,7 +18,7 @@
 					 android:layout_gravity="center_horizontal"
 					 android:id="@+id/parking_no_lim_button"
 					 android:gravity="center_horizontal"
-					 android:background="@drawable/poi_parking_pos_no_limit_menu"
+					 android:background="@drawable/list_poi_parking_pos_no_limit_menu"
 					 android:contentDescription="@string/osmand_parking_time_no_limit"/>
 
 		<TextView android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
 					 android:id="@+id/parking_lim_button"
 					 android:layout_gravity="center_horizontal"
 					 android:gravity="center_horizontal"
-					 android:background="@drawable/poi_parking_pos_limit_menu"
+					 android:background="@drawable/list_poi_parking_pos_limit_menu"
 					 android:contentDescription="@string/osmand_parking_time_limit"/>
 
 		<TextView android:layout_height="wrap_content"

OsmAnd/res/values/styles.xml

@@ -141,8 +141,8 @@
 		<item name="dashboard_button">@drawable/dashboard_button_light</item>
 		<item name="dashboardSearchButtonStyle">@style/DashboardSearchButton.Light</item>
         <item name="search_background">@color/search_background_dark</item>
-        <item name="android:actionModeCloseDrawable">@drawable/action_mode_back</item>
-        <item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
+        <item name="android:actionModeCloseDrawable">@drawable/ic_action_mode_back</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_action_mode_back</item>
         <item name="android:actionModeStyle">@style/WhiteActionMode</item>
         <item name="actionModeStyle">@style/WhiteActionMode</item>
         <item name="android:actionMenuTextColor">@color/color_white</item>

OsmAnd/src/net/osmand/plus/ApplicationMode.java

@@ -101,8 +101,8 @@ public class ApplicationMode {
 		}
 		
 		public ApplicationModeBuilder carLocation(){
-			applicationMode.bearingIcon = R.drawable.car_bearing;
-			applicationMode.locationIcon = R.drawable.car_location;
+			applicationMode.bearingIcon = R.drawable.map_car_bearing;
+			applicationMode.locationIcon = R.drawable.map_car_location;
 			return this;
 		}
 		
@@ -112,14 +112,14 @@ public class ApplicationMode {
 		}
 		
 		public ApplicationModeBuilder bicycleLocation(){
-			applicationMode.bearingIcon = R.drawable.bicycle_bearing;
-			applicationMode.locationIcon = R.drawable.bicycle_location;
+			applicationMode.bearingIcon = R.drawable.map_bicycle_bearing;
+			applicationMode.locationIcon = R.drawable.map_bicycle_location;
 			return this;
 		}
 		
 		public ApplicationModeBuilder defLocation(){
-			applicationMode.bearingIcon = R.drawable.pedestrian_bearing;
-			applicationMode.locationIcon = R.drawable.pedestrian_location;
+			applicationMode.bearingIcon = R.drawable.map_pedestrian_bearing;
+			applicationMode.locationIcon = R.drawable.map_pedestrian_location;
 			return this;
 		}
 		
@@ -152,8 +152,8 @@ public class ApplicationMode {
 	private float defaultSpeed = 10f;
 	private int minDistanceForTurn = 50;
 	private int arrivalDistance = 90;
-	private int bearingIcon = R.drawable.pedestrian_bearing;
-	private int locationIcon = R.drawable.pedestrian_location;
+	private int bearingIcon = R.drawable.map_pedestrian_bearing;
+	private int locationIcon = R.drawable.map_pedestrian_location;
 
 	private ApplicationMode(int key, String stringKey) {
 		this.key = key;

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

@@ -4,7 +4,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-
+import android.annotation.SuppressLint;
 import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.support.v4.view.MenuItemCompat;
@@ -13,7 +13,6 @@ import android.view.*;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.helpers.ScreenOrientationHelper;
-
 import android.os.Bundle;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -30,6 +29,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 	private static final int CLOSE = 4;
 	private WebView wv;
 	
+	@SuppressLint("NewApi")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
@@ -120,7 +120,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 				R.drawable.ic_action_redo_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
 		createMenuItem(menu, CLOSE, R.string.shared_string_close, 
-				R.drawable.ic_action_close_dark,
+				R.drawable.ic_action_remove_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
 		return super.onCreateOptionsMenu(menu);
 	}

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

@@ -251,9 +251,9 @@ public class IntermediatePointsDialog {
 						}
 					});
 				} else {
-					tv.setCompoundDrawablesWithIntrinsicBounds(
-							position == intermediates.size() - 1? R.drawable.list_destination:
-								R.drawable.list_intermediate, 0, 0, 0);
+					int icon = position == intermediates.size() - 1? R.drawable.ic_action_target:
+						R.drawable.ic_action_intermediate;
+					tv.setCompoundDrawablesWithIntrinsicBounds(app.getIconsCache().getContentIcon(icon), null, null, null);
 					tv.setCompoundDrawablePadding(padding);
 					final CheckBox ch = ((CheckBox) v.findViewById(R.id.check_item));
 					ch.setVisibility(View.VISIBLE);

OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java

@@ -19,6 +19,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 /**
@@ -34,6 +35,8 @@ public class DashErrorFragment extends DashBaseFragment {
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_error_fragment, container, false);
 		String msg = MessageFormat.format(getString(R.string.previous_run_crashed), OsmandApplication.EXCEPTION_PATH);
 		Typeface typeface = FontCache.getRobotoMedium(getActivity());
+		ImageView iv = ((ImageView) view.findViewById(R.id.error_icon));
+		iv.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_crashlog));
 		TextView message = ((TextView) view.findViewById(R.id.error_header));
 		message.setTypeface(typeface);
 		message.setText(msg);

OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java

@@ -688,9 +688,9 @@ public class WaypointHelper {
 				}
 				return null;
 			} else if(type == TARGETS) {
-				return uiCtx.getResources().getDrawable(
-						!((TargetPoint)point).intermediate? R.drawable.list_destination:
-					R.drawable.list_intermediate);
+				int i = !((TargetPoint)point).intermediate? R.drawable.list_destination :
+					R.drawable.list_destination;
+				return uiCtx.getResources().getDrawable(i);
 			} else if(type == FAVORITES || type == WAYPOINTS) {
 				return FavoriteImageDrawable.getOrCreate(uiCtx, point.getColor());
 			} else if(type == ALARMS) {

OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java

@@ -139,7 +139,7 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 						}
 					}).position(0).reg();
 			if(OsMoPositionLayer.getFollowDestinationId() != null) {
-				adapter.item(R.string.osmo_cancel_moving_target).iconColor(R.drawable.ic_action_close_dark).listen(new OnContextMenuClick() {
+				adapter.item(R.string.osmo_cancel_moving_target).iconColor(R.drawable.ic_action_remove_dark).listen(new OnContextMenuClick() {
 
 							@Override
 							public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {

OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionLayer.java

@@ -70,8 +70,8 @@ public class ParkingPositionLayer extends OsmandMapLayer implements ContextMenuL
 		bitmapPaint.setDither(true);
 		bitmapPaint.setAntiAlias(true);
 		bitmapPaint.setFilterBitmap(true);
-		parkingNoLimitIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.poi_parking_pos_no_limit);
-		parkingLimitIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.poi_parking_pos_limit);
+		parkingNoLimitIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_poi_parking_pos_no_limit);
+		parkingLimitIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_poi_parking_pos_limit);
 		timeLimit = plugin.getParkingType();
 	}
 

OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java

@@ -29,8 +29,7 @@ public class SkiMapsPlugin extends OsmandPlugin {
 	
 	@Override
 	public int getLogoResourceId() {
-		// TODO
-		return super.getLogoResourceId();
+		return R.drawable.ic_plugin_skimaps;
 	}
 	
 	@Override

OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java

@@ -169,7 +169,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	private void initTopControls() {
 		View configureMap = mapActivity.findViewById(R.id.map_layers_button);
-		controls.add(createHudButton((ImageView) configureMap, R.drawable.ic_action_layers_dark).setBg(
+		controls.add(createHudButton((ImageView) configureMap, R.drawable.map_layer_dark).setIconColorId(0).setBg(
 				R.drawable.btn_inset_circle, R.drawable.btn_inset_circle_night));
 		configureMap.setOnClickListener(new View.OnClickListener() {
 			@Override

OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java

@@ -141,8 +141,8 @@ public class MapInfoLayer extends OsmandMapLayer {
 		rightStack.requestLayout();
 		expand.setVisibility(mapInfoControls.hasCollapsibles(settings.getApplicationMode())? 
 				View.VISIBLE : View.GONE);
-		this.expand.setImageResource(expanded ? R.drawable.av_upload :
-			R.drawable.av_download);
+		this.expand.setImageResource(expanded ? R.drawable.map_up :
+			R.drawable.map_down);
 		expand.setOnClickListener(new OnClickListener() {
 			
 			@Override
@@ -315,7 +315,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 			}
 		});
 		cm.item(R.string.map_widget_reset) 
-				.iconColor(R.drawable.widget_reset_to_default_dark).listen(new OnContextMenuClick() {
+				.iconColor(R.drawable.ic_action_reset_to_default_dark).listen(new OnContextMenuClick() {
 					
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {

OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java

@@ -61,9 +61,9 @@ public class PointNavigationLayer extends OsmandMapLayer implements IContextMenu
 		textPaint.setTextSize(sp * 18);
 		textPaint.setTextAlign(Align.CENTER);
 		textPaint.setAntiAlias(true);
-		targetPoint = BitmapFactory.decodeResource(view.getResources(), R.drawable.target_point);
-		intermediatePoint = BitmapFactory.decodeResource(view.getResources(), R.drawable.intermediate_point);
-		arrowToDestination = BitmapFactory.decodeResource(view.getResources(), R.drawable.arrow_to_destination);
+		targetPoint = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_target_point);
+		intermediatePoint = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_intermediate_point);
+		arrowToDestination = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_arrow_to_destination);
 
 		
 	}