From 91e23d08f2f59d3b56dd9a8d4029388465b10e35 Mon Sep 17 00:00:00 2001 From: Andrew Shkrob Date: Wed, 8 May 2024 20:37:27 +0200 Subject: [PATCH] [data] Refactor resources folder Signed-off-by: Andrew Shkrob --- .gitignore | 2 +- .../app/src/main/assets/resources-6plus_dark | 1 - android/app/src/main/assets/resources-default | 1 - .../app/src/main/assets/resources-hdpi_dark | 1 - .../app/src/main/assets/resources-mdpi_dark | 1 - .../app/src/main/assets/resources-xhdpi_dark | 1 - .../app/src/main/assets/resources-xxhdpi_dark | 1 - .../src/main/assets/resources-xxxhdpi_dark | 1 - android/app/src/main/assets/symbols | 1 + data/{resources-svg => symbols-svg}/README.md | 0 .../ic_facebook_white.svg | 0 .../ic_follow.svg | 0 .../ic_instagram_white.svg | 0 .../ic_layer_contours.svg | 0 .../ic_layer_outdoor_lake.svg | 0 .../ic_layer_outdoor_river.svg | 0 .../ic_layer_outdoor_river_r2.svg | 0 .../ic_layer_subway.svg | 0 .../ic_level_white.svg | 0 .../ic_line_white.svg | 0 .../ic_twitter_white.svg | 0 .../ic_vk_white.svg | 0 .../ic_wikimedia_commons_white.svg | 0 .../ios_ic_category_secondhand_dark.svg | 0 .../ios_ic_category_secondhand_light.svg | 0 .../6plus/dark}/area-hatching.png | Bin .../6plus/dark}/symbols.png | Bin .../6plus/dark}/symbols.sdf | 0 .../6plus/dark}/traffic-arrow.png | Bin .../6plus/light}/area-hatching.png | Bin .../6plus/light}/symbols.png | Bin .../6plus/light}/symbols.sdf | 0 .../6plus/light}/traffic-arrow.png | Bin .../default}/arrow.obj | 0 .../default}/arrow_shadow.obj | 0 .../default}/default.ui | 0 .../default}/smaa-area.png | Bin .../default}/smaa-search.png | Bin .../hdpi/dark}/area-hatching.png | Bin .../hdpi/dark}/symbols.png | Bin .../hdpi/dark}/symbols.sdf | 0 .../hdpi/dark}/traffic-arrow.png | Bin .../hdpi/light}/area-hatching.png | Bin .../hdpi/light}/symbols.png | Bin .../hdpi/light}/symbols.sdf | 0 .../hdpi/light}/traffic-arrow.png | Bin .../mdpi/dark}/area-hatching.png | Bin .../mdpi/dark}/symbols.png | Bin .../mdpi/dark}/symbols.sdf | 0 .../mdpi/dark}/traffic-arrow.png | Bin .../mdpi/light}/area-hatching.png | Bin .../mdpi/light}/symbols.png | Bin .../mdpi/light}/symbols.sdf | 0 .../mdpi/light}/traffic-arrow.png | Bin .../xhdpi/dark}/area-hatching.png | Bin .../xhdpi/dark}/symbols.png | Bin .../xhdpi/dark}/symbols.sdf | 0 .../xhdpi/dark}/traffic-arrow.png | Bin .../xhdpi/light}/area-hatching.png | Bin .../xhdpi/light}/symbols.png | Bin .../xhdpi/light}/symbols.sdf | 0 .../xhdpi/light}/traffic-arrow.png | Bin .../xxhdpi/dark}/area-hatching.png | Bin .../xxhdpi/dark}/symbols.png | Bin .../xxhdpi/dark}/symbols.sdf | 0 .../xxhdpi/dark}/traffic-arrow.png | Bin .../xxhdpi/light}/area-hatching.png | Bin .../xxhdpi/light}/symbols.png | Bin .../xxhdpi/light}/symbols.sdf | 0 .../xxhdpi/light}/traffic-arrow.png | Bin .../xxxhdpi/dark}/area-hatching.png | Bin .../xxxhdpi/dark}/symbols.png | Bin .../xxxhdpi/dark}/symbols.sdf | 0 .../xxxhdpi/dark}/traffic-arrow.png | Bin .../xxxhdpi/light}/area-hatching.png | Bin .../xxxhdpi/light}/symbols.png | Bin .../xxxhdpi/light}/symbols.sdf | 0 .../xxxhdpi/light}/traffic-arrow.png | Bin docs/STRUCTURE.md | 7 ++- drape_frontend/gui/skin.cpp | 4 +- indexer/map_style_reader.cpp | 31 +++++----- iphone/Maps/Maps.xcodeproj/project.pbxproj | 56 ++---------------- platform/platform_tests/apk_test.cpp | 12 ++-- platform/platform_tests/platform_test.cpp | 2 +- qt/CMakeLists.txt | 32 ++++------ qt/build_style/build_skins.cpp | 6 +- tools/unix/generate_symbols.sh | 53 ++++++++--------- 87 files changed, 74 insertions(+), 139 deletions(-) delete mode 120000 android/app/src/main/assets/resources-6plus_dark delete mode 120000 android/app/src/main/assets/resources-default delete mode 120000 android/app/src/main/assets/resources-hdpi_dark delete mode 120000 android/app/src/main/assets/resources-mdpi_dark delete mode 120000 android/app/src/main/assets/resources-xhdpi_dark delete mode 120000 android/app/src/main/assets/resources-xxhdpi_dark delete mode 120000 android/app/src/main/assets/resources-xxxhdpi_dark create mode 120000 android/app/src/main/assets/symbols rename data/{resources-svg => symbols-svg}/README.md (100%) rename data/{resources-svg => symbols-svg}/ic_facebook_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_follow.svg (100%) rename data/{resources-svg => symbols-svg}/ic_instagram_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_layer_contours.svg (100%) rename data/{resources-svg => symbols-svg}/ic_layer_outdoor_lake.svg (100%) rename data/{resources-svg => symbols-svg}/ic_layer_outdoor_river.svg (100%) rename data/{resources-svg => symbols-svg}/ic_layer_outdoor_river_r2.svg (100%) rename data/{resources-svg => symbols-svg}/ic_layer_subway.svg (100%) rename data/{resources-svg => symbols-svg}/ic_level_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_line_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_twitter_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_vk_white.svg (100%) rename data/{resources-svg => symbols-svg}/ic_wikimedia_commons_white.svg (100%) rename data/{resources-svg => symbols-svg}/ios_ic_category_secondhand_dark.svg (100%) rename data/{resources-svg => symbols-svg}/ios_ic_category_secondhand_light.svg (100%) rename data/{resources-6plus_dark => symbols/6plus/dark}/area-hatching.png (100%) rename data/{resources-6plus_dark => symbols/6plus/dark}/symbols.png (100%) rename data/{resources-6plus_dark => symbols/6plus/dark}/symbols.sdf (100%) rename data/{resources-6plus_dark => symbols/6plus/dark}/traffic-arrow.png (100%) rename data/{resources-6plus_light => symbols/6plus/light}/area-hatching.png (100%) rename data/{resources-6plus_light => symbols/6plus/light}/symbols.png (100%) rename data/{resources-6plus_light => symbols/6plus/light}/symbols.sdf (100%) rename data/{resources-6plus_light => symbols/6plus/light}/traffic-arrow.png (100%) rename data/{resources-default => symbols/default}/arrow.obj (100%) rename data/{resources-default => symbols/default}/arrow_shadow.obj (100%) rename data/{resources-default => symbols/default}/default.ui (100%) rename data/{resources-default => symbols/default}/smaa-area.png (100%) rename data/{resources-default => symbols/default}/smaa-search.png (100%) rename data/{resources-hdpi_dark => symbols/hdpi/dark}/area-hatching.png (100%) rename data/{resources-hdpi_dark => symbols/hdpi/dark}/symbols.png (100%) rename data/{resources-hdpi_dark => symbols/hdpi/dark}/symbols.sdf (100%) rename data/{resources-hdpi_dark => symbols/hdpi/dark}/traffic-arrow.png (100%) rename data/{resources-hdpi_light => symbols/hdpi/light}/area-hatching.png (100%) rename data/{resources-hdpi_light => symbols/hdpi/light}/symbols.png (100%) rename data/{resources-hdpi_light => symbols/hdpi/light}/symbols.sdf (100%) rename data/{resources-hdpi_light => symbols/hdpi/light}/traffic-arrow.png (100%) rename data/{resources-mdpi_dark => symbols/mdpi/dark}/area-hatching.png (100%) rename data/{resources-mdpi_dark => symbols/mdpi/dark}/symbols.png (100%) rename data/{resources-mdpi_dark => symbols/mdpi/dark}/symbols.sdf (100%) rename data/{resources-mdpi_dark => symbols/mdpi/dark}/traffic-arrow.png (100%) rename data/{resources-mdpi_light => symbols/mdpi/light}/area-hatching.png (100%) rename data/{resources-mdpi_light => symbols/mdpi/light}/symbols.png (100%) rename data/{resources-mdpi_light => symbols/mdpi/light}/symbols.sdf (100%) rename data/{resources-mdpi_light => symbols/mdpi/light}/traffic-arrow.png (100%) rename data/{resources-xhdpi_dark => symbols/xhdpi/dark}/area-hatching.png (100%) rename data/{resources-xhdpi_dark => symbols/xhdpi/dark}/symbols.png (100%) rename data/{resources-xhdpi_dark => symbols/xhdpi/dark}/symbols.sdf (100%) rename data/{resources-xhdpi_dark => symbols/xhdpi/dark}/traffic-arrow.png (100%) rename data/{resources-xhdpi_light => symbols/xhdpi/light}/area-hatching.png (100%) rename data/{resources-xhdpi_light => symbols/xhdpi/light}/symbols.png (100%) rename data/{resources-xhdpi_light => symbols/xhdpi/light}/symbols.sdf (100%) rename data/{resources-xhdpi_light => symbols/xhdpi/light}/traffic-arrow.png (100%) rename data/{resources-xxhdpi_dark => symbols/xxhdpi/dark}/area-hatching.png (100%) rename data/{resources-xxhdpi_dark => symbols/xxhdpi/dark}/symbols.png (100%) rename data/{resources-xxhdpi_dark => symbols/xxhdpi/dark}/symbols.sdf (100%) rename data/{resources-xxhdpi_dark => symbols/xxhdpi/dark}/traffic-arrow.png (100%) rename data/{resources-xxhdpi_light => symbols/xxhdpi/light}/area-hatching.png (100%) rename data/{resources-xxhdpi_light => symbols/xxhdpi/light}/symbols.png (100%) rename data/{resources-xxhdpi_light => symbols/xxhdpi/light}/symbols.sdf (100%) rename data/{resources-xxhdpi_light => symbols/xxhdpi/light}/traffic-arrow.png (100%) rename data/{resources-xxxhdpi_dark => symbols/xxxhdpi/dark}/area-hatching.png (100%) rename data/{resources-xxxhdpi_dark => symbols/xxxhdpi/dark}/symbols.png (100%) rename data/{resources-xxxhdpi_dark => symbols/xxxhdpi/dark}/symbols.sdf (100%) rename data/{resources-xxxhdpi_dark => symbols/xxxhdpi/dark}/traffic-arrow.png (100%) rename data/{resources-xxxhdpi_light => symbols/xxxhdpi/light}/area-hatching.png (100%) rename data/{resources-xxxhdpi_light => symbols/xxxhdpi/light}/symbols.png (100%) rename data/{resources-xxxhdpi_light => symbols/xxxhdpi/light}/symbols.sdf (100%) rename data/{resources-xxxhdpi_light => symbols/xxxhdpi/light}/traffic-arrow.png (100%) diff --git a/.gitignore b/.gitignore index 938425f7c0..521f988dea 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ stxxl.log screenlog.0 data/styles/*/*/out/* -data/resources-*_design/* +data/symbols/*/design/* data/drules_proto_default_design.bin data/colors_design.txt data/patterns_design.txt diff --git a/android/app/src/main/assets/resources-6plus_dark b/android/app/src/main/assets/resources-6plus_dark deleted file mode 120000 index 543501d63a..0000000000 --- a/android/app/src/main/assets/resources-6plus_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-6plus_dark \ No newline at end of file diff --git a/android/app/src/main/assets/resources-default b/android/app/src/main/assets/resources-default deleted file mode 120000 index 9a8aaa1811..0000000000 --- a/android/app/src/main/assets/resources-default +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-default \ No newline at end of file diff --git a/android/app/src/main/assets/resources-hdpi_dark b/android/app/src/main/assets/resources-hdpi_dark deleted file mode 120000 index 21d8f368d4..0000000000 --- a/android/app/src/main/assets/resources-hdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-hdpi_dark \ No newline at end of file diff --git a/android/app/src/main/assets/resources-mdpi_dark b/android/app/src/main/assets/resources-mdpi_dark deleted file mode 120000 index f59648be5b..0000000000 --- a/android/app/src/main/assets/resources-mdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-mdpi_dark \ No newline at end of file diff --git a/android/app/src/main/assets/resources-xhdpi_dark b/android/app/src/main/assets/resources-xhdpi_dark deleted file mode 120000 index 127d046ad6..0000000000 --- a/android/app/src/main/assets/resources-xhdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-xhdpi_dark \ No newline at end of file diff --git a/android/app/src/main/assets/resources-xxhdpi_dark b/android/app/src/main/assets/resources-xxhdpi_dark deleted file mode 120000 index d9877f68f1..0000000000 --- a/android/app/src/main/assets/resources-xxhdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-xxhdpi_dark \ No newline at end of file diff --git a/android/app/src/main/assets/resources-xxxhdpi_dark b/android/app/src/main/assets/resources-xxxhdpi_dark deleted file mode 120000 index 072a2b1ec3..0000000000 --- a/android/app/src/main/assets/resources-xxxhdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../../../../data/resources-xxxhdpi_dark \ No newline at end of file diff --git a/android/app/src/main/assets/symbols b/android/app/src/main/assets/symbols new file mode 120000 index 0000000000..60317a425b --- /dev/null +++ b/android/app/src/main/assets/symbols @@ -0,0 +1 @@ +../../../../../data/symbols \ No newline at end of file diff --git a/data/resources-svg/README.md b/data/symbols-svg/README.md similarity index 100% rename from data/resources-svg/README.md rename to data/symbols-svg/README.md diff --git a/data/resources-svg/ic_facebook_white.svg b/data/symbols-svg/ic_facebook_white.svg similarity index 100% rename from data/resources-svg/ic_facebook_white.svg rename to data/symbols-svg/ic_facebook_white.svg diff --git a/data/resources-svg/ic_follow.svg b/data/symbols-svg/ic_follow.svg similarity index 100% rename from data/resources-svg/ic_follow.svg rename to data/symbols-svg/ic_follow.svg diff --git a/data/resources-svg/ic_instagram_white.svg b/data/symbols-svg/ic_instagram_white.svg similarity index 100% rename from data/resources-svg/ic_instagram_white.svg rename to data/symbols-svg/ic_instagram_white.svg diff --git a/data/resources-svg/ic_layer_contours.svg b/data/symbols-svg/ic_layer_contours.svg similarity index 100% rename from data/resources-svg/ic_layer_contours.svg rename to data/symbols-svg/ic_layer_contours.svg diff --git a/data/resources-svg/ic_layer_outdoor_lake.svg b/data/symbols-svg/ic_layer_outdoor_lake.svg similarity index 100% rename from data/resources-svg/ic_layer_outdoor_lake.svg rename to data/symbols-svg/ic_layer_outdoor_lake.svg diff --git a/data/resources-svg/ic_layer_outdoor_river.svg b/data/symbols-svg/ic_layer_outdoor_river.svg similarity index 100% rename from data/resources-svg/ic_layer_outdoor_river.svg rename to data/symbols-svg/ic_layer_outdoor_river.svg diff --git a/data/resources-svg/ic_layer_outdoor_river_r2.svg b/data/symbols-svg/ic_layer_outdoor_river_r2.svg similarity index 100% rename from data/resources-svg/ic_layer_outdoor_river_r2.svg rename to data/symbols-svg/ic_layer_outdoor_river_r2.svg diff --git a/data/resources-svg/ic_layer_subway.svg b/data/symbols-svg/ic_layer_subway.svg similarity index 100% rename from data/resources-svg/ic_layer_subway.svg rename to data/symbols-svg/ic_layer_subway.svg diff --git a/data/resources-svg/ic_level_white.svg b/data/symbols-svg/ic_level_white.svg similarity index 100% rename from data/resources-svg/ic_level_white.svg rename to data/symbols-svg/ic_level_white.svg diff --git a/data/resources-svg/ic_line_white.svg b/data/symbols-svg/ic_line_white.svg similarity index 100% rename from data/resources-svg/ic_line_white.svg rename to data/symbols-svg/ic_line_white.svg diff --git a/data/resources-svg/ic_twitter_white.svg b/data/symbols-svg/ic_twitter_white.svg similarity index 100% rename from data/resources-svg/ic_twitter_white.svg rename to data/symbols-svg/ic_twitter_white.svg diff --git a/data/resources-svg/ic_vk_white.svg b/data/symbols-svg/ic_vk_white.svg similarity index 100% rename from data/resources-svg/ic_vk_white.svg rename to data/symbols-svg/ic_vk_white.svg diff --git a/data/resources-svg/ic_wikimedia_commons_white.svg b/data/symbols-svg/ic_wikimedia_commons_white.svg similarity index 100% rename from data/resources-svg/ic_wikimedia_commons_white.svg rename to data/symbols-svg/ic_wikimedia_commons_white.svg diff --git a/data/resources-svg/ios_ic_category_secondhand_dark.svg b/data/symbols-svg/ios_ic_category_secondhand_dark.svg similarity index 100% rename from data/resources-svg/ios_ic_category_secondhand_dark.svg rename to data/symbols-svg/ios_ic_category_secondhand_dark.svg diff --git a/data/resources-svg/ios_ic_category_secondhand_light.svg b/data/symbols-svg/ios_ic_category_secondhand_light.svg similarity index 100% rename from data/resources-svg/ios_ic_category_secondhand_light.svg rename to data/symbols-svg/ios_ic_category_secondhand_light.svg diff --git a/data/resources-6plus_dark/area-hatching.png b/data/symbols/6plus/dark/area-hatching.png similarity index 100% rename from data/resources-6plus_dark/area-hatching.png rename to data/symbols/6plus/dark/area-hatching.png diff --git a/data/resources-6plus_dark/symbols.png b/data/symbols/6plus/dark/symbols.png similarity index 100% rename from data/resources-6plus_dark/symbols.png rename to data/symbols/6plus/dark/symbols.png diff --git a/data/resources-6plus_dark/symbols.sdf b/data/symbols/6plus/dark/symbols.sdf similarity index 100% rename from data/resources-6plus_dark/symbols.sdf rename to data/symbols/6plus/dark/symbols.sdf diff --git a/data/resources-6plus_dark/traffic-arrow.png b/data/symbols/6plus/dark/traffic-arrow.png similarity index 100% rename from data/resources-6plus_dark/traffic-arrow.png rename to data/symbols/6plus/dark/traffic-arrow.png diff --git a/data/resources-6plus_light/area-hatching.png b/data/symbols/6plus/light/area-hatching.png similarity index 100% rename from data/resources-6plus_light/area-hatching.png rename to data/symbols/6plus/light/area-hatching.png diff --git a/data/resources-6plus_light/symbols.png b/data/symbols/6plus/light/symbols.png similarity index 100% rename from data/resources-6plus_light/symbols.png rename to data/symbols/6plus/light/symbols.png diff --git a/data/resources-6plus_light/symbols.sdf b/data/symbols/6plus/light/symbols.sdf similarity index 100% rename from data/resources-6plus_light/symbols.sdf rename to data/symbols/6plus/light/symbols.sdf diff --git a/data/resources-6plus_light/traffic-arrow.png b/data/symbols/6plus/light/traffic-arrow.png similarity index 100% rename from data/resources-6plus_light/traffic-arrow.png rename to data/symbols/6plus/light/traffic-arrow.png diff --git a/data/resources-default/arrow.obj b/data/symbols/default/arrow.obj similarity index 100% rename from data/resources-default/arrow.obj rename to data/symbols/default/arrow.obj diff --git a/data/resources-default/arrow_shadow.obj b/data/symbols/default/arrow_shadow.obj similarity index 100% rename from data/resources-default/arrow_shadow.obj rename to data/symbols/default/arrow_shadow.obj diff --git a/data/resources-default/default.ui b/data/symbols/default/default.ui similarity index 100% rename from data/resources-default/default.ui rename to data/symbols/default/default.ui diff --git a/data/resources-default/smaa-area.png b/data/symbols/default/smaa-area.png similarity index 100% rename from data/resources-default/smaa-area.png rename to data/symbols/default/smaa-area.png diff --git a/data/resources-default/smaa-search.png b/data/symbols/default/smaa-search.png similarity index 100% rename from data/resources-default/smaa-search.png rename to data/symbols/default/smaa-search.png diff --git a/data/resources-hdpi_dark/area-hatching.png b/data/symbols/hdpi/dark/area-hatching.png similarity index 100% rename from data/resources-hdpi_dark/area-hatching.png rename to data/symbols/hdpi/dark/area-hatching.png diff --git a/data/resources-hdpi_dark/symbols.png b/data/symbols/hdpi/dark/symbols.png similarity index 100% rename from data/resources-hdpi_dark/symbols.png rename to data/symbols/hdpi/dark/symbols.png diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/symbols/hdpi/dark/symbols.sdf similarity index 100% rename from data/resources-hdpi_dark/symbols.sdf rename to data/symbols/hdpi/dark/symbols.sdf diff --git a/data/resources-hdpi_dark/traffic-arrow.png b/data/symbols/hdpi/dark/traffic-arrow.png similarity index 100% rename from data/resources-hdpi_dark/traffic-arrow.png rename to data/symbols/hdpi/dark/traffic-arrow.png diff --git a/data/resources-hdpi_light/area-hatching.png b/data/symbols/hdpi/light/area-hatching.png similarity index 100% rename from data/resources-hdpi_light/area-hatching.png rename to data/symbols/hdpi/light/area-hatching.png diff --git a/data/resources-hdpi_light/symbols.png b/data/symbols/hdpi/light/symbols.png similarity index 100% rename from data/resources-hdpi_light/symbols.png rename to data/symbols/hdpi/light/symbols.png diff --git a/data/resources-hdpi_light/symbols.sdf b/data/symbols/hdpi/light/symbols.sdf similarity index 100% rename from data/resources-hdpi_light/symbols.sdf rename to data/symbols/hdpi/light/symbols.sdf diff --git a/data/resources-hdpi_light/traffic-arrow.png b/data/symbols/hdpi/light/traffic-arrow.png similarity index 100% rename from data/resources-hdpi_light/traffic-arrow.png rename to data/symbols/hdpi/light/traffic-arrow.png diff --git a/data/resources-mdpi_dark/area-hatching.png b/data/symbols/mdpi/dark/area-hatching.png similarity index 100% rename from data/resources-mdpi_dark/area-hatching.png rename to data/symbols/mdpi/dark/area-hatching.png diff --git a/data/resources-mdpi_dark/symbols.png b/data/symbols/mdpi/dark/symbols.png similarity index 100% rename from data/resources-mdpi_dark/symbols.png rename to data/symbols/mdpi/dark/symbols.png diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/symbols/mdpi/dark/symbols.sdf similarity index 100% rename from data/resources-mdpi_dark/symbols.sdf rename to data/symbols/mdpi/dark/symbols.sdf diff --git a/data/resources-mdpi_dark/traffic-arrow.png b/data/symbols/mdpi/dark/traffic-arrow.png similarity index 100% rename from data/resources-mdpi_dark/traffic-arrow.png rename to data/symbols/mdpi/dark/traffic-arrow.png diff --git a/data/resources-mdpi_light/area-hatching.png b/data/symbols/mdpi/light/area-hatching.png similarity index 100% rename from data/resources-mdpi_light/area-hatching.png rename to data/symbols/mdpi/light/area-hatching.png diff --git a/data/resources-mdpi_light/symbols.png b/data/symbols/mdpi/light/symbols.png similarity index 100% rename from data/resources-mdpi_light/symbols.png rename to data/symbols/mdpi/light/symbols.png diff --git a/data/resources-mdpi_light/symbols.sdf b/data/symbols/mdpi/light/symbols.sdf similarity index 100% rename from data/resources-mdpi_light/symbols.sdf rename to data/symbols/mdpi/light/symbols.sdf diff --git a/data/resources-mdpi_light/traffic-arrow.png b/data/symbols/mdpi/light/traffic-arrow.png similarity index 100% rename from data/resources-mdpi_light/traffic-arrow.png rename to data/symbols/mdpi/light/traffic-arrow.png diff --git a/data/resources-xhdpi_dark/area-hatching.png b/data/symbols/xhdpi/dark/area-hatching.png similarity index 100% rename from data/resources-xhdpi_dark/area-hatching.png rename to data/symbols/xhdpi/dark/area-hatching.png diff --git a/data/resources-xhdpi_dark/symbols.png b/data/symbols/xhdpi/dark/symbols.png similarity index 100% rename from data/resources-xhdpi_dark/symbols.png rename to data/symbols/xhdpi/dark/symbols.png diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/symbols/xhdpi/dark/symbols.sdf similarity index 100% rename from data/resources-xhdpi_dark/symbols.sdf rename to data/symbols/xhdpi/dark/symbols.sdf diff --git a/data/resources-xhdpi_dark/traffic-arrow.png b/data/symbols/xhdpi/dark/traffic-arrow.png similarity index 100% rename from data/resources-xhdpi_dark/traffic-arrow.png rename to data/symbols/xhdpi/dark/traffic-arrow.png diff --git a/data/resources-xhdpi_light/area-hatching.png b/data/symbols/xhdpi/light/area-hatching.png similarity index 100% rename from data/resources-xhdpi_light/area-hatching.png rename to data/symbols/xhdpi/light/area-hatching.png diff --git a/data/resources-xhdpi_light/symbols.png b/data/symbols/xhdpi/light/symbols.png similarity index 100% rename from data/resources-xhdpi_light/symbols.png rename to data/symbols/xhdpi/light/symbols.png diff --git a/data/resources-xhdpi_light/symbols.sdf b/data/symbols/xhdpi/light/symbols.sdf similarity index 100% rename from data/resources-xhdpi_light/symbols.sdf rename to data/symbols/xhdpi/light/symbols.sdf diff --git a/data/resources-xhdpi_light/traffic-arrow.png b/data/symbols/xhdpi/light/traffic-arrow.png similarity index 100% rename from data/resources-xhdpi_light/traffic-arrow.png rename to data/symbols/xhdpi/light/traffic-arrow.png diff --git a/data/resources-xxhdpi_dark/area-hatching.png b/data/symbols/xxhdpi/dark/area-hatching.png similarity index 100% rename from data/resources-xxhdpi_dark/area-hatching.png rename to data/symbols/xxhdpi/dark/area-hatching.png diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/symbols/xxhdpi/dark/symbols.png similarity index 100% rename from data/resources-xxhdpi_dark/symbols.png rename to data/symbols/xxhdpi/dark/symbols.png diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/symbols/xxhdpi/dark/symbols.sdf similarity index 100% rename from data/resources-xxhdpi_dark/symbols.sdf rename to data/symbols/xxhdpi/dark/symbols.sdf diff --git a/data/resources-xxhdpi_dark/traffic-arrow.png b/data/symbols/xxhdpi/dark/traffic-arrow.png similarity index 100% rename from data/resources-xxhdpi_dark/traffic-arrow.png rename to data/symbols/xxhdpi/dark/traffic-arrow.png diff --git a/data/resources-xxhdpi_light/area-hatching.png b/data/symbols/xxhdpi/light/area-hatching.png similarity index 100% rename from data/resources-xxhdpi_light/area-hatching.png rename to data/symbols/xxhdpi/light/area-hatching.png diff --git a/data/resources-xxhdpi_light/symbols.png b/data/symbols/xxhdpi/light/symbols.png similarity index 100% rename from data/resources-xxhdpi_light/symbols.png rename to data/symbols/xxhdpi/light/symbols.png diff --git a/data/resources-xxhdpi_light/symbols.sdf b/data/symbols/xxhdpi/light/symbols.sdf similarity index 100% rename from data/resources-xxhdpi_light/symbols.sdf rename to data/symbols/xxhdpi/light/symbols.sdf diff --git a/data/resources-xxhdpi_light/traffic-arrow.png b/data/symbols/xxhdpi/light/traffic-arrow.png similarity index 100% rename from data/resources-xxhdpi_light/traffic-arrow.png rename to data/symbols/xxhdpi/light/traffic-arrow.png diff --git a/data/resources-xxxhdpi_dark/area-hatching.png b/data/symbols/xxxhdpi/dark/area-hatching.png similarity index 100% rename from data/resources-xxxhdpi_dark/area-hatching.png rename to data/symbols/xxxhdpi/dark/area-hatching.png diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/symbols/xxxhdpi/dark/symbols.png similarity index 100% rename from data/resources-xxxhdpi_dark/symbols.png rename to data/symbols/xxxhdpi/dark/symbols.png diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/symbols/xxxhdpi/dark/symbols.sdf similarity index 100% rename from data/resources-xxxhdpi_dark/symbols.sdf rename to data/symbols/xxxhdpi/dark/symbols.sdf diff --git a/data/resources-xxxhdpi_dark/traffic-arrow.png b/data/symbols/xxxhdpi/dark/traffic-arrow.png similarity index 100% rename from data/resources-xxxhdpi_dark/traffic-arrow.png rename to data/symbols/xxxhdpi/dark/traffic-arrow.png diff --git a/data/resources-xxxhdpi_light/area-hatching.png b/data/symbols/xxxhdpi/light/area-hatching.png similarity index 100% rename from data/resources-xxxhdpi_light/area-hatching.png rename to data/symbols/xxxhdpi/light/area-hatching.png diff --git a/data/resources-xxxhdpi_light/symbols.png b/data/symbols/xxxhdpi/light/symbols.png similarity index 100% rename from data/resources-xxxhdpi_light/symbols.png rename to data/symbols/xxxhdpi/light/symbols.png diff --git a/data/resources-xxxhdpi_light/symbols.sdf b/data/symbols/xxxhdpi/light/symbols.sdf similarity index 100% rename from data/resources-xxxhdpi_light/symbols.sdf rename to data/symbols/xxxhdpi/light/symbols.sdf diff --git a/data/resources-xxxhdpi_light/traffic-arrow.png b/data/symbols/xxxhdpi/light/traffic-arrow.png similarity index 100% rename from data/resources-xxxhdpi_light/traffic-arrow.png rename to data/symbols/xxxhdpi/light/traffic-arrow.png diff --git a/docs/STRUCTURE.md b/docs/STRUCTURE.md index 0a66302a4b..79f8eef061 100644 --- a/docs/STRUCTURE.md +++ b/docs/STRUCTURE.md @@ -43,13 +43,14 @@ Automatically generated: ### Styles and icons -- `resources-default/` - -- `resources-svg/` - social networks icons +- `symbols/` - symbols for different screen DPIs +- `symbols/default/` - default resources used on all sceen DPIs +- `symbols-svg/` - social networks icons - `search-icons/svg/` - source SVG files for search categories icons - `styles/` - map [style files](STYLES.md#files) Automatically [generated](STYLES.md#technical-details): -- `resources-*/` - icons skin files in various resolutions for `dark` and `clear` (light) themes. +- `symbols/` - icons skin files in various resolutions for `dark` and `light` themes. - `drules_proto*` - binary drawing rules files. - `colors.txt`,`patterns.txt`,`visibility.txt` diff --git a/drape_frontend/gui/skin.cpp b/drape_frontend/gui/skin.cpp index 623087b735..c0f3f230fa 100644 --- a/drape_frontend/gui/skin.cpp +++ b/drape_frontend/gui/skin.cpp @@ -288,7 +288,7 @@ ReaderPtr ResolveGuiSkinFile(std::string const & deviceType) std::unique_ptr reader; try { - reader = pl.GetReader("resources-default/" + deviceType + ".ui"); + reader = pl.GetReader("symbols/default/" + deviceType + ".ui"); } catch(FileAbsentException & e) { @@ -299,7 +299,7 @@ ReaderPtr ResolveGuiSkinFile(std::string const & deviceType) { try { - reader = pl.GetReader("resources-default/default.ui"); + reader = pl.GetReader("symbols/default/default.ui"); } catch(FileAbsentException & e) { diff --git a/indexer/map_style_reader.cpp b/indexer/map_style_reader.cpp index ba4f7091ef..c799f92b52 100644 --- a/indexer/map_style_reader.cpp +++ b/indexer/map_style_reader.cpp @@ -7,19 +7,19 @@ namespace { -std::string const kSuffixDark = "_dark"; -std::string const kSuffixLight = "_light"; -std::string const kSuffixDefaultDark = "_default_dark"; -std::string const kSuffixDefaultLight = "_default_light"; -std::string const kSuffixVehicleDark = "_vehicle_dark"; -std::string const kSuffixVehicleLight = "_vehicle_light"; -std::string const kSuffixOutdoorsLight = "_outdoors_light"; -std::string const kSuffixOutdoorsDark = "_outdoors_dark"; +std::string const kSuffixDark = "dark"; +std::string const kSuffixLight = "light"; +std::string const kSuffixDefaultDark = "default_dark"; +std::string const kSuffixDefaultLight = "default_light"; +std::string const kSuffixVehicleDark = "vehicle_dark"; +std::string const kSuffixVehicleLight = "vehicle_light"; +std::string const kSuffixOutdoorsLight = "outdoors_light"; +std::string const kSuffixOutdoorsDark = "outdoors_dark"; std::string const kStylesOverrideDir = "styles"; #ifdef BUILD_DESIGNER -std::string const kSuffixDesignTool = "_design"; +std::string const kSuffixDesignTool = "design"; #endif // BUILD_DESIGNER std::string GetStyleRulesSuffix(MapStyle mapStyle) @@ -42,7 +42,7 @@ std::string GetStyleRulesSuffix(MapStyle mapStyle) case MapStyleOutdoorsDark: return kSuffixOutdoorsDark; case MapStyleMerged: - return std::string(); + return ""; case MapStyleCount: break; @@ -70,7 +70,7 @@ std::string GetStyleResourcesSuffix(MapStyle mapStyle) case MapStyleOutdoorsLight: return kSuffixLight; case MapStyleMerged: - return std::string(); + return ""; case MapStyleCount: break; @@ -103,8 +103,7 @@ bool StyleReader::IsCarNavigationStyle() const ReaderPtr StyleReader::GetDrawingRulesReader() const { - std::string rulesFile = - std::string("drules_proto") + GetStyleRulesSuffix(GetCurrentStyle()) + ".bin"; + std::string rulesFile = std::string("drules_proto_") + GetStyleRulesSuffix(GetCurrentStyle()) + ".bin"; auto overriddenRulesFile = base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, rulesFile); @@ -122,9 +121,7 @@ ReaderPtr StyleReader::GetDrawingRulesReader() const ReaderPtr StyleReader::GetResourceReader(std::string const & file, std::string_view density) const { - std::string const resourceDir = - std::string("resources-").append(density) + GetStyleResourcesSuffix(GetCurrentStyle()); - std::string resFile = base::JoinPath(resourceDir, file); + std::string resFile = base::JoinPath("symbols", std::string{density}, GetStyleResourcesSuffix(GetCurrentStyle()), file); auto overriddenResFile = base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, resFile); if (GetPlatform().IsFileExistsByFullPath(overriddenResFile)) @@ -140,7 +137,7 @@ ReaderPtr StyleReader::GetResourceReader(std::string const & file, ReaderPtr StyleReader::GetDefaultResourceReader(std::string const & file) const { - return GetPlatform().GetReader(base::JoinPath("resources-default", file)); + return GetPlatform().GetReader(base::JoinPath("symbols/default", file)); } StyleReader & GetStyleReader() diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 75119c0263..c4078f1375 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 039371B62C5B68CD00708377 /* UIFont+monospaced.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039371B52C5B68CD00708377 /* UIFont+monospaced.swift */; }; + 165953942CB44B5600CFED7C /* symbols in Resources */ = {isa = PBXBuildFile; fileRef = 165953932CB44B3B00CFED7C /* symbols */; }; 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */; }; 3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; }; 33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */; }; @@ -187,8 +188,6 @@ 44360A112A7D35440016F412 /* TransportRuler.xib in Resources */ = {isa = PBXBuildFile; fileRef = 44360A102A7D35440016F412 /* TransportRuler.xib */; }; 447DB4BC2BA78282000DF4C2 /* MWMOsmReauthAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 447DB4BB2BA78282000DF4C2 /* MWMOsmReauthAlert.mm */; }; 447DB4C42BA78665000DF4C2 /* MWMOsmReauthAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 447DB4C12BA78665000DF4C2 /* MWMOsmReauthAlert.xib */; }; - 4501B1942077C35A001B9173 /* resources-xxxhdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = 4501B1922077C35A001B9173 /* resources-xxxhdpi_light */; }; - 4501B1952077C35A001B9173 /* resources-xxxhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */; }; 4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4554B6E81E55F02B0084017F /* drules_proto_vehicle_light.bin */; }; 4554B6EE1E55F0F30084017F /* drules_proto_vehicle_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4554B6E91E55F02B0084017F /* drules_proto_vehicle_dark.bin */; }; 462452E92BD052C0004C85E1 /* MWMEditorSegmentedTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 462452E72BD052C0004C85E1 /* MWMEditorSegmentedTableViewCell.mm */; }; @@ -267,17 +266,14 @@ 6741A9421BF340DE002C974C /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; }; 6741A9451BF340DE002C974C /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; }; 6741A9491BF340DE002C974C /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA46DA2B12D4166E00968C36 /* countries.txt */; }; - 6741A94A1BF340DE002C974C /* resources-6plus_light in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1571B8B4DD700D4EB6F /* resources-6plus_light */; }; 6741A94B1BF340DE002C974C /* unicode_blocks.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */; }; 6741A94C1BF340DE002C974C /* fonts_blacklist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */; }; - 6741A94D1BF340DE002C974C /* resources-xxhdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D15A1B8B4DD700D4EB6F /* resources-xxhdpi_light */; }; 6741A94F1BF340DE002C974C /* MWMDefaultAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F198C1AB81A00006EAF7E /* MWMDefaultAlert.xib */; }; 6741A9501BF340DE002C974C /* fonts_whitelist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */; }; 6741A9511BF340DE002C974C /* MWMDownloaderDialogHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F4B701B4A41D40081A24A /* MWMDownloaderDialogHeader.xib */; }; 6741A9521BF340DE002C974C /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FAFF42291347F101009BBB14 /* World.mwm */; }; 6741A9531BF340DE002C974C /* 01_dejavusans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E5134C4968003A9827 /* 01_dejavusans.ttf */; }; 6741A9541BF340DE002C974C /* 02_droidsans-fallback.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */; }; - 6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */; }; 6741A9571BF340DE002C974C /* 03_jomolhari-id-a3d.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E7134C4968003A9827 /* 03_jomolhari-id-a3d.ttf */; }; 6741A9581BF340DE002C974C /* 04_padauk.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E8134C4968003A9827 /* 04_padauk.ttf */; }; 6741A9591BF340DE002C974C /* 05_khmeros.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E9134C4968003A9827 /* 05_khmeros.ttf */; }; @@ -285,22 +281,17 @@ 6741A95C1BF340DE002C974C /* categories.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAFD696139D9BE2000AE70C /* categories.txt */; }; 6741A95D1BF340DE002C974C /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA64D9A813F975AD00350ECF /* types.txt */; }; 6741A9601BF340DE002C974C /* MWMRoutingDisclaimerAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */; }; - 6741A9611BF340DE002C974C /* resources-xhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */; }; 6741A9681BF340DE002C974C /* faq.html in Resources */ = {isa = PBXBuildFile; fileRef = 978D4A30199A11E600D72CA7 /* faq.html */; }; 6741A96C1BF340DE002C974C /* MWMDownloadTransitMapAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19981AB81A00006EAF7E /* MWMDownloadTransitMapAlert.xib */; }; 6741A96D1BF340DE002C974C /* MWMLocationAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BBF2C71B4FFB8C000CF8E2 /* MWMLocationAlert.xib */; }; 6741A9711BF340DE002C974C /* copyright.html in Resources */ = {isa = PBXBuildFile; fileRef = 97A5967E19B9CD47007A963F /* copyright.html */; }; - 6741A9741BF340DE002C974C /* resources-6plus_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C11B2EBF3B00AC843E /* resources-6plus_dark */; }; 6741A9751BF340DE002C974C /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FA459EB314327AF700B5BB3C /* WorldCoasts.mwm */; }; 6741A9761BF340DE002C974C /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA85F632145DDDC20090E1A0 /* packed_polygons.bin */; }; 6741A97D1BF340DE002C974C /* synonyms.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAEA7D0161BD26600CCD661 /* synonyms.txt */; }; 6741A97E1BF340DE002C974C /* drules_proto_default_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A00DBDE1AB704C400113624 /* drules_proto_default_dark.bin */; }; - 6741A97F1BF340DE002C974C /* resources-mdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_light */; }; 6741A9871BF340DE002C974C /* drules_proto_default_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1561B8B4DD700D4EB6F /* drules_proto_default_light.bin */; }; 6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; }; - 6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */; }; 6741A9951BF340DE002C974C /* MWMDownloaderDialogCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F4B6E1B46A5380081A24A /* MWMDownloaderDialogCell.xib */; }; - 6741A9981BF340DE002C974C /* resources-xhdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_light */; }; 6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */; }; 6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FAF30A94173AB23900818BF6 /* 07_roboto_medium.ttf */; }; 6741A9A31BF340DE002C974C /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; }; @@ -325,7 +316,6 @@ 674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34FE4C441BCC013500066718 /* MWMMapWidgets.mm */; }; 676507601C10559800830BB3 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 451950391B7A3E070085DA05 /* patterns.txt */; }; 676507611C10559B00830BB3 /* colors.txt in Resources */ = {isa = PBXBuildFile; fileRef = 452FCA3A1B6A3DF7007019AB /* colors.txt */; }; - 677A2DE21C0DD50900635A00 /* resources-default in Resources */ = {isa = PBXBuildFile; fileRef = A367C93A1B17334800E2B6E7 /* resources-default */; }; 6B15907226623AE500944BBA /* 00_NotoSansThai-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6B15907026623AE500944BBA /* 00_NotoSansThai-Regular.ttf */; }; 6B679E89266BFD0A0074AE2A /* 00_NotoNaskhArabic-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6B679E88266BFD090074AE2A /* 00_NotoNaskhArabic-Regular.ttf */; }; 6B9978361C89A316003B8AA0 /* editor.config in Resources */ = {isa = PBXBuildFile; fileRef = 6B9978341C89A316003B8AA0 /* editor.config */; }; @@ -518,8 +508,6 @@ EDFDFB4C2B722C9C0013A44C /* InfoTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDFDFB4B2B722C9C0013A44C /* InfoTableViewCell.swift */; }; EDFDFB522B726F1A0013A44C /* ButtonsStackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDFDFB512B726F1A0013A44C /* ButtonsStackView.swift */; }; EDFDFB612B74E2500013A44C /* DonationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDFDFB602B74E2500013A44C /* DonationView.swift */; }; - F607C1881C032A8800B53A87 /* resources-hdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = F607C1831C032A8800B53A87 /* resources-hdpi_light */; }; - F607C18A1C032A8800B53A87 /* resources-hdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = F607C1841C032A8800B53A87 /* resources-hdpi_dark */; }; F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */ = {isa = PBXBuildFile; fileRef = F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */; }; F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F653CE171C71F62400A453F1 /* MWMAddPlaceNavigationBar.xib */; }; F62607FD207B790300176C5A /* SpinnerAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = F62607FC207B790300176C5A /* SpinnerAlert.swift */; }; @@ -747,6 +735,7 @@ /* Begin PBXFileReference section */ 039371B52C5B68CD00708377 /* UIFont+monospaced.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+monospaced.swift"; sourceTree = ""; }; + 165953932CB44B3B00CFED7C /* symbols */ = {isa = PBXFileReference; lastKnownFileType = folder; name = symbols; path = ../../data/symbols; sourceTree = ""; }; 1D3623240D0F684500981E51 /* MapsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapsAppDelegate.h; sourceTree = ""; }; 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapsAppDelegate.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 1DFA2F6820D3B52F00FB2C66 /* UIColor+PartnerColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIColor+PartnerColor.h"; sourceTree = ""; }; @@ -1096,8 +1085,6 @@ 447DB4BA2BA78282000DF4C2 /* MWMOsmReauthAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MWMOsmReauthAlert.h; path = Classes/CustomAlert/MWMOsmReauthAlert.h; sourceTree = SOURCE_ROOT; }; 447DB4BB2BA78282000DF4C2 /* MWMOsmReauthAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MWMOsmReauthAlert.mm; path = Classes/CustomAlert/MWMOsmReauthAlert.mm; sourceTree = SOURCE_ROOT; }; 447DB4C12BA78665000DF4C2 /* MWMOsmReauthAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MWMOsmReauthAlert.xib; path = Classes/CustomAlert/MWMOsmReauthAlert.xib; sourceTree = SOURCE_ROOT; }; - 4501B1922077C35A001B9173 /* resources-xxxhdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxxhdpi_light"; path = "../../data/resources-xxxhdpi_light"; sourceTree = ""; }; - 4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxxhdpi_dark"; path = "../../data/resources-xxxhdpi_dark"; sourceTree = ""; }; 451950391B7A3E070085DA05 /* patterns.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = patterns.txt; path = ../../data/patterns.txt; sourceTree = ""; }; 452FCA3A1B6A3DF7007019AB /* colors.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = colors.txt; path = ../../data/colors.txt; sourceTree = ""; }; 4554B6E81E55F02B0084017F /* drules_proto_vehicle_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_vehicle_light.bin; path = ../../data/drules_proto_vehicle_light.bin; sourceTree = ""; }; @@ -1191,15 +1178,7 @@ 47F86D0020C93D8D00FEE291 /* TabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = ""; }; 4A00DBDE1AB704C400113624 /* drules_proto_default_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_default_dark.bin; path = ../../data/drules_proto_default_dark.bin; sourceTree = ""; }; 4A23D1561B8B4DD700D4EB6F /* drules_proto_default_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_default_light.bin; path = ../../data/drules_proto_default_light.bin; sourceTree = ""; }; - 4A23D1571B8B4DD700D4EB6F /* resources-6plus_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus_light"; path = "../../data/resources-6plus_light"; sourceTree = ""; }; - 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-mdpi_light"; path = "../../data/resources-mdpi_light"; sourceTree = ""; }; - 4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi_light"; path = "../../data/resources-xhdpi_light"; sourceTree = ""; }; - 4A23D15A1B8B4DD700D4EB6F /* resources-xxhdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi_light"; path = "../../data/resources-xxhdpi_light"; sourceTree = ""; }; 4A300ED31C6DCFD400140018 /* countries-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "countries-strings"; path = "../../data/countries-strings"; sourceTree = ""; }; - 4A7D89C11B2EBF3B00AC843E /* resources-6plus_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus_dark"; path = "../../data/resources-6plus_dark"; sourceTree = ""; }; - 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-mdpi_dark"; path = "../../data/resources-mdpi_dark"; sourceTree = ""; }; - 4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi_dark"; path = "../../data/resources-xhdpi_dark"; sourceTree = ""; }; - 4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi_dark"; path = "../../data/resources-xxhdpi_dark"; sourceTree = ""; }; 4B4153B42BF9695500EE4B02 /* MWMTextToSpeechTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTextToSpeechTests.mm; sourceTree = ""; }; 4B83AE472C2E59F800B0C3BC /* TTSTester.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TTSTester.h; sourceTree = ""; }; 4B83AE482C2E59F800B0C3BC /* TTSTester.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TTSTester.mm; sourceTree = ""; }; @@ -1329,7 +1308,6 @@ 99F9A0E42462CA0E00AE21E0 /* DownloadAllView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadAllView.swift; sourceTree = ""; }; 99F9A0E62462CA1700AE21E0 /* DownloadAllView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DownloadAllView.xib; sourceTree = ""; }; 9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "02_droidsans-fallback.ttf"; path = "../../data/02_droidsans-fallback.ttf"; sourceTree = ""; }; - A367C93A1B17334800E2B6E7 /* resources-default */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-default"; path = "../../data/resources-default"; sourceTree = ""; }; A630D1E9207CA95900976DEA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ar; path = ar.lproj/Localizable.stringsdict; sourceTree = ""; }; A630D1EB207CA96700976DEA /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = cs; path = cs.lproj/Localizable.stringsdict; sourceTree = ""; }; A630D1EC207CA96D00976DEA /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = da; path = da.lproj/Localizable.stringsdict; sourceTree = ""; }; @@ -1456,8 +1434,6 @@ EED10A4411F78D120095FAD4 /* MapViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapViewController.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_blacklist.txt; path = ../../data/fonts_blacklist.txt; sourceTree = ""; }; EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_whitelist.txt; path = ../../data/fonts_whitelist.txt; sourceTree = ""; }; - F607C1831C032A8800B53A87 /* resources-hdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_light"; path = "../../data/resources-hdpi_light"; sourceTree = ""; }; - F607C1841C032A8800B53A87 /* resources-hdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_dark"; path = "../../data/resources-hdpi_dark"; sourceTree = ""; }; F607C18C1C047FDC00B53A87 /* MWMSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSegue.h; sourceTree = ""; }; F607C18D1C047FDC00B53A87 /* MWMSegue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSegue.m; sourceTree = ""; }; F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = opening_hours_how_to_edit.html; path = ../../data/opening_hours_how_to_edit.html; sourceTree = ""; }; @@ -3843,6 +3819,7 @@ FA065FC61286143F00FEA989 /* External Resources */ = { isa = PBXGroup; children = ( + 165953932CB44B3B00CFED7C /* symbols */, 6B679E88266BFD090074AE2A /* 00_NotoNaskhArabic-Regular.ttf */, FAC4E60F2C1FA9FC0043979C /* 00_NotoSansBengali-Regular.ttf */, FA80EB682C6BEB9300C5E8E5 /* 00_NotoSansHebrew-Regular.ttf */, @@ -3879,19 +3856,6 @@ F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */, FA85F632145DDDC20090E1A0 /* packed_polygons.bin */, 451950391B7A3E070085DA05 /* patterns.txt */, - 4A23D1571B8B4DD700D4EB6F /* resources-6plus_light */, - 4A7D89C11B2EBF3B00AC843E /* resources-6plus_dark */, - A367C93A1B17334800E2B6E7 /* resources-default */, - F607C1831C032A8800B53A87 /* resources-hdpi_light */, - F607C1841C032A8800B53A87 /* resources-hdpi_dark */, - 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_light */, - 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */, - 4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_light */, - 4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */, - 4A23D15A1B8B4DD700D4EB6F /* resources-xxhdpi_light */, - 4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */, - 4501B1922077C35A001B9173 /* resources-xxxhdpi_light */, - 4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */, FAAEA7D0161BD26600CCD661 /* synonyms.txt */, BB25B1A51FB32767007276FA /* transit_colors.txt */, FA64D9A813F975AD00350ECF /* types.txt */, @@ -4091,6 +4055,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 165953942CB44B5600CFED7C /* symbols in Resources */, 47AEF8402231249E00D20538 /* categories_brands.txt in Resources */, F6C3A1B221AC22810060EEC8 /* Alert 5.m4a in Resources */, 6741A9531BF340DE002C974C /* 01_dejavusans.ttf in Resources */, @@ -4136,7 +4101,6 @@ 993DF0CA23F6BD0600AC231A /* ElevationDetailsViewController.xib in Resources */, F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */, 6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */, - 4501B1942077C35A001B9173 /* resources-xxxhdpi_light in Resources */, 3467CEB7202C6FA900D3C670 /* BMCNotificationsCell.xib in Resources */, 4761BE2B252D3DB900EE2DE4 /* SubgroupCell.xib in Resources */, 99F9A0E72462CA1700AE21E0 /* DownloadAllView.xib in Resources */, @@ -4216,7 +4180,6 @@ F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */, 34AB66681FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */, F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */, - 4501B1952077C35A001B9173 /* resources-xxxhdpi_dark in Resources */, F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */, 3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */, F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */, @@ -4226,20 +4189,9 @@ 6741A9761BF340DE002C974C /* packed_polygons.bin in Resources */, 676507601C10559800830BB3 /* patterns.txt in Resources */, 6B15907226623AE500944BBA /* 00_NotoSansThai-Regular.ttf in Resources */, - 6741A94A1BF340DE002C974C /* resources-6plus_light in Resources */, 9989273D2449E60200260CE2 /* BottomMenuViewController.xib in Resources */, - 6741A9741BF340DE002C974C /* resources-6plus_dark in Resources */, - 677A2DE21C0DD50900635A00 /* resources-default in Resources */, - F607C1881C032A8800B53A87 /* resources-hdpi_light in Resources */, - F607C18A1C032A8800B53A87 /* resources-hdpi_dark in Resources */, FA637ED229A500BE00D8921A /* drules_proto_outdoors_light.bin in Resources */, - 6741A97F1BF340DE002C974C /* resources-mdpi_light in Resources */, - 6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */, - 6741A9981BF340DE002C974C /* resources-xhdpi_light in Resources */, - 6741A9611BF340DE002C974C /* resources-xhdpi_dark in Resources */, - 6741A94D1BF340DE002C974C /* resources-xxhdpi_light in Resources */, 3404F49E2028A2430090E401 /* BMCActionsCell.xib in Resources */, - 6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */, 340E1EF51E2F614400CE49BF /* SearchFilters.storyboard in Resources */, 340E1EF81E2F614400CE49BF /* Settings.storyboard in Resources */, 44360A112A7D35440016F412 /* TransportRuler.xib in Resources */, diff --git a/platform/platform_tests/apk_test.cpp b/platform/platform_tests/apk_test.cpp index e4f1fa8906..35af9676ee 100644 --- a/platform/platform_tests/apk_test.cpp +++ b/platform/platform_tests/apk_test.cpp @@ -21,12 +21,12 @@ using std::string, std::vector; char const * arrFiles[] = { "copyright.html", - "resources-mdpi_light/symbols.sdf", - "resources-mdpi_light/symbols.png", - "resources-hdpi_light/symbols.sdf", - "resources-hdpi_light/symbols.png", - "resources-xhdpi_light/symbols.sdf", - "resources-xhdpi_light/symbols.png", + "symbols/mdpi/light/symbols.sdf", + "symbols/mdpi/light/symbols.png", + "symbols/hdpi/light/symbols.sdf", + "symbols/hdpi/light/symbols.png", + "symbols/xhdpi/light/symbols.sdf", + "symbols/xhdpi/light/symbols.png", "categories.txt", "categories_cuisines.txt", "classificator.txt", diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp index f1c6e79978..e9d4dd6ae9 100644 --- a/platform/platform_tests/platform_test.cpp +++ b/platform/platform_tests/platform_test.cpp @@ -68,7 +68,7 @@ UNIT_TEST(GetReader) { char const * NON_EXISTING_FILE = "mgbwuerhsnmbui45efhdbn34.tmp"; char const * arr[] = { - "resources-mdpi_light/symbols.sdf", + "symbols/mdpi/light/symbols.sdf", "classificator.txt", "minsk-pass.mwm" }; diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 8513577266..3f385ee95d 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -107,13 +107,7 @@ endfunction() copy_resources( countries-strings - resources-default - resources-mdpi_light - resources-hdpi_light - resources-xhdpi_light - resources-xxhdpi_light - resources-xxxhdpi_light - resources-6plus_light + symbols welcome.html categories.txt @@ -194,12 +188,12 @@ endif() if (BUILD_DESIGNER) execute_process( - COMMAND cp -rf ${OMIM_ROOT}/data/resources-mdpi_light/ ${OMIM_ROOT}/data/resources-mdpi_design/ - COMMAND cp -rf ${OMIM_ROOT}/data/resources-hdpi_light/ ${OMIM_ROOT}/data/resources-hdpi_design/ - COMMAND cp -rf ${OMIM_ROOT}/data/resources-xhdpi_light/ ${OMIM_ROOT}/data/resources-xhdpi_design/ - COMMAND cp -rf ${OMIM_ROOT}/data/resources-xxhdpi_light/ ${OMIM_ROOT}/data/resources-xxhdpi_design/ - COMMAND cp -rf ${OMIM_ROOT}/data/resources-6plus_light/ ${OMIM_ROOT}/data/resources-6plus_design/ - COMMAND cp -rf ${OMIM_ROOT}/data/resources-xxxhdpi_light/ ${OMIM_ROOT}/data/resources-xxxhdpi_design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/mdpi/light/ ${OMIM_ROOT}/data/symbols/mdpi/design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/hdpi/light/ ${OMIM_ROOT}/data/symbols/hdpi/design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xhdpi/light/ ${OMIM_ROOT}/data/symbols/xhdpi/design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xxhdpi/light/ ${OMIM_ROOT}/data/symbols/xxhdpi/design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/6plus/light/ ${OMIM_ROOT}/data/symbols/6plus/design/ + COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xxxhdpi/light/ ${OMIM_ROOT}/data/symbols/xxxhdpi/design/ COMMAND cp -f ${OMIM_ROOT}/data/drules_proto_default_light.bin ${OMIM_ROOT}/data/drules_proto_default_design.bin COMMAND cp -f ${OMIM_ROOT}/data/colors.txt ${OMIM_ROOT}/data/colors_design.txt COMMAND cp -f ${OMIM_ROOT}/data/patterns.txt ${OMIM_ROOT}/data/patterns_design.txt @@ -211,12 +205,12 @@ if (BUILD_DESIGNER) mapcss-dynamic.txt mapcss-mapping.csv patterns_design.txt - resources-mdpi_design - resources-hdpi_design - resources-xhdpi_design - resources-xxhdpi_design - resources-xxxhdpi_design - resources-6plus_design + symbols/mdpi/design + symbols/hdpi/design + symbols/xhdpi/design + symbols/xxhdpi/design + symbols/xxxhdpi/design + symbols/6plus/design ) execute_process( diff --git a/qt/build_style/build_skins.cpp b/qt/build_style/build_skins.cpp index 12873c2109..121a5364db 100644 --- a/qt/build_style/build_skins.cpp +++ b/qt/build_style/build_skins.cpp @@ -177,7 +177,7 @@ void BuildSkins(QString const & styleDir, QString const & outputDir) for (SkinType s : g_skinTypes) { QString const suffix = SkinSuffix(s); - QString const outputSkinDir = JoinPathQt({outputDir, "resources-" + suffix + "_design"}); + QString const outputSkinDir = JoinPathQt({outputDir, "symbols", suffix, "design"}); int const size = resolution2size.at(suffix.toStdString()); // SkinSize(s); bool const colorCorrection = SkinCoorrectColor(s); @@ -192,8 +192,8 @@ void ApplySkins(QString const & outputDir) for (SkinType s : g_skinTypes) { QString const suffix = SkinSuffix(s); - QString const outputSkinDir = JoinPathQt({outputDir, "resources-" + suffix + "_design"}); - QString const resourceSkinDir = JoinPathQt({resourceDir, "resources-" + suffix + "_design"}); + QString const outputSkinDir = JoinPathQt({outputDir, "symbols", suffix, "design"}); + QString const resourceSkinDir = JoinPathQt({resourceDir, "symbols", suffix, "design"}); if (!QFileInfo::exists(resourceSkinDir) && !QDir().mkdir(resourceSkinDir)) throw std::runtime_error("Cannot create resource skin directory: " + resourceSkinDir.toStdString()); diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index a4947e1f4b..888d0442b0 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -64,44 +64,41 @@ function BuildSkin() { ln -s "$STYLE_PATH/$resourceName$symbolsSuffix" "$PNG_PATH" # Run skin generator "$SKIN_GENERATOR" --symbolWidth $symbolSize --symbolHeight $symbolSize --symbolsDir "$STYLE_PATH/$symbolsFolder" \ - --skinName "$DATA_PATH/resources-$resourceName$suffix/basic" --skinSuffix="$symbolsSuffix" + --skinName "$DATA_PATH/symbols/$resourceName/$suffix/basic" --skinSuffix="$symbolsSuffix" # Reset environment rm -r "$PNG_PATH" || true } +symbols_name=(6plus mdpi hdpi xhdpi xxhdpi xxxhdpi) + # Cleanup -cleanup=(resources-{{6plus,mdpi,hdpi,xhdpi,xxhdpi,xxxhdpi}{_dark,_light}}) -for item in ${cleanup[*]} -do - rm -rf "$DATA_PATH/$item" || true - mkdir "$DATA_PATH/$item" -done +rm -rf "$DATA_PATH"/symbols/*/*/symbols.* # Build styles -BuildSkin default dark mdpi 18 _dark symbols -BuildSkin default dark hdpi 27 _dark symbols -BuildSkin default dark xhdpi 36 _dark symbols -BuildSkin default dark 6plus 43 _dark symbols -BuildSkin default dark xxhdpi 54 _dark symbols -BuildSkin default dark xxxhdpi 64 _dark symbols +BuildSkin default dark mdpi 18 dark symbols +BuildSkin default dark hdpi 27 dark symbols +BuildSkin default dark xhdpi 36 dark symbols +BuildSkin default dark 6plus 43 dark symbols +BuildSkin default dark xxhdpi 54 dark symbols +BuildSkin default dark xxxhdpi 64 dark symbols -BuildSkin default light mdpi 18 _light symbols -BuildSkin default light hdpi 27 _light symbols -BuildSkin default light xhdpi 36 _light symbols -BuildSkin default light 6plus 43 _light symbols -BuildSkin default light xxhdpi 54 _light symbols -BuildSkin default light xxxhdpi 64 _light symbols +BuildSkin default light mdpi 18 light symbols +BuildSkin default light hdpi 27 light symbols +BuildSkin default light xhdpi 36 light symbols +BuildSkin default light 6plus 43 light symbols +BuildSkin default light xxhdpi 54 light symbols +BuildSkin default light xxxhdpi 64 light symbols -rm -rf "$OMIM_PATH"/data/resources-{*} - -rm -rf "$OMIM_PATH"/data/resources-*_design - -for i in mdpi hdpi xhdpi xxhdpi xxxhdpi 6plus; do - optipng -zc9 -zm8 -zs0 -f0 "$OMIM_PATH"/data/resources-${i}_light/symbols.png - optipng -zc9 -zm8 -zs0 -f0 "$OMIM_PATH"/data/resources-${i}_dark/symbols.png +for i in ${symbols_name[*]}; +do + optipng -zc9 -zm8 -zs0 -f0 "$DATA_PATH"/symbols/"${i}"/light/symbols.png + optipng -zc9 -zm8 -zs0 -f0 "$DATA_PATH"/symbols/"${i}"/dark/symbols.png done -for i in mdpi hdpi xhdpi xxhdpi xxxhdpi 6plus; do - cp -r "$OMIM_PATH"/data/resources-${i}_light/ "$OMIM_PATH"/data/resources-${i}_design/ +rm -rf "$DATA_PATH"/symbols/*/design/ + +for i in ${symbols_name[*]}; +do + cp -r "$DATA_PATH"/symbols/"${i}"/light/ "$DATA_PATH"/symbols/"${i}"/design/ done -- 2.45.3