TouchInstinct
/
vk-ios-sdk
316
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13 from K-Be/master 

Fix for prevent possible names conflict
This commit is contained in:
Dreddik 2014-01-28 22:22:44 -08:00
parent eec1aa9914 950e91f2ee
commit 6d207a5e61
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -23,6 +23,7 @@ CVS
**/!*.xcworkspace/contents.xcworkspacedata
!xcshareddata
xcuserdata
VKSdkWorkspace.xcworkspace/xcshareddata/
#Project files
[Bb]uild/
@ -30,3 +31,7 @@ DerivedData/
#CocoaPods
Pods
#AppCode
*/.idea/*
.idea/*

10
VKSDKTestApplication/VKSDKTestApplication.xcodeproj/project.pbxproj
View File

@ -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 = "";

4
sdk/sdk/VKAuthorizeController.m
View File

@ -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]];

10
sdk/sdk/VKUtil.h
View File

@ -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 <Foundation/Foundation.h>
/**