added graphics::EDensity and resources naming system similar to Android.

2 files changed, 22 insertions, 32 deletions

diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm
index d4553778fa..b717978d9b 100644
--- a/iphone/Maps/Classes/EAGLView.mm
+++ b/iphone/Maps/Classes/EAGLView.mm
@@ -88,15 +88,17 @@
   CGRect frameRect = [[UIScreen mainScreen] applicationFrame];
   CGRect screenRect = [[UIScreen mainScreen] bounds];
   
-  rpParams.m_visualScale = [[UIScreen mainScreen] scale];
+  double vs = [[UIScreen mainScreen] scale];
     
-  rpParams.m_screenWidth = screenRect.size.width * rpParams.m_visualScale;
-  rpParams.m_screenHeight = screenRect.size.height * rpParams.m_visualScale;
+  rpParams.m_screenWidth = screenRect.size.width * vs;
+  rpParams.m_screenHeight = screenRect.size.height * vs;
   
-  if (rpParams.m_visualScale > 1.0)
-    rpParams.m_skinName = "basic_xhdpi.skn";
+  rpParams.m_skinName = "basic.skn";
+  
+  if (vs > 1.0)
+    rpParams.m_density = graphics::EDensityXHDPI;
   else
-    rpParams.m_skinName = "basic_mdpi.skn";
+    rpParams.m_density = graphics::EDensityMDPI;
   
   rpParams.m_videoTimer = videoTimer;
   rpParams.m_useDefaultFB = false;
@@ -114,8 +116,8 @@
   
   frameBuffer = renderPolicy->GetDrawer()->screen()->frameBuffer();
   
-  GetFramework().OnSize(frameRect.size.width * rpParams.m_visualScale,
-                        frameRect.size.height * rpParams.m_visualScale);
+  GetFramework().OnSize(frameRect.size.width * vs,
+                        frameRect.size.height * vs);
   GetFramework().SetRenderPolicy(renderPolicy);
 }
 
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 76a8896351..9bd774118c 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -23,6 +23,10 @@
 		49DE1CA413437D7A00A93417 /* libbzip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DE1CA213437D7A00A93417 /* libbzip2.a */; };
 		573D1AF4165252760093A55D /* location-follow.png in Resources */ = {isa = PBXBuildFile; fileRef = 573D1AF2165252760093A55D /* location-follow.png */; };
 		573D1AF5165252760093A55D /* location-follow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 573D1AF3165252760093A55D /* location-follow@2x.png */; };
+		5797B6D516C931EE00FFE6D2 /* resources-mdpi in Resources */ = {isa = PBXBuildFile; fileRef = 5797B6D316C931EE00FFE6D2 /* resources-mdpi */; };
+		5797B6D616C931EE00FFE6D2 /* resources-mdpi in Resources */ = {isa = PBXBuildFile; fileRef = 5797B6D316C931EE00FFE6D2 /* resources-mdpi */; };
+		5797B6D716C931EE00FFE6D2 /* resources-xhdpi in Resources */ = {isa = PBXBuildFile; fileRef = 5797B6D416C931EE00FFE6D2 /* resources-xhdpi */; };
+		5797B6D816C931EE00FFE6D2 /* resources-xhdpi in Resources */ = {isa = PBXBuildFile; fileRef = 5797B6D416C931EE00FFE6D2 /* resources-xhdpi */; };
 		ED8676FE16A0793800D9A02A /* 22x29-pro.png in Resources */ = {isa = PBXBuildFile; fileRef = ED8676FA16A0793800D9A02A /* 22x29-pro.png */; };
 		ED8676FF16A0793800D9A02A /* 44x58-pro.png in Resources */ = {isa = PBXBuildFile; fileRef = ED8676FB16A0793800D9A02A /* 44x58-pro.png */; };
 		ED86770016A0793800D9A02A /* 64-pro.png in Resources */ = {isa = PBXBuildFile; fileRef = ED8676FC16A0793800D9A02A /* 64-pro.png */; };
@@ -31,7 +35,6 @@
 		EDBB18B816972B0600AF0742 /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EDBB18B716972B0600AF0742 /* libzlib.a */; };
 		EDBB18B916972B3000AF0742 /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EDBB18B716972B0600AF0742 /* libzlib.a */; };
 		EE026F0611D6AC0D00645242 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; };
-		EE026F0D11D6AC2800645242 /* basic_mdpi.skn in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0811D6AC2800645242 /* basic_mdpi.skn */; };
 		EE12020911CD464100ABDD5D /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE1201FF11CD464100ABDD5D /* libbase.a */; };
 		EE12020A11CD464100ABDD5D /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020011CD464100ABDD5D /* libcoding.a */; };
 		EE12020C11CD464100ABDD5D /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020211CD464100ABDD5D /* libexpat.a */; };
@@ -54,9 +57,6 @@
 		EEAF65E6134BCBD500A81C82 /* location-search@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = EEAF65E4134BCBD500A81C82 /* location-search@2x.png */; };
 		EEB7E22211E9079400080A68 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEB7E22111E9079400080A68 /* CoreLocation.framework */; };
 		EED10A4511F78D120095FAD4 /* MapViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EED10A4411F78D120095FAD4 /* MapViewController.mm */; };
-		EEE4C93E1298A2F3007231A9 /* symbols_mdpi.png in Resources */ = {isa = PBXBuildFile; fileRef = EEE4C93D1298A2F3007231A9 /* symbols_mdpi.png */; };
-		EEE4C9401298A303007231A9 /* symbols_xhdpi.png in Resources */ = {isa = PBXBuildFile; fileRef = EEE4C93F1298A303007231A9 /* symbols_xhdpi.png */; };
-		EEE4C9421298A31B007231A9 /* basic_xhdpi.skn in Resources */ = {isa = PBXBuildFile; fileRef = EEE4C9411298A31B007231A9 /* basic_xhdpi.skn */; };
 		EEF5745512DE1AD50082F472 /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EEF5745412DE1AD50082F472 /* libfribidi.a */; };
 		EEFC0BBF12B5656A002914FF /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020311CD464100ABDD5D /* libfreetype.a */; };
 		EEFE7C1412F8C9E1006AF8C3 /* fonts_blacklist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */; };
@@ -757,16 +757,12 @@
 		FAF805311417E3510024E8C1 /* zw@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAF804331417E3510024E8C1 /* zw@2x.png */; };
 		FAFB06AB151215EE0041901D /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD73870D9D96C1002E5188 /* MainWindow.xib */; };
 		FAFB06AC151215EE0041901D /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; };
-		FAFB06AD151215EE0041901D /* basic_mdpi.skn in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0811D6AC2800645242 /* basic_mdpi.skn */; };
 		FAFB06AE151215EE0041901D /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA065FEC128614C400FEA989 /* MainWindow-iPad.xib */; };
 		FAFB06AF151215EE0041901D /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA065FFD1286167A00FEA989 /* Default@2x.png */; };
 		FAFB06B0151215EE0041901D /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FA065FFE1286167A00FEA989 /* Default.png */; };
 		FAFB06B1151215EE0041901D /* Default-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0660011286168700FEA989 /* Default-Portrait.png */; };
 		FAFB06B2151215EE0041901D /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0660021286168700FEA989 /* Default-Landscape.png */; };
 		FAFB06B9151215EE0041901D /* visibility.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA500587128907F0002961F0 /* visibility.txt */; };
-		FAFB06BA151215EE0041901D /* symbols_mdpi.png in Resources */ = {isa = PBXBuildFile; fileRef = EEE4C93D1298A2F3007231A9 /* symbols_mdpi.png */; };
-		FAFB06BB151215EE0041901D /* symbols_xhdpi.png in Resources */ = {isa = PBXBuildFile; fileRef = EEE4C93F1298A303007231A9 /* symbols_xhdpi.png */; };
-		FAFB06BC151215EE0041901D /* basic_xhdpi.skn in Resources */ = {isa = PBXBuildFile; fileRef = EEE4C9411298A31B007231A9 /* basic_xhdpi.skn */; };
 		FAFB06BE151215EE0041901D /* unicode_blocks.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */; };
 		FAFB06BF151215EE0041901D /* fonts_blacklist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */; };
 		FAFB06C0151215EE0041901D /* fonts_whitelist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */; };
@@ -1375,6 +1371,8 @@
 		49DE1CA213437D7A00A93417 /* libbzip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbzip2.a; sourceTree = SOURCE_ROOT; };
 		573D1AF2165252760093A55D /* location-follow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location-follow.png"; sourceTree = "<group>"; };
 		573D1AF3165252760093A55D /* location-follow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location-follow@2x.png"; sourceTree = "<group>"; };
+		5797B6D316C931EE00FFE6D2 /* resources-mdpi */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-mdpi"; path = "../../data/resources-mdpi"; sourceTree = "<group>"; };
+		5797B6D416C931EE00FFE6D2 /* resources-xhdpi */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi"; path = "../../data/resources-xhdpi"; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* MapsWithMe-Pro.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "MapsWithMe-Pro.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
 		ED8676FA16A0793800D9A02A /* 22x29-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "22x29-pro.png"; sourceTree = "<group>"; };
 		ED8676FB16A0793800D9A02A /* 44x58-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "44x58-pro.png"; sourceTree = "<group>"; };
@@ -1383,7 +1381,6 @@
 		ED8B1A2016772AB4003CAD0A /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
 		EDBB18B716972B0600AF0742 /* libzlib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzlib.a; sourceTree = "<group>"; };
 		EE026F0511D6AC0D00645242 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = classificator.txt; path = ../../data/classificator.txt; sourceTree = SOURCE_ROOT; };
-		EE026F0811D6AC2800645242 /* basic_mdpi.skn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = basic_mdpi.skn; path = ../../data/basic_mdpi.skn; sourceTree = SOURCE_ROOT; };
 		EE1201FF11CD464100ABDD5D /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbase.a; sourceTree = SOURCE_ROOT; };
 		EE12020011CD464100ABDD5D /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcoding.a; sourceTree = SOURCE_ROOT; };
 		EE12020211CD464100ABDD5D /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libexpat.a; sourceTree = SOURCE_ROOT; };
@@ -1408,9 +1405,6 @@
 		EEAF65E4134BCBD500A81C82 /* location-search@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location-search@2x.png"; sourceTree = "<group>"; };
 		EEB7E22111E9079400080A68 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		EED10A4411F78D120095FAD4 /* MapViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		EEE4C93D1298A2F3007231A9 /* symbols_mdpi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbols_mdpi.png; path = ../../data/symbols_mdpi.png; sourceTree = SOURCE_ROOT; };
-		EEE4C93F1298A303007231A9 /* symbols_xhdpi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbols_xhdpi.png; path = ../../data/symbols_xhdpi.png; sourceTree = SOURCE_ROOT; };
-		EEE4C9411298A31B007231A9 /* basic_xhdpi.skn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = basic_xhdpi.skn; path = ../../data/basic_xhdpi.skn; sourceTree = SOURCE_ROOT; };
 		EEF5745412DE1AD50082F472 /* libfribidi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfribidi.a; sourceTree = SOURCE_ROOT; };
 		EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_blacklist.txt; path = ../../data/fonts_blacklist.txt; sourceTree = "<group>"; };
 		EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_whitelist.txt; path = ../../data/fonts_whitelist.txt; sourceTree = "<group>"; };
@@ -2306,6 +2300,8 @@
 		FA065FC61286143F00FEA989 /* External Resources */ = {
 			isa = PBXGroup;
 			children = (
+				5797B6D316C931EE00FFE6D2 /* resources-mdpi */,
+				5797B6D416C931EE00FFE6D2 /* resources-xhdpi */,
 				FAAEA7D0161BD26600CCD661 /* synonyms.txt */,
 				F7FDD822147F30CC005900FA /* drules_proto.bin */,
 				FAB5841914168E3200CEA40C /* Flags */,
@@ -2325,12 +2321,8 @@
 				EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */,
 				EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */,
 				FA46DA2B12D4166E00968C36 /* countries.txt */,
-				EEE4C9411298A31B007231A9 /* basic_xhdpi.skn */,
 				FA85F632145DDDC20090E1A0 /* packed_polygons.bin */,
-				EEE4C93F1298A303007231A9 /* symbols_xhdpi.png */,
-				EEE4C93D1298A2F3007231A9 /* symbols_mdpi.png */,
 				FA500587128907F0002961F0 /* visibility.txt */,
-				EE026F0811D6AC2800645242 /* basic_mdpi.skn */,
 				EE026F0511D6AC0D00645242 /* classificator.txt */,
 			);
 			name = "External Resources";
@@ -3109,16 +3101,12 @@
 			files = (
 				28AD73880D9D96C1002E5188 /* MainWindow.xib in Resources */,
 				EE026F0611D6AC0D00645242 /* classificator.txt in Resources */,
-				EE026F0D11D6AC2800645242 /* basic_mdpi.skn in Resources */,
 				FA065FED128614C400FEA989 /* MainWindow-iPad.xib in Resources */,
 				FA065FFF1286167A00FEA989 /* Default@2x.png in Resources */,
 				FA0660001286167A00FEA989 /* Default.png in Resources */,
 				FA0660031286168700FEA989 /* Default-Portrait.png in Resources */,
 				FA0660041286168700FEA989 /* Default-Landscape.png in Resources */,
 				FA500588128907F0002961F0 /* visibility.txt in Resources */,
-				EEE4C93E1298A2F3007231A9 /* symbols_mdpi.png in Resources */,
-				EEE4C9401298A303007231A9 /* symbols_xhdpi.png in Resources */,
-				EEE4C9421298A31B007231A9 /* basic_xhdpi.skn in Resources */,
 				FA46DA2C12D4166E00968C36 /* countries.txt in Resources */,
 				EE583CBB12F773F00042CBE3 /* unicode_blocks.txt in Resources */,
 				EEFE7C1412F8C9E1006AF8C3 /* fonts_blacklist.txt in Resources */,
@@ -3743,6 +3731,8 @@
 				ED8676FF16A0793800D9A02A /* 44x58-pro.png in Resources */,
 				ED86770016A0793800D9A02A /* 64-pro.png in Resources */,
 				ED86770116A0793800D9A02A /* 320-pro.png in Resources */,
+				5797B6D516C931EE00FFE6D2 /* resources-mdpi in Resources */,
+				5797B6D716C931EE00FFE6D2 /* resources-xhdpi in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3752,16 +3742,12 @@
 			files = (
 				FAFB06AB151215EE0041901D /* MainWindow.xib in Resources */,
 				FAFB06AC151215EE0041901D /* classificator.txt in Resources */,
-				FAFB06AD151215EE0041901D /* basic_mdpi.skn in Resources */,
 				FAFB06AE151215EE0041901D /* MainWindow-iPad.xib in Resources */,
 				FAFB06AF151215EE0041901D /* Default@2x.png in Resources */,
 				FAFB06B0151215EE0041901D /* Default.png in Resources */,
 				FAFB06B1151215EE0041901D /* Default-Portrait.png in Resources */,
 				FAFB06B2151215EE0041901D /* Default-Landscape.png in Resources */,
 				FAFB06B9151215EE0041901D /* visibility.txt in Resources */,
-				FAFB06BA151215EE0041901D /* symbols_mdpi.png in Resources */,
-				FAFB06BB151215EE0041901D /* symbols_xhdpi.png in Resources */,
-				FAFB06BC151215EE0041901D /* basic_xhdpi.skn in Resources */,
 				FAFB06BE151215EE0041901D /* unicode_blocks.txt in Resources */,
 				FAFB06BF151215EE0041901D /* fonts_blacklist.txt in Resources */,
 				FAFB06C0151215EE0041901D /* fonts_whitelist.txt in Resources */,
@@ -4350,6 +4336,8 @@
 				F785EAB816385321003A38A8 /* tail.png in Resources */,
 				F785EAB916385324003A38A8 /* tail@2x.png in Resources */,
 				F7264B8C16388E0B00A8E6C0 /* countries.txt in Resources */,
+				5797B6D616C931EE00FFE6D2 /* resources-mdpi in Resources */,
+				5797B6D816C931EE00FFE6D2 /* resources-xhdpi in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};