diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java b/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java index f8705e3d0b..90e00ad2cf 100644 --- a/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java +++ b/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java @@ -138,6 +138,8 @@ public class RenderingRuleStorageProperties { public RenderingRuleProperty R_ICON_ORDER; public RenderingRuleProperty R_TEXT_MIN_DISTANCE; public RenderingRuleProperty R_TEXT_ON_PATH; + public RenderingRuleProperty R_ICON_SHIFT_PX; + public RenderingRuleProperty R_ICON_SHIFT_PY; public RenderingRuleProperty R_ICON__1; public RenderingRuleProperty R_ICON; public RenderingRuleProperty R_ICON_2; @@ -232,6 +234,8 @@ public class RenderingRuleStorageProperties { R_TEXT_ON_PATH = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(TEXT_ON_PATH)); // point + R_ICON_SHIFT_PX = registerRuleInternal(RenderingRuleProperty.createOutputFloatProperty("icon_shift_px")); + R_ICON_SHIFT_PY = registerRuleInternal(RenderingRuleProperty.createOutputFloatProperty("icon_shift_py")); R_ICON__1 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty("icon__1")); R_ICON = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty(ICON)); R_ICON_2 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty("icon_2")); diff --git a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_dark.png b/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_dark.png deleted file mode 100644 index 73d8dfdb97..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_dark.png b/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_dark.png deleted file mode 100644 index bd4051327b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/app_mode_globus_dark.png b/OsmAnd/res/drawable-hdpi/app_mode_globus_dark.png deleted file mode 100644 index d5fd9a397b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/app_mode_globus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_aircraft.png b/OsmAnd/res/drawable-hdpi/ic_action_aircraft.png new file mode 100644 index 0000000000..c01306ad29 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_aircraft.png differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_aircraft_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_aircraft_dark.png deleted file mode 100644 index 772c6d4e0b..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_aircraft_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gpin_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gpin_dark.png deleted file mode 100644 index b6c12a0e77..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gpin_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_remove_light.png b/OsmAnd/res/drawable-hdpi/ic_action_test_light.png similarity index 100% rename from OsmAnd/res/drawable-hdpi/ic_action_remove_light.png rename to OsmAnd/res/drawable-hdpi/ic_action_test_light.png diff --git a/OsmAnd/res/drawable-hdpi/ic_action_volume_off.png b/OsmAnd/res/drawable-hdpi/ic_action_volume_off.png new file mode 100644 index 0000000000..6577af1a8f Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_volume_off.png differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_volume_up.png b/OsmAnd/res/drawable-hdpi/ic_action_volume_up.png new file mode 100644 index 0000000000..ebd445ed8f Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_volume_up.png differ diff --git a/OsmAnd/res/drawable-hdpi/ic_aircraft.png b/OsmAnd/res/drawable-hdpi/ic_aircraft.png index 58a4737bc7..02c08ed0c1 100644 Binary files a/OsmAnd/res/drawable-hdpi/ic_aircraft.png and b/OsmAnd/res/drawable-hdpi/ic_aircraft.png differ diff --git a/OsmAnd/res/drawable-hdpi/ic_download_cancel_normal.png b/OsmAnd/res/drawable-hdpi/ic_download_cancel_normal.png deleted file mode 100644 index debf873368..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_download_cancel_normal.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_download_cancel_tap.png b/OsmAnd/res/drawable-hdpi/ic_download_cancel_tap.png deleted file mode 100644 index af65969b19..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_download_cancel_tap.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_download_disabled.png b/OsmAnd/res/drawable-hdpi/ic_download_disabled.png deleted file mode 100644 index 2f411ee3f6..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_download_disabled.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_download_normal.png b/OsmAnd/res/drawable-hdpi/ic_download_normal.png deleted file mode 100644 index 75fb954a27..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_download_normal.png and /dev/null differ diff --git a/OsmAnd/res/drawable-hdpi/ic_download_tap.png b/OsmAnd/res/drawable-hdpi/ic_download_tap.png deleted file mode 100644 index 01989dbc8d..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/ic_download_tap.png and /dev/null differ diff --git a/OsmAnd/res/drawable-large/app_mode_globus_dark.png b/OsmAnd/res/drawable-large/app_mode_globus_dark.png deleted file mode 100644 index d5fd9a397b..0000000000 Binary files a/OsmAnd/res/drawable-large/app_mode_globus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_muted_dark.png b/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_muted_dark.png deleted file mode 100644 index 7f53eb4590..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_muted_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_on_dark.png b/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_on_dark.png deleted file mode 100644 index 10ca590a47..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_on_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_aircraft.png b/OsmAnd/res/drawable-mdpi/ic_action_aircraft.png new file mode 100644 index 0000000000..50cebaa749 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_aircraft.png differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_aircraft_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_aircraft_dark.png deleted file mode 100644 index 23401614ba..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_aircraft_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gpin_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gpin_dark.png deleted file mode 100644 index a46041a269..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gpin_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_remove_light.png b/OsmAnd/res/drawable-mdpi/ic_action_test_light.png similarity index 100% rename from OsmAnd/res/drawable-mdpi/ic_action_remove_light.png rename to OsmAnd/res/drawable-mdpi/ic_action_test_light.png diff --git a/OsmAnd/res/drawable-mdpi/ic_action_volume_off.png b/OsmAnd/res/drawable-mdpi/ic_action_volume_off.png new file mode 100644 index 0000000000..a618059f9b Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_volume_off.png differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_volume_up.png b/OsmAnd/res/drawable-mdpi/ic_action_volume_up.png new file mode 100644 index 0000000000..1395316d57 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_volume_up.png differ diff --git a/OsmAnd/res/drawable-mdpi/ic_aircraft.png b/OsmAnd/res/drawable-mdpi/ic_aircraft.png index 9a86659723..c01306ad29 100644 Binary files a/OsmAnd/res/drawable-mdpi/ic_aircraft.png and b/OsmAnd/res/drawable-mdpi/ic_aircraft.png differ diff --git a/OsmAnd/res/drawable-mdpi/ic_download_cancel_normal.png b/OsmAnd/res/drawable-mdpi/ic_download_cancel_normal.png deleted file mode 100644 index fa58c6672c..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_download_cancel_normal.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_download_cancel_tap.png b/OsmAnd/res/drawable-mdpi/ic_download_cancel_tap.png deleted file mode 100644 index 0c5e6cb7ce..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_download_cancel_tap.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_download_disabled.png b/OsmAnd/res/drawable-mdpi/ic_download_disabled.png deleted file mode 100644 index f0abf30eea..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_download_disabled.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_download_normal.png b/OsmAnd/res/drawable-mdpi/ic_download_normal.png deleted file mode 100644 index 5ae587c1ba..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_download_normal.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/ic_download_tap.png b/OsmAnd/res/drawable-mdpi/ic_download_tap.png deleted file mode 100644 index 9d9386906d..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/ic_download_tap.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_dark.png b/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_dark.png deleted file mode 100644 index 9115faef0a..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_dark.png b/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_dark.png deleted file mode 100644 index 0291c036b4..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/app_mode_globus_dark.png b/OsmAnd/res/drawable-xhdpi/app_mode_globus_dark.png deleted file mode 100644 index b81b42b6fa..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/app_mode_globus_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_aircraft.png b/OsmAnd/res/drawable-xhdpi/ic_action_aircraft.png new file mode 100644 index 0000000000..eb0bcd04f6 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_aircraft.png differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_aircraft_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_aircraft_dark.png deleted file mode 100644 index 787ad1b9a5..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_aircraft_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gpin_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gpin_dark.png deleted file mode 100644 index b0eb5fd167..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gpin_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_remove_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_test_light.png similarity index 100% rename from OsmAnd/res/drawable-xhdpi/ic_action_remove_light.png rename to OsmAnd/res/drawable-xhdpi/ic_action_test_light.png diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_volume_off.png b/OsmAnd/res/drawable-xhdpi/ic_action_volume_off.png new file mode 100644 index 0000000000..c51dabae78 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_volume_off.png differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_volume_up.png b/OsmAnd/res/drawable-xhdpi/ic_action_volume_up.png new file mode 100644 index 0000000000..a0b4af2891 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_volume_up.png differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_aircraft.png b/OsmAnd/res/drawable-xhdpi/ic_aircraft.png index 0922436699..6a9167d383 100644 Binary files a/OsmAnd/res/drawable-xhdpi/ic_aircraft.png and b/OsmAnd/res/drawable-xhdpi/ic_aircraft.png differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_download_cancel_normal.png b/OsmAnd/res/drawable-xhdpi/ic_download_cancel_normal.png deleted file mode 100644 index 7478fc4366..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_download_cancel_normal.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_download_cancel_tap.png b/OsmAnd/res/drawable-xhdpi/ic_download_cancel_tap.png deleted file mode 100644 index cb72c6ccdb..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_download_cancel_tap.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_download_disabled.png b/OsmAnd/res/drawable-xhdpi/ic_download_disabled.png deleted file mode 100644 index c18a584913..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_download_disabled.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_download_normal.png b/OsmAnd/res/drawable-xhdpi/ic_download_normal.png deleted file mode 100644 index 432cdfc5c7..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_download_normal.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_download_tap.png b/OsmAnd/res/drawable-xhdpi/ic_download_tap.png deleted file mode 100644 index 165e230538..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/ic_download_tap.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_muted_dark.png b/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_muted_dark.png deleted file mode 100644 index ffcafb10a7..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_muted_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_on_dark.png b/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_on_dark.png deleted file mode 100644 index 10b165ca80..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_on_dark.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_aircraft.png b/OsmAnd/res/drawable-xxhdpi/ic_action_aircraft.png new file mode 100644 index 0000000000..6a9167d383 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_aircraft.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_remove_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_test_light.png similarity index 100% rename from OsmAnd/res/drawable-xxhdpi/ic_action_remove_light.png rename to OsmAnd/res/drawable-xxhdpi/ic_action_test_light.png diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_volume_off.png b/OsmAnd/res/drawable-xxhdpi/ic_action_volume_off.png new file mode 100644 index 0000000000..9f44de0527 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_volume_off.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_volume_up.png b/OsmAnd/res/drawable-xxhdpi/ic_action_volume_up.png new file mode 100644 index 0000000000..fa8e34f850 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_volume_up.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_aircraft.png b/OsmAnd/res/drawable-xxhdpi/ic_aircraft.png new file mode 100644 index 0000000000..060fcd25f2 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_aircraft.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_download_cancel_normal.png b/OsmAnd/res/drawable-xxhdpi/ic_download_cancel_normal.png deleted file mode 100644 index b63b4024d6..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_download_cancel_normal.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_download_cancel_tap.png b/OsmAnd/res/drawable-xxhdpi/ic_download_cancel_tap.png deleted file mode 100644 index 265c75b89b..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_download_cancel_tap.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_download_disabled.png b/OsmAnd/res/drawable-xxhdpi/ic_download_disabled.png deleted file mode 100644 index 28913a115a..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_download_disabled.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_download_normal.png b/OsmAnd/res/drawable-xxhdpi/ic_download_normal.png deleted file mode 100644 index e726fdf777..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_download_normal.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_download_tap.png b/OsmAnd/res/drawable-xxhdpi/ic_download_tap.png deleted file mode 100644 index 2e5bd278ca..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/ic_download_tap.png and /dev/null differ diff --git a/OsmAnd/res/drawable/cancel_button.xml b/OsmAnd/res/drawable/cancel_button.xml deleted file mode 100644 index 3211e6e6cd..0000000000 --- a/OsmAnd/res/drawable/cancel_button.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OsmAnd/res/drawable/download_button.xml b/OsmAnd/res/drawable/download_button.xml deleted file mode 100644 index 45ac3cb02a..0000000000 --- a/OsmAnd/res/drawable/download_button.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OsmAnd/res/drawable/download_disabled.xml b/OsmAnd/res/drawable/download_disabled.xml deleted file mode 100644 index aa07d37a5a..0000000000 --- a/OsmAnd/res/drawable/download_disabled.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml index 47baa1073e..cfd51a6716 100644 --- a/OsmAnd/res/layout-land/map_hud_bottom.xml +++ b/OsmAnd/res/layout-land/map_hud_bottom.xml @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_gravity="top|center" android:layout_marginTop="3dp" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> @@ -162,7 +162,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:background="@drawable/btn_flat" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> @@ -243,7 +243,7 @@ android:layout_height="@dimen/map_button_size" android:layout_gravity="bottom" android:background="@drawable/btn_circle" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml index d6ec1e6f75..55d7a667bc 100644 --- a/OsmAnd/res/layout-land/map_hud_top.xml +++ b/OsmAnd/res/layout-land/map_hud_top.xml @@ -72,7 +72,7 @@ android:layout_gravity="center_vertical" android:layout_marginLeft="@dimen/map_button_margin" android:layout_marginRight="@dimen/map_button_margin" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> @@ -168,14 +168,14 @@ android:layout_width="@dimen/map_button_size" android:layout_height="@dimen/map_button_size" android:background="@drawable/btn_inset_circle" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> @@ -211,7 +211,7 @@ android:layout_height="@dimen/map_button_size" android:layout_gravity="top|center_horizontal" android:background="@drawable/btn_inset_circle" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> diff --git a/OsmAnd/res/layout/dash_updates_item.xml b/OsmAnd/res/layout/dash_updates_item.xml index a40655275a..77549b840a 100644 --- a/OsmAnd/res/layout/dash_updates_item.xml +++ b/OsmAnd/res/layout/dash_updates_item.xml @@ -53,13 +53,14 @@ android:visibility="gone" /> - + android:scaleType="center" + android:src="@drawable/ic_action_import"/> \ No newline at end of file diff --git a/OsmAnd/res/layout/favorites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml index e45c987614..3da0a6751f 100644 --- a/OsmAnd/res/layout/favorites_list_item.xml +++ b/OsmAnd/res/layout/favorites_list_item.xml @@ -102,7 +102,7 @@ android:visibility="invisible" android:layout_marginLeft="@dimen/dashFavIconMargin" android:background="?attr/dashboard_button" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> @@ -186,7 +186,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:background="@drawable/btn_flat" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml index 3e58184b66..0540baa380 100644 --- a/OsmAnd/res/layout/map_hud_top.xml +++ b/OsmAnd/res/layout/map_hud_top.xml @@ -43,7 +43,7 @@ android:layout_gravity="center_vertical" android:layout_marginLeft="@dimen/map_button_margin" android:layout_marginRight="@dimen/map_button_margin" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> @@ -128,14 +128,14 @@ android:layout_width="@dimen/map_button_size" android:layout_height="@dimen/map_button_size" android:background="@drawable/btn_inset_circle" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_test_light" /> @@ -230,7 +230,7 @@ android:layout_height="@dimen/map_button_size" android:layout_gravity="top|center_horizontal" android:background="@drawable/btn_inset_circle" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml index 601731b77a..ce46fba3f4 100644 --- a/OsmAnd/res/layout/map_hud_widget.xml +++ b/OsmAnd/res/layout/map_hud_widget.xml @@ -24,7 +24,7 @@ android:layout_width="@dimen/map_widget_image" android:layout_height="@dimen/map_widget_image" android:layout_gravity="center" - android:src="@drawable/ic_action_remove_light" + android:src="@drawable/ic_action_test_light" android:visibility="gone" /> @@ -40,7 +40,7 @@ android:layout_height="@dimen/map_widget_icon" android:layout_gravity="left|center_vertical" android:gravity="center" - android:src="@drawable/ic_action_remove_light" /> + android:src="@drawable/ic_action_test_light" /> + android:src="@drawable/ic_action_volume_off" /> diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java index 8bcda3ede2..48c7712349 100644 --- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java +++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java @@ -21,7 +21,7 @@ public class ApplicationMode { * DEFAULT("Browse map"), CAR("Car"), BICYCLE("Bicycle"), PEDESTRIAN("Pedestrian"); */ public static final ApplicationMode DEFAULT = create(R.string.app_mode_default, "default").speed(1.5f, 5).arrivalDistance(90).defLocation(). - icon(R.drawable.ic_browse_map, R.drawable.app_mode_globus_dark).reg(); + icon(R.drawable.ic_browse_map, R.drawable.ic_world_globe_dark).reg(); public static final ApplicationMode CAR = create(R.string.app_mode_car, "car").speed(15.3f, 35).arrivalDistance(90).carLocation(). icon(R.drawable.ic_car, R.drawable.ic_action_car_dark).reg(); @@ -33,7 +33,7 @@ public class ApplicationMode { icon(R.drawable.ic_pedestrian, R.drawable.ic_action_pedestrian_dark).reg(); public static final ApplicationMode AIRCRAFT = create(R.string.app_mode_aircraft, "aircraft").speed(40f, 100).carLocation(). - icon(R.drawable.ic_aircraft,R.drawable.ic_action_aircraft_dark).reg(); + icon(R.drawable.ic_aircraft,R.drawable.ic_action_aircraft).reg(); public static final ApplicationMode BOAT = create(R.string.app_mode_boat, "boat").speed(5.5f, 20).carLocation(). icon(R.drawable.ic_sail_boat, R.drawable.ic_action_sail_boat_dark).reg(); @@ -148,7 +148,7 @@ public class ApplicationMode { private ApplicationMode parent; private int iconId = R.drawable.ic_browse_map; - private int smallIconDark = R.drawable.app_mode_globus_dark ; + private int smallIconDark = R.drawable.ic_world_globe_dark ; private float defaultSpeed = 10f; private int minDistanceForTurn = 50; private int arrivalDistance = 90; diff --git a/OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java b/OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java index 979b06dfa8..b886a7b250 100644 --- a/OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java +++ b/OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java @@ -5,12 +5,10 @@ import java.util.TreeMap; import net.osmand.plus.R; import android.content.Context; import android.content.res.Resources; -import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.Paint; -import android.graphics.RectF; import android.graphics.Paint.Style; import android.graphics.Rect; import android.graphics.drawable.Drawable; @@ -25,9 +23,6 @@ public class FavoriteImageDrawable extends Drawable { private Paint paintOuter; private Drawable drawable; private float density; - private Bitmap bmp; - private Paint paintBmp; - private RectF bmpDest; public FavoriteImageDrawable(Context ctx, int color) { @@ -41,10 +36,6 @@ public class FavoriteImageDrawable extends Drawable { paintOuter = new Paint(); paintOuter.setAntiAlias(true); paintOuter.setStyle(Style.FILL_AND_STROKE); - paintBmp = new Paint(); - paintBmp.setAntiAlias(true); - paintBmp.setFilterBitmap(true); - paintBmp.setDither(true); paintInnerCircle = new Paint(); paintInnerCircle.setStyle(Style.FILL_AND_STROKE); paintOuter.setColor(color == 0 || color == Color.BLACK ? 0x88555555 : color ); @@ -95,14 +86,11 @@ public class FavoriteImageDrawable extends Drawable { } public void drawBitmapInCenter(Canvas canvas, int x, int y, float density) { - canvas.translate(x, y); + int dx = x - getIntrinsicWidth() / 2; + int dy = y - getIntrinsicHeight() / 2; + canvas.translate(dx, dy); draw(canvas); - canvas.translate(-x, -y); -// float bmpRad = 10 * density; -// bmpDest.set(x - bmpRad, y - bmpRad, x + bmpRad, y + bmpRad); -// canvas.drawCircle(x, density + y, bmpRad + 3 * density, paintOuter); -// canvas.drawCircle(x, density + y, bmpRad + 2 * density, paintInnerCircle); -// canvas.drawBitmap(bmp, null, bmpDest, paintBmp); + canvas.translate(-dx, -dy); } @Override diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index e0a8e2dce9..14e4172c33 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -22,6 +22,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; @@ -123,9 +124,11 @@ public class DashUpdatesFragment extends DashBaseFragment { public void onClick(View view) { if (getDownloadActivity().isInQueue(item)) { getDownloadActivity().removeFromQueue(item); - ((ImageButton) view).setImageResource(R.drawable.download_button); + ((ImageView) view).setImageDrawable( + getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_import)); } else if (!getDownloadActivity().startDownload(item)) { - ((ImageButton) view).setImageResource(R.drawable.cancel_button); + ((ImageView) view).setImageDrawable( + getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark)); } } }); @@ -163,7 +166,7 @@ public class DashUpdatesFragment extends DashBaseFragment { if (!visible) { return; } - cancelButton.setImageResource(R.drawable.cancel_button); + cancelButton.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark)); View view = (View) cancelButton.getParent(); if (view != null && view.findViewById(R.id.map_descr) != null) { view.findViewById(R.id.map_descr).setVisibility(View.GONE); diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java index 3abd2df3a2..0606b7b979 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -530,9 +530,8 @@ public class MapControlsLayer extends OsmandMapLayer { backToLocationControl.setBg(R.drawable.btn_circle, R.drawable.btn_circle_night); backToLocationControl.setIconColorId(R.color.icon_color_light, 0); } else if (tracked) { - // TODO different icon - backToLocationControl.setIconColorId(R.color.map_widget_icon_color); - backToLocationControl.setBg(R.drawable.btn_circle_blue); + backToLocationControl.setBg(R.drawable.btn_circle, R.drawable.btn_circle_night); + backToLocationControl.setIconColorId(R.color.color_myloc_distance); } else { backToLocationControl.setIconColorId(0); backToLocationControl.setBg(R.drawable.btn_circle_blue); diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java index 35a786d670..242a26aea6 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java @@ -345,9 +345,9 @@ public class MapRoutePreferencesControl { int t = mute ? R.string.menu_mute_on : R.string.menu_mute_off; int icon; if(mute) { - icon = R.drawable.a_10_device_access_volume_muted_dark; + icon = R.drawable.ic_action_volume_off; } else{ - icon = R.drawable.a_10_device_access_volume_on_dark; + icon = R.drawable.ic_action_volume_up; } muteBtn.setContentDescription(mapActivity.getString(t)); muteBtn.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(icon, R.color.icon_color_light));