diff --git a/OsmAnd/res/drawable/ic_action_bicycle.xml b/OsmAnd/res/drawable/ic_action_bicycle_dark.xml similarity index 100% rename from OsmAnd/res/drawable/ic_action_bicycle.xml rename to OsmAnd/res/drawable/ic_action_bicycle_dark.xml diff --git a/OsmAnd/res/drawable/ic_action_bus.xml b/OsmAnd/res/drawable/ic_action_bus_dark.xml similarity index 100% rename from OsmAnd/res/drawable/ic_action_bus.xml rename to OsmAnd/res/drawable/ic_action_bus_dark.xml diff --git a/OsmAnd/res/drawable/ic_action_car.xml b/OsmAnd/res/drawable/ic_action_car_dark.xml similarity index 100% rename from OsmAnd/res/drawable/ic_action_car.xml rename to OsmAnd/res/drawable/ic_action_car_dark.xml diff --git a/OsmAnd/res/drawable/ic_action_motorcycle.xml b/OsmAnd/res/drawable/ic_action_motorcycle_dark.xml similarity index 100% rename from OsmAnd/res/drawable/ic_action_motorcycle.xml rename to OsmAnd/res/drawable/ic_action_motorcycle_dark.xml diff --git a/OsmAnd/res/drawable/ic_action_pedestrian.xml b/OsmAnd/res/drawable/ic_action_pedestrian_dark.xml similarity index 100% rename from OsmAnd/res/drawable/ic_action_pedestrian.xml rename to OsmAnd/res/drawable/ic_action_pedestrian_dark.xml diff --git a/OsmAnd/res/drawable/ic_action_sail_boat.xml b/OsmAnd/res/drawable/ic_action_sail_boat_dark.xml similarity index 100% rename from OsmAnd/res/drawable/ic_action_sail_boat.xml rename to OsmAnd/res/drawable/ic_action_sail_boat_dark.xml diff --git a/OsmAnd/res/drawable/ic_action_trekking.xml b/OsmAnd/res/drawable/ic_action_trekking_dark.xml similarity index 100% rename from OsmAnd/res/drawable/ic_action_trekking.xml rename to OsmAnd/res/drawable/ic_action_trekking_dark.xml diff --git a/OsmAnd/res/drawable/ic_action_truck.xml b/OsmAnd/res/drawable/ic_action_truck_dark.xml similarity index 100% rename from OsmAnd/res/drawable/ic_action_truck.xml rename to OsmAnd/res/drawable/ic_action_truck_dark.xml diff --git a/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml b/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml index 687f1192c3..0ed2c38ace 100644 --- a/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml +++ b/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml @@ -52,7 +52,7 @@ android:textAllCaps="true" android:textColor="@color/color_white" android:textSize="@dimen/default_desc_text_size" - tools:drawableRight="@drawable/ic_action_car" + tools:drawableRight="@drawable/ic_action_car_dark" tools:text="car"/> diff --git a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml index 0fa5fc5d21..e86c5fe4f3 100644 --- a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml +++ b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml @@ -48,7 +48,7 @@ android:textAllCaps="true" android:textColor="@color/color_white" android:textSize="@dimen/default_desc_text_size" - tools:drawableRight="@drawable/ic_action_car" + tools:drawableRight="@drawable/ic_action_car_dark" tools:text="car"/> diff --git a/OsmAnd/res/layout/list_item_icon_and_title.xml b/OsmAnd/res/layout/list_item_icon_and_title.xml index 9471d4e14a..ee7652a09c 100644 --- a/OsmAnd/res/layout/list_item_icon_and_title.xml +++ b/OsmAnd/res/layout/list_item_icon_and_title.xml @@ -18,7 +18,7 @@ android:layout_centerVertical="true" android:layout_marginEnd="@dimen/bottom_sheet_icon_margin" android:layout_marginRight="@dimen/bottom_sheet_icon_margin" - tools:src="@drawable/ic_action_car"/> + tools:src="@drawable/ic_action_car_dark"/> + tools:src="@drawable/ic_action_bicycle_dark" /> diff --git a/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml b/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml index 76fcd90a7e..0057b31699 100644 --- a/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml +++ b/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml @@ -22,7 +22,7 @@ android:layout_width="@dimen/standard_icon_size" android:layout_height="@dimen/standard_icon_size" android:layout_gravity="center" - tools:src="@drawable/ic_action_bicycle" /> + tools:src="@drawable/ic_action_bicycle_dark" /> diff --git a/OsmAnd/res/layout/preference_button.xml b/OsmAnd/res/layout/preference_button.xml index 09809a23d6..a89464d4ef 100644 --- a/OsmAnd/res/layout/preference_button.xml +++ b/OsmAnd/res/layout/preference_button.xml @@ -21,7 +21,7 @@ android:layout_gravity="center" android:layout_marginLeft="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding" - tools:src="@drawable/ic_action_car" + tools:src="@drawable/ic_action_car_dark" tools:tint="?colorAccent" /> \ No newline at end of file diff --git a/OsmAnd/res/layout/profile_edit_list_item.xml b/OsmAnd/res/layout/profile_edit_list_item.xml index 5f4e9a2971..51f763ee1a 100644 --- a/OsmAnd/res/layout/profile_edit_list_item.xml +++ b/OsmAnd/res/layout/profile_edit_list_item.xml @@ -36,7 +36,7 @@ android:layout_marginTop="@dimen/bottom_sheet_icon_margin" android:layout_marginRight="@dimen/content_padding" android:layout_marginBottom="@dimen/bottom_sheet_icon_margin" - tools:src="@drawable/ic_action_car" + tools:src="@drawable/ic_action_car_dark" tools:tint="@color/profile_icon_color_blue_light_default" /> + tools:src="@drawable/ic_action_bicycle_dark" /> + tools:src="@drawable/ic_action_bus_dark" /> + tools:icon="@drawable/ic_action_car_dark" /> + tools:icon="@drawable/ic_action_car_dark" /> + tools:icon="@drawable/ic_action_car_dark" /> stops) { LinearLayout view = (LinearLayout) buildCollapsableContentView(context, false); - int drawableResId = transportStopRoute.type == null ? R.drawable.ic_action_bus : transportStopRoute.type.getResourceId(); + int drawableResId = transportStopRoute.type == null ? R.drawable.ic_action_bus_dark : transportStopRoute.type.getResourceId(); Drawable icon = getContentIcon(drawableResId); for (int i = 0; i < stops.size(); i++) { final TransportStop stop = stops.get(i); @@ -1421,7 +1421,7 @@ public class RouteDetailsFragment extends ContextMenuFragment implements PublicT TextView transportStopRouteTextView = (TextView) convertView.findViewById(R.id.transport_stop_route_text); ImageView transportStopRouteImageView = (ImageView) convertView.findViewById(R.id.transport_stop_route_icon); - int drawableResId = transportStopRoute.type == null ? R.drawable.ic_action_bus : transportStopRoute.type.getResourceId(); + int drawableResId = transportStopRoute.type == null ? R.drawable.ic_action_bus_dark : transportStopRoute.type.getResourceId(); transportStopRouteImageView.setImageDrawable(app.getUIUtilities().getPaintedIcon(drawableResId, UiUtilities.getContrastColor(mapActivity, bgColor, true))); transportStopRouteTextView.setText(routeRef + ": " + routeDescription); GradientDrawable gradientDrawableBg = (GradientDrawable) convertView.getBackground(); diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java index 4ab491f8b2..7b8cdf4b5d 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java @@ -525,8 +525,8 @@ public class RoutingOptionsHelper { if (rp instanceof LocalRoutingParameterGroup) { LocalRoutingParameterGroup group = (LocalRoutingParameterGroup) rp; if (group.groupName.equals(DRIVING_STYLE)) { - rp.activeIconId = R.drawable.ic_action_bicycle; - rp.disabledIconId = R.drawable.ic_action_bicycle; + rp.activeIconId = R.drawable.ic_action_bicycle_dark; + rp.disabledIconId = R.drawable.ic_action_bicycle_dark; } } if (rp.routingParameter == null) { @@ -888,12 +888,12 @@ public class RoutingOptionsHelper { @Override public int getActiveIconId() { - return R.drawable.ic_action_bus; + return R.drawable.ic_action_bus_dark; } @Override public int getDisabledIconId() { - return R.drawable.ic_action_bus; + return R.drawable.ic_action_bus_dark; } } diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportBetaWarningCard.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportBetaWarningCard.java index 0cbeb78e2c..08e7861cfc 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportBetaWarningCard.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportBetaWarningCard.java @@ -13,7 +13,7 @@ public class PublicTransportBetaWarningCard extends WarningCard { public PublicTransportBetaWarningCard(@NonNull MapActivity mapActivity) { super(mapActivity); - imageId = R.drawable.ic_action_bus; + imageId = R.drawable.ic_action_bus_dark; title = mapActivity.getString(R.string.public_transport_warning_title); linkText = mapActivity.getString(R.string.public_transport_warning_descr_blog); startLinkIndex = linkText.lastIndexOf(" "); diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportCard.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportCard.java index 5e5070da7f..16c058ac53 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportCard.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportCard.java @@ -348,7 +348,7 @@ public class PublicTransportCard extends BaseCard { TextView transportStopRouteTextView = (TextView) bageView.findViewById(R.id.transport_stop_route_text); ImageView transportStopRouteImageView = (ImageView) bageView.findViewById(R.id.transport_stop_route_icon); - int drawableResId = transportStopRoute.type == null ? R.drawable.ic_action_bus : transportStopRoute.type.getResourceId(); + int drawableResId = transportStopRoute.type == null ? R.drawable.ic_action_bus_dark : transportStopRoute.type.getResourceId(); transportStopRouteImageView.setImageDrawable(app.getUIUtilities().getPaintedIcon(drawableResId, UiUtilities.getContrastColor(app, bgColor, true))); transportStopRouteTextView.setText(routeRef); GradientDrawable gradientDrawableBg = (GradientDrawable) bageView.getBackground(); @@ -388,7 +388,7 @@ public class PublicTransportCard extends BaseCard { TextView transportStopRouteTextView = (TextView) bageView.findViewById(R.id.transport_stop_route_text); ImageView transportStopRouteImageView = (ImageView) bageView.findViewById(R.id.transport_stop_route_icon); - transportStopRouteImageView.setImageDrawable(getActiveIcon(R.drawable.ic_action_pedestrian)); + transportStopRouteImageView.setImageDrawable(getActiveIcon(R.drawable.ic_action_pedestrian_dark)); transportStopRouteTextView.setText(OsmAndFormatter.getFormattedDuration((int) walkTime, app)); GradientDrawable gradientDrawableBg = (GradientDrawable) bageView.getBackground(); gradientDrawableBg.setColor(activeColor); diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportNotFoundWarningCard.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportNotFoundWarningCard.java index 6ebeec2dee..42f28cf001 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportNotFoundWarningCard.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportNotFoundWarningCard.java @@ -9,7 +9,7 @@ public class PublicTransportNotFoundWarningCard extends WarningCard { public PublicTransportNotFoundWarningCard(@NonNull MapActivity mapActivity) { super(mapActivity); - imageId = R.drawable.ic_action_pedestrian; + imageId = R.drawable.ic_action_pedestrian_dark; title = mapActivity.getString(R.string.public_transport_no_route_title) + "\n\n" + mapActivity.getString(R.string.public_transport_try_ped); linkText = mapActivity.getString(R.string.public_transport_calc_pedestrian); } diff --git a/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java index ceccd0ffed..67027d462e 100644 --- a/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java @@ -154,7 +154,7 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme private void setupDrivingRegionPref() { ApplicationMode selectedMode = getSelectedAppMode(); Preference defaultDrivingRegion = findPreference(settings.DRIVING_REGION.getId()); - defaultDrivingRegion.setIcon(getContentIcon(R.drawable.ic_action_car)); + defaultDrivingRegion.setIcon(getContentIcon(R.drawable.ic_action_car_dark)); defaultDrivingRegion.setSummary(getString(settings.DRIVING_REGION_AUTOMATIC.getModeValue(selectedMode) ? R.string.driving_region_automatic : settings.DRIVING_REGION.getModeValue(selectedMode).name)); } diff --git a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java index d70af55bee..b4b71d82d0 100644 --- a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java @@ -389,7 +389,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP case AVOID_ROUTING_PARAMETER_PREFIX: return getContentIcon(R.drawable.ic_action_alert); case DRIVING_STYLE: - return getContentIcon(R.drawable.ic_action_bicycle); + return getContentIcon(R.drawable.ic_action_bicycle_dark); case "fast_route_mode": return getContentIcon(R.drawable.ic_action_fastest_route); case "enable_time_conditional_routing":