diff --git a/BranchMonsterFactory.xcodeproj/project.pbxproj b/BranchMonsterFactory.xcodeproj/project.pbxproj index f538dfd..49874ef 100644 --- a/BranchMonsterFactory.xcodeproj/project.pbxproj +++ b/BranchMonsterFactory.xcodeproj/project.pbxproj @@ -72,11 +72,14 @@ 67FD95071A4D250C00D6BFA8 /* MonsterViewerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 67FD94C01A4D250C00D6BFA8 /* MonsterViewerViewController.m */; }; 67FD95081A4D250C00D6BFA8 /* SplashViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 67FD94C21A4D250C00D6BFA8 /* SplashViewController.m */; }; 67FD950A1A4D25D100D6BFA8 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67FD95091A4D25D100D6BFA8 /* CoreTelephony.framework */; }; + CA4BDFEB66D490362206A106 /* libPods-BranchMonsterFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E185BB371AF087FA3DBDDCC /* libPods-BranchMonsterFactory.a */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 15B4B8121B0AB016002AA93E /* BranchInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchInfoViewController.h; sourceTree = ""; }; 15B4B8131B0AB016002AA93E /* BranchInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchInfoViewController.m; sourceTree = ""; }; + 2E185BB371AF087FA3DBDDCC /* libPods-BranchMonsterFactory.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BranchMonsterFactory.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 362EE7B4CBB78C5FFC9B9ECB /* Pods-BranchMonsterFactory.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BranchMonsterFactory.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BranchMonsterFactory/Pods-BranchMonsterFactory.debug.xcconfig"; sourceTree = ""; }; 374174E81C3C870A0069BA54 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = ""; }; 377C3CE61C121DCC005DF795 /* BranchUniversalObject+MonsterHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "BranchUniversalObject+MonsterHelpers.h"; sourceTree = ""; }; 377C3CE71C121DCC005DF795 /* BranchUniversalObject+MonsterHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "BranchUniversalObject+MonsterHelpers.m"; sourceTree = ""; }; @@ -152,6 +155,7 @@ 67FD94C11A4D250C00D6BFA8 /* SplashViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SplashViewController.h; sourceTree = ""; }; 67FD94C21A4D250C00D6BFA8 /* SplashViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SplashViewController.m; sourceTree = ""; }; 67FD95091A4D25D100D6BFA8 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; + BD9AE1348178301ADB0A5AF7 /* Pods-BranchMonsterFactory.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BranchMonsterFactory.release.xcconfig"; path = "Pods/Target Support Files/Pods-BranchMonsterFactory/Pods-BranchMonsterFactory.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -164,12 +168,30 @@ 6705923E19BBE22D0039DAE1 /* MessageUI.framework in Frameworks */, 6705923B19BBD0060039DAE1 /* UIKit.framework in Frameworks */, 6705921019BBB7430039DAE1 /* AdSupport.framework in Frameworks */, + CA4BDFEB66D490362206A106 /* libPods-BranchMonsterFactory.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0F97F77282DE44C19BC9C33F /* Pods */ = { + isa = PBXGroup; + children = ( + 362EE7B4CBB78C5FFC9B9ECB /* Pods-BranchMonsterFactory.debug.xcconfig */, + BD9AE1348178301ADB0A5AF7 /* Pods-BranchMonsterFactory.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; + 34E62C464254BBF220E149FE /* Frameworks */ = { + isa = PBXGroup; + children = ( + 2E185BB371AF087FA3DBDDCC /* libPods-BranchMonsterFactory.a */, + ); + name = Frameworks; + sourceTree = ""; + }; 670591E019BBAC630039DAE1 = { isa = PBXGroup; children = ( @@ -181,6 +203,8 @@ 6705923A19BBD0060039DAE1 /* UIKit.framework */, 6705920F19BBB7430039DAE1 /* AdSupport.framework */, 670591EA19BBAC630039DAE1 /* Products */, + 0F97F77282DE44C19BC9C33F /* Pods */, + 34E62C464254BBF220E149FE /* Frameworks */, ); sourceTree = ""; }; @@ -356,9 +380,12 @@ isa = PBXNativeTarget; buildConfigurationList = 6705920919BBAC630039DAE1 /* Build configuration list for PBXNativeTarget "BranchMonsterFactory" */; buildPhases = ( + BFDE1236E89C59EF24A00124 /* [CP] Check Pods Manifest.lock */, 670591E519BBAC630039DAE1 /* Sources */, 670591E619BBAC630039DAE1 /* Frameworks */, 670591E719BBAC630039DAE1 /* Resources */, + 823FA6B6BAE8DB68FC1716C1 /* [CP] Embed Pods Frameworks */, + EF6132270E97CDC0ED574CAA /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -470,6 +497,54 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 823FA6B6BAE8DB68FC1716C1 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BranchMonsterFactory/Pods-BranchMonsterFactory-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + BFDE1236E89C59EF24A00124 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; + EF6132270E97CDC0ED574CAA /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BranchMonsterFactory/Pods-BranchMonsterFactory-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 670591E519BBAC630039DAE1 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -583,6 +658,7 @@ }; 6705920A19BBAC630039DAE1 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 362EE7B4CBB78C5FFC9B9ECB /* Pods-BranchMonsterFactory.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -607,6 +683,7 @@ }; 6705920B19BBAC630039DAE1 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = BD9AE1348178301ADB0A5AF7 /* Pods-BranchMonsterFactory.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; diff --git a/BranchMonsterFactory/AppDelegate.m b/BranchMonsterFactory/AppDelegate.m index 7e53123..3985833 100644 --- a/BranchMonsterFactory/AppDelegate.m +++ b/BranchMonsterFactory/AppDelegate.m @@ -10,6 +10,7 @@ #import "Branch.h" #import "SplashViewController.h" #import "BranchUniversalObject+MonsterHelpers.h" +@import Localytics; @interface AppDelegate () @property (nonatomic) BOOL justLaunched; @@ -23,6 +24,16 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( // Initalize Branch and register the deep link handler // The deep link handler is called on every install/open to tell you if the user had just clicked a deep link [[Branch getInstance] initSessionWithLaunchOptions:launchOptions andRegisterDeepLinkHandlerUsingBranchUniversalObject:^(BranchUniversalObject *BUO, BranchLinkProperties *linkProperties, NSError *error) { + NSDictionary *params = [[Branch getInstance] getLatestReferringParams]; + if (params[@"+non_branch_link"] && params[@"+from_email_ctd"]) { + NSURL *url = [NSURL URLWithString:params[@"+non_branch_link"]]; + if (url) { + [application openURL:url]; + // check to make sure your existing deep linking logic, if any, is not executed + return; + } + } + if (BUO && [BUO.metadata objectForKey:@"monster"]) { self.initialMonster = BUO; [[NSNotificationCenter defaultCenter] postNotificationName:@"pushEditAndViewerViews" object:nil]; @@ -33,7 +44,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( self.justLaunched = NO; } }]; - + +// [Localytics setLoggingEnabled:YES]; + [Localytics autoIntegrate:@"0d738869f6b0f04eb1341f5-fbdada7a-f4ff-11e4-3279-00f82776ce8b" launchOptions:launchOptions]; + return YES; } diff --git a/BranchMonsterFactory/Images.xcassets/AppIcon.appiconset/Contents.json b/BranchMonsterFactory/Images.xcassets/AppIcon.appiconset/Contents.json index 17bfc0e..574c986 100644 --- a/BranchMonsterFactory/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/BranchMonsterFactory/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "size" : "29x29", "idiom" : "iphone", @@ -51,6 +61,16 @@ "size" : "60x60", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "size" : "29x29", "idiom" : "ipad", diff --git a/BranchMonsterFactory/Info.plist b/BranchMonsterFactory/Info.plist index c085bf1..fe048e9 100644 --- a/BranchMonsterFactory/Info.plist +++ b/BranchMonsterFactory/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.5 + 1.1.8 CFBundleSignature ???? CFBundleURLTypes @@ -33,13 +33,24 @@ CFBundleVersion - 15 + 18 FacebookAppID 288726397999326 FacebookDisplayName Branch Monster Factory LSRequiresIPhoneOS + NSAppTransportSecurity + + NSExceptionDomains + + public.localytics.s3.amazonaws.com + + NSExceptionAllowsInsecureHTTPLoads + + + + UIMainStoryboardFile Main UIRequiredDeviceCapabilities diff --git a/podfile b/podfile index f6475ee..533f512 100644 --- a/podfile +++ b/podfile @@ -1,4 +1,5 @@ target 'BranchMonsterFactory' do pod 'Branch' + pod 'LocalyticsStaticFramework', '~> 4.0' end \ No newline at end of file