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

Revert names for old app profile icons

Browse source
This commit is contained in:
Dmitry 2020-01-24 18:15:55 +02:00
parent 360a8565c7
commit d058e15639
36 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
OsmAnd/res/drawable/ic_action_bicycle.xml → OsmAnd/res/drawable/ic_action_bicycle_dark.xml
View file

0
OsmAnd/res/drawable/ic_action_bus.xml → OsmAnd/res/drawable/ic_action_bus_dark.xml
View file

0
OsmAnd/res/drawable/ic_action_car.xml → OsmAnd/res/drawable/ic_action_car_dark.xml
View file

0
OsmAnd/res/drawable/ic_action_motorcycle.xml → OsmAnd/res/drawable/ic_action_motorcycle_dark.xml
View file

0
OsmAnd/res/drawable/ic_action_pedestrian.xml → OsmAnd/res/drawable/ic_action_pedestrian_dark.xml
View file

0
OsmAnd/res/drawable/ic_action_sail_boat.xml → OsmAnd/res/drawable/ic_action_sail_boat_dark.xml
View file

0
OsmAnd/res/drawable/ic_action_trekking.xml → OsmAnd/res/drawable/ic_action_trekking_dark.xml
View file

0
OsmAnd/res/drawable/ic_action_truck.xml → OsmAnd/res/drawable/ic_action_truck_dark.xml
View file

2
OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
View file

@ -52,7 +52,7 @@
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:drawableRight="@drawable/ic_action_car" tools:drawableRight="@drawable/ic_action_car_dark"
tools:text="car"/> tools:text="car"/>
</LinearLayout> </LinearLayout>

2
OsmAnd/res/layout/fragment_direction_indication_dialog.xml
View file

@ -48,7 +48,7 @@
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:drawableRight="@drawable/ic_action_car" tools:drawableRight="@drawable/ic_action_car_dark"
tools:text="car"/> tools:text="car"/>
</LinearLayout> </LinearLayout>

2
OsmAnd/res/layout/list_item_icon_and_title.xml
View file

@ -18,7 +18,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin" android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@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"/>
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"

2
OsmAnd/res/layout/main_menu_drawer_btn_configure_profile.xml
View file

@ -28,7 +28,7 @@
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/standard_icon_size"
android:visibility="invisible" android:visibility="invisible"
android:layout_gravity="center" android:layout_gravity="center"
tools:src="@drawable/ic_action_bicycle" /> tools:src="@drawable/ic_action_bicycle_dark" />
</FrameLayout> </FrameLayout>

2
OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml
View file

@ -22,7 +22,7 @@
android:layout_width="@dimen/standard_icon_size" android:layout_width="@dimen/standard_icon_size"
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/standard_icon_size"
android:layout_gravity="center" android:layout_gravity="center"
tools:src="@drawable/ic_action_bicycle" /> tools:src="@drawable/ic_action_bicycle_dark" />
</FrameLayout> </FrameLayout>

2
OsmAnd/res/layout/preference_button.xml
View file

@ -21,7 +21,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@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" /> tools:tint="?colorAccent" />
<LinearLayout <LinearLayout

2
OsmAnd/res/layout/preference_with_descr.xml
View file

@ -23,7 +23,7 @@
android:layout_marginTop="@dimen/bottom_sheet_icon_margin" android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:layout_marginBottom="@dimen/bottom_sheet_icon_margin" android:layout_marginBottom="@dimen/bottom_sheet_icon_margin"
tools:src="@drawable/ic_action_car" tools:src="@drawable/ic_action_car_dark"
tools:tint="@color/active_color_primary_light" /> tools:tint="@color/active_color_primary_light" />
<LinearLayout <LinearLayout

2
OsmAnd/res/layout/profile_button_small.xml
View file

@ -12,7 +12,7 @@
android:layout_width="@dimen/standard_icon_size" android:layout_width="@dimen/standard_icon_size"
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/standard_icon_size"
android:layout_gravity="center" android:layout_gravity="center"
tools:src="@drawable/ic_action_car" tools:src="@drawable/ic_action_car_dark"
tools:tint="@color/active_color_primary_light" /> tools:tint="@color/active_color_primary_light" />
</FrameLayout> </FrameLayout>

2
OsmAnd/res/layout/profile_edit_list_item.xml
View file

@ -36,7 +36,7 @@
android:layout_marginTop="@dimen/bottom_sheet_icon_margin" android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:layout_marginBottom="@dimen/bottom_sheet_icon_margin" 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:tint="@color/profile_icon_color_blue_light_default" />
<LinearLayout <LinearLayout

2
OsmAnd/res/layout/profile_list_item.xml
View file

@ -15,7 +15,7 @@
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/standard_icon_size"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/favorites_icon_right_margin" android:layout_marginRight="@dimen/favorites_icon_right_margin"
tools:src="@drawable/ic_action_bicycle" /> tools:src="@drawable/ic_action_bicycle_dark" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
OsmAnd/res/layout/profile_preference_toolbar_big.xml
View file

@ -67,7 +67,7 @@
android:layout_marginLeft="@dimen/bottom_sheet_image_text_margin_start" android:layout_marginLeft="@dimen/bottom_sheet_image_text_margin_start"
android:layout_marginEnd="@dimen/content_padding" android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
tools:src="@drawable/ic_action_bus" tools:src="@drawable/ic_action_bus_dark"
tools:tint="?attr/default_icon_color" /> tools:tint="?attr/default_icon_color" />
<LinearLayout <LinearLayout

2
OsmAnd/res/layout/route_ped_info.xml
View file

@ -43,7 +43,7 @@
android:layout_marginTop="@dimen/context_menu_padding_margin_large" android:layout_marginTop="@dimen/context_menu_padding_margin_large"
android:layout_marginEnd="@dimen/favorites_icon_right_margin" android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginRight="@dimen/favorites_icon_right_margin" android:layout_marginRight="@dimen/favorites_icon_right_margin"
android:src="@drawable/ic_action_pedestrian" android:src="@drawable/ic_action_pedestrian_dark"
android:tint="@color/description_font_and_bottom_sheet_icons" /> android:tint="@color/description_font_and_bottom_sheet_icons" />
<LinearLayout <LinearLayout

2
OsmAnd/res/layout/transport_stop_route_item_with_icon.xml
View file

@ -20,7 +20,7 @@
android:layout_height="20dp" android:layout_height="20dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_margin="4dp" android:layout_margin="4dp"
tools:src="@drawable/ic_action_bus" /> tools:src="@drawable/ic_action_bus_dark" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/transport_stop_route_text" android:id="@+id/transport_stop_route_text"

2
OsmAnd/res/layout/warning_card.xml
View file

@ -15,7 +15,7 @@
android:layout_marginTop="@dimen/context_menu_padding_margin_large" android:layout_marginTop="@dimen/context_menu_padding_margin_large"
android:layout_marginEnd="@dimen/favorites_icon_right_margin" android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginRight="@dimen/favorites_icon_right_margin" android:layout_marginRight="@dimen/favorites_icon_right_margin"
tools:src="@drawable/ic_action_bus" tools:src="@drawable/ic_action_bus_dark"
tools:tint="?attr/route_info_control_icon_color" /> tools:tint="?attr/route_info_control_icon_color" />
<LinearLayout <LinearLayout

4
OsmAnd/res/xml/navigation_settings_new.xml
View file

@ -9,7 +9,7 @@
android:layout="@layout/preference_with_descr" android:layout="@layout/preference_with_descr"
android:summary="@string/rendering_value_car_name" android:summary="@string/rendering_value_car_name"
android:title="@string/nav_type_hint" android:title="@string/nav_type_hint"
tools:icon="@drawable/ic_action_car" /> tools:icon="@drawable/ic_action_car_dark" />
<Preference <Preference
android:key="route_parameters" android:key="route_parameters"
@ -43,7 +43,7 @@
android:summary="@string/vehicle_parameters_descr" android:summary="@string/vehicle_parameters_descr"
android:title="@string/vehicle_parameters" android:title="@string/vehicle_parameters"
app:fragment="net.osmand.plus.settings.VehicleParametersFragment" app:fragment="net.osmand.plus.settings.VehicleParametersFragment"
tools:icon="@drawable/ic_action_car" /> tools:icon="@drawable/ic_action_car_dark" />
<PreferenceCategory <PreferenceCategory
android:key="other" android:key="other"

2
OsmAnd/res/xml/settings_main_screen.xml
View file

@ -28,7 +28,7 @@
android:persistent="false" android:persistent="false"
android:title="@string/configure_profile" android:title="@string/configure_profile"
app:fragment="net.osmand.plus.settings.ConfigureProfileFragment" app:fragment="net.osmand.plus.settings.ConfigureProfileFragment"
tools:icon="@drawable/ic_action_car" /> tools:icon="@drawable/ic_action_car_dark" />
<PreferenceCategory <PreferenceCategory
android:key="app_profiles" android:key="app_profiles"

26
OsmAnd/src/net/osmand/plus/ApplicationMode.java
View file

@ -96,28 +96,28 @@ public class ApplicationMode {
public static final ApplicationMode CAR = createBase(R.string.app_mode_car, "car") public static final ApplicationMode CAR = createBase(R.string.app_mode_car, "car")
.speed(12.5f, 35) .speed(12.5f, 35)
.locationIcon(LocationIcon.CAR).navigationIcon(NavigationIcon.DEFAULT) .locationIcon(LocationIcon.CAR).navigationIcon(NavigationIcon.DEFAULT)
.icon(R.drawable.ic_action_car, R.drawable.map_action_car_dark, "ic_action_car") .icon(R.drawable.ic_action_car_dark, R.drawable.map_action_car_dark, "ic_action_car_dark")
.setRoutingProfile("car").description(R.string.base_profile_descr_car).reg(); .setRoutingProfile("car").description(R.string.base_profile_descr_car).reg();
public static final ApplicationMode BICYCLE = createBase(R.string.app_mode_bicycle, "bicycle") public static final ApplicationMode BICYCLE = createBase(R.string.app_mode_bicycle, "bicycle")
.speed(2.77f, 15).arrivalDistance(60).offRouteDistance(50) .speed(2.77f, 15).arrivalDistance(60).offRouteDistance(50)
.locationIcon(LocationIcon.BICYCLE).navigationIcon(NavigationIcon.DEFAULT) .locationIcon(LocationIcon.BICYCLE).navigationIcon(NavigationIcon.DEFAULT)
.icon(R.drawable.ic_action_bicycle, R.drawable.map_action_bicycle_dark, "ic_action_bicycle") .icon(R.drawable.ic_action_bicycle_dark, R.drawable.map_action_bicycle_dark, "ic_action_bicycle_dark")
.setRoutingProfile("bicycle").description(R.string.base_profile_descr_bicycle).reg(); .setRoutingProfile("bicycle").description(R.string.base_profile_descr_bicycle).reg();
public static final ApplicationMode PEDESTRIAN = createBase(R.string.app_mode_pedestrian, "pedestrian") public static final ApplicationMode PEDESTRIAN = createBase(R.string.app_mode_pedestrian, "pedestrian")
.speed(1.11f, 5).arrivalDistance(45).offRouteDistance(20) .speed(1.11f, 5).arrivalDistance(45).offRouteDistance(20)
.icon(R.drawable.ic_action_pedestrian, R.drawable.map_action_pedestrian_dark, "ic_action_pedestrian") .icon(R.drawable.ic_action_pedestrian_dark, R.drawable.map_action_pedestrian_dark, "ic_action_pedestrian_dark")
.setRoutingProfile("pedestrian").description(R.string.base_profile_descr_pedestrian).reg(); .setRoutingProfile("pedestrian").description(R.string.base_profile_descr_pedestrian).reg();
public static final ApplicationMode PUBLIC_TRANSPORT = createBase(R.string.app_mode_public_transport, "public_transport") public static final ApplicationMode PUBLIC_TRANSPORT = createBase(R.string.app_mode_public_transport, "public_transport")
.icon(R.drawable.ic_action_bus, R.drawable.map_action_bus_dark, "ic_action_bus") .icon(R.drawable.ic_action_bus_dark, R.drawable.map_action_bus_dark, "ic_action_bus_dark")
.setRoutingProfile("public_transport").description(R.string.base_profile_descr_public_transport).reg(); .setRoutingProfile("public_transport").description(R.string.base_profile_descr_public_transport).reg();
public static final ApplicationMode BOAT = createBase(R.string.app_mode_boat, "boat") public static final ApplicationMode BOAT = createBase(R.string.app_mode_boat, "boat")
.speed(1.38f, 20) .speed(1.38f, 20)
.locationIcon(LocationIcon.DEFAULT).navigationIcon(NavigationIcon.NAUTICAL) .locationIcon(LocationIcon.DEFAULT).navigationIcon(NavigationIcon.NAUTICAL)
.icon(R.drawable.ic_action_sail_boat, R.drawable.map_action_sail_boat_dark, "ic_action_sail_boat") .icon(R.drawable.ic_action_sail_boat_dark, R.drawable.map_action_sail_boat_dark, "ic_action_sail_boat_dark")
.setRoutingProfile("boat").description(R.string.base_profile_descr_boat).reg(); .setRoutingProfile("boat").description(R.string.base_profile_descr_boat).reg();
public static final ApplicationMode AIRCRAFT = createBase(R.string.app_mode_aircraft, "aircraft") public static final ApplicationMode AIRCRAFT = createBase(R.string.app_mode_aircraft, "aircraft")
@ -854,19 +854,19 @@ public class ApplicationMode {
public enum ProfileIcons { public enum ProfileIcons {
DEFAULT(R.drawable.ic_world_globe_dark, R.string.app_mode_default, "ic_world_globe_dark"), DEFAULT(R.drawable.ic_world_globe_dark, R.string.app_mode_default, "ic_world_globe_dark"),
CAR(R.drawable.ic_action_car, R.string.app_mode_car, "ic_action_car"), CAR(R.drawable.ic_action_car_dark, R.string.app_mode_car, "ic_action_car_dark"),
TAXI(R.drawable.ic_action_taxi, R.string.app_mode_taxi, "ic_action_taxi"), TAXI(R.drawable.ic_action_taxi, R.string.app_mode_taxi, "ic_action_taxi"),
TRUCK(R.drawable.ic_action_truck, R.string.app_mode_truck, "ic_action_truck"), TRUCK(R.drawable.ic_action_truck_dark, R.string.app_mode_truck, "ic_action_truck_dark"),
SHUTTLE_BUS(R.drawable.ic_action_shuttle_bus, R.string.app_mode_shuttle_bus, "ic_action_shuttle_bus"), SHUTTLE_BUS(R.drawable.ic_action_shuttle_bus, R.string.app_mode_shuttle_bus, "ic_action_shuttle_bus"),
BUS(R.drawable.ic_action_bus, R.string.app_mode_bus, "ic_action_bus"), BUS(R.drawable.ic_action_bus_dark, R.string.app_mode_bus, "ic_action_bus_dark"),
SUBWAY(R.drawable.ic_action_subway, R.string.app_mode_subway, "ic_action_subway"), SUBWAY(R.drawable.ic_action_subway, R.string.app_mode_subway, "ic_action_subway"),
MOTORCYCLE(R.drawable.ic_action_motorcycle, R.string.app_mode_motorcycle, "ic_action_motorcycle"), MOTORCYCLE(R.drawable.ic_action_motorcycle_dark, R.string.app_mode_motorcycle, "ic_action_motorcycle_dark"),
BICYCLE(R.drawable.ic_action_bicycle, R.string.app_mode_bicycle, "ic_action_bicycle"), BICYCLE(R.drawable.ic_action_bicycle_dark, R.string.app_mode_bicycle, "ic_action_bicycle_dark"),
HORSE(R.drawable.ic_action_horse, R.string.app_mode_horse, "ic_action_horse"), HORSE(R.drawable.ic_action_horse, R.string.app_mode_horse, "ic_action_horse"),
PEDESTRIAN(R.drawable.ic_action_pedestrian, R.string.app_mode_pedestrian, "ic_action_pedestrian"), PEDESTRIAN(R.drawable.ic_action_pedestrian_dark, R.string.app_mode_pedestrian, "ic_action_pedestrian_dark"),
TREKKING(R.drawable.ic_action_trekking, R.string.app_mode_hiking, "ic_action_trekking"), TREKKING(R.drawable.ic_action_trekking_dark, R.string.app_mode_hiking, "ic_action_trekking_dark"),
SKIING(R.drawable.ic_action_skiing, R.string.app_mode_skiing, "ic_action_skiing"), SKIING(R.drawable.ic_action_skiing, R.string.app_mode_skiing, "ic_action_skiing"),
SAIL_BOAT(R.drawable.ic_action_sail_boat, R.string.app_mode_boat, "ic_action_sail_boat"), SAIL_BOAT(R.drawable.ic_action_sail_boat_dark, R.string.app_mode_boat, "ic_action_sail_boat_dark"),
AIRCRAFT(R.drawable.ic_action_aircraft, R.string.app_mode_aircraft, "ic_action_aircraft"), AIRCRAFT(R.drawable.ic_action_aircraft, R.string.app_mode_aircraft, "ic_action_aircraft"),
HELICOPTER(R.drawable.ic_action_helicopter, R.string.app_mode_helicopter, "ic_action_helicopter"), HELICOPTER(R.drawable.ic_action_helicopter, R.string.app_mode_helicopter, "ic_action_helicopter"),
TRANSPORTER(R.drawable.ic_action_personal_transporter, R.string.app_mode_personal_transporter, "ic_action_personal_transporter"), TRANSPORTER(R.drawable.ic_action_personal_transporter, R.string.app_mode_personal_transporter, "ic_action_personal_transporter"),

2
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -334,7 +334,7 @@ public class ConfigureMapMenu {
.setListener(l).createItem()); .setListener(l).createItem());
/* /*
ContextMenuItem item = createProperties(customRules, null, R.string.rendering_category_transport, R.drawable.ic_action_bus, ContextMenuItem item = createProperties(customRules, null, R.string.rendering_category_transport, R.drawable.ic_action_bus_dark,
"transport", settings.TRANSPORT_DEFAULT_SETTINGS, adapter, activity, false); "transport", settings.TRANSPORT_DEFAULT_SETTINGS, adapter, activity, false);
if (item != null) { if (item != null) {
adapter.addItem(item); adapter.addItem(item);

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -1424,7 +1424,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
TextView transportStopRouteTextView = (TextView) convertView.findViewById(R.id.transport_stop_route_text); TextView transportStopRouteTextView = (TextView) convertView.findViewById(R.id.transport_stop_route_text);
ImageView transportStopRouteImageView = (ImageView) convertView.findViewById(R.id.transport_stop_route_icon); 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))); transportStopRouteImageView.setImageDrawable(app.getUIUtilities().getPaintedIcon(drawableResId, UiUtilities.getContrastColor(mapActivity, bgColor, true)));
transportStopRouteTextView.setText(routeRef + ": " + routeDescription); transportStopRouteTextView.setText(routeRef + ": " + routeDescription);
GradientDrawable gradientDrawableBg = (GradientDrawable) convertView.getBackground(); GradientDrawable gradientDrawableBg = (GradientDrawable) convertView.getBackground();

10
OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java
View file

@ -816,12 +816,12 @@ public class EditProfileFragment extends BaseOsmAndFragment {
private enum RoutingProfilesResources { private enum RoutingProfilesResources {
STRAIGHT_LINE_MODE(R.string.routing_profile_straightline, R.drawable.ic_action_split_interval), STRAIGHT_LINE_MODE(R.string.routing_profile_straightline, R.drawable.ic_action_split_interval),
BROUTER_MODE(R.string.routing_profile_broutrer, R.drawable.ic_action_split_interval), BROUTER_MODE(R.string.routing_profile_broutrer, R.drawable.ic_action_split_interval),
CAR(R.string.rendering_value_car_name, R.drawable.ic_action_car), CAR(R.string.rendering_value_car_name, R.drawable.ic_action_car_dark),
PEDESTRIAN(R.string.rendering_value_pedestrian_name, R.drawable.ic_action_pedestrian), PEDESTRIAN(R.string.rendering_value_pedestrian_name, R.drawable.ic_action_pedestrian_dark),
BICYCLE(R.string.rendering_value_bicycle_name, R.drawable.ic_action_bicycle), BICYCLE(R.string.rendering_value_bicycle_name, R.drawable.ic_action_bicycle_dark),
SKI(R.string.routing_profile_ski, R.drawable.ic_action_skiing), SKI(R.string.routing_profile_ski, R.drawable.ic_action_skiing),
PUBLIC_TRANSPORT(R.string.app_mode_public_transport, R.drawable.ic_action_bus), PUBLIC_TRANSPORT(R.string.app_mode_public_transport, R.drawable.ic_action_bus_dark),
BOAT(R.string.app_mode_boat, R.drawable.ic_action_sail_boat), BOAT(R.string.app_mode_boat, R.drawable.ic_action_sail_boat_dark),
GEOCODING(R.string.routing_profile_geocoding, R.drawable.ic_action_world_globe); GEOCODING(R.string.routing_profile_geocoding, R.drawable.ic_action_world_globe);
int stringRes; int stringRes;

10
OsmAnd/src/net/osmand/plus/profiles/RoutingProfileDataObject.java
View file

@ -22,12 +22,12 @@ public class RoutingProfileDataObject extends ProfileDataObject {
public enum RoutingProfilesResources { public enum RoutingProfilesResources {
STRAIGHT_LINE_MODE(R.string.routing_profile_straightline, R.drawable.ic_action_split_interval), STRAIGHT_LINE_MODE(R.string.routing_profile_straightline, R.drawable.ic_action_split_interval),
BROUTER_MODE(R.string.routing_profile_broutrer, R.drawable.ic_action_split_interval), BROUTER_MODE(R.string.routing_profile_broutrer, R.drawable.ic_action_split_interval),
CAR(R.string.rendering_value_car_name, R.drawable.ic_action_car), CAR(R.string.rendering_value_car_name, R.drawable.ic_action_car_dark),
PEDESTRIAN(R.string.rendering_value_pedestrian_name, R.drawable.ic_action_pedestrian), PEDESTRIAN(R.string.rendering_value_pedestrian_name, R.drawable.ic_action_pedestrian_dark),
BICYCLE(R.string.rendering_value_bicycle_name, R.drawable.ic_action_bicycle), BICYCLE(R.string.rendering_value_bicycle_name, R.drawable.ic_action_bicycle_dark),
SKI(R.string.routing_profile_ski, R.drawable.ic_action_skiing), SKI(R.string.routing_profile_ski, R.drawable.ic_action_skiing),
PUBLIC_TRANSPORT(R.string.app_mode_public_transport, R.drawable.ic_action_bus), PUBLIC_TRANSPORT(R.string.app_mode_public_transport, R.drawable.ic_action_bus_dark),
BOAT(R.string.app_mode_boat, R.drawable.ic_action_sail_boat), BOAT(R.string.app_mode_boat, R.drawable.ic_action_sail_boat_dark),
GEOCODING(R.string.routing_profile_geocoding, R.drawable.ic_action_world_globe); GEOCODING(R.string.routing_profile_geocoding, R.drawable.ic_action_world_globe);
int stringRes; int stringRes;

8
OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteDetailsFragment.java
View file

@ -468,7 +468,7 @@ public class RouteDetailsFragment extends ContextMenuFragment implements PublicT
stopsContainer.setOrientation(LinearLayout.VERTICAL); stopsContainer.setOrientation(LinearLayout.VERTICAL);
baseContainer.addView(stopsContainer, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); baseContainer.addView(stopsContainer, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
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); Drawable icon = getContentIcon(drawableResId);
Typeface typeface = FontCache.getRobotoMedium(app); Typeface typeface = FontCache.getRobotoMedium(app);
@ -1124,7 +1124,7 @@ public class RouteDetailsFragment extends ContextMenuFragment implements PublicT
}); });
baseView.addView(ll); baseView.addView(ll);
Drawable icon = getPaintedContentIcon(R.drawable.ic_action_pedestrian, getActiveColor()); Drawable icon = getPaintedContentIcon(R.drawable.ic_action_pedestrian_dark, getActiveColor());
ImageView iconView = new ImageView(view.getContext()); ImageView iconView = new ImageView(view.getContext());
iconView.setImageDrawable(icon); iconView.setImageDrawable(icon);
FrameLayout.LayoutParams imageViewLayoutParams = new FrameLayout.LayoutParams(dpToPx(24), dpToPx(24)); FrameLayout.LayoutParams imageViewLayoutParams = new FrameLayout.LayoutParams(dpToPx(24), dpToPx(24));
@ -1338,7 +1338,7 @@ public class RouteDetailsFragment extends ContextMenuFragment implements PublicT
private CollapsableView getCollapsableTransportStopRoutesView(@NonNull Context context, TransportStopRoute transportStopRoute, final List<TransportStop> stops) { private CollapsableView getCollapsableTransportStopRoutesView(@NonNull Context context, TransportStopRoute transportStopRoute, final List<TransportStop> stops) {
LinearLayout view = (LinearLayout) buildCollapsableContentView(context, false); 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); Drawable icon = getContentIcon(drawableResId);
for (int i = 0; i < stops.size(); i++) { for (int i = 0; i < stops.size(); i++) {
final TransportStop stop = stops.get(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); TextView transportStopRouteTextView = (TextView) convertView.findViewById(R.id.transport_stop_route_text);
ImageView transportStopRouteImageView = (ImageView) convertView.findViewById(R.id.transport_stop_route_icon); 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))); transportStopRouteImageView.setImageDrawable(app.getUIUtilities().getPaintedIcon(drawableResId, UiUtilities.getContrastColor(mapActivity, bgColor, true)));
transportStopRouteTextView.setText(routeRef + ": " + routeDescription); transportStopRouteTextView.setText(routeRef + ": " + routeDescription);
GradientDrawable gradientDrawableBg = (GradientDrawable) convertView.getBackground(); GradientDrawable gradientDrawableBg = (GradientDrawable) convertView.getBackground();

8
OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java
View file

@ -525,8 +525,8 @@ public class RoutingOptionsHelper {
if (rp instanceof LocalRoutingParameterGroup) { if (rp instanceof LocalRoutingParameterGroup) {
LocalRoutingParameterGroup group = (LocalRoutingParameterGroup) rp; LocalRoutingParameterGroup group = (LocalRoutingParameterGroup) rp;
if (group.groupName.equals(DRIVING_STYLE)) { if (group.groupName.equals(DRIVING_STYLE)) {
rp.activeIconId = R.drawable.ic_action_bicycle; rp.activeIconId = R.drawable.ic_action_bicycle_dark;
rp.disabledIconId = R.drawable.ic_action_bicycle; rp.disabledIconId = R.drawable.ic_action_bicycle_dark;
} }
} }
if (rp.routingParameter == null) { if (rp.routingParameter == null) {
@ -888,12 +888,12 @@ public class RoutingOptionsHelper {
@Override @Override
public int getActiveIconId() { public int getActiveIconId() {
return R.drawable.ic_action_bus; return R.drawable.ic_action_bus_dark;
} }
@Override @Override
public int getDisabledIconId() { public int getDisabledIconId() {
return R.drawable.ic_action_bus; return R.drawable.ic_action_bus_dark;
} }
} }

2
OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportBetaWarningCard.java
View file

@ -13,7 +13,7 @@ public class PublicTransportBetaWarningCard extends WarningCard {
public PublicTransportBetaWarningCard(@NonNull MapActivity mapActivity) { public PublicTransportBetaWarningCard(@NonNull MapActivity mapActivity) {
super(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); title = mapActivity.getString(R.string.public_transport_warning_title);
linkText = mapActivity.getString(R.string.public_transport_warning_descr_blog); linkText = mapActivity.getString(R.string.public_transport_warning_descr_blog);
startLinkIndex = linkText.lastIndexOf(" "); startLinkIndex = linkText.lastIndexOf(" ");

4
OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportCard.java
View file

@ -348,7 +348,7 @@ public class PublicTransportCard extends BaseCard {
TextView transportStopRouteTextView = (TextView) bageView.findViewById(R.id.transport_stop_route_text); TextView transportStopRouteTextView = (TextView) bageView.findViewById(R.id.transport_stop_route_text);
ImageView transportStopRouteImageView = (ImageView) bageView.findViewById(R.id.transport_stop_route_icon); 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))); transportStopRouteImageView.setImageDrawable(app.getUIUtilities().getPaintedIcon(drawableResId, UiUtilities.getContrastColor(app, bgColor, true)));
transportStopRouteTextView.setText(routeRef); transportStopRouteTextView.setText(routeRef);
GradientDrawable gradientDrawableBg = (GradientDrawable) bageView.getBackground(); 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); TextView transportStopRouteTextView = (TextView) bageView.findViewById(R.id.transport_stop_route_text);
ImageView transportStopRouteImageView = (ImageView) bageView.findViewById(R.id.transport_stop_route_icon); 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)); transportStopRouteTextView.setText(OsmAndFormatter.getFormattedDuration((int) walkTime, app));
GradientDrawable gradientDrawableBg = (GradientDrawable) bageView.getBackground(); GradientDrawable gradientDrawableBg = (GradientDrawable) bageView.getBackground();
gradientDrawableBg.setColor(activeColor); gradientDrawableBg.setColor(activeColor);

2
OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportNotFoundWarningCard.java
View file

@ -9,7 +9,7 @@ public class PublicTransportNotFoundWarningCard extends WarningCard {
public PublicTransportNotFoundWarningCard(@NonNull MapActivity mapActivity) { public PublicTransportNotFoundWarningCard(@NonNull MapActivity mapActivity) {
super(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); 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); linkText = mapActivity.getString(R.string.public_transport_calc_pedestrian);
} }

2
OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java
View file

@ -154,7 +154,7 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
private void setupDrivingRegionPref() { private void setupDrivingRegionPref() {
ApplicationMode selectedMode = getSelectedAppMode(); ApplicationMode selectedMode = getSelectedAppMode();
Preference defaultDrivingRegion = findPreference(settings.DRIVING_REGION.getId()); 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)); defaultDrivingRegion.setSummary(getString(settings.DRIVING_REGION_AUTOMATIC.getModeValue(selectedMode) ? R.string.driving_region_automatic : settings.DRIVING_REGION.getModeValue(selectedMode).name));
} }

2
OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
View file

@ -389,7 +389,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
case AVOID_ROUTING_PARAMETER_PREFIX: case AVOID_ROUTING_PARAMETER_PREFIX:
return getContentIcon(R.drawable.ic_action_alert); return getContentIcon(R.drawable.ic_action_alert);
case DRIVING_STYLE: case DRIVING_STYLE:
return getContentIcon(R.drawable.ic_action_bicycle); return getContentIcon(R.drawable.ic_action_bicycle_dark);
case "fast_route_mode": case "fast_route_mode":
return getContentIcon(R.drawable.ic_action_fastest_route); return getContentIcon(R.drawable.ic_action_fastest_route);
case "enable_time_conditional_routing": case "enable_time_conditional_routing":