diff --git a/VK-ios-sdk.podspec b/VK-ios-sdk.podspec index 9563b09..e6450fd 100755 --- a/VK-ios-sdk.podspec +++ b/VK-ios-sdk.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "VK-ios-sdk" - s.version = "1.3.17" + s.version = "1.4" s.summary = "Library for working with VK." s.homepage = "https://github.com/VKCOM/vk-ios-sdk" s.license = 'MIT' @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/VKCOM/vk-ios-sdk.git", :tag => s.version.to_s } s.source_files = 'library/source/**/*.{h,m}' s.public_header_files = 'library/source/**/*.h' - s.resources = "VKSdkResources.bundle" + s.resources = ['library/Resources/SdkAssetCatalog.xcassets','library/Resources/*.lproj'] s.frameworks = 'Foundation','UIKit','SafariServices','CoreGraphics','Security' s.requires_arc = true end diff --git a/VK-ios-sdk.xcodeproj/project.pbxproj b/VK-ios-sdk.xcodeproj/project.pbxproj index 5f7d9f0..c8075f1 100755 --- a/VK-ios-sdk.xcodeproj/project.pbxproj +++ b/VK-ios-sdk.xcodeproj/project.pbxproj @@ -70,53 +70,13 @@ F3007C5D1AEE50B5007CCA9D /* VKApiConst.m in Sources */ = {isa = PBXBuildFile; fileRef = F3007C5C1AEE50B5007CCA9D /* VKApiConst.m */; }; F3050D211C49123C0092FE76 /* VKDocs.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 8F99D6381C42C61A0006DB03 /* VKDocs.h */; }; F3050D221C4912420092FE76 /* VKApiDocs.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 8F99D6331C42C6010006DB03 /* VKApiDocs.h */; }; - F3062B801A4185FF006B57F9 /* ic_vk_ios7_activity_logo~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = F3062B7F1A4185FD006B57F9 /* ic_vk_ios7_activity_logo~ipad.png */; }; - F3062B851A418A0E006B57F9 /* ic_vk_ios7_activity_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = F3062B811A418A0E006B57F9 /* ic_vk_ios7_activity_logo.png */; }; - F3062B861A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F3062B821A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x.png */; }; - F3062B871A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = F3062B831A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x~ipad.png */; }; - F3062B881A418A0E006B57F9 /* ic_vk_ios7_activity_logo@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F3062B841A418A0E006B57F9 /* ic_vk_ios7_activity_logo@3x.png */; }; - F32ADDCD1A417CE9009A9FD6 /* ic_vk_activity_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = F32ADDC81A417C4C009A9FD6 /* ic_vk_activity_logo.png */; }; - F32ADDCE1A417CE9009A9FD6 /* ic_vk_activity_logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F32ADDC91A417C4C009A9FD6 /* ic_vk_activity_logo@2x.png */; }; - F32ADDCF1A417CE9009A9FD6 /* ic_vk_activity_logo@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = F32ADDCA1A417C4C009A9FD6 /* ic_vk_activity_logo@2x~ipad.png */; }; - F32ADDD01A417CE9009A9FD6 /* ic_vk_activity_logo@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F32ADDCB1A417C4C009A9FD6 /* ic_vk_activity_logo@3x.png */; }; - F32ADDD11A417CE9009A9FD6 /* ic_vk_activity_logo~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = F32ADDCC1A417C4C009A9FD6 /* ic_vk_activity_logo~ipad.png */; }; F34074F61D214AAC00F65798 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3769E701BE8E41C00AEC4AF /* SafariServices.framework */; }; F3454FD01ABB1D1A00B15E85 /* VKRequestsScheduler.m in Sources */ = {isa = PBXBuildFile; fileRef = F3454FCF1ABB1D1A00B15E85 /* VKRequestsScheduler.m */; }; F34670201B8B6BF3003EF74B /* VKSdk.h in Copy Files */ = {isa = PBXBuildFile; fileRef = F34670171B8B50E0003EF74B /* VKSdk.h */; }; F34670361B8B7C5A003EF74B /* VKSdkFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = F34670351B8B7C5A003EF74B /* VKSdkFramework.h */; settings = {ATTRIBUTES = (Public, ); }; }; F346704A1B8B7C6B003EF74B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3EEFFA81827BB18000BB525 /* UIKit.framework */; }; F346704B1B8B7C70003EF74B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3C75430182133CC00964716 /* Foundation.framework */; }; - F346704C1B8B7C8E003EF74B /* ic_vk_ios7_activity_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = F3062B811A418A0E006B57F9 /* ic_vk_ios7_activity_logo.png */; }; - F346704D1B8B7C8E003EF74B /* ic_vk_ios7_activity_logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F3062B821A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x.png */; }; - F346704E1B8B7C8E003EF74B /* ic_vk_ios7_activity_logo@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = F3062B831A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x~ipad.png */; }; - F346704F1B8B7C8E003EF74B /* ic_vk_ios7_activity_logo@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F3062B841A418A0E006B57F9 /* ic_vk_ios7_activity_logo@3x.png */; }; - F34670501B8B7C8E003EF74B /* ic_vk_ios7_activity_logo~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = F3062B7F1A4185FD006B57F9 /* ic_vk_ios7_activity_logo~ipad.png */; }; - F34670511B8B7C8E003EF74B /* ic_vk_activity_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = F32ADDC81A417C4C009A9FD6 /* ic_vk_activity_logo.png */; }; - F34670521B8B7C8E003EF74B /* ic_vk_activity_logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F32ADDC91A417C4C009A9FD6 /* ic_vk_activity_logo@2x.png */; }; - F34670531B8B7C8E003EF74B /* ic_vk_activity_logo@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = F32ADDCA1A417C4C009A9FD6 /* ic_vk_activity_logo@2x~ipad.png */; }; - F34670541B8B7C8E003EF74B /* ic_vk_activity_logo@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F32ADDCB1A417C4C009A9FD6 /* ic_vk_activity_logo@3x.png */; }; - F34670551B8B7C8E003EF74B /* ic_vk_activity_logo~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = F32ADDCC1A417C4C009A9FD6 /* ic_vk_activity_logo~ipad.png */; }; - F34670561B8B7C8E003EF74B /* Disclosure.png in Resources */ = {isa = PBXBuildFile; fileRef = F3A1D1F01A40436A00EFEC74 /* Disclosure.png */; }; - F34670571B8B7C8E003EF74B /* Disclosure@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F3A1D1F11A40436A00EFEC74 /* Disclosure@2x.png */; }; - F34670581B8B7C8E003EF74B /* Disclosure@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F3A1D1F21A40436A00EFEC74 /* Disclosure@3x.png */; }; - F34670591B8B7C8E003EF74B /* BlueBtn_pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00AF1A3A019A00167AEB /* BlueBtn_pressed.png */; }; - F346705A1B8B7C8E003EF74B /* BlueBtn_pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B01A3A019A00167AEB /* BlueBtn_pressed@2x.png */; }; - F346705B1B8B7C8E003EF74B /* BlueBtn_pressed@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B11A3A019A00167AEB /* BlueBtn_pressed@3x.png */; }; - F346705C1B8B7C8E003EF74B /* BlueBtn.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B21A3A019A00167AEB /* BlueBtn.png */; }; - F346705D1B8B7C8E003EF74B /* BlueBtn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B31A3A019A00167AEB /* BlueBtn@2x.png */; }; - F346705E1B8B7C8E003EF74B /* BlueBtn@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B41A3A019A00167AEB /* BlueBtn@3x.png */; }; - F346705F1B8B7C8E003EF74B /* ic_deleteattach.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114C31977DC2D0085898F /* ic_deleteattach.png */; }; - F34670601B8B7C8E003EF74B /* ic_deleteattach@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114C41977DC2D0085898F /* ic_deleteattach@2x.png */; }; - F34670611B8B7C8E003EF74B /* ic_deletephoto.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114C51977DC2D0085898F /* ic_deletephoto.png */; }; - F34670621B8B7C8E003EF74B /* ic_deletephoto@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114C61977DC2D0085898F /* ic_deletephoto@2x.png */; }; - F34670631B8B7C8E003EF74B /* ic_vk_logo_nb.png in Resources */ = {isa = PBXBuildFile; fileRef = F3BACC5F186883E8003158DA /* ic_vk_logo_nb.png */; }; - F34670641B8B7C8E003EF74B /* ic_vk_logo_nb@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F3BACC60186883E8003158DA /* ic_vk_logo_nb@2x.png */; }; - F34670651B8B7C8E003EF74B /* ic_vk_logo_nb@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B51A3A019A00167AEB /* ic_vk_logo_nb@3x.png */; }; - F34670661B8B7C8E003EF74B /* img_newpostattachlink.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114CF1978060F0085898F /* img_newpostattachlink.png */; }; - F34670671B8B7C8E003EF74B /* img_newpostattachlink@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114D01978060F0085898F /* img_newpostattachlink@2x.png */; }; F34670681B8B7C8E003EF74B /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F36114A4197684870085898F /* Localizable.strings */; }; - F34670691B8B7C8E003EF74B /* vk_settings.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114AF19768FD70085898F /* vk_settings.png */; }; - F346706A1B8B7C8E003EF74B /* vk_settings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114B019768FD70085898F /* vk_settings@2x.png */; }; F34670D51B8B7CC7003EF74B /* VKImageParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACA64A77C64725DC48444F7 /* VKImageParameters.m */; }; F34670D61B8B7CCA003EF74B /* VKUploadImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACA6FA4664723004E33ADE4 /* VKUploadImage.m */; }; F34670D71B8B7CD2003EF74B /* VKUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACA6F8866BE96889BB9DA68 /* VKUtil.m */; }; @@ -223,15 +183,9 @@ F346713C1B8B7D07003EF74B /* NSString+MD5.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACA6E07E9640D2B9D9B4831 /* NSString+MD5.h */; settings = {ATTRIBUTES = (Public, ); }; }; F346713D1B8B7D07003EF74B /* VKUploadImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACA68CDC5C08713A61C5AD1 /* VKUploadImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; F346713E1B8B7D07003EF74B /* VKImageParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACA62D0E659DB7778EF2633 /* VKImageParameters.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F34DECF61D2171E3005495E5 /* SdkAssetCatalog.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F34DECF11D2171A1005495E5 /* SdkAssetCatalog.xcassets */; }; + F34DECF71D217260005495E5 /* SdkAssetCatalog.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F34DECF11D2171A1005495E5 /* SdkAssetCatalog.xcassets */; }; F36114A9197685810085898F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F36114A4197684870085898F /* Localizable.strings */; }; - F36114B319768FDD0085898F /* vk_settings.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114AF19768FD70085898F /* vk_settings.png */; }; - F36114B419768FDD0085898F /* vk_settings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114B019768FD70085898F /* vk_settings@2x.png */; }; - F36114C71977DC2D0085898F /* ic_deleteattach.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114C31977DC2D0085898F /* ic_deleteattach.png */; }; - F36114C81977DC2D0085898F /* ic_deleteattach@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114C41977DC2D0085898F /* ic_deleteattach@2x.png */; }; - F36114C91977DC2D0085898F /* ic_deletephoto.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114C51977DC2D0085898F /* ic_deletephoto.png */; }; - F36114CA1977DC2D0085898F /* ic_deletephoto@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114C61977DC2D0085898F /* ic_deletephoto@2x.png */; }; - F36114D11978060F0085898F /* img_newpostattachlink.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114CF1978060F0085898F /* img_newpostattachlink.png */; }; - F36114D21978060F0085898F /* img_newpostattachlink@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114D01978060F0085898F /* img_newpostattachlink@2x.png */; }; F3769D411BDFDC6F00AEC4AF /* VKAuthorizationResult.h in Headers */ = {isa = PBXBuildFile; fileRef = F3769D3F1BDFDC6F00AEC4AF /* VKAuthorizationResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; F3769D421BDFDC6F00AEC4AF /* VKAuthorizationResult.m in Sources */ = {isa = PBXBuildFile; fileRef = F3769D401BDFDC6F00AEC4AF /* VKAuthorizationResult.m */; }; F3769D431BDFDC6F00AEC4AF /* VKAuthorizationResult.m in Sources */ = {isa = PBXBuildFile; fileRef = F3769D401BDFDC6F00AEC4AF /* VKAuthorizationResult.m */; }; @@ -278,19 +232,6 @@ F390A00A1A9C7B25006540A6 /* VKUtil.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 1ACA671427725230741603BC /* VKUtil.h */; }; F390A00B1A9C7B25006540A6 /* VKUploadImage.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 1ACA68CDC5C08713A61C5AD1 /* VKUploadImage.h */; }; F390A00C1A9C7B25006540A6 /* VKImageParameters.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 1ACA62D0E659DB7778EF2633 /* VKImageParameters.h */; }; - F39A00B61A3A019A00167AEB /* BlueBtn_pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00AF1A3A019A00167AEB /* BlueBtn_pressed.png */; }; - F39A00B71A3A019A00167AEB /* BlueBtn_pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B01A3A019A00167AEB /* BlueBtn_pressed@2x.png */; }; - F39A00B81A3A019A00167AEB /* BlueBtn_pressed@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B11A3A019A00167AEB /* BlueBtn_pressed@3x.png */; }; - F39A00B91A3A019A00167AEB /* BlueBtn.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B21A3A019A00167AEB /* BlueBtn.png */; }; - F39A00BA1A3A019A00167AEB /* BlueBtn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B31A3A019A00167AEB /* BlueBtn@2x.png */; }; - F39A00BB1A3A019A00167AEB /* BlueBtn@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B41A3A019A00167AEB /* BlueBtn@3x.png */; }; - F39A00BC1A3A019A00167AEB /* ic_vk_logo_nb@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F39A00B51A3A019A00167AEB /* ic_vk_logo_nb@3x.png */; }; - F3A1D1F31A40436A00EFEC74 /* Disclosure.png in Resources */ = {isa = PBXBuildFile; fileRef = F3A1D1F01A40436A00EFEC74 /* Disclosure.png */; }; - F3A1D1F41A40436A00EFEC74 /* Disclosure@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F3A1D1F11A40436A00EFEC74 /* Disclosure@2x.png */; }; - F3A1D1F51A40436A00EFEC74 /* Disclosure@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F3A1D1F21A40436A00EFEC74 /* Disclosure@3x.png */; }; - F3BACC481865905B003158DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F3BACC461865905B003158DA /* InfoPlist.strings */; }; - F3BACC61186883E8003158DA /* ic_vk_logo_nb.png in Resources */ = {isa = PBXBuildFile; fileRef = F3BACC5F186883E8003158DA /* ic_vk_logo_nb.png */; }; - F3BACC62186883E8003158DA /* ic_vk_logo_nb@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F3BACC60186883E8003158DA /* ic_vk_logo_nb@2x.png */; }; F3C58CD01D213B2C005E94B5 /* VKSdkTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F3C58CCF1D213B2C005E94B5 /* VKSdkTests.m */; }; F3C58CF61D2140F4005E94B5 /* libVKSdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F3C7542D182133CC00964716 /* libVKSdk.a */; }; F3C68F151C0C7E6600E1EB5E /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3769E701BE8E41C00AEC4AF /* SafariServices.framework */; }; @@ -477,54 +418,24 @@ 8F99D6381C42C61A0006DB03 /* VKDocs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VKDocs.h; sourceTree = ""; }; 8F99D6391C42C61A0006DB03 /* VKDocs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VKDocs.m; sourceTree = ""; }; F3007C5C1AEE50B5007CCA9D /* VKApiConst.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VKApiConst.m; sourceTree = ""; }; - F3062B7F1A4185FD006B57F9 /* ic_vk_ios7_activity_logo~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_vk_ios7_activity_logo~ipad.png"; sourceTree = ""; }; - F3062B811A418A0E006B57F9 /* ic_vk_ios7_activity_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_vk_ios7_activity_logo.png; sourceTree = ""; }; - F3062B821A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_vk_ios7_activity_logo@2x.png"; sourceTree = ""; }; - F3062B831A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_vk_ios7_activity_logo@2x~ipad.png"; sourceTree = ""; }; - F3062B841A418A0E006B57F9 /* ic_vk_ios7_activity_logo@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_vk_ios7_activity_logo@3x.png"; sourceTree = ""; }; - F32ADDC81A417C4C009A9FD6 /* ic_vk_activity_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_vk_activity_logo.png; sourceTree = ""; }; - F32ADDC91A417C4C009A9FD6 /* ic_vk_activity_logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_vk_activity_logo@2x.png"; sourceTree = ""; }; - F32ADDCA1A417C4C009A9FD6 /* ic_vk_activity_logo@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_vk_activity_logo@2x~ipad.png"; sourceTree = ""; }; - F32ADDCB1A417C4C009A9FD6 /* ic_vk_activity_logo@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_vk_activity_logo@3x.png"; sourceTree = ""; }; - F32ADDCC1A417C4C009A9FD6 /* ic_vk_activity_logo~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_vk_activity_logo~ipad.png"; sourceTree = ""; }; F3454FCE1ABB1D1A00B15E85 /* VKRequestsScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VKRequestsScheduler.h; sourceTree = ""; }; F3454FCF1ABB1D1A00B15E85 /* VKRequestsScheduler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VKRequestsScheduler.m; sourceTree = ""; }; F34670171B8B50E0003EF74B /* VKSdk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VKSdk.h; sourceTree = ""; }; F34670311B8B7C5A003EF74B /* VKSdkFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = VKSdkFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F34670341B8B7C5A003EF74B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F34670351B8B7C5A003EF74B /* VKSdkFramework.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKSdkFramework.h; sourceTree = ""; }; + F34DECF11D2171A1005495E5 /* SdkAssetCatalog.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = SdkAssetCatalog.xcassets; sourceTree = ""; }; + F34DECF81D217291005495E5 /* Resources-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Resources-Info.plist"; sourceTree = ""; }; F36114A5197684870085898F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; F36114A8197684A00085898F /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; - F36114AF19768FD70085898F /* vk_settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vk_settings.png; sourceTree = ""; }; - F36114B019768FD70085898F /* vk_settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "vk_settings@2x.png"; sourceTree = ""; }; F36114BF1976CEB80085898F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - F36114C31977DC2D0085898F /* ic_deleteattach.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_deleteattach.png; sourceTree = ""; }; - F36114C41977DC2D0085898F /* ic_deleteattach@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_deleteattach@2x.png"; sourceTree = ""; }; - F36114C51977DC2D0085898F /* ic_deletephoto.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_deletephoto.png; sourceTree = ""; }; - F36114C61977DC2D0085898F /* ic_deletephoto@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_deletephoto@2x.png"; sourceTree = ""; }; - F36114CF1978060F0085898F /* img_newpostattachlink.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = img_newpostattachlink.png; sourceTree = ""; }; - F36114D01978060F0085898F /* img_newpostattachlink@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "img_newpostattachlink@2x.png"; sourceTree = ""; }; F3769D3F1BDFDC6F00AEC4AF /* VKAuthorizationResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VKAuthorizationResult.h; sourceTree = ""; }; F3769D401BDFDC6F00AEC4AF /* VKAuthorizationResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VKAuthorizationResult.m; sourceTree = ""; }; F3769E6E1BE8E41800AEC4AF /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; F3769E701BE8E41C00AEC4AF /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; }; - F39A00AF1A3A019A00167AEB /* BlueBtn_pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = BlueBtn_pressed.png; sourceTree = ""; }; - F39A00B01A3A019A00167AEB /* BlueBtn_pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BlueBtn_pressed@2x.png"; sourceTree = ""; }; - F39A00B11A3A019A00167AEB /* BlueBtn_pressed@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BlueBtn_pressed@3x.png"; sourceTree = ""; }; - F39A00B21A3A019A00167AEB /* BlueBtn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = BlueBtn.png; sourceTree = ""; }; - F39A00B31A3A019A00167AEB /* BlueBtn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BlueBtn@2x.png"; sourceTree = ""; }; - F39A00B41A3A019A00167AEB /* BlueBtn@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BlueBtn@3x.png"; sourceTree = ""; }; - F39A00B51A3A019A00167AEB /* ic_vk_logo_nb@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_vk_logo_nb@3x.png"; sourceTree = ""; }; - F3A1D1F01A40436A00EFEC74 /* Disclosure.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Disclosure.png; sourceTree = ""; }; - F3A1D1F11A40436A00EFEC74 /* Disclosure@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Disclosure@2x.png"; sourceTree = ""; }; - F3A1D1F21A40436A00EFEC74 /* Disclosure@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Disclosure@3x.png"; sourceTree = ""; }; F3BACC401865905B003158DA /* VKSdkResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VKSdkResources.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - F3BACC451865905B003158DA /* Resources-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Resources-Info.plist"; sourceTree = ""; }; - F3BACC471865905B003158DA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; F3BACC5618659493003158DA /* VKBundle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VKBundle.h; sourceTree = ""; }; F3BACC5718659493003158DA /* VKBundle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VKBundle.m; sourceTree = ""; }; - F3BACC5F186883E8003158DA /* ic_vk_logo_nb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_vk_logo_nb.png; sourceTree = ""; }; - F3BACC60186883E8003158DA /* ic_vk_logo_nb@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_vk_logo_nb@2x.png"; sourceTree = ""; }; F3C58CCD1D213B2C005E94B5 /* VKSdkTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VKSdkTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; F3C58CCF1D213B2C005E94B5 /* VKSdkTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VKSdkTests.m; sourceTree = ""; }; F3C58CD11D213B2C005E94B5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -767,52 +678,14 @@ F3BACC431865905B003158DA /* Resources */ = { isa = PBXGroup; children = ( - F3062B811A418A0E006B57F9 /* ic_vk_ios7_activity_logo.png */, - F3062B821A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x.png */, - F3062B831A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x~ipad.png */, - F3062B841A418A0E006B57F9 /* ic_vk_ios7_activity_logo@3x.png */, - F3062B7F1A4185FD006B57F9 /* ic_vk_ios7_activity_logo~ipad.png */, - F32ADDC81A417C4C009A9FD6 /* ic_vk_activity_logo.png */, - F32ADDC91A417C4C009A9FD6 /* ic_vk_activity_logo@2x.png */, - F32ADDCA1A417C4C009A9FD6 /* ic_vk_activity_logo@2x~ipad.png */, - F32ADDCB1A417C4C009A9FD6 /* ic_vk_activity_logo@3x.png */, - F32ADDCC1A417C4C009A9FD6 /* ic_vk_activity_logo~ipad.png */, - F3A1D1F01A40436A00EFEC74 /* Disclosure.png */, - F3A1D1F11A40436A00EFEC74 /* Disclosure@2x.png */, - F3A1D1F21A40436A00EFEC74 /* Disclosure@3x.png */, - F39A00AF1A3A019A00167AEB /* BlueBtn_pressed.png */, - F39A00B01A3A019A00167AEB /* BlueBtn_pressed@2x.png */, - F39A00B11A3A019A00167AEB /* BlueBtn_pressed@3x.png */, - F39A00B21A3A019A00167AEB /* BlueBtn.png */, - F39A00B31A3A019A00167AEB /* BlueBtn@2x.png */, - F39A00B41A3A019A00167AEB /* BlueBtn@3x.png */, - F36114C31977DC2D0085898F /* ic_deleteattach.png */, - F36114C41977DC2D0085898F /* ic_deleteattach@2x.png */, - F36114C51977DC2D0085898F /* ic_deletephoto.png */, - F36114C61977DC2D0085898F /* ic_deletephoto@2x.png */, - F3BACC5F186883E8003158DA /* ic_vk_logo_nb.png */, - F3BACC60186883E8003158DA /* ic_vk_logo_nb@2x.png */, - F39A00B51A3A019A00167AEB /* ic_vk_logo_nb@3x.png */, - F36114CF1978060F0085898F /* img_newpostattachlink.png */, - F36114D01978060F0085898F /* img_newpostattachlink@2x.png */, + F34DECF81D217291005495E5 /* Resources-Info.plist */, + F34DECF11D2171A1005495E5 /* SdkAssetCatalog.xcassets */, F36114A4197684870085898F /* Localizable.strings */, - F3BACC441865905B003158DA /* Supporting Files */, - F36114AF19768FD70085898F /* vk_settings.png */, - F36114B019768FD70085898F /* vk_settings@2x.png */, ); name = Resources; path = library/Resources; sourceTree = ""; }; - F3BACC441865905B003158DA /* Supporting Files */ = { - isa = PBXGroup; - children = ( - F3BACC451865905B003158DA /* Resources-Info.plist */, - F3BACC461865905B003158DA /* InfoPlist.strings */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; F3C58CCE1D213B2C005E94B5 /* VKSdkTests */ = { isa = PBXGroup; children = ( @@ -1083,37 +956,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - F346704C1B8B7C8E003EF74B /* ic_vk_ios7_activity_logo.png in Resources */, - F346704D1B8B7C8E003EF74B /* ic_vk_ios7_activity_logo@2x.png in Resources */, - F346704E1B8B7C8E003EF74B /* ic_vk_ios7_activity_logo@2x~ipad.png in Resources */, - F346704F1B8B7C8E003EF74B /* ic_vk_ios7_activity_logo@3x.png in Resources */, - F34670501B8B7C8E003EF74B /* ic_vk_ios7_activity_logo~ipad.png in Resources */, - F34670511B8B7C8E003EF74B /* ic_vk_activity_logo.png in Resources */, - F34670521B8B7C8E003EF74B /* ic_vk_activity_logo@2x.png in Resources */, - F34670531B8B7C8E003EF74B /* ic_vk_activity_logo@2x~ipad.png in Resources */, - F34670541B8B7C8E003EF74B /* ic_vk_activity_logo@3x.png in Resources */, - F34670551B8B7C8E003EF74B /* ic_vk_activity_logo~ipad.png in Resources */, - F34670561B8B7C8E003EF74B /* Disclosure.png in Resources */, - F34670571B8B7C8E003EF74B /* Disclosure@2x.png in Resources */, - F34670581B8B7C8E003EF74B /* Disclosure@3x.png in Resources */, - F34670591B8B7C8E003EF74B /* BlueBtn_pressed.png in Resources */, - F346705A1B8B7C8E003EF74B /* BlueBtn_pressed@2x.png in Resources */, - F346705B1B8B7C8E003EF74B /* BlueBtn_pressed@3x.png in Resources */, - F346705C1B8B7C8E003EF74B /* BlueBtn.png in Resources */, - F346705D1B8B7C8E003EF74B /* BlueBtn@2x.png in Resources */, - F346705E1B8B7C8E003EF74B /* BlueBtn@3x.png in Resources */, - F346705F1B8B7C8E003EF74B /* ic_deleteattach.png in Resources */, - F34670601B8B7C8E003EF74B /* ic_deleteattach@2x.png in Resources */, - F34670611B8B7C8E003EF74B /* ic_deletephoto.png in Resources */, - F34670621B8B7C8E003EF74B /* ic_deletephoto@2x.png in Resources */, - F34670631B8B7C8E003EF74B /* ic_vk_logo_nb.png in Resources */, - F34670641B8B7C8E003EF74B /* ic_vk_logo_nb@2x.png in Resources */, - F34670651B8B7C8E003EF74B /* ic_vk_logo_nb@3x.png in Resources */, - F34670661B8B7C8E003EF74B /* img_newpostattachlink.png in Resources */, - F34670671B8B7C8E003EF74B /* img_newpostattachlink@2x.png in Resources */, F34670681B8B7C8E003EF74B /* Localizable.strings in Resources */, - F34670691B8B7C8E003EF74B /* vk_settings.png in Resources */, - F346706A1B8B7C8E003EF74B /* vk_settings@2x.png in Resources */, + F34DECF61D2171E3005495E5 /* SdkAssetCatalog.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1121,38 +965,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - F36114D21978060F0085898F /* img_newpostattachlink@2x.png in Resources */, - F39A00BB1A3A019A00167AEB /* BlueBtn@3x.png in Resources */, - F36114B319768FDD0085898F /* vk_settings.png in Resources */, - F36114CA1977DC2D0085898F /* ic_deletephoto@2x.png in Resources */, - F3062B851A418A0E006B57F9 /* ic_vk_ios7_activity_logo.png in Resources */, - F3A1D1F51A40436A00EFEC74 /* Disclosure@3x.png in Resources */, - F3062B881A418A0E006B57F9 /* ic_vk_ios7_activity_logo@3x.png in Resources */, - F3A1D1F41A40436A00EFEC74 /* Disclosure@2x.png in Resources */, - F39A00BA1A3A019A00167AEB /* BlueBtn@2x.png in Resources */, - F3062B801A4185FF006B57F9 /* ic_vk_ios7_activity_logo~ipad.png in Resources */, - F3062B861A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x.png in Resources */, - F32ADDCE1A417CE9009A9FD6 /* ic_vk_activity_logo@2x.png in Resources */, - F39A00BC1A3A019A00167AEB /* ic_vk_logo_nb@3x.png in Resources */, - F36114B419768FDD0085898F /* vk_settings@2x.png in Resources */, - F32ADDD01A417CE9009A9FD6 /* ic_vk_activity_logo@3x.png in Resources */, - F3A1D1F31A40436A00EFEC74 /* Disclosure.png in Resources */, + F34DECF71D217260005495E5 /* SdkAssetCatalog.xcassets in Resources */, F36114A9197685810085898F /* Localizable.strings in Resources */, - F39A00B61A3A019A00167AEB /* BlueBtn_pressed.png in Resources */, - F3BACC62186883E8003158DA /* ic_vk_logo_nb@2x.png in Resources */, - F32ADDCF1A417CE9009A9FD6 /* ic_vk_activity_logo@2x~ipad.png in Resources */, - F3BACC481865905B003158DA /* InfoPlist.strings in Resources */, - F36114C71977DC2D0085898F /* ic_deleteattach.png in Resources */, - F36114D11978060F0085898F /* img_newpostattachlink.png in Resources */, - F39A00B91A3A019A00167AEB /* BlueBtn.png in Resources */, - F32ADDCD1A417CE9009A9FD6 /* ic_vk_activity_logo.png in Resources */, - F3BACC61186883E8003158DA /* ic_vk_logo_nb.png in Resources */, - F39A00B71A3A019A00167AEB /* BlueBtn_pressed@2x.png in Resources */, - F36114C91977DC2D0085898F /* ic_deletephoto.png in Resources */, - F39A00B81A3A019A00167AEB /* BlueBtn_pressed@3x.png in Resources */, - F36114C81977DC2D0085898F /* ic_deleteattach@2x.png in Resources */, - F32ADDD11A417CE9009A9FD6 /* ic_vk_activity_logo~ipad.png in Resources */, - F3062B871A418A0E006B57F9 /* ic_vk_ios7_activity_logo@2x~ipad.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1347,14 +1161,6 @@ name = Localizable.strings; sourceTree = ""; }; - F3BACC461865905B003158DA /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - F3BACC471865905B003158DA /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ diff --git a/VK-ios-sdk.xcworkspace/contents.xcworkspacedata b/VK-ios-sdk.xcworkspace/contents.xcworkspacedata index d3ba2c0..2c60465 100755 --- a/VK-ios-sdk.xcworkspace/contents.xcworkspacedata +++ b/VK-ios-sdk.xcworkspace/contents.xcworkspacedata @@ -1,9 +1,6 @@ - - diff --git a/example/VKSDKTestApplication.xcodeproj/project.pbxproj b/example/VKSDKTestApplication.xcodeproj/project.pbxproj index abbc7c1..662ca33 100755 --- a/example/VKSDKTestApplication.xcodeproj/project.pbxproj +++ b/example/VKSDKTestApplication.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - F34670291B8B7A9A003EF74B /* libVKSdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F34670281B8B7A9A003EF74B /* libVKSdk.a */; }; - F346702B1B8B7ADA003EF74B /* VKSdkResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = F346702A1B8B7ADA003EF74B /* VKSdkResources.bundle */; }; + F34DED0C1D2173D6005495E5 /* VKSdkFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F34DED091D2173C9005495E5 /* VKSdkFramework.framework */; }; + F34DED0D1D2173D6005495E5 /* VKSdkFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F34DED091D2173C9005495E5 /* VKSdkFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; F36114C21976DC770085898F /* apple.png in Resources */ = {isa = PBXBuildFile; fileRef = F36114C11976DC770085898F /* apple.png */; }; F3769E671BE8D48800AEC4AF /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3769E661BE8D48800AEC4AF /* SafariServices.framework */; }; F3B7EEAB184353CF00104B90 /* ApiCallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3B7EEAA184353CF00104B90 /* ApiCallViewController.m */; }; @@ -26,9 +26,60 @@ F3EEFFD01827F9B5000BB525 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3EEFFCF1827F9B5000BB525 /* SystemConfiguration.framework */; settings = {ATTRIBUTES = (Required, ); }; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + F34DED041D2173C9005495E5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F34DECFD1D2173C9005495E5 /* VK-ios-sdk.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F3C7542D182133CC00964716; + remoteInfo = VKSdk; + }; + F34DED061D2173C9005495E5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F34DECFD1D2173C9005495E5 /* VK-ios-sdk.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F3BACC401865905B003158DA; + remoteInfo = VKSdkResources; + }; + F34DED081D2173C9005495E5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F34DECFD1D2173C9005495E5 /* VK-ios-sdk.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F34670311B8B7C5A003EF74B; + remoteInfo = VKSdkFramework; + }; + F34DED0A1D2173C9005495E5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F34DECFD1D2173C9005495E5 /* VK-ios-sdk.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F3C58CCD1D213B2C005E94B5; + remoteInfo = VKSdkTests; + }; + F34DED0E1D2173D6005495E5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F34DECFD1D2173C9005495E5 /* VK-ios-sdk.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = F34670301B8B7C5A003EF74B; + remoteInfo = VKSdkFramework; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + F34DED101D2173D6005495E5 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + F34DED0D1D2173D6005495E5 /* VKSdkFramework.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - F34670281B8B7A9A003EF74B /* libVKSdk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libVKSdk.a; path = "../../../../Library/Developer/Xcode/DerivedData/vk-ios-sdk-eremnbwjlxlirebgffkshiqkekmt/Build/Products/Debug-iphoneos/libVKSdk.a"; sourceTree = ""; }; - F346702A1B8B7ADA003EF74B /* VKSdkResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = VKSdkResources.bundle; path = ../VKSdkResources.bundle; sourceTree = ""; }; + F34DECFD1D2173C9005495E5 /* VK-ios-sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "VK-ios-sdk.xcodeproj"; path = "../VK-ios-sdk.xcodeproj"; sourceTree = ""; }; F36114AA197687050085898F /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = ""; }; F36114C11976DC770085898F /* apple.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = apple.png; sourceTree = ""; }; F3769E661BE8D48800AEC4AF /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; }; @@ -49,7 +100,6 @@ F3EEFF781827B1DD000BB525 /* VKAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKAppDelegate.h; sourceTree = ""; }; F3EEFF791827B1DD000BB525 /* VKAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VKAppDelegate.m; sourceTree = ""; }; F3EEFF7B1827B1DD000BB525 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - F3EEFF821827B1DD000BB525 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; F3EEFFBD1827E990000BB525 /* TestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestViewController.h; sourceTree = ""; }; F3EEFFBE1827E990000BB525 /* TestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestViewController.m; sourceTree = ""; }; F3EEFFCD1827F9AF000BB525 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; @@ -62,25 +112,36 @@ buildActionMask = 2147483647; files = ( F3769E671BE8D48800AEC4AF /* SafariServices.framework in Frameworks */, - F34670291B8B7A9A003EF74B /* libVKSdk.a in Frameworks */, F3EEFFD01827F9B5000BB525 /* SystemConfiguration.framework in Frameworks */, F3EEFFCE1827F9AF000BB525 /* MobileCoreServices.framework in Frameworks */, F3EEFF6C1827B1DD000BB525 /* CoreGraphics.framework in Frameworks */, F3EEFF6E1827B1DD000BB525 /* UIKit.framework in Frameworks */, F3EEFF6A1827B1DD000BB525 /* Foundation.framework in Frameworks */, + F34DED0C1D2173D6005495E5 /* VKSdkFramework.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + F34DECFE1D2173C9005495E5 /* Products */ = { + isa = PBXGroup; + children = ( + F34DED051D2173C9005495E5 /* libVKSdk.a */, + F34DED071D2173C9005495E5 /* VKSdkResources.bundle */, + F34DED091D2173C9005495E5 /* VKSdkFramework.framework */, + F34DED0B1D2173C9005495E5 /* VKSdkTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; F3EEFF5D1827B1DD000BB525 = { isa = PBXGroup; children = ( - F346702A1B8B7ADA003EF74B /* VKSdkResources.bundle */, F3EEFF6F1827B1DD000BB525 /* VKSDKTestApplication */, F3EEFF681827B1DD000BB525 /* Frameworks */, F3EEFF671827B1DD000BB525 /* Products */, + F34DECFD1D2173C9005495E5 /* VK-ios-sdk.xcodeproj */, ); sourceTree = ""; }; @@ -96,13 +157,11 @@ isa = PBXGroup; children = ( F3769E661BE8D48800AEC4AF /* SafariServices.framework */, - F34670281B8B7A9A003EF74B /* libVKSdk.a */, F3EEFFCF1827F9B5000BB525 /* SystemConfiguration.framework */, F3EEFFCD1827F9AF000BB525 /* MobileCoreServices.framework */, F3EEFF691827B1DD000BB525 /* Foundation.framework */, F3EEFF6B1827B1DD000BB525 /* CoreGraphics.framework */, F3EEFF6D1827B1DD000BB525 /* UIKit.framework */, - F3EEFF821827B1DD000BB525 /* XCTest.framework */, F3BACC301865902D003158DA /* CoreFoundation.framework */, ); name = Frameworks; @@ -148,10 +207,12 @@ F3EEFF621827B1DD000BB525 /* Sources */, F3EEFF631827B1DD000BB525 /* Frameworks */, F3EEFF641827B1DD000BB525 /* Resources */, + F34DED101D2173D6005495E5 /* Embed Frameworks */, ); buildRules = ( ); dependencies = ( + F34DED0F1D2173D6005495E5 /* PBXTargetDependency */, ); name = VKSDKTestApplication; productName = VKSDKTestApplication; @@ -184,6 +245,12 @@ mainGroup = F3EEFF5D1827B1DD000BB525; productRefGroup = F3EEFF671827B1DD000BB525 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = F34DECFE1D2173C9005495E5 /* Products */; + ProjectRef = F34DECFD1D2173C9005495E5 /* VK-ios-sdk.xcodeproj */; + }, + ); projectRoot = ""; targets = ( F3EEFF651827B1DD000BB525 /* VKSDKTestApplication */, @@ -191,12 +258,42 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + F34DED051D2173C9005495E5 /* libVKSdk.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libVKSdk.a; + remoteRef = F34DED041D2173C9005495E5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + F34DED071D2173C9005495E5 /* VKSdkResources.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = VKSdkResources.bundle; + remoteRef = F34DED061D2173C9005495E5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + F34DED091D2173C9005495E5 /* VKSdkFramework.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = VKSdkFramework.framework; + remoteRef = F34DED081D2173C9005495E5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + F34DED0B1D2173C9005495E5 /* VKSdkTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = VKSdkTests.xctest; + remoteRef = F34DED0A1D2173C9005495E5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ F3EEFF641827B1DD000BB525 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - F346702B1B8B7ADA003EF74B /* VKSdkResources.bundle in Resources */, F3DC2446183B811E00E3A93D /* Storyboard.storyboard in Resources */, F3EEFF741827B1DD000BB525 /* InfoPlist.strings in Resources */, F3EEFF7C1827B1DD000BB525 /* Images.xcassets in Resources */, @@ -221,6 +318,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + F34DED0F1D2173D6005495E5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = VKSdkFramework; + targetProxy = F34DED0E1D2173D6005495E5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ F3EEFF721827B1DD000BB525 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -323,7 +428,8 @@ "VKDEBUG=1", ); INFOPLIST_FILE = "VKSDKTestApplication/VKSDKTestApplication-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-all_load"; PRODUCT_BUNDLE_IDENTIFIER = "com.vk.$(PRODUCT_NAME:rfc1034identifier)"; @@ -349,7 +455,8 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "VKSDKTestApplication/VKSDKTestApplication-Prefix.pch"; INFOPLIST_FILE = "VKSDKTestApplication/VKSDKTestApplication-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-all_load"; PRODUCT_BUNDLE_IDENTIFIER = "com.vk.$(PRODUCT_NAME:rfc1034identifier)"; diff --git a/example/VKSDKTestApplication/VKSDKTestApplication-Prefix.pch b/example/VKSDKTestApplication/VKSDKTestApplication-Prefix.pch index a774286..68dd8d3 100755 --- a/example/VKSDKTestApplication/VKSDKTestApplication-Prefix.pch +++ b/example/VKSDKTestApplication/VKSDKTestApplication-Prefix.pch @@ -13,5 +13,7 @@ #ifdef __OBJC__ #import #import - #import + @import VKSdkFramework; +// OR +// #import #endif diff --git a/library/Resources/BlueBtn.png b/library/Resources/SdkAssetCatalog.xcassets/BlueBtn.imageset/BlueBtn.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/BlueBtn.png rename to library/Resources/SdkAssetCatalog.xcassets/BlueBtn.imageset/BlueBtn.png diff --git a/library/Resources/BlueBtn@2x.png b/library/Resources/SdkAssetCatalog.xcassets/BlueBtn.imageset/BlueBtn@2x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/BlueBtn@2x.png rename to library/Resources/SdkAssetCatalog.xcassets/BlueBtn.imageset/BlueBtn@2x.png diff --git a/library/Resources/BlueBtn@3x.png b/library/Resources/SdkAssetCatalog.xcassets/BlueBtn.imageset/BlueBtn@3x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/BlueBtn@3x.png rename to library/Resources/SdkAssetCatalog.xcassets/BlueBtn.imageset/BlueBtn@3x.png diff --git a/library/Resources/SdkAssetCatalog.xcassets/BlueBtn.imageset/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/BlueBtn.imageset/Contents.json new file mode 100644 index 0000000..5df4e05 --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/BlueBtn.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "BlueBtn.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "BlueBtn@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "BlueBtn@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/BlueBtn_pressed.png b/library/Resources/SdkAssetCatalog.xcassets/BlueBtn_pressed.imageset/BlueBtn_pressed.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/BlueBtn_pressed.png rename to library/Resources/SdkAssetCatalog.xcassets/BlueBtn_pressed.imageset/BlueBtn_pressed.png diff --git a/library/Resources/BlueBtn_pressed@2x.png b/library/Resources/SdkAssetCatalog.xcassets/BlueBtn_pressed.imageset/BlueBtn_pressed@2x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/BlueBtn_pressed@2x.png rename to library/Resources/SdkAssetCatalog.xcassets/BlueBtn_pressed.imageset/BlueBtn_pressed@2x.png diff --git a/library/Resources/BlueBtn_pressed@3x.png b/library/Resources/SdkAssetCatalog.xcassets/BlueBtn_pressed.imageset/BlueBtn_pressed@3x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/BlueBtn_pressed@3x.png rename to library/Resources/SdkAssetCatalog.xcassets/BlueBtn_pressed.imageset/BlueBtn_pressed@3x.png diff --git a/library/Resources/SdkAssetCatalog.xcassets/BlueBtn_pressed.imageset/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/BlueBtn_pressed.imageset/Contents.json new file mode 100644 index 0000000..b26d3a4 --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/BlueBtn_pressed.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "BlueBtn_pressed.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "BlueBtn_pressed@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "BlueBtn_pressed@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/SdkAssetCatalog.xcassets/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/SdkAssetCatalog.xcassets/Disclosure.imageset/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/Disclosure.imageset/Contents.json new file mode 100644 index 0000000..0a8ed0f --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/Disclosure.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Disclosure.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Disclosure@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Disclosure@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/Disclosure.png b/library/Resources/SdkAssetCatalog.xcassets/Disclosure.imageset/Disclosure.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/Disclosure.png rename to library/Resources/SdkAssetCatalog.xcassets/Disclosure.imageset/Disclosure.png diff --git a/library/Resources/Disclosure@2x.png b/library/Resources/SdkAssetCatalog.xcassets/Disclosure.imageset/Disclosure@2x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/Disclosure@2x.png rename to library/Resources/SdkAssetCatalog.xcassets/Disclosure.imageset/Disclosure@2x.png diff --git a/library/Resources/Disclosure@3x.png b/library/Resources/SdkAssetCatalog.xcassets/Disclosure.imageset/Disclosure@3x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/Disclosure@3x.png rename to library/Resources/SdkAssetCatalog.xcassets/Disclosure.imageset/Disclosure@3x.png diff --git a/library/Resources/SdkAssetCatalog.xcassets/ic_deleteattach.imageset/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/ic_deleteattach.imageset/Contents.json new file mode 100644 index 0000000..c99dbd0 --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/ic_deleteattach.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_deleteattach.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_deleteattach@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/ic_deleteattach.png b/library/Resources/SdkAssetCatalog.xcassets/ic_deleteattach.imageset/ic_deleteattach.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_deleteattach.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_deleteattach.imageset/ic_deleteattach.png diff --git a/library/Resources/ic_deleteattach@2x.png b/library/Resources/SdkAssetCatalog.xcassets/ic_deleteattach.imageset/ic_deleteattach@2x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_deleteattach@2x.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_deleteattach.imageset/ic_deleteattach@2x.png diff --git a/library/Resources/SdkAssetCatalog.xcassets/ic_deletephoto.imageset/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/ic_deletephoto.imageset/Contents.json new file mode 100644 index 0000000..afbd273 --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/ic_deletephoto.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_deletephoto.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_deletephoto@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/ic_deletephoto.png b/library/Resources/SdkAssetCatalog.xcassets/ic_deletephoto.imageset/ic_deletephoto.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_deletephoto.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_deletephoto.imageset/ic_deletephoto.png diff --git a/library/Resources/ic_deletephoto@2x.png b/library/Resources/SdkAssetCatalog.xcassets/ic_deletephoto.imageset/ic_deletephoto@2x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_deletephoto@2x.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_deletephoto.imageset/ic_deletephoto@2x.png diff --git a/library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/Contents.json new file mode 100644 index 0000000..16aee4e --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/Contents.json @@ -0,0 +1,33 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "filename" : "ic_vk_activity_logo.png", + "scale" : "1x" + }, + { + "idiom" : "iphone", + "filename" : "ic_vk_activity_logo@2x.png", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "filename" : "ic_vk_activity_logo@3x.png", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "filename" : "ic_vk_activity_logo~ipad.png", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "filename" : "ic_vk_activity_logo@2x~ipad.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/ic_vk_activity_logo.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/ic_vk_activity_logo.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_activity_logo.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/ic_vk_activity_logo.png diff --git a/library/Resources/ic_vk_activity_logo@2x.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/ic_vk_activity_logo@2x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_activity_logo@2x.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/ic_vk_activity_logo@2x.png diff --git a/library/Resources/ic_vk_activity_logo@2x~ipad.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/ic_vk_activity_logo@2x~ipad.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_activity_logo@2x~ipad.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/ic_vk_activity_logo@2x~ipad.png diff --git a/library/Resources/ic_vk_activity_logo@3x.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/ic_vk_activity_logo@3x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_activity_logo@3x.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/ic_vk_activity_logo@3x.png diff --git a/library/Resources/ic_vk_activity_logo~ipad.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/ic_vk_activity_logo~ipad.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_activity_logo~ipad.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_activity_logo.imageset/ic_vk_activity_logo~ipad.png diff --git a/library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/Contents.json new file mode 100644 index 0000000..7ebc2ea --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/Contents.json @@ -0,0 +1,33 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "filename" : "ic_vk_ios7_activity_logo.png", + "scale" : "1x" + }, + { + "idiom" : "iphone", + "filename" : "ic_vk_ios7_activity_logo@2x.png", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "filename" : "ic_vk_ios7_activity_logo@3x.png", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "filename" : "ic_vk_ios7_activity_logo~ipad.png", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "filename" : "ic_vk_ios7_activity_logo@2x~ipad.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/ic_vk_ios7_activity_logo.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/ic_vk_ios7_activity_logo.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_ios7_activity_logo.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/ic_vk_ios7_activity_logo.png diff --git a/library/Resources/ic_vk_ios7_activity_logo@2x.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/ic_vk_ios7_activity_logo@2x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_ios7_activity_logo@2x.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/ic_vk_ios7_activity_logo@2x.png diff --git a/library/Resources/ic_vk_ios7_activity_logo@2x~ipad.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/ic_vk_ios7_activity_logo@2x~ipad.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_ios7_activity_logo@2x~ipad.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/ic_vk_ios7_activity_logo@2x~ipad.png diff --git a/library/Resources/ic_vk_ios7_activity_logo@3x.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/ic_vk_ios7_activity_logo@3x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_ios7_activity_logo@3x.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/ic_vk_ios7_activity_logo@3x.png diff --git a/library/Resources/ic_vk_ios7_activity_logo~ipad.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/ic_vk_ios7_activity_logo~ipad.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_ios7_activity_logo~ipad.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_ios7_activity_logo.imageset/ic_vk_ios7_activity_logo~ipad.png diff --git a/library/Resources/SdkAssetCatalog.xcassets/ic_vk_logo_nb.imageset/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_logo_nb.imageset/Contents.json new file mode 100644 index 0000000..8fbb34f --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_logo_nb.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_vk_logo_nb.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_vk_logo_nb@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_vk_logo_nb@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/ic_vk_logo_nb.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_logo_nb.imageset/ic_vk_logo_nb.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_logo_nb.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_logo_nb.imageset/ic_vk_logo_nb.png diff --git a/library/Resources/ic_vk_logo_nb@2x.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_logo_nb.imageset/ic_vk_logo_nb@2x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_logo_nb@2x.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_logo_nb.imageset/ic_vk_logo_nb@2x.png diff --git a/library/Resources/ic_vk_logo_nb@3x.png b/library/Resources/SdkAssetCatalog.xcassets/ic_vk_logo_nb.imageset/ic_vk_logo_nb@3x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/ic_vk_logo_nb@3x.png rename to library/Resources/SdkAssetCatalog.xcassets/ic_vk_logo_nb.imageset/ic_vk_logo_nb@3x.png diff --git a/library/Resources/SdkAssetCatalog.xcassets/img_newpostattachlink.imageset/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/img_newpostattachlink.imageset/Contents.json new file mode 100644 index 0000000..9a5b964 --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/img_newpostattachlink.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "img_newpostattachlink.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "img_newpostattachlink@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/img_newpostattachlink.png b/library/Resources/SdkAssetCatalog.xcassets/img_newpostattachlink.imageset/img_newpostattachlink.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/img_newpostattachlink.png rename to library/Resources/SdkAssetCatalog.xcassets/img_newpostattachlink.imageset/img_newpostattachlink.png diff --git a/library/Resources/img_newpostattachlink@2x.png b/library/Resources/SdkAssetCatalog.xcassets/img_newpostattachlink.imageset/img_newpostattachlink@2x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/img_newpostattachlink@2x.png rename to library/Resources/SdkAssetCatalog.xcassets/img_newpostattachlink.imageset/img_newpostattachlink@2x.png diff --git a/library/Resources/SdkAssetCatalog.xcassets/vk_settings.imageset/Contents.json b/library/Resources/SdkAssetCatalog.xcassets/vk_settings.imageset/Contents.json new file mode 100644 index 0000000..f452087 --- /dev/null +++ b/library/Resources/SdkAssetCatalog.xcassets/vk_settings.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "vk_settings.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "vk_settings@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/library/Resources/vk_settings.png b/library/Resources/SdkAssetCatalog.xcassets/vk_settings.imageset/vk_settings.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/vk_settings.png rename to library/Resources/SdkAssetCatalog.xcassets/vk_settings.imageset/vk_settings.png diff --git a/library/Resources/vk_settings@2x.png b/library/Resources/SdkAssetCatalog.xcassets/vk_settings.imageset/vk_settings@2x.png old mode 100755 new mode 100644 similarity index 100% rename from library/Resources/vk_settings@2x.png rename to library/Resources/SdkAssetCatalog.xcassets/vk_settings.imageset/vk_settings@2x.png diff --git a/library/Resources/en.lproj/InfoPlist.strings b/library/Resources/en.lproj/InfoPlist.strings deleted file mode 100755 index 477b28f..0000000 --- a/library/Resources/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/library/Source/VKBundle.m b/library/Source/VKBundle.m index ec9d09a..533115a 100755 --- a/library/Source/VKBundle.m +++ b/library/Source/VKBundle.m @@ -33,8 +33,11 @@ if (!url) { url = [[NSBundle bundleForClass:[self class]] URLForResource:fileName withExtension:ext]; } + if (url) { myLibraryResourcesBundle = [NSBundle bundleWithURL:url]; + } else { + myLibraryResourcesBundle = [NSBundle bundleForClass:self]; } }); return myLibraryResourcesBundle; diff --git a/library/Source/VKSdk.m b/library/Source/VKSdk.m index 282d3ca..bb2c66b 100644 --- a/library/Source/VKSdk.m +++ b/library/Source/VKSdk.m @@ -223,7 +223,7 @@ static NSString *VK_ACCESS_TOKEN_DEFAULTS_KEY = @"VK_ACCESS_TOKEN_DEFAULTS_KEY_D void (^hideViews)() = ^{ if (instance.presentedSafariViewController) { - SFSafariViewController *safariVC = instance.presentedSafariViewController; + UIViewController *safariVC = instance.presentedSafariViewController; [safariVC vks_viewControllerWillDismiss]; [safariVC.presentingViewController dismissViewControllerAnimated:YES completion:^{ [safariVC vks_viewControllerDidDismiss]; diff --git a/library/Source/VKSdkVersion.h b/library/Source/VKSdkVersion.h index 8232181..c1cf10a 100755 --- a/library/Source/VKSdkVersion.h +++ b/library/Source/VKSdkVersion.h @@ -20,5 +20,5 @@ // 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 VK_SDK_VERSION @"1.3.17" +#define VK_SDK_VERSION @"1.4" #define VK_SDK_API_VERSION @"5.40" diff --git a/library/Source/Views/VKShareDialogController.m b/library/Source/Views/VKShareDialogController.m index 89144a7..482fcbf 100755 --- a/library/Source/Views/VKShareDialogController.m +++ b/library/Source/Views/VKShareDialogController.m @@ -856,11 +856,7 @@ static const CGFloat kAttachmentsViewSize = 100.0f; [super viewDidLoad]; UIImage *image = [VKBundle vkLibraryImageNamed:@"ic_vk_logo_nb"]; self.navigationItem.titleView = [[UIImageView alloc] initWithImage:image]; -#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_8_0 - self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:VKLocalizedString(@"Cancel") style:UIBarButtonItemStylePlain target:self action:@selector(close:)]; -#else - self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:VKLocalizedString(@"Cancel") style:UIBarButtonItemStyleBordered target:self action:@selector(close:)]; -#endif + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(close:)]; [[VKSdk instance] registerDelegate:self]; }