From 1dd26de0b9637fb6db53aefd7517040ba353f29e Mon Sep 17 00:00:00 2001 From: rachytski Date: Sat, 7 Jan 2012 03:55:01 +0400 Subject: [PATCH] [ios] using mdpi and xhdpi as skin suffixes. --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 32 +++++++++++----------- platform/platform_ios.mm | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index ef207bfb53..13f9da7610 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -22,7 +22,7 @@ 49B3FB8E132FA43E00057053 /* location@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 49B3FB8C132FA43E00057053 /* location@2x.png */; }; 49DE1CA413437D7A00A93417 /* libbzip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DE1CA213437D7A00A93417 /* libbzip2.a */; }; EE026F0611D6AC0D00645242 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; }; - EE026F0D11D6AC2800645242 /* basic_ldpi.skn in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0811D6AC2800645242 /* basic_ldpi.skn */; }; + 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 */; }; @@ -43,9 +43,9 @@ 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_ldpi.png in Resources */ = {isa = PBXBuildFile; fileRef = EEE4C93D1298A2F3007231A9 /* symbols_ldpi.png */; }; - EEE4C9401298A303007231A9 /* symbols_hdpi.png in Resources */ = {isa = PBXBuildFile; fileRef = EEE4C93F1298A303007231A9 /* symbols_hdpi.png */; }; - EEE4C9421298A31B007231A9 /* basic_hdpi.skn in Resources */ = {isa = PBXBuildFile; fileRef = EEE4C9411298A31B007231A9 /* basic_hdpi.skn */; }; + 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 */; }; @@ -631,7 +631,7 @@ 49DE1CA213437D7A00A93417 /* libbzip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbzip2.a; sourceTree = SOURCE_ROOT; }; 8D1107310486CEB800E47090 /* MapsWithMe-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "MapsWithMe-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; EE026F0511D6AC0D00645242 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = classificator.txt; path = ../../data/classificator.txt; sourceTree = SOURCE_ROOT; }; - EE026F0811D6AC2800645242 /* basic_ldpi.skn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = basic_ldpi.skn; path = ../../data/basic_ldpi.skn; 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; }; @@ -655,9 +655,9 @@ EEAF65E4134BCBD500A81C82 /* location-search@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location-search@2x.png"; sourceTree = ""; }; 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 = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - EEE4C93D1298A2F3007231A9 /* symbols_ldpi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbols_ldpi.png; path = ../../data/symbols_ldpi.png; sourceTree = SOURCE_ROOT; }; - EEE4C93F1298A303007231A9 /* symbols_hdpi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbols_hdpi.png; path = ../../data/symbols_hdpi.png; sourceTree = SOURCE_ROOT; }; - EEE4C9411298A31B007231A9 /* basic_hdpi.skn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = basic_hdpi.skn; path = ../../data/basic_hdpi.skn; sourceTree = SOURCE_ROOT; }; + 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 = ""; }; EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_whitelist.txt; path = ../../data/fonts_whitelist.txt; sourceTree = ""; }; @@ -1393,12 +1393,12 @@ EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */, EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */, FA46DA2B12D4166E00968C36 /* countries.txt */, - EEE4C9411298A31B007231A9 /* basic_hdpi.skn */, + EEE4C9411298A31B007231A9 /* basic_xhdpi.skn */, FA85F632145DDDC20090E1A0 /* packed_polygons.bin */, - EEE4C93F1298A303007231A9 /* symbols_hdpi.png */, - EEE4C93D1298A2F3007231A9 /* symbols_ldpi.png */, + EEE4C93F1298A303007231A9 /* symbols_xhdpi.png */, + EEE4C93D1298A2F3007231A9 /* symbols_mdpi.png */, FA500587128907F0002961F0 /* visibility.txt */, - EE026F0811D6AC2800645242 /* basic_ldpi.skn */, + EE026F0811D6AC2800645242 /* basic_mdpi.skn */, EE026F0511D6AC0D00645242 /* classificator.txt */, ); name = "External Resources"; @@ -2047,7 +2047,7 @@ files = ( 28AD73880D9D96C1002E5188 /* MainWindow.xib in Resources */, EE026F0611D6AC0D00645242 /* classificator.txt in Resources */, - EE026F0D11D6AC2800645242 /* basic_ldpi.skn 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 */, @@ -2060,9 +2060,9 @@ FA5005661287BFCE002961F0 /* Icon.png in Resources */, FA5005671287BFCE002961F0 /* Icon@2x.png in Resources */, FA500588128907F0002961F0 /* visibility.txt in Resources */, - EEE4C93E1298A2F3007231A9 /* symbols_ldpi.png in Resources */, - EEE4C9401298A303007231A9 /* symbols_hdpi.png in Resources */, - EEE4C9421298A31B007231A9 /* basic_hdpi.skn 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 */, diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm index cc03facf0b..0e177ce123 100644 --- a/platform/platform_ios.mm +++ b/platform/platform_ios.mm @@ -56,7 +56,7 @@ Platform::Platform() // Hardcoding screen resolution depending on the device we are running. m_impl->m_visualScale = 1.0; - m_impl->m_skinName = "basic_ldpi.skn"; + m_impl->m_skinName = "basic_mdpi.skn"; m_impl->m_videoMemoryLimit = 8 * 1024 * 1024; // Calculating resolution @@ -78,7 +78,7 @@ Platform::Platform() if ([UIScreen mainScreen].currentMode.size.width == 640) { m_impl->m_visualScale = 2.0; - m_impl->m_skinName = "basic_hdpi.skn"; + m_impl->m_skinName = "basic_xhdpi.skn"; } }