diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fav_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_fav_dark.png deleted file mode 100644 index dfe6808cad..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_fav_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_flag_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_flag_dark.png deleted file mode 100644 index 5bc3ca2e17..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fav_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_fav_dark.png deleted file mode 100644 index 04044ab479..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_fav_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_flag_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_flag_dark.png deleted file mode 100644 index 8e75e65563..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fav_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_fav_dark.png deleted file mode 100644 index 9613a43ad6..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_fav_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_flag_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_flag_dark.png deleted file mode 100644 index e61d74d4e9..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fav_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fav_dark.png deleted file mode 100644 index d2407408a1..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_fav_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_flag_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_flag_dark.png deleted file mode 100644 index 7b41a25dfb..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_flag_dark.png and /dev/null differ diff --git a/OsmAnd/res/layout/along_the_route_point_item.xml b/OsmAnd/res/layout/along_the_route_point_item.xml index 9a5e3727f9..7bcd0575ac 100644 --- a/OsmAnd/res/layout/along_the_route_point_item.xml +++ b/OsmAnd/res/layout/along_the_route_point_item.xml @@ -23,7 +23,7 @@ android:layout_marginLeft="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding" android:layout_marginTop="@dimen/content_padding" - android:src="@drawable/ic_action_fav_dark" + android:src="@drawable/ic_action_favorite" android:layout_marginStart="@dimen/content_padding" android:layout_marginEnd="@dimen/content_padding" /> diff --git a/OsmAnd/res/layout/map_marker_item.xml b/OsmAnd/res/layout/map_marker_item.xml index a7d6a62f65..131686f72b 100644 --- a/OsmAnd/res/layout/map_marker_item.xml +++ b/OsmAnd/res/layout/map_marker_item.xml @@ -24,7 +24,7 @@ android:layout_width="56dp" android:layout_height="25dp" android:layout_gravity="center_vertical" - android:src="@drawable/ic_action_fav_dark"/> + android:src="@drawable/ic_action_favorite"/> diff --git a/OsmAnd/res/layout/map_marker_item_new.xml b/OsmAnd/res/layout/map_marker_item_new.xml index d805a97049..20cd3105a2 100644 --- a/OsmAnd/res/layout/map_marker_item_new.xml +++ b/OsmAnd/res/layout/map_marker_item_new.xml @@ -62,7 +62,7 @@ android:layout_gravity="center_vertical" android:layout_marginEnd="@dimen/bottom_sheet_content_margin" android:layout_marginRight="@dimen/bottom_sheet_content_margin" - tools:src="@drawable/ic_action_flag_dark"/> + tools:src="@drawable/ic_action_flag"/> + android:src="@drawable/ic_action_favorite"/> diff --git a/OsmAnd/res/layout/quick_action_add_gpx.xml b/OsmAnd/res/layout/quick_action_add_gpx.xml index 08183aa5fd..e0779e0ff6 100644 --- a/OsmAnd/res/layout/quick_action_add_gpx.xml +++ b/OsmAnd/res/layout/quick_action_add_gpx.xml @@ -78,7 +78,7 @@ android:layout_marginTop="2dp" android:scaleType="centerInside" android:tint="?attr/default_icon_color" - android:src="@drawable/ic_action_fav_dark"/> + android:src="@drawable/ic_action_favorite"/> diff --git a/OsmAnd/res/layout/quick_action_create_edit_dialog.xml b/OsmAnd/res/layout/quick_action_create_edit_dialog.xml index 67cf8cf498..ca07a156ab 100644 --- a/OsmAnd/res/layout/quick_action_create_edit_dialog.xml +++ b/OsmAnd/res/layout/quick_action_create_edit_dialog.xml @@ -19,7 +19,7 @@ - + @@ -51,7 +51,7 @@ android:scaleType="centerInside" app:tint="?attr/app_bar_primary_item_color" android:layout_marginTop="24dp" - android:src="@drawable/ic_action_flag_dark" + android:src="@drawable/ic_action_flag" android:layout_marginStart="16dp" /> + android:src="@drawable/ic_action_favorite" /> + android:src="@drawable/ic_action_favorite"/> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) { @@ -801,7 +801,7 @@ public class MapActivityActions implements DialogProvider { optionsMenuHelper.addItem(new ItemBuilder().setTitleId(R.string.shared_string_my_places, mapActivity) .setId(DRAWER_MY_PLACES_ID) - .setIcon(R.drawable.ic_action_fav_dark) + .setIcon(R.drawable.ic_action_favorite) .setListener(new ItemClickListener() { @Override public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) { diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 819600f085..74deefe972 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -177,7 +177,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa }); showOnMapItem.setEnabled(!isNameSearch() || amenityAdapter.getCount() > 0); if (filter != null && !isNameSearch()) { - createMenuItem(omenu, SAVE_FILTER, R.string.edit_filter_save_as_menu_item, R.drawable.ic_action_fav_dark, + createMenuItem(omenu, SAVE_FILTER, R.string.edit_filter_save_as_menu_item, R.drawable.ic_action_favorite, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); if (!filter.isStandardFilter()) { createMenuItem(omenu, DELETE_FILTER, R.string.shared_string_delete, R.drawable.ic_action_delete_dark, diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java index d66754bace..730152071e 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java @@ -180,7 +180,7 @@ public class DashWaypointsFragment extends DashLocationFragment { MenuItem item; // item = optionsMenu.getMenu().add( // R.string.shared_string_add_to_favorites).setIcon(getMyApplication().getIconsCache(). -// getIcon(R.drawable.ic_action_fav_dark)); +// getIcon(R.drawable.ic_action_favorite)); // item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { // @Override // public boolean onMenuItemClick(MenuItem item) { diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java index fca947ca37..a1d303de49 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java @@ -405,8 +405,10 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo actionButton = new ImageView(mapActivity); int btnSizePx = mapActivity.getResources().getDimensionPixelSize(R.dimen.map_button_size); actionButton.setLayoutParams(getActionButtonLayoutParams(btnSizePx)); - actionButton.setScaleType(ScaleType.CENTER); actionButton.setBackgroundResource(R.drawable.btn_circle_blue); + int iconSizePx = mapActivity.getResources().getDimensionPixelSize(R.dimen.standard_icon_size); + int iconPadding = (btnSizePx - iconSizePx) / 2; + actionButton.setPadding(iconPadding, iconPadding, iconPadding, iconPadding); hideActionButton(); diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java index bbf47785d2..21213eb4a8 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java @@ -38,7 +38,6 @@ import net.osmand.plus.GpxSelectionHelper; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandSettings; -import net.osmand.plus.OsmandSettings.OsmandPreference; import net.osmand.plus.OsmandSettings.CommonPreference; import net.osmand.plus.OsmandSettings.ListStringPreference; import net.osmand.plus.R; @@ -372,7 +371,7 @@ public class ConfigureMapMenu { .setTitleId(R.string.shared_string_favorites, activity) .setSelected(settings.SHOW_FAVORITES.get()) .setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID) - .setIcon(R.drawable.ic_action_fav_dark) + .setIcon(R.drawable.ic_action_favorite) .setItemDeleteAction(makeDeleteAction(settings.SHOW_FAVORITES)) .setListener(l) .createItem()); @@ -443,7 +442,7 @@ public class ConfigureMapMenu { .setTitleId(R.string.map_markers, activity) .setSelected(selected) .setColor(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID) - .setIcon(R.drawable.ic_action_flag_dark) + .setIcon(R.drawable.ic_action_flag) .setItemDeleteAction(makeDeleteAction(settings.SHOW_MAP_MARKERS)) .setListener(l).createItem()); diff --git a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java index 7651f8413a..7eed4a7934 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java @@ -1257,7 +1257,7 @@ public class ImportHelper { items.add(new ShortDescriptionItem(txt)); BaseBottomSheetItem asFavoritesItem = new SimpleBottomSheetItem.Builder() - .setIcon(getContentIcon(R.drawable.ic_action_fav_dark)) + .setIcon(getContentIcon(R.drawable.ic_action_favorite)) .setTitle(getString(R.string.import_as_favorites)) .setLayoutId(R.layout.bottom_sheet_item_simple) .setOnClickListener(new View.OnClickListener() { diff --git a/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java index cac67efe46..37bbbfda1a 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java @@ -80,7 +80,7 @@ public class MapMarkerDialogHelper { .getColor(useCenter ? R.color.color_distance : R.color.color_myloc_distance)); } else { waypointIcon.setImageDrawable(app.getUIUtilities() - .getIcon(R.drawable.ic_action_flag_dark, !nightMode)); + .getIcon(R.drawable.ic_action_flag, !nightMode)); AndroidUtils.setTextSecondaryColor(ctx, text, nightMode); AndroidUtils.setTextSecondaryColor(ctx, textDist, nightMode); } @@ -114,6 +114,6 @@ public class MapMarkerDialogHelper { } public static Drawable getMapMarkerIcon(OsmandApplication app, int colorIndex) { - return app.getUIUtilities().getIcon(R.drawable.ic_action_flag_dark, MapMarker.getColorId(colorIndex)); + return app.getUIUtilities().getIcon(R.drawable.ic_action_flag, MapMarker.getColorId(colorIndex)); } } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java index 1600d2d736..d6952651fb 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java @@ -908,8 +908,8 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL favActionIconId = menuController.getFavActionIconId(); waypointActionIconId = menuController.getWaypointActionIconId(); } else { - favActionIconId = R.drawable.ic_action_fav_dark; - waypointActionIconId = R.drawable.ic_action_flag_dark; + favActionIconId = R.drawable.ic_action_favorite_stroke; + waypointActionIconId = R.drawable.ic_action_flag_stroke; } } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java index 3e1dbd23bc..05ad42000f 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java @@ -504,7 +504,7 @@ public abstract class MenuController extends BaseMenuController implements Colla } public int getFavActionIconId() { - return R.drawable.ic_action_fav_dark; + return R.drawable.ic_action_favorite_stroke; } public int getFavActionStringId() { @@ -516,7 +516,7 @@ public abstract class MenuController extends BaseMenuController implements Colla } public int getWaypointActionIconId() { - return R.drawable.ic_action_flag_dark; + return R.drawable.ic_action_flag_stroke; } public int getWaypointActionStringId() { diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/MapMarkerEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/MapMarkerEditorFragment.java index e19914f3f0..ac0f69e37f 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/MapMarkerEditorFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/MapMarkerEditorFragment.java @@ -119,7 +119,7 @@ public class MapMarkerEditorFragment extends PointEditorFragment { @Override public Drawable getNameIcon() { - return requireMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_flag_dark, getPointColor()); + return requireMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_flag, getPointColor()); } @Override diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java index 01a7ac5d8f..a1a3eaf82b 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java @@ -49,7 +49,7 @@ public class HistoryMarkerMenuBottomSheetDialogFragment extends MenuBottomSheetD BaseBottomSheetItem markerItem = new BottomSheetItemWithDescription.Builder() .setDescription(getString(R.string.passed, month + " " + day)) - .setIcon(getIcon(R.drawable.ic_action_flag_dark, MapMarker.getColorId(markerColorIndex))) + .setIcon(getIcon(R.drawable.ic_action_flag, MapMarker.getColorId(markerColorIndex))) .setTitle(markerName) .setLayoutId(R.layout.bottom_sheet_item_with_descr_56dp) .create(); diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectionMarkersGroupBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectionMarkersGroupBottomSheetDialogFragment.java index e06ec566c3..2b5969f0b3 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectionMarkersGroupBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectionMarkersGroupBottomSheetDialogFragment.java @@ -27,7 +27,7 @@ public class SelectionMarkersGroupBottomSheetDialogFragment extends MenuBottomSh items.add(new ShortDescriptionItem(getString(R.string.add_group_descr))); BaseBottomSheetItem favoritesItem = new SimpleBottomSheetItem.Builder() - .setIcon(getContentIcon(R.drawable.ic_action_fav_dark)) + .setIcon(getContentIcon(R.drawable.ic_action_favorite)) .setTitle(getString(R.string.favourites_group)) .setLayoutId(R.layout.bottom_sheet_item_simple) .setOnClickListener(new View.OnClickListener() { diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java index fb99d047f1..bb1a3fea80 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java @@ -96,7 +96,7 @@ public class MapMarkersActiveAdapter extends RecyclerView.Adapter