From 44ef28c0533adf9eb7429b43c7b455b36f5ef615 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Tue, 21 Apr 2020 17:22:38 +0200
Subject: [PATCH] Clean up icons

---
 OsmAnd/.gitignore   |  9 ++++-----
 OsmAnd/build.gradle | 24 ++++++++++++++++++++----
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/.gitignore b/OsmAnd/.gitignore
index d2b201e178..e3071e5fbf 100644
--- a/OsmAnd/.gitignore
+++ b/OsmAnd/.gitignore
@@ -28,11 +28,10 @@ res/drawable-large-hdpi/widget_*
 res/drawable-large-xhdpi/widget_* 
 
 # rendering-styles/style-icons/
-res/drawable/mx_*
-res/drawable-hdpi/mx_*
-res/drawable-mdpi/mx_*
-res/drawable-xhdpi/mx_*
-res/drawable-xxhdpi/mx_*
+h_*
+g_*
+mm_*
+mx_*
 
 valgrind/
 bin/
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 5a2212e790..4f649e8931 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -359,29 +359,45 @@ task copyPoiCategiry(type: Copy) {
 	into "assets"
 }
 
-task copyStyleIcons(type: Copy) {
+task copyStyleIcons(type: Sync) {
 	from "../../resources/rendering_styles/style-icons/"
 	into "res/"
 	include "**/*.png",  "**/*.xml"
+	preserve {
+		include '**/*'
+		exclude "**/mx_*",  "**/mm_*", "**/h_*"
+	}
 }
 
 
-task copyWidgetIconsXhdpi(type: Copy) {
+task copyWidgetIconsXhdpi(type: Sync) {
 	from "res/drawable-xxhdpi/"
 	into "res/drawable-large-xhdpi/"
 	include "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	preserve {
+		include '*'
+		exclude "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	}
 }
 
-task copyWidgetIconsHdpi(type: Copy) {
+task copyWidgetIconsHdpi(type: Sync) {
 	from "res/drawable-xhdpi/"
 	into "res/drawable-large-hdpi/"
 	include "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	preserve {
+		include '*'
+		exclude "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	}
 }
 
-task copyWidgetIcons(type: Copy) {
+task copyWidgetIcons(type: Sync) {
 	from "res/drawable-hdpi/"
 	into "res/drawable-large/"
 	include "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	preserve {
+		include '*'
+		exclude "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	}
 }
 
 task collectExternalResources {