diff --git a/iphone/Maps/22x29-lite.png b/iphone/Maps/22x29-lite.png deleted file mode 100644 index b5e1013370..0000000000 Binary files a/iphone/Maps/22x29-lite.png and /dev/null differ diff --git a/iphone/Maps/22x29-pro.png b/iphone/Maps/22x29-pro.png deleted file mode 100644 index c13884a48d..0000000000 Binary files a/iphone/Maps/22x29-pro.png and /dev/null differ diff --git a/iphone/Maps/320-lite.png b/iphone/Maps/320-lite.png deleted file mode 100644 index 9d83214897..0000000000 Binary files a/iphone/Maps/320-lite.png and /dev/null differ diff --git a/iphone/Maps/320-pro.png b/iphone/Maps/320-pro.png deleted file mode 100644 index 71f5b7ae89..0000000000 Binary files a/iphone/Maps/320-pro.png and /dev/null differ diff --git a/iphone/Maps/44x58-lite.png b/iphone/Maps/44x58-lite.png deleted file mode 100644 index 5bf6c3c5cb..0000000000 Binary files a/iphone/Maps/44x58-lite.png and /dev/null differ diff --git a/iphone/Maps/44x58-pro.png b/iphone/Maps/44x58-pro.png deleted file mode 100644 index 3b1571e7a2..0000000000 Binary files a/iphone/Maps/44x58-pro.png and /dev/null differ diff --git a/iphone/Maps/64-lite.png b/iphone/Maps/64-lite.png deleted file mode 100644 index 2267e7ad2f..0000000000 Binary files a/iphone/Maps/64-lite.png and /dev/null differ diff --git a/iphone/Maps/64-pro.png b/iphone/Maps/64-pro.png deleted file mode 100644 index 6e348d4959..0000000000 Binary files a/iphone/Maps/64-pro.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/ButtonZoomIn.imageset/Contents.json b/iphone/Maps/Images.xcassets/ButtonZoomIn.imageset/Contents.json new file mode 100644 index 0000000000..1a92f078c6 --- /dev/null +++ b/iphone/Maps/Images.xcassets/ButtonZoomIn.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "btn-zoom-in.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "btn-zoom-in@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/btn-zoom-in.png b/iphone/Maps/Images.xcassets/ButtonZoomIn.imageset/btn-zoom-in.png similarity index 100% rename from iphone/Maps/btn-zoom-in.png rename to iphone/Maps/Images.xcassets/ButtonZoomIn.imageset/btn-zoom-in.png diff --git a/iphone/Maps/btn-zoom-in@2x.png b/iphone/Maps/Images.xcassets/ButtonZoomIn.imageset/btn-zoom-in@2x.png similarity index 100% rename from iphone/Maps/btn-zoom-in@2x.png rename to iphone/Maps/Images.xcassets/ButtonZoomIn.imageset/btn-zoom-in@2x.png diff --git a/iphone/Maps/Images.xcassets/ButtonZoomOut.imageset/Contents.json b/iphone/Maps/Images.xcassets/ButtonZoomOut.imageset/Contents.json new file mode 100644 index 0000000000..d3c8eb90d9 --- /dev/null +++ b/iphone/Maps/Images.xcassets/ButtonZoomOut.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "btn-zoom-out.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "btn-zoom-out@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/btn-zoom-out.png b/iphone/Maps/Images.xcassets/ButtonZoomOut.imageset/btn-zoom-out.png similarity index 100% rename from iphone/Maps/btn-zoom-out.png rename to iphone/Maps/Images.xcassets/ButtonZoomOut.imageset/btn-zoom-out.png diff --git a/iphone/Maps/btn-zoom-out@2x.png b/iphone/Maps/Images.xcassets/ButtonZoomOut.imageset/btn-zoom-out@2x.png similarity index 100% rename from iphone/Maps/btn-zoom-out@2x.png rename to iphone/Maps/Images.xcassets/ButtonZoomOut.imageset/btn-zoom-out@2x.png diff --git a/iphone/Maps/MainWindow.xib b/iphone/Maps/MainWindow.xib index adf5644f37..9f3e3d2efe 100644 --- a/iphone/Maps/MainWindow.xib +++ b/iphone/Maps/MainWindow.xib @@ -1,8 +1,8 @@ - + - + @@ -29,7 +29,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -66,7 +66,7 @@ - - + + - \ No newline at end of file + diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 87f057d137..5928bcc228 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -35,10 +35,6 @@ 9747277E18328E65006B7CB7 /* SideToolbarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9747277A18328E65006B7CB7 /* SideToolbarCell.m */; }; 9747278418338F0C006B7CB7 /* UIViewController+Navigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 9747278318338F0C006B7CB7 /* UIViewController+Navigation.m */; }; 9747278518338F0C006B7CB7 /* UIViewController+Navigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 9747278318338F0C006B7CB7 /* UIViewController+Navigation.m */; }; - 97719D381843AE6F00BDD815 /* btn-zoom-in.png in Resources */ = {isa = PBXBuildFile; fileRef = 97719D361843AE6F00BDD815 /* btn-zoom-in.png */; }; - 97719D391843AE6F00BDD815 /* btn-zoom-in.png in Resources */ = {isa = PBXBuildFile; fileRef = 97719D361843AE6F00BDD815 /* btn-zoom-in.png */; }; - 97719D3A1843AE6F00BDD815 /* btn-zoom-out.png in Resources */ = {isa = PBXBuildFile; fileRef = 97719D371843AE6F00BDD815 /* btn-zoom-out.png */; }; - 97719D3B1843AE6F00BDD815 /* btn-zoom-out.png in Resources */ = {isa = PBXBuildFile; fileRef = 97719D371843AE6F00BDD815 /* btn-zoom-out.png */; }; 97719D421843AF1E00BDD815 /* ScopeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 97719D411843AF1E00BDD815 /* ScopeView.m */; }; 97719D431843AF1E00BDD815 /* ScopeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 97719D411843AF1E00BDD815 /* ScopeView.m */; }; 97719D451843B6DC00BDD815 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97719D441843B6DC00BDD815 /* MessageUI.framework */; }; @@ -193,10 +189,6 @@ 97ECD881183674CA00F77A46 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD87718362B3D00F77A46 /* CoreTelephony.framework */; }; 97ECD8821836751100F77A46 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD87918362B5400F77A46 /* MobileCoreServices.framework */; }; 97EDDCE518A299C000AEFB7A /* Twitter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97EDDCE418A299C000AEFB7A /* Twitter.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 97F61764183D0A72009919E2 /* btn-zoom-in@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 97F61762183D0A72009919E2 /* btn-zoom-in@2x.png */; }; - 97F61765183D0A72009919E2 /* btn-zoom-in@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 97F61762183D0A72009919E2 /* btn-zoom-in@2x.png */; }; - 97F61766183D0A72009919E2 /* btn-zoom-out@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 97F61763183D0A72009919E2 /* btn-zoom-out@2x.png */; }; - 97F61767183D0A72009919E2 /* btn-zoom-out@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 97F61763183D0A72009919E2 /* btn-zoom-out@2x.png */; }; 97F61781183E6172009919E2 /* LocationButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97F6177F183E6172009919E2 /* LocationButton.mm */; }; 97F61782183E6172009919E2 /* LocationButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97F6177F183E6172009919E2 /* LocationButton.mm */; }; 97F61794183E7445009919E2 /* LinkCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 97F61793183E7445009919E2 /* LinkCell.m */; }; @@ -213,10 +205,6 @@ ED5D141E181AA8C900B51FB1 /* ic_guide_mark.png in Resources */ = {isa = PBXBuildFile; fileRef = ED5D141B181AA8C900B51FB1 /* ic_guide_mark.png */; }; ED5D141F181AA8C900B51FB1 /* ic_guide_mark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = ED5D141C181AA8C900B51FB1 /* ic_guide_mark@2x.png */; }; ED5D1420181AA8C900B51FB1 /* ic_guide_mark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = ED5D141C181AA8C900B51FB1 /* ic_guide_mark@2x.png */; }; - 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 */; }; - ED86770116A0793800D9A02A /* 320-pro.png in Resources */ = {isa = PBXBuildFile; fileRef = ED8676FD16A0793800D9A02A /* 320-pro.png */; }; ED9CC5EF17CA18770051642E /* ios-guides.json in Resources */ = {isa = PBXBuildFile; fileRef = ED9CC5EE17CA18770051642E /* ios-guides.json */; }; ED9CC5F017CA18770051642E /* ios-guides.json in Resources */ = {isa = PBXBuildFile; fileRef = ED9CC5EE17CA18770051642E /* ios-guides.json */; }; EDB811A3175E1A9C00E36BF2 /* TwoButtonsView.m in Sources */ = {isa = PBXBuildFile; fileRef = EDB811A2175E1A9C00E36BF2 /* TwoButtonsView.m */; }; @@ -318,10 +306,6 @@ FA5D4F191557F79900E7D8BB /* PlacePageVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA5D4F161557F79900E7D8BB /* PlacePageVC.mm */; }; FA5D4F1A1557F79900E7D8BB /* PlacePageVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA5D4F161557F79900E7D8BB /* PlacePageVC.mm */; }; FA64D9A913F975AD00350ECF /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA64D9A813F975AD00350ECF /* types.txt */; }; - FA765AB31737BC6D00279CFF /* 22x29-lite.png in Resources */ = {isa = PBXBuildFile; fileRef = FA765AAF1737BC6D00279CFF /* 22x29-lite.png */; }; - FA765AB41737BC6D00279CFF /* 44x58-lite.png in Resources */ = {isa = PBXBuildFile; fileRef = FA765AB01737BC6D00279CFF /* 44x58-lite.png */; }; - FA765AB51737BC6D00279CFF /* 64-lite.png in Resources */ = {isa = PBXBuildFile; fileRef = FA765AB11737BC6D00279CFF /* 64-lite.png */; }; - FA765AB61737BC6D00279CFF /* 320-lite.png in Resources */ = {isa = PBXBuildFile; fileRef = FA765AB21737BC6D00279CFF /* 320-lite.png */; }; FA7F4B0017F1FFE800FAB1B5 /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FAFF42291347F101009BBB14 /* World.mwm */; }; FA85F633145DDDC20090E1A0 /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA85F632145DDDC20090E1A0 /* packed_polygons.bin */; }; FA87151B12B1518F00592DAF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA87151A12B1518F00592DAF /* SystemConfiguration.framework */; }; @@ -1455,8 +1439,6 @@ 9747277A18328E65006B7CB7 /* SideToolbarCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SideToolbarCell.m; sourceTree = ""; }; 9747278218338F0C006B7CB7 /* UIViewController+Navigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+Navigation.h"; path = "Classes/UIViewController+Navigation.h"; sourceTree = ""; }; 9747278318338F0C006B7CB7 /* UIViewController+Navigation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+Navigation.m"; path = "Classes/UIViewController+Navigation.m"; sourceTree = ""; }; - 97719D361843AE6F00BDD815 /* btn-zoom-in.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn-zoom-in.png"; sourceTree = ""; }; - 97719D371843AE6F00BDD815 /* btn-zoom-out.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn-zoom-out.png"; sourceTree = ""; }; 97719D401843AF1E00BDD815 /* ScopeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScopeView.h; sourceTree = ""; }; 97719D411843AF1E00BDD815 /* ScopeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScopeView.m; sourceTree = ""; }; 97719D441843B6DC00BDD815 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; @@ -1699,8 +1681,6 @@ 97ECD87918362B5400F77A46 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; 97ECD87E1836594400F77A46 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; 97EDDCE418A299C000AEFB7A /* Twitter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Twitter.framework; path = System/Library/Frameworks/Twitter.framework; sourceTree = SDKROOT; }; - 97F61762183D0A72009919E2 /* btn-zoom-in@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn-zoom-in@2x.png"; sourceTree = ""; }; - 97F61763183D0A72009919E2 /* btn-zoom-out@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn-zoom-out@2x.png"; sourceTree = ""; }; 97F6177F183E6172009919E2 /* LocationButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocationButton.mm; sourceTree = ""; }; 97F61780183E6172009919E2 /* LocationButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocationButton.h; sourceTree = ""; }; 97F6178F183E742E009919E2 /* LinkCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LinkCell.h; path = Settings/LinkCell.h; sourceTree = ""; }; @@ -1715,10 +1695,6 @@ ED48BBB917C2B1E2003E7E92 /* CircleView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CircleView.mm; sourceTree = ""; }; ED5D141B181AA8C900B51FB1 /* ic_guide_mark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_guide_mark.png; sourceTree = ""; }; ED5D141C181AA8C900B51FB1 /* ic_guide_mark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_guide_mark@2x.png"; sourceTree = ""; }; - ED8676FA16A0793800D9A02A /* 22x29-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "22x29-pro.png"; sourceTree = ""; }; - ED8676FB16A0793800D9A02A /* 44x58-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "44x58-pro.png"; sourceTree = ""; }; - ED8676FC16A0793800D9A02A /* 64-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "64-pro.png"; sourceTree = ""; }; - ED8676FD16A0793800D9A02A /* 320-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "320-pro.png"; sourceTree = ""; }; ED9CC5EE17CA18770051642E /* ios-guides.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "ios-guides.json"; path = "../../data/ios-guides.json"; sourceTree = ""; }; EDB811A1175E1A9C00E36BF2 /* TwoButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TwoButtonsView.h; sourceTree = ""; }; EDB811A2175E1A9C00E36BF2 /* TwoButtonsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TwoButtonsView.m; sourceTree = ""; }; @@ -1823,10 +1799,6 @@ FA5D4F151557F79900E7D8BB /* PlacePageVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = PlacePageVC.h; path = Bookmarks/PlacePageVC.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; FA5D4F161557F79900E7D8BB /* PlacePageVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = PlacePageVC.mm; path = Bookmarks/PlacePageVC.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; FA64D9A813F975AD00350ECF /* types.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = types.txt; path = ../../data/types.txt; sourceTree = SOURCE_ROOT; }; - FA765AAF1737BC6D00279CFF /* 22x29-lite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "22x29-lite.png"; sourceTree = ""; }; - FA765AB01737BC6D00279CFF /* 44x58-lite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "44x58-lite.png"; sourceTree = ""; }; - FA765AB11737BC6D00279CFF /* 64-lite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "64-lite.png"; sourceTree = ""; }; - FA765AB21737BC6D00279CFF /* 320-lite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "320-lite.png"; sourceTree = ""; }; FA85F632145DDDC20090E1A0 /* packed_polygons.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = packed_polygons.bin; path = ../../data/packed_polygons.bin; sourceTree = SOURCE_ROOT; }; FA87151A12B1518F00592DAF /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; FA8F8937132D5DB00048E3FE /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libtomcrypt.a; sourceTree = SOURCE_ROOT; }; @@ -2553,18 +2525,6 @@ ED5D141B181AA8C900B51FB1 /* ic_guide_mark.png */, ED5D141C181AA8C900B51FB1 /* ic_guide_mark@2x.png */, ED9CC5EE17CA18770051642E /* ios-guides.json */, - FA765AAF1737BC6D00279CFF /* 22x29-lite.png */, - FA765AB01737BC6D00279CFF /* 44x58-lite.png */, - FA765AB11737BC6D00279CFF /* 64-lite.png */, - FA765AB21737BC6D00279CFF /* 320-lite.png */, - 97F61762183D0A72009919E2 /* btn-zoom-in@2x.png */, - 97F61763183D0A72009919E2 /* btn-zoom-out@2x.png */, - 97719D361843AE6F00BDD815 /* btn-zoom-in.png */, - 97719D371843AE6F00BDD815 /* btn-zoom-out.png */, - ED8676FA16A0793800D9A02A /* 22x29-pro.png */, - ED8676FB16A0793800D9A02A /* 44x58-pro.png */, - ED8676FC16A0793800D9A02A /* 64-pro.png */, - ED8676FD16A0793800D9A02A /* 320-pro.png */, 97D40C09184D031900A1D572 /* Images.xcassets */, 97D40C04184CF5F100A1D572 /* ImagesLite.xcassets */, 97D40C07184CFA4100A1D572 /* ImagesPro.xcassets */, @@ -3992,7 +3952,6 @@ FAF800991417D7E50024E8C1 /* gy.png in Resources */, FAF8009A1417D7E50024E8C1 /* hk.png in Resources */, FAF8009B1417D7E50024E8C1 /* hm.png in Resources */, - 97F61766183D0A72009919E2 /* btn-zoom-out@2x.png in Resources */, FAF8009C1417D7E50024E8C1 /* hn.png in Resources */, FAF8009D1417D7E50024E8C1 /* hr.png in Resources */, FAF8009E1417D7E50024E8C1 /* ht.png in Resources */, @@ -4052,7 +4011,6 @@ FAF800D41417D7E50024E8C1 /* mt.png in Resources */, FAF800D51417D7E50024E8C1 /* mu.png in Resources */, FAF800D61417D7E50024E8C1 /* mv.png in Resources */, - 97F61764183D0A72009919E2 /* btn-zoom-in@2x.png in Resources */, FAF800D71417D7E50024E8C1 /* mw.png in Resources */, FAF800D81417D7E50024E8C1 /* mx.png in Resources */, FAF800D91417D7E50024E8C1 /* my.png in Resources */, @@ -4250,7 +4208,6 @@ FAF804911417E3510024E8C1 /* gy@2x.png in Resources */, FAF804921417E3510024E8C1 /* hk@2x.png in Resources */, FAF804931417E3510024E8C1 /* hm@2x.png in Resources */, - 97719D381843AE6F00BDD815 /* btn-zoom-in.png in Resources */, FAF804941417E3510024E8C1 /* hn@2x.png in Resources */, FAF804951417E3510024E8C1 /* hr@2x.png in Resources */, FAF804961417E3510024E8C1 /* ht@2x.png in Resources */, @@ -4264,7 +4221,6 @@ FAF8049E1417E3510024E8C1 /* iq@2x.png in Resources */, FAF8049F1417E3510024E8C1 /* ir@2x.png in Resources */, FAF804A01417E3510024E8C1 /* is@2x.png in Resources */, - 97719D3A1843AE6F00BDD815 /* btn-zoom-out.png in Resources */, FAF804A11417E3510024E8C1 /* it@2x.png in Resources */, FAF804A21417E3510024E8C1 /* je@2x.png in Resources */, FAF804A31417E3510024E8C1 /* jm@2x.png in Resources */, @@ -4452,10 +4408,6 @@ F7E7BA3D1672328F00B4492E /* transport@2x.png in Resources */, F7E7BA4016723CD200B4492E /* hotel.png in Resources */, F7E7BA4116723CD200B4492E /* hotel@2x.png in Resources */, - ED8676FE16A0793800D9A02A /* 22x29-pro.png in Resources */, - 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 */, FAF30A95173AB23900818BF6 /* 00_roboto_regular.ttf in Resources */, @@ -4499,7 +4451,6 @@ FAFB06E2151215EE0041901D /* aw.png in Resources */, FAFB06E3151215EE0041901D /* ax.png in Resources */, FAFB06E4151215EE0041901D /* az.png in Resources */, - 97F61767183D0A72009919E2 /* btn-zoom-out@2x.png in Resources */, FAFB06E5151215EE0041901D /* ba.png in Resources */, FAFB06E6151215EE0041901D /* bb.png in Resources */, FAFB06E7151215EE0041901D /* bd.png in Resources */, @@ -4758,7 +4709,6 @@ FAFB07DF151215EE0041901D /* au@2x.png in Resources */, FAFB07E0151215EE0041901D /* aw@2x.png in Resources */, FAFB07E1151215EE0041901D /* ax@2x.png in Resources */, - 97719D3B1843AE6F00BDD815 /* btn-zoom-out.png in Resources */, FAFB07E2151215EE0041901D /* az@2x.png in Resources */, FAFB07E3151215EE0041901D /* ba@2x.png in Resources */, FAFB07E4151215EE0041901D /* bb@2x.png in Resources */, @@ -4823,7 +4773,6 @@ FAFB081D151215EE0041901D /* ga@2x.png in Resources */, FAFB081E151215EE0041901D /* gb@2x.png in Resources */, FAFB081F151215EE0041901D /* gd@2x.png in Resources */, - 97719D391843AE6F00BDD815 /* btn-zoom-in.png in Resources */, FAFB0820151215EE0041901D /* ge@2x.png in Resources */, FAFB0821151215EE0041901D /* gf@2x.png in Resources */, 97D40C06184CF5F100A1D572 /* ImagesLite.xcassets in Resources */, @@ -4832,7 +4781,6 @@ FAFB0824151215EE0041901D /* gi@2x.png in Resources */, FAFB0825151215EE0041901D /* gl@2x.png in Resources */, FAFB0826151215EE0041901D /* gm@2x.png in Resources */, - 97F61765183D0A72009919E2 /* btn-zoom-in@2x.png in Resources */, FAFB0827151215EE0041901D /* gn@2x.png in Resources */, FAFB0828151215EE0041901D /* gp@2x.png in Resources */, FAFB0829151215EE0041901D /* gq@2x.png in Resources */, @@ -5020,10 +4968,6 @@ F7264B8C16388E0B00A8E6C0 /* countries.txt in Resources */, 5797B6D616C931EE00FFE6D2 /* resources-mdpi in Resources */, 5797B6D816C931EE00FFE6D2 /* resources-xhdpi in Resources */, - FA765AB31737BC6D00279CFF /* 22x29-lite.png in Resources */, - FA765AB41737BC6D00279CFF /* 44x58-lite.png in Resources */, - FA765AB51737BC6D00279CFF /* 64-lite.png in Resources */, - FA765AB61737BC6D00279CFF /* 320-lite.png in Resources */, FAF30A96173AB23900818BF6 /* 00_roboto_regular.ttf in Resources */, ED9CC5F017CA18770051642E /* ios-guides.json in Resources */, ); @@ -5090,7 +5034,6 @@ 97A8001C18B25497000C07A2 /* SegmentedControl.m in Sources */, 97A8000C18B21363000C07A2 /* SearchView.mm in Sources */, FAA5C2A2144F135F005337F6 /* LocationManager.mm in Sources */, - FA81AE3314D061BF00A0D70D /* SearchCell.mm in Sources */, 97DEA09618D75BB000C5F963 /* ContextViews.mm in Sources */, 978F9240183B660F000D6C7C /* SettingsViewController.mm in Sources */, 97D807BC18A933FB00D416E0 /* MoreAppsCell.m in Sources */, @@ -5114,7 +5057,7 @@ 9747277B18328E65006B7CB7 /* SideToolbar.mm in Sources */, 97F61794183E7445009919E2 /* LinkCell.m in Sources */, EDCB4E8E175E67120005AA35 /* PlacePreviewViewController.mm in Sources */, - 97A8001018B21395000C07A2 /* SearchBar.m in Sources */, + 97A8001018B21395000C07A2 /* SearchBar.mm in Sources */, EDC5C543175F2CA600420E92 /* ShareActionSheet.mm in Sources */, EDFC74D0177AE6C500FAF21F /* PlaceAndCompasView.mm in Sources */, ED48BBB117BE6EA8003E7E92 /* MWMApi.mm in Sources */, diff --git a/iphone/Maps/Resources-iPad/MainWindow-iPad.xib b/iphone/Maps/Resources-iPad/MainWindow-iPad.xib index a4eda24756..12044f4777 100644 --- a/iphone/Maps/Resources-iPad/MainWindow-iPad.xib +++ b/iphone/Maps/Resources-iPad/MainWindow-iPad.xib @@ -1,8 +1,8 @@ - + - + @@ -29,7 +29,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -66,7 +66,7 @@ - - + + - \ No newline at end of file +