From ce167cb752c9bc3cb148e0e36e5dd8b630f6ff9e Mon Sep 17 00:00:00 2001 From: k-be Date: Wed, 29 Jan 2014 12:41:23 +0700 Subject: [PATCH 1/4] adde AppCode files to ignore and xcshareddata --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 8a2f69d..a1eda6c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ CVS **/!*.xcworkspace/contents.xcworkspacedata !xcshareddata xcuserdata +VKSdkWorkspace.xcworkspace/xcshareddata/ #Project files [Bb]uild/ @@ -30,3 +31,6 @@ DerivedData/ #CocoaPods Pods + +#AppCode +*/.idea/* \ No newline at end of file From 1c9c73f569d04af2c71a04a3b73c890464580368 Mon Sep 17 00:00:00 2001 From: k-be Date: Wed, 29 Jan 2014 12:47:37 +0700 Subject: [PATCH 2/4] renamed macros for naming agreements --- sdk/sdk/VKAuthorizeController.m | 4 ++-- sdk/sdk/VKUtil.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/sdk/VKAuthorizeController.m b/sdk/sdk/VKAuthorizeController.m index 3095d9f..0534e2d 100644 --- a/sdk/sdk/VKAuthorizeController.m +++ b/sdk/sdk/VKAuthorizeController.m @@ -52,7 +52,7 @@ static NSString *const REDIRECT_URL = @"https://oauth.vk.com/blank.html"; + (void)presentThisController:(VKAuthorizeController *)controller { UINavigationController *navigation = [[UINavigationController alloc] initWithRootViewController:controller]; - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")) { + if (VK_SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")) { navigation.navigationBar.barTintColor = VK_COLOR; navigation.navigationBar.tintColor = [UIColor whiteColor]; navigation.navigationBar.translucent = YES; @@ -77,7 +77,7 @@ static NSString *const REDIRECT_URL = @"https://oauth.vk.com/blank.html"; - (void)loadView { [super loadView]; - if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")) { + if (VK_SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")) { self.edgesForExtendedLayout = UIRectEdgeNone; } UIView *view = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]]; diff --git a/sdk/sdk/VKUtil.h b/sdk/sdk/VKUtil.h index 80c0d88..60557f8 100644 --- a/sdk/sdk/VKUtil.h +++ b/sdk/sdk/VKUtil.h @@ -20,11 +20,11 @@ // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -#define SYSTEM_VERSION_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedSame) -#define SYSTEM_VERSION_GREATER_THAN(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedDescending) -#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending) -#define SYSTEM_VERSION_LESS_THAN(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedAscending) -#define SYSTEM_VERSION_LESS_THAN_OR_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedDescending) +#define VK_SYSTEM_VERSION_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedSame) +#define VK_SYSTEM_VERSION_GREATER_THAN(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedDescending) +#define VK_SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending) +#define VK_SYSTEM_VERSION_LESS_THAN(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedAscending) +#define VK_SYSTEM_VERSION_LESS_THAN_OR_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedDescending) #define VK_COLOR [UIColor colorWithRed:85.0f / 255 green:133.0f / 255 blue:188.0f / 255 alpha:1.0f] #import /** From d4c962d23e90700c770d1402b081fe6e9f444d60 Mon Sep 17 00:00:00 2001 From: k-be Date: Wed, 29 Jan 2014 12:48:03 +0700 Subject: [PATCH 3/4] added AppCode files to ignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a1eda6c..b2747e5 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ DerivedData/ Pods #AppCode -*/.idea/* \ No newline at end of file +*/.idea/* +.idea/* From 950e91f2ee6104cb540f0faa189582b174db9fea Mon Sep 17 00:00:00 2001 From: k-be Date: Wed, 29 Jan 2014 12:51:15 +0700 Subject: [PATCH 4/4] removed user-depend link library --- .../VKSDKTestApplication.xcodeproj/project.pbxproj | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/VKSDKTestApplication/VKSDKTestApplication.xcodeproj/project.pbxproj b/VKSDKTestApplication/VKSDKTestApplication.xcodeproj/project.pbxproj index 561bc21..5afa8b2 100644 --- a/VKSDKTestApplication/VKSDKTestApplication.xcodeproj/project.pbxproj +++ b/VKSDKTestApplication/VKSDKTestApplication.xcodeproj/project.pbxproj @@ -316,10 +316,7 @@ "VKDEBUG=1", ); INFOPLIST_FILE = "VKSDKTestApplication/VKSDKTestApplication-Info.plist"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/VKSdkWorkspace-ghpvcyvmpixypwgqyfufolinkorb/Build/Products/Debug-iphoneos", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-all_load"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -341,10 +338,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "VKSDKTestApplication/VKSDKTestApplication-Prefix.pch"; INFOPLIST_FILE = "VKSDKTestApplication/VKSDKTestApplication-Info.plist"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/VKSdkWorkspace-ghpvcyvmpixypwgqyfufolinkorb/Build/Products/Debug-iphoneos", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-all_load"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "";