From dfe1b0645f71cbd89430e8f6671ed84def3113e8 Mon Sep 17 00:00:00 2001 From: Andrey Subbotin Date: Mon, 22 Jul 2013 17:33:42 +0400 Subject: [PATCH 1/7] Update the PodFile to ref the latest build --- Podfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Podfile b/Podfile index 6fcb203..037273e 100644 --- a/Podfile +++ b/Podfile @@ -1,3 +1,7 @@ platform :ios, :deployment_target => '5.0' -pod 'YandexMapKit', '~> 1.0' +if ENV['YANDEX_DEV'] + pod 'YandexMapKit', :path => ENV['YANDEX_MAPKIT_FOLDER'] +else + pod 'YandexMapKit', '~> 1.0' +end From 6ed87ac8123649572a73287ca3cef191fe83eea7 Mon Sep 17 00:00:00 2001 From: Andrey Subbotin Date: Tue, 23 Jul 2013 17:00:53 +0400 Subject: [PATCH 2/7] Update MapKit to 1.0.5 --- Podfile | 2 +- Podfile.lock | 13 +- YandexMapKitSample.xcodeproj/project.pbxproj | 18 +- .../xcschemes/YandexMapKitSample.xcscheme | 2 +- YandexMapKitSample/RootViewController.xib | 232 ++---------------- YandexMapKitSample/{main.m => main.mm} | 0 6 files changed, 42 insertions(+), 225 deletions(-) rename YandexMapKitSample/{main.m => main.mm} (100%) diff --git a/Podfile b/Podfile index 037273e..35e62ce 100644 --- a/Podfile +++ b/Podfile @@ -1,7 +1,7 @@ platform :ios, :deployment_target => '5.0' if ENV['YANDEX_DEV'] - pod 'YandexMapKit', :path => ENV['YANDEX_MAPKIT_FOLDER'] + pod 'YandexMapKit', :path => "#{ENV['BINBUILDS_FOLDER']}/yandex-mapkit-ios" else pod 'YandexMapKit', '~> 1.0' end diff --git a/Podfile.lock b/Podfile.lock index 5908e23..014d11a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,11 +1,14 @@ - PODS: -- YandexMapKit (1.0.4) + - YandexMapKit (1.0.5) DEPENDENCIES: -- YandexMapKit (~> 1.0) + - YandexMapKit (from `/Users/eploko/Projects/00-bin-builds/yandex-mapkit-ios`) + +EXTERNAL SOURCES: + YandexMapKit: + :path: /Users/eploko/Projects/00-bin-builds/yandex-mapkit-ios SPEC CHECKSUMS: - YandexMapKit: 69db16c8ae6ab219c6ef67eb8feebb5fa4c4ef39 + YandexMapKit: c80ca386343cb197183dc209ff6d38e5c412eae8 -COCOAPODS: 0.16.4 +COCOAPODS: 0.22.2 diff --git a/YandexMapKitSample.xcodeproj/project.pbxproj b/YandexMapKitSample.xcodeproj/project.pbxproj index 517d0be..1d29df3 100644 --- a/YandexMapKitSample.xcodeproj/project.pbxproj +++ b/YandexMapKitSample.xcodeproj/project.pbxproj @@ -28,7 +28,7 @@ C96EECA81423899B00F3D0CF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C96EECA71423899B00F3D0CF /* Foundation.framework */; }; C96EECAA1423899B00F3D0CF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C96EECA91423899B00F3D0CF /* CoreGraphics.framework */; }; C96EECB01423899B00F3D0CF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C96EECAE1423899B00F3D0CF /* InfoPlist.strings */; }; - C96EECB21423899B00F3D0CF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C96EECB11423899B00F3D0CF /* main.m */; }; + C96EECB21423899B00F3D0CF /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = C96EECB11423899B00F3D0CF /* main.mm */; }; C96EECB61423899B00F3D0CF /* YandexMapKitSampleAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C96EECB51423899B00F3D0CF /* YandexMapKitSampleAppDelegate.m */; }; C96EECB91423899B00F3D0CF /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = C96EECB71423899B00F3D0CF /* MainWindow.xib */; }; C96EECD114238DB300F3D0CF /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C96EECD014238DB300F3D0CF /* OpenGLES.framework */; }; @@ -111,7 +111,7 @@ C96EECA91423899B00F3D0CF /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; C96EECAD1423899B00F3D0CF /* YandexMapKitSample-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "YandexMapKitSample-Info.plist"; sourceTree = ""; }; C96EECAF1423899B00F3D0CF /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - C96EECB11423899B00F3D0CF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + C96EECB11423899B00F3D0CF /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = ""; }; C96EECB31423899B00F3D0CF /* YandexMapKitSample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YandexMapKitSample-Prefix.pch"; sourceTree = ""; }; C96EECB41423899B00F3D0CF /* YandexMapKitSampleAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YandexMapKitSampleAppDelegate.h; sourceTree = ""; }; C96EECB51423899B00F3D0CF /* YandexMapKitSampleAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YandexMapKitSampleAppDelegate.m; sourceTree = ""; }; @@ -324,7 +324,7 @@ C940DD2514265AFF004DB73E /* Default.png */, C96EECAD1423899B00F3D0CF /* YandexMapKitSample-Info.plist */, C96EECAE1423899B00F3D0CF /* InfoPlist.strings */, - C96EECB11423899B00F3D0CF /* main.m */, + C96EECB11423899B00F3D0CF /* main.mm */, C96EECB31423899B00F3D0CF /* YandexMapKitSample-Prefix.pch */, ); name = "Supporting Files"; @@ -493,6 +493,7 @@ C96EEC981423899B00F3D0CF /* Project object */ = { isa = PBXProject; attributes = { + LastUpgradeCheck = 0500; ORGANIZATIONNAME = "–Ø–Ω–¥–µ–∫—Å"; }; buildConfigurationList = C96EEC9B1423899B00F3D0CF /* Build configuration list for PBXProject "YandexMapKitSample" */; @@ -577,7 +578,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C96EECB21423899B00F3D0CF /* main.m in Sources */, + C96EECB21423899B00F3D0CF /* main.mm in Sources */, C96EECB61423899B00F3D0CF /* YandexMapKitSampleAppDelegate.m in Sources */, C99C78621426193F00380582 /* MapViewController.m in Sources */, C9D7219F14261C1B00711704 /* RootViewController.m in Sources */, @@ -628,9 +629,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = ""; - GCC_VERSION = ""; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -663,20 +662,17 @@ ALWAYS_SEARCH_USER_PATHS = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SRCROOT)/YandexMapKit/Headers"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-all_load"; SDKROOT = iphoneos; @@ -689,9 +685,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = ""; - GCC_VERSION = ""; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; diff --git a/YandexMapKitSample.xcodeproj/xcshareddata/xcschemes/YandexMapKitSample.xcscheme b/YandexMapKitSample.xcodeproj/xcshareddata/xcschemes/YandexMapKitSample.xcscheme index a40b81c..a198af7 100644 --- a/YandexMapKitSample.xcodeproj/xcshareddata/xcschemes/YandexMapKitSample.xcscheme +++ b/YandexMapKitSample.xcodeproj/xcshareddata/xcschemes/YandexMapKitSample.xcscheme @@ -1,6 +1,6 @@ - - - 1056 - 11B26 - 1617 - 1138 - 566.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 534 - - - YES - IBProxyObject - IBUITableView - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - - - YES - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - {{0, 64}, {320, 416}} - - - - 10 - - 549453824 - {84, 1} - - YES - - YES - - - - TU0AKgAAAVjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P8ADQEAAAMAAAABAFQAAAEB -AAMAAAABAAEAAAECAAMAAAAEAAAB+gEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABAAEAAAEXAAQAAAABAAABUAEcAAMAAAABAAEAAAFS -AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA - - - - - - 3 - MCAwAA - - - groupTableViewBackgroundColor - - NO - YES - NO - - - NO - - IBCocoaTouchFramework - NO - 1 - 1 - 0 - YES - 44 - 10 - 10 - - - - - YES - - - view - - - - 5 - - - - dataSource - - - - 6 - - - - delegate - - - - 7 - - - - - YES - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - - - YES - - YES - -1.CustomClassName - -1.IBPluginDependency - -2.CustomClassName - -2.IBPluginDependency - 4.IBPluginDependency - - - YES - RootViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - - - - YES - - - - - 7 - - - - YES - - RootViewController - UITableViewController - - IBProjectSource - ./Classes/RootViewController.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - 3 - 534 - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/YandexMapKitSample/main.m b/YandexMapKitSample/main.mm similarity index 100% rename from YandexMapKitSample/main.m rename to YandexMapKitSample/main.mm From 6aa04119c823e635d7d6de19d0d7167cb475228d Mon Sep 17 00:00:00 2001 From: Andrey Subbotin Date: Tue, 23 Jul 2013 17:14:43 +0400 Subject: [PATCH 3/7] Update copyrights --- .../AnnotationDetailViewController.h | 4 ++-- .../AnnotationDetailViewController.m | 4 ++-- YandexMapKitSample/AnnotationsViewController.h | 4 ++-- YandexMapKitSample/AnnotationsViewController.m | 4 ++-- YandexMapKitSample/CalloutView.h | 4 ++-- YandexMapKitSample/CalloutView.m | 4 ++-- .../CustomAnnotationViewController.h | 4 ++-- .../CustomAnnotationViewController.m | 4 ++-- .../CustomCalloutViewController.h | 4 ++-- .../CustomCalloutViewController.m | 4 ++-- .../DraggableAnnotationViewController.h | 4 ++-- .../DraggableAnnotationViewController.m | 4 ++-- YandexMapKitSample/MapLayersViewController.h | 4 ++-- YandexMapKitSample/MapLayersViewController.m | 4 ++-- YandexMapKitSample/MapViewController.h | 4 ++-- YandexMapKitSample/MapViewController.m | 4 ++-- .../OnScreenButtonsViewController.h | 4 ++-- .../OnScreenButtonsViewController.m | 4 ++-- YandexMapKitSample/PointAnnotation.h | 4 ++-- YandexMapKitSample/PointAnnotation.m | 4 ++-- YandexMapKitSample/RootViewController.h | 4 ++-- YandexMapKitSample/RootViewController.m | 4 ++-- YandexMapKitSample/Sample.h | 4 ++-- YandexMapKitSample/Sample.m | 4 ++-- YandexMapKitSample/Settings.h | 4 ++-- YandexMapKitSample/Settings.m | 4 ++-- YandexMapKitSample/SettingsViewController.h | 4 ++-- YandexMapKitSample/SettingsViewController.m | 4 ++-- .../StaticMapExampleViewController.h | 4 ++-- .../StaticMapExampleViewController.m | 4 ++-- YandexMapKitSample/TrafficViewController.h | 4 ++-- YandexMapKitSample/TrafficViewController.m | 4 ++-- .../VisibleRectExampleViewController.h | 4 ++-- .../VisibleRectExampleViewController.m | 4 ++-- .../YandexMapKitSampleAppDelegate.h | 2 +- .../YandexMapKitSampleAppDelegate.m | 17 ++++++++++------- 36 files changed, 79 insertions(+), 76 deletions(-) diff --git a/YandexMapKitSample/AnnotationDetailViewController.h b/YandexMapKitSample/AnnotationDetailViewController.h index 63c4ac1..918d71a 100644 --- a/YandexMapKitSample/AnnotationDetailViewController.h +++ b/YandexMapKitSample/AnnotationDetailViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/AnnotationDetailViewController.m b/YandexMapKitSample/AnnotationDetailViewController.m index 7eeec89..6bdb1cc 100644 --- a/YandexMapKitSample/AnnotationDetailViewController.m +++ b/YandexMapKitSample/AnnotationDetailViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/AnnotationsViewController.h b/YandexMapKitSample/AnnotationsViewController.h index cf82d2c..72fd58b 100644 --- a/YandexMapKitSample/AnnotationsViewController.h +++ b/YandexMapKitSample/AnnotationsViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/AnnotationsViewController.m b/YandexMapKitSample/AnnotationsViewController.m index 58fa231..795bd5f 100644 --- a/YandexMapKitSample/AnnotationsViewController.m +++ b/YandexMapKitSample/AnnotationsViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/CalloutView.h b/YandexMapKitSample/CalloutView.h index f2cc088..9be237f 100644 --- a/YandexMapKitSample/CalloutView.h +++ b/YandexMapKitSample/CalloutView.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/CalloutView.m b/YandexMapKitSample/CalloutView.m index 46b6c43..1e8b477 100644 --- a/YandexMapKitSample/CalloutView.m +++ b/YandexMapKitSample/CalloutView.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/CustomAnnotationViewController.h b/YandexMapKitSample/CustomAnnotationViewController.h index c3df775..15db3b7 100644 --- a/YandexMapKitSample/CustomAnnotationViewController.h +++ b/YandexMapKitSample/CustomAnnotationViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/CustomAnnotationViewController.m b/YandexMapKitSample/CustomAnnotationViewController.m index 42ff5a2..4966e1d 100644 --- a/YandexMapKitSample/CustomAnnotationViewController.m +++ b/YandexMapKitSample/CustomAnnotationViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/CustomCalloutViewController.h b/YandexMapKitSample/CustomCalloutViewController.h index e0dc2b5..080d59b 100644 --- a/YandexMapKitSample/CustomCalloutViewController.h +++ b/YandexMapKitSample/CustomCalloutViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/CustomCalloutViewController.m b/YandexMapKitSample/CustomCalloutViewController.m index 4911e54..be01e65 100644 --- a/YandexMapKitSample/CustomCalloutViewController.m +++ b/YandexMapKitSample/CustomCalloutViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/DraggableAnnotationViewController.h b/YandexMapKitSample/DraggableAnnotationViewController.h index 0a20cf0..ec33449 100644 --- a/YandexMapKitSample/DraggableAnnotationViewController.h +++ b/YandexMapKitSample/DraggableAnnotationViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/DraggableAnnotationViewController.m b/YandexMapKitSample/DraggableAnnotationViewController.m index f06c445..1b3a03d 100644 --- a/YandexMapKitSample/DraggableAnnotationViewController.m +++ b/YandexMapKitSample/DraggableAnnotationViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/MapLayersViewController.h b/YandexMapKitSample/MapLayersViewController.h index 0bded22..99a2a8b 100644 --- a/YandexMapKitSample/MapLayersViewController.h +++ b/YandexMapKitSample/MapLayersViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/MapLayersViewController.m b/YandexMapKitSample/MapLayersViewController.m index e82814b..4c873b5 100644 --- a/YandexMapKitSample/MapLayersViewController.m +++ b/YandexMapKitSample/MapLayersViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/MapViewController.h b/YandexMapKitSample/MapViewController.h index afa4800..893526d 100644 --- a/YandexMapKitSample/MapViewController.h +++ b/YandexMapKitSample/MapViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/MapViewController.m b/YandexMapKitSample/MapViewController.m index 33e869f..d39f08e 100644 --- a/YandexMapKitSample/MapViewController.m +++ b/YandexMapKitSample/MapViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/OnScreenButtonsViewController.h b/YandexMapKitSample/OnScreenButtonsViewController.h index 2a5d9d3..ced97d5 100644 --- a/YandexMapKitSample/OnScreenButtonsViewController.h +++ b/YandexMapKitSample/OnScreenButtonsViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/OnScreenButtonsViewController.m b/YandexMapKitSample/OnScreenButtonsViewController.m index 51a620f..2b3c422 100644 --- a/YandexMapKitSample/OnScreenButtonsViewController.m +++ b/YandexMapKitSample/OnScreenButtonsViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/PointAnnotation.h b/YandexMapKitSample/PointAnnotation.h index 2b22dc3..ecbc734 100644 --- a/YandexMapKitSample/PointAnnotation.h +++ b/YandexMapKitSample/PointAnnotation.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/PointAnnotation.m b/YandexMapKitSample/PointAnnotation.m index ecef064..0c26977 100644 --- a/YandexMapKitSample/PointAnnotation.m +++ b/YandexMapKitSample/PointAnnotation.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/RootViewController.h b/YandexMapKitSample/RootViewController.h index c83fe4c..7b81bfa 100644 --- a/YandexMapKitSample/RootViewController.h +++ b/YandexMapKitSample/RootViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/RootViewController.m b/YandexMapKitSample/RootViewController.m index 4b33865..48fa73c 100644 --- a/YandexMapKitSample/RootViewController.m +++ b/YandexMapKitSample/RootViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/Sample.h b/YandexMapKitSample/Sample.h index a0c4d16..2db8acb 100644 --- a/YandexMapKitSample/Sample.h +++ b/YandexMapKitSample/Sample.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/Sample.m b/YandexMapKitSample/Sample.m index 625fc61..ad8cb44 100644 --- a/YandexMapKitSample/Sample.m +++ b/YandexMapKitSample/Sample.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/Settings.h b/YandexMapKitSample/Settings.h index 016cf9c..71061dc 100644 --- a/YandexMapKitSample/Settings.h +++ b/YandexMapKitSample/Settings.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/Settings.m b/YandexMapKitSample/Settings.m index 04e5768..edf9cfd 100644 --- a/YandexMapKitSample/Settings.m +++ b/YandexMapKitSample/Settings.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/SettingsViewController.h b/YandexMapKitSample/SettingsViewController.h index b73bb5a..c03b6af 100644 --- a/YandexMapKitSample/SettingsViewController.h +++ b/YandexMapKitSample/SettingsViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/SettingsViewController.m b/YandexMapKitSample/SettingsViewController.m index e9f372c..3a56821 100644 --- a/YandexMapKitSample/SettingsViewController.m +++ b/YandexMapKitSample/SettingsViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/StaticMapExampleViewController.h b/YandexMapKitSample/StaticMapExampleViewController.h index 77e1976..1b54b26 100644 --- a/YandexMapKitSample/StaticMapExampleViewController.h +++ b/YandexMapKitSample/StaticMapExampleViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/StaticMapExampleViewController.m b/YandexMapKitSample/StaticMapExampleViewController.m index 532b8c5..ea3d516 100644 --- a/YandexMapKitSample/StaticMapExampleViewController.m +++ b/YandexMapKitSample/StaticMapExampleViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/TrafficViewController.h b/YandexMapKitSample/TrafficViewController.h index 9713a26..ee1d818 100644 --- a/YandexMapKitSample/TrafficViewController.h +++ b/YandexMapKitSample/TrafficViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/TrafficViewController.m b/YandexMapKitSample/TrafficViewController.m index fff4c00..3790bae 100644 --- a/YandexMapKitSample/TrafficViewController.m +++ b/YandexMapKitSample/TrafficViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/VisibleRectExampleViewController.h b/YandexMapKitSample/VisibleRectExampleViewController.h index a5dbfa7..50ab27f 100644 --- a/YandexMapKitSample/VisibleRectExampleViewController.h +++ b/YandexMapKitSample/VisibleRectExampleViewController.h @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/VisibleRectExampleViewController.m b/YandexMapKitSample/VisibleRectExampleViewController.m index 37d388e..5e0479c 100644 --- a/YandexMapKitSample/VisibleRectExampleViewController.m +++ b/YandexMapKitSample/VisibleRectExampleViewController.m @@ -3,8 +3,8 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX - * + * Version for iOS © 2011-2013 YANDEX + * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ */ diff --git a/YandexMapKitSample/YandexMapKitSampleAppDelegate.h b/YandexMapKitSample/YandexMapKitSampleAppDelegate.h index 448f18f..a58d396 100644 --- a/YandexMapKitSample/YandexMapKitSampleAppDelegate.h +++ b/YandexMapKitSample/YandexMapKitSampleAppDelegate.h @@ -3,7 +3,7 @@ * * This file is a part of the Yandex Map Kit. * - * Version for iOS © 2011-2012 YANDEX + * Version for iOS © 2011-2013 YANDEX * * You may not use this file except in compliance with the License. * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ diff --git a/YandexMapKitSample/YandexMapKitSampleAppDelegate.m b/YandexMapKitSample/YandexMapKitSampleAppDelegate.m index fd5f90f..66036f4 100644 --- a/YandexMapKitSample/YandexMapKitSampleAppDelegate.m +++ b/YandexMapKitSample/YandexMapKitSampleAppDelegate.m @@ -1,10 +1,13 @@ -// -// YandexMapKitSampleAppDelegate.m -// YandexMapKitSample -// -// Created by Roman Busyghin on 9/16/11. -// Copyright 2011 Яндекс. All rights reserved. -// +/* + * YandexMapKitSampleAppDelegate.m + * + * This file is a part of the Yandex Map Kit. + * + * Version for iOS © 2011-2013 YANDEX + * + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at http://legal.yandex.ru/mapkit/ + */ #import "YandexMapKitSampleAppDelegate.h" #import "Settings.h" From 276f6538222313fb0a00c58824d27b5c167fb8cc Mon Sep 17 00:00:00 2001 From: Andrey Subbotin Date: Tue, 23 Jul 2013 17:20:53 +0400 Subject: [PATCH 4/7] ARCify the project --- YandexMapKitSample/YandexMapKitSampleAppDelegate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YandexMapKitSample/YandexMapKitSampleAppDelegate.h b/YandexMapKitSample/YandexMapKitSampleAppDelegate.h index a58d396..aa5dcc1 100644 --- a/YandexMapKitSample/YandexMapKitSampleAppDelegate.h +++ b/YandexMapKitSample/YandexMapKitSampleAppDelegate.h @@ -13,6 +13,6 @@ @interface YandexMapKitSampleAppDelegate : UIResponder -@property (nonatomic, retain) UIWindow *window; +@property (nonatomic, strong) UIWindow *window; @end From 3eb2b432b745bd3f095d8f526df221e59ede2052 Mon Sep 17 00:00:00 2001 From: Andrey Subbotin Date: Tue, 23 Jul 2013 20:53:41 +0400 Subject: [PATCH 5/7] iOS 7 fixes --- .../YandexMapKitSample.xccheckout | 39 +++ YandexMapKitSample/MapLayersViewController.m | 2 +- YandexMapKitSample/RootViewController.m | 8 +- YandexMapKitSample/RootViewController.xib | 172 ++++++++++-- YandexMapKitSample/Sample.m | 6 +- YandexMapKitSample/SettingsViewController.m | 33 ++- YandexMapKitSample/SettingsViewController.xib | 259 +++++++----------- 7 files changed, 320 insertions(+), 199 deletions(-) create mode 100644 YandexMapKitSample.xcworkspace/xcshareddata/YandexMapKitSample.xccheckout diff --git a/YandexMapKitSample.xcworkspace/xcshareddata/YandexMapKitSample.xccheckout b/YandexMapKitSample.xcworkspace/xcshareddata/YandexMapKitSample.xccheckout new file mode 100644 index 0000000..92c824c --- /dev/null +++ b/YandexMapKitSample.xcworkspace/xcshareddata/YandexMapKitSample.xccheckout @@ -0,0 +1,39 @@ + + + + + IDESourceControlProjectIdentifier + 885E977A-BFD2-488E-A074-75A70A14BB02 + IDESourceControlProjectName + YandexMapKitSample + IDESourceControlProjectOriginsDictionary + + E66839EE-7A2F-4B5E-AF90-22680F6C400D + ssh://github.com/yandexmobile/yandexmapkit-ios.git + + IDESourceControlProjectPath + YandexMapKitSample.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + E66839EE-7A2F-4B5E-AF90-22680F6C400D + .. + + IDESourceControlProjectURL + ssh://github.com/yandexmobile/yandexmapkit-ios.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + E66839EE-7A2F-4B5E-AF90-22680F6C400D + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + E66839EE-7A2F-4B5E-AF90-22680F6C400D + IDESourceControlWCCName + yandexmapkit-ios + + + + diff --git a/YandexMapKitSample/MapLayersViewController.m b/YandexMapKitSample/MapLayersViewController.m index 4c873b5..92d2f73 100644 --- a/YandexMapKitSample/MapLayersViewController.m +++ b/YandexMapKitSample/MapLayersViewController.m @@ -114,7 +114,7 @@ - (void)configureVisibleLayerSegmentedControl - (void)layerChange:(UISegmentedControl *)sender { NSInteger index = sender.selectedSegmentIndex; - YMKMapLayerInfo *layerInfo = [self.layers objectAtIndex:index]; + YMKMapLayerInfo *layerInfo = self.layers[index]; self.mapView.visibleLayerIdentifier = layerInfo.identifier; } diff --git a/YandexMapKitSample/RootViewController.m b/YandexMapKitSample/RootViewController.m index 48fa73c..b49843e 100644 --- a/YandexMapKitSample/RootViewController.m +++ b/YandexMapKitSample/RootViewController.m @@ -32,8 +32,8 @@ - (id)initWithStyle:(UITableViewStyle)style { - (IBAction)settingsButtonTapped:(id)sender { SettingsViewController *vc = [[SettingsViewController alloc] init]; - vc.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal; - [self presentModalViewController:vc animated:YES]; + UINavigationController *nc = [[UINavigationController alloc] initWithRootViewController:vc]; + [self presentModalViewController:nc animated:YES]; } #pragma mark - View lifecycle @@ -100,7 +100,7 @@ - (void)readSamples { NSString * samplesDictionaryPath = [[NSBundle mainBundle] pathForResource:@"SamplesList" ofType:@"plist"]; NSDictionary * samplesDictionary = [[NSDictionary alloc] initWithContentsOfFile:samplesDictionaryPath]; - for (NSDictionary * sampleDictionary in [samplesDictionary objectForKey:@"Samples"]) { + for (NSDictionary * sampleDictionary in samplesDictionary[@"Samples"]) { Sample * sample = [Sample sampleWithDictionary:sampleDictionary]; [tempArray addObject:sample]; } @@ -110,7 +110,7 @@ - (void)readSamples { } - (Sample *)sampleAtIndexPath:(NSIndexPath *)indexPath { - return [self.samples objectAtIndex:indexPath.row]; + return (self.samples)[indexPath.row]; } @end diff --git a/YandexMapKitSample/RootViewController.xib b/YandexMapKitSample/RootViewController.xib index d0ff56c..b43859f 100644 --- a/YandexMapKitSample/RootViewController.xib +++ b/YandexMapKitSample/RootViewController.xib @@ -1,26 +1,146 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + 1280 + 13A510d + 4471.1 + 1242.11 + 683.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 3697.3 + + + IBProxyObject + IBUITableView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 1298 + + {{0, 64}, {320, 416}} + + + + 3 + MQA + + NO + YES + NO + + + NO + + IBCocoaTouchFramework + NO + 1 + 0 + YES + 44 + 22 + 22 + + + + NO + + + + view + + + + 5 + + + + dataSource + + + + 6 + + + + delegate + + + + 7 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 4 + + + + + + + RootViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + 3 + 3697.3 + + diff --git a/YandexMapKitSample/Sample.m b/YandexMapKitSample/Sample.m index ad8cb44..dbaf76c 100644 --- a/YandexMapKitSample/Sample.m +++ b/YandexMapKitSample/Sample.m @@ -35,9 +35,9 @@ + (id)sampleWithDictionary:(NSDictionary *)dictionary { - (id)initWithDictionary:(NSDictionary *)dictionary { self = [super init]; if (self) { - self.title = [dictionary objectForKey:@"Title"]; - self.subtitle = [dictionary objectForKey:@"Subtitle"]; - self.viewControllerClassName = [dictionary objectForKey:@"ViewControllerClass"]; + self.title = dictionary[@"Title"]; + self.subtitle = dictionary[@"Subtitle"]; + self.viewControllerClassName = dictionary[@"ViewControllerClass"]; } return self; } diff --git a/YandexMapKitSample/SettingsViewController.m b/YandexMapKitSample/SettingsViewController.m index 3a56821..cb8090b 100644 --- a/YandexMapKitSample/SettingsViewController.m +++ b/YandexMapKitSample/SettingsViewController.m @@ -15,6 +15,8 @@ @interface SettingsViewController () @property(nonatomic, weak) IBOutlet UITextField *keyTextField; +@property (nonatomic, weak) IBOutlet UIBarButtonItem *cancelButton; +@property (nonatomic, weak) IBOutlet UIBarButtonItem *saveButton; @end @@ -22,23 +24,46 @@ @interface SettingsViewController () @implementation SettingsViewController +- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { + [self setup]; + } + return self; +} + +- (instancetype)initWithCoder:(NSCoder *)aDecoder +{ + if ((self = [super initWithCoder:aDecoder])) { + [self setup]; + } + return self; +} + +- (void)setup +{ + self.title = NSLocalizedString(@"Settings", @"Screen title"); +} + + - (void)viewDidLoad { [super viewDidLoad]; - self.keyTextField.text = [Settings sharedSettings].apiKey; + self.navigationItem.leftBarButtonItem = self.cancelButton; + self.navigationItem.rightBarButtonItem = self.saveButton; } - (void)viewDidUnload { - [super viewDidUnload]; - + self.cancelButton = nil; + self.saveButton = nil; self.keyTextField = nil; + [super viewDidUnload]; } - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - [self.keyTextField becomeFirstResponder]; } diff --git a/YandexMapKitSample/SettingsViewController.xib b/YandexMapKitSample/SettingsViewController.xib index 276296b..4f02602 100644 --- a/YandexMapKitSample/SettingsViewController.xib +++ b/YandexMapKitSample/SettingsViewController.xib @@ -1,20 +1,18 @@ - 1536 - 12B19 - 2829 - 1187 - 624.00 + 1280 + 13A510d + 4471.1 + 1242.11 + 683.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1914 + 3697.3 IBProxyObject IBUIBarButtonItem - IBUINavigationBar - IBUINavigationItem IBUITextField IBUIView @@ -25,91 +23,57 @@ PluginDependencyRecalculationVersion - - + + IBFilesOwner IBCocoaTouchFramework - + IBFirstResponder IBCocoaTouchFramework - + - 274 + 1298 - - - 290 - {320, 44} - + + + 1314 + + {{20, 120}, {280, 30}} + - - _NS:9 - IBCocoaTouchFramework - - - - Настройка - - IBCocoaTouchFramework - 1 - - 1 - - - IBCocoaTouchFramework - 2 - - 3 - - IBCocoaTouchFramework - - - - - - 292 - {{20, 128}, {280, 31}} - - - _NS:9 NO YES IBCocoaTouchFramework 0 + 3 - Ваш API ключ + Your API key + + 3 + MAA + YES 17 - 9 IBCocoaTouchFramework - 1 - - - 3 - MAA - - 2 - - 1 14 - Helvetica + HelveticaNeue 14 16 + {{0, 20}, {320, 460}} - 3 MC42NjY2NjY2NjY3AA @@ -117,176 +81,149 @@ IBCocoaTouchFramework + + IBCocoaTouchFramework + 1 + 1 + + + IBCocoaTouchFramework + 2 + 3 + + NO - view - - + cancelButton + + - 3 + 2By-q9-ok6 keyTextField - - + + - 11 + Vhm-bg-kNU - - cancelButtonTapped: - - + + saveButton + + - 16 + DKY-CX-1Us + + + + view + + + + 2bu-rM-FaL - saveButtonTapped: - - + cancelButtonTapped: + + - 14 + 16 saveButtonTapped: - - - 20 + + - 15 + 14 - 0 + 0 - + - 1 - - - - - - - - - -1 - + -1 + File's Owner - -2 - + -2 + - 4 - - - - - - - - 5 - + 1 + - - + - + - 6 - - + Xyd-Km-pB6 + + - 7 - - + 6 + + - 9 - - + 7 + + SettingsViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + - 16 - - - - - SettingsViewController - UIViewController - - id - id - - - - cancelButtonTapped: - id - - - saveButtonTapped: - id - - - - keyTextField - UITextField - - - keyTextField - - keyTextField - UITextField - - - - IBProjectSource - ./Classes/SettingsViewController.h - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + YES 3 - 1914 + 3697.3 From abba9d5a15eb70e60f131e5a75fd64667dd1c1a3 Mon Sep 17 00:00:00 2001 From: Andrey Subbotin Date: Wed, 24 Jul 2013 15:53:41 +0400 Subject: [PATCH 6/7] Remove the Podfile.lock from the repo. --- .gitignore | 1 + Podfile.lock | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 Podfile.lock diff --git a/.gitignore b/.gitignore index a961cca..fd7c351 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ docs xcuserdata .idea Pods +Podfile.lock diff --git a/Podfile.lock b/Podfile.lock deleted file mode 100644 index 014d11a..0000000 --- a/Podfile.lock +++ /dev/null @@ -1,14 +0,0 @@ -PODS: - - YandexMapKit (1.0.5) - -DEPENDENCIES: - - YandexMapKit (from `/Users/eploko/Projects/00-bin-builds/yandex-mapkit-ios`) - -EXTERNAL SOURCES: - YandexMapKit: - :path: /Users/eploko/Projects/00-bin-builds/yandex-mapkit-ios - -SPEC CHECKSUMS: - YandexMapKit: c80ca386343cb197183dc209ff6d38e5c412eae8 - -COCOAPODS: 0.22.2 From d400786b09c4ab17d7f2787cd71ff12f178c963c Mon Sep 17 00:00:00 2001 From: Andrey Subbotin Date: Wed, 24 Jul 2013 16:37:59 +0400 Subject: [PATCH 7/7] Update the dependencies --- Podfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile b/Podfile index 35e62ce..0199e5f 100644 --- a/Podfile +++ b/Podfile @@ -1,7 +1,7 @@ -platform :ios, :deployment_target => '5.0' +platform :ios, '5.0' if ENV['YANDEX_DEV'] pod 'YandexMapKit', :path => "#{ENV['BINBUILDS_FOLDER']}/yandex-mapkit-ios" else - pod 'YandexMapKit', '~> 1.0' + pod 'YandexMapKit', '>= 1.0.5' end