[data] Refactor resources folder

.gitignore

@@ -15,7 +15,7 @@ stxxl.log
 screenlog.0
 
 data/styles/*/*/out/*
-data/resources-*_design/*
+data/symbols/*/design/*
 data/drules_proto_design.bin
 data/colors_design.txt
 data/patterns_design.txt

android/app/src/main/assets/symbols

@@ -0,0 +1 @@
+../../../../../data/symbols

docs/STRUCTURE.md

@@ -44,13 +44,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 `clear` (light) themes.
 - `drules_proto*` - binary drawing rules files.
 - `colors.txt`,`patterns.txt`,`visibility.txt`
 

drape/drape_tests/static_texture_tests.cpp

@@ -1,34 +1,16 @@
 #include "testing/testing.hpp"
 
-#include "indexer/map_style.hpp"
-#include "indexer/map_style_reader.hpp"
-
 #include "drape/drape_tests/testing_graphics_context.hpp"
 #include "drape/static_texture.hpp"
 
-#include <string>
-#include <vector>
-
 UNIT_TEST(CheckTrafficArrowTextures)
 {
-  static std::vector<std::string> skinPaths = {"6plus", "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"};
-  static std::vector<MapStyle> styles = {MapStyle::MapStyleClear, MapStyle::MapStyleDark,
-                                         MapStyle::MapStyleVehicleClear,
-                                         MapStyle::MapStyleVehicleDark};
-
   TestingGraphicsContext context;
-  for (auto const & style : styles)
-  {
-    GetStyleReader().SetCurrentStyle(style);
-    for (size_t i = 0; i < skinPaths.size(); ++i)
-    {
-      dp::StaticTexture texture(make_ref(&context), "traffic-arrow", skinPaths[i],
-                                dp::TextureFormat::RGBA8, nullptr);
-      TEST(texture.IsLoadingCorrect(), ());
+  dp::StaticTexture texture(make_ref(&context), "traffic-arrow", dp::StaticTexture::kDefaultResource,
+                            dp::TextureFormat::RGBA8, nullptr);
+  TEST(texture.IsLoadingCorrect(), ());
 
-      dp::StaticTexture texture2(make_ref(&context), "area-hatching", skinPaths[i],
-                                 dp::TextureFormat::RGBA8, nullptr);
-      TEST(texture2.IsLoadingCorrect(), ());
-    }
-  }
+  dp::StaticTexture texture2(make_ref(&context), "area-hatching", dp::StaticTexture::kDefaultResource,
+                             dp::TextureFormat::RGBA8, nullptr);
+  TEST(texture2.IsLoadingCorrect(), ());
 }

drape/texture_manager.cpp

@@ -399,10 +399,10 @@ void TextureManager::Init(ref_ptr<dp::GraphicsContext> context, Params const & p
 
   // Initialize static textures.
   m_trafficArrowTexture =
-      make_unique_dp<StaticTexture>(context, "traffic-arrow.png", m_resPostfix,
+      make_unique_dp<StaticTexture>(context, "traffic-arrow.png", StaticTexture::kDefaultResource,
                                     dp::TextureFormat::RGBA8, make_ref(m_textureAllocator));
   m_hatchingTexture =
-      make_unique_dp<StaticTexture>(context, "area-hatching.png", m_resPostfix,
+      make_unique_dp<StaticTexture>(context, "area-hatching.png", StaticTexture::kDefaultResource,
                                     dp::TextureFormat::RGBA8, make_ref(m_textureAllocator));
   m_arrowTexture =
       CreateArrowTexture(context, make_ref(m_textureAllocator), params.m_arrowTexturePath,

drape_frontend/gui/skin.cpp

@@ -288,7 +288,7 @@ ReaderPtr<Reader> ResolveGuiSkinFile(std::string const & deviceType)
   std::unique_ptr<Reader> reader;
   try
   {
-    reader = pl.GetReader("resources-default/" + deviceType + ".ui");
+    reader = pl.GetReader("symbols/default/" + deviceType + ".ui");
   }
   catch(FileAbsentException & e)
   {
@@ -299,7 +299,7 @@ ReaderPtr<Reader> ResolveGuiSkinFile(std::string const & deviceType)
   {
     try
     {
-      reader = pl.GetReader("resources-default/default.ui");
+      reader = pl.GetReader("symbols/default/default.ui");
     }
     catch(FileAbsentException & e)
     {

indexer/map_style_reader.cpp

@@ -7,17 +7,17 @@
 
 namespace
 {
-std::string const kSuffixDark = "_dark";
-std::string const kSuffixClear = "_clear";
-std::string const kSuffixVehicleDark = "_vehicle_dark";
-std::string const kSuffixVehicleClear = "_vehicle_clear";
-std::string const kSuffixOutdoorsClear = "_outdoors_clear";
-std::string const kSuffixOutdoorsDark = "_outdoors_dark";
+std::string const kSuffixDark = "dark";
+std::string const kSuffixClear = "clear";
+std::string const kSuffixVehicleDark = "vehicle_dark";
+std::string const kSuffixVehicleClear = "vehicle_clear";
+std::string const kSuffixOutdoorsClear = "outdoors_clear";
+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)
@@ -40,7 +40,7 @@ std::string GetStyleRulesSuffix(MapStyle mapStyle)
   case MapStyleOutdoorsDark:
     return kSuffixOutdoorsDark;
   case MapStyleMerged:
-    return std::string();
+    return "";
 
   case MapStyleCount:
     break;
@@ -68,7 +68,7 @@ std::string GetStyleResourcesSuffix(MapStyle mapStyle)
   case MapStyleOutdoorsClear:
     return kSuffixClear;
   case MapStyleMerged:
-    return std::string();
+    return "";
 
   case MapStyleCount:
     break;
@@ -101,8 +101,11 @@ bool StyleReader::IsCarNavigationStyle() const
 
 ReaderPtr<Reader> StyleReader::GetDrawingRulesReader() const
 {
-  std::string rulesFile =
-      std::string("drules_proto") + GetStyleRulesSuffix(GetCurrentStyle()) + ".bin";
+  std::string rulesFile;
+  if (const std::string & stylesPrefix = GetStyleRulesSuffix(GetCurrentStyle()); stylesPrefix.empty())
+    rulesFile = "drules_proto.bin";
+  else
+    rulesFile = std::string("drules_proto_") + stylesPrefix + ".bin";
 
   auto overriddenRulesFile =
       base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, rulesFile);
@@ -120,9 +123,7 @@ ReaderPtr<Reader> StyleReader::GetDrawingRulesReader() const
 ReaderPtr<Reader> 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))
@@ -138,7 +139,7 @@ ReaderPtr<Reader> StyleReader::GetResourceReader(std::string const & file,
 
 ReaderPtr<Reader> 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()