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

Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads_improvements

Browse source
This commit is contained in:
Vitaliy 2020-04-21 19:05:31 +03:00
commit 137e554059
3 changed files with 42 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/.gitignore vendored
View file

@ -27,6 +27,12 @@ res/drawable-large/widget_*
res/drawable-large-hdpi/widget_*
res/drawable-large-xhdpi/widget_*
# rendering-styles/style-icons/
h_*
g_*
mm_*
mx_*
valgrind/
bin/
dist/

41
OsmAnd/build.gradle
View file

@ -359,15 +359,44 @@ task copyPoiCategiry(type: Copy) {
into "assets"
}
task copyStyleIcons(type: Copy) {
task copyStyleIcons(type: Sync) {
from "../../resources/rendering_styles/style-icons/"
into "res/"
include "**/*.png"
include "**/*.png", "**/*.xml"
preserve {
include '**/*'
exclude "**/mx_*", "**/mm_*", "**/h_*"
}
}
task copyWidgetIcons(type: Exec) {
if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
commandLine 'sh', file("./copy_widget_icons.sh").getAbsolutePath()
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: 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: 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"
}
}
@ -380,6 +409,8 @@ task collectExternalResources {
updateNoTranslate,
validateTranslate,
copyWidgetIcons,
copyWidgetIconsHdpi,
copyWidgetIconsXhdpi,
copyPoiCategiry,
downloadWorldMiniBasemap

6
OsmAnd/copy_widget_icons.sh
View file

@ -1,6 +0,0 @@
cp -f res/drawable-hdpi/widget_* res/drawable-large/
cp -f res/drawable-xxhdpi/widget_* res/drawable-large-hdpi/
cp -f res/drawable-xhdpi/widget_* res/drawable-large-xhdpi/
cp -f res/drawable-hdpi/map_* res/drawable-large/
cp -f res/drawable-xhdpi/map_* res/drawable-large-hdpi/
cp -f res/drawable-xxhdpi/map_* res/drawable-large-xhdpi/