Adding PageCard implementation in Example app

kshdeo · kshdeo · commit 5eeaa003cfcd · 2016-01-29T12:45:49.000+05:30
diff --git a/Examples/BeaconstacExample/BeaconstacExample.xcodeproj/project.pbxproj b/Examples/BeaconstacExample/BeaconstacExample.xcodeproj/project.pbxproj
@@ -13,6 +13,8 @@
 		7D4A2C931BFEE9C5003BBBC0 /* soundcloud.html in Resources */ = {isa = PBXBuildFile; fileRef = 7D4A2C921BFEE9C5003BBBC0 /* soundcloud.html */; };
 		7D4A2C951BFEEBDF003BBBC0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D4A2C941BFEEBDF003BBBC0 /* QuartzCore.framework */; };
 		7D4A2C971BFEEC07003BBBC0 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D4A2C961BFEEC07003BBBC0 /* Accelerate.framework */; };
+		7D788D231C57530800A321BA /* PageCardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D788D211C57530800A321BA /* PageCardView.m */; };
+		7D788D241C57530800A321BA /* PageCardView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D788D221C57530800A321BA /* PageCardView.xib */; };
 		7D911A691C4CCAAB0019E427 /* Assets.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 7D911A681C4CCAAB0019E427 /* Assets.bundle */; };
 		7D911A7B1C4E4F450019E427 /* SummaryCardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D911A791C4E4F450019E427 /* SummaryCardView.m */; };
 		7D911A7C1C4E4F450019E427 /* SummaryCardView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D911A7A1C4E4F450019E427 /* SummaryCardView.xib */; };
@@ -41,6 +43,9 @@
 		7D4A2C921BFEE9C5003BBBC0 /* soundcloud.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = soundcloud.html; path = BeaconstacExample/soundcloud.html; sourceTree = SOURCE_ROOT; };
 		7D4A2C941BFEEBDF003BBBC0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		7D4A2C961BFEEC07003BBBC0 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
+		7D788D201C57530800A321BA /* PageCardView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageCardView.h; sourceTree = "<group>"; };
+		7D788D211C57530800A321BA /* PageCardView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PageCardView.m; sourceTree = "<group>"; };
+		7D788D221C57530800A321BA /* PageCardView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PageCardView.xib; sourceTree = "<group>"; };
 		7D911A681C4CCAAB0019E427 /* Assets.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Assets.bundle; path = BeaconstacExample/Assets.bundle; sourceTree = SOURCE_ROOT; };
 		7D911A781C4E4F450019E427 /* SummaryCardView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SummaryCardView.h; sourceTree = "<group>"; };
 		7D911A791C4E4F450019E427 /* SummaryCardView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SummaryCardView.m; sourceTree = "<group>"; };
@@ -146,6 +151,9 @@
 				7D911A811C4E7DC60019E427 /* PhotoCardView.h */,
 				7D911A821C4E7DC60019E427 /* PhotoCardView.m */,
 				7D911A831C4E7DC60019E427 /* PhotoCardView.xib */,
+				7D788D201C57530800A321BA /* PageCardView.h */,
+				7D788D211C57530800A321BA /* PageCardView.m */,
+				7D788D221C57530800A321BA /* PageCardView.xib */,
 				7DDF9EA61B2EE5D0001C142B /* Main.storyboard */,
 				7DE6C1DD1BE878D3006783B2 /* VideoPlayer */,
 				7DDF9EA91B2EE5D0001C142B /* Images.xcassets */,
@@ -259,6 +267,7 @@
 				7D4A2C931BFEE9C5003BBBC0 /* soundcloud.html in Resources */,
 				7DE6C1E41BE87F8D006783B2 /* vimeo.html in Resources */,
 				7DDF9EA81B2EE5D0001C142B /* Main.storyboard in Resources */,
+				7D788D241C57530800A321BA /* PageCardView.xib in Resources */,
 				7D911A7C1C4E4F450019E427 /* SummaryCardView.xib in Resources */,
 				7DDF9EAD1B2EE5D0001C142B /* LaunchScreen.xib in Resources */,
 				7DE6C1DC1BE877EB006783B2 /* MusicCardView.xib in Resources */,
@@ -325,6 +334,7 @@
 				7DDF9EA51B2EE5D0001C142B /* ViewController.m in Sources */,
 				7DDF9ED81B2EF190001C142B /* WebViewController.m in Sources */,
 				7DDF9EA21B2EE5D0001C142B /* AppDelegate.m in Sources */,
+				7D788D231C57530800A321BA /* PageCardView.m in Sources */,
 				7D911A7B1C4E4F450019E427 /* SummaryCardView.m in Sources */,
 				7DE6C1DB1BE877EB006783B2 /* MusicCardView.m in Sources */,
 				7DDF9E9F1B2EE5D0001C142B /* main.m in Sources */,
diff --git a/Examples/BeaconstacExample/BeaconstacExample/ViewController.m b/Examples/BeaconstacExample/BeaconstacExample/ViewController.m
@@ -208,6 +208,8 @@ - (void)beaconstac:(Beaconstac *)beaconstac triggeredRuleWithRuleName:(NSString
     }
 }
 
+#pragma mark - Webhook delegate
+
 - (BOOL)webhookShouldExecute:(MSWebhook *)webhook
 {
     return YES;
@@ -223,6 +225,7 @@ - (void)webhook:(MSWebhook *)webhook executedWithResponse:(NSURLResponse *)respo
 }
 
 #pragma mark - Music Card delegate
+
 - (void)mediaCardButtonClickedAtIndex:(int)index
 {
     switch (index) {
@@ -252,6 +255,8 @@ - (void)mediaCardButtonClickedAtIndex:(int)index
     }
 }
 
+#pragma mark - Summary Card delegate
+
 - (void)summaryButtonClickedAtIndex:(int)index
 {
     switch (index) {
@@ -280,6 +285,8 @@ - (void)summaryButtonClickedAtIndex:(int)index
     }
 }
 
+#pragma mark - Photo Card delegate
+
 - (void)photoCardButtonClickedAtIndex:(int)index
 {
     switch (index)
@@ -309,6 +316,8 @@ - (void)photoCardButtonClickedAtIndex:(int)index
     }
 }
 
+#pragma mark - Page Card delegate
+
 - (void)pageButtonClickedAtIndex:(int)index
 {
     switch (index) {
@@ -317,7 +326,9 @@ - (void)pageButtonClickedAtIndex:(int)index
             [UIView animateWithDuration:0.35 animations:^{
                 self.visibleCardView.frame = CGRectMake(0, self.visibleCardView.frame.size.height, self.visibleCardView.frame.size.width, self.visibleCardView.frame.size.height);
             } completion:^(BOOL finished) {
+                [pageCardView removeFromSuperview];
                 self.visibleCardView = nil;
+                self.navigationController.navigationBarHidden = NO;
             }];
         }
             break;
@@ -457,7 +468,6 @@ - (void)showCard:(MSCard*)card
             if (!self.visibleCardView) {
                 [self.view addSubview:pageCardView];
                 pageCardView.frame = CGRectMake(0, self.view.frame.size.height, self.view.frame.size.width, self.view.frame.size.height);
-                pageCardView.layer.masksToBounds = YES;
                 pageCardView.delegate = self;
                 pageCardView.titleLabel.text = visibleCard.title;
                 pageCardView.summaryView.text = visibleCard.body;
diff --git a/README.md b/README.md
@@ -24,11 +24,11 @@ Run `pod install` in the project directory
 ##### Manually:
 
 1. Download or clone this repo on your system.
-2. Drag and drop the Beaconstac.framework file into your Xcode project. Make sure that **Copy Items to Destination's Group Folder** is checked.
-![Framework drop](https://raw.githubusercontent.com/Beaconstac/iOS-SDK/master/images/frameworkdrop.png)
+2. Drag and drop the Beaconstac.framework file into your Xcode project. Make sure that "Copy Items to Destination's Group Folder" is checked.
+<img src="images/frameworkdrop.png" alt="Build Phases" width="600">
 
-3. Navigate to Beaconstac.framework/Resources folder in Finder and drop the Beaconstac.bundle into Project navigator area. Make sure that **Copy Items to Destination's Group Folder** checked.
-![Bundle drop](https://raw.githubusercontent.com/Beaconstac/iOS-SDK/master/images/bundledrop.png)
+3. Navigate to Beaconstac.framework/Resources folder in Finder and drop the Beaconstac.bundle into Project navigator area. Make sure that "Copy Items to Destination's Group Folder" checked.
+<img src="images/bundledrop.png" alt="Build Phases" width="600">
 
 4. In Build Phases under Target, add the following frameworks in “Link Binary With Libraries” section:
 	- CoreData.framework
@@ -39,7 +39,7 @@ Run `pod install` in the project directory
 ## Configure your project
 	
 1. In Info.plist, add a new field, NSLocationAlwaysUsageDescription with relevant value that you want to show to the user. This is mandatory for iOS 8 and above.
-![Build phases](https://raw.githubusercontent.com/Beaconstac/iOS-SDK/master/images/usagedescription.png)
+<img src="images/usagedescription.png" alt="Build Phases" width="600">
 
 2. Import the framework header in your class and make sure the  class conforms to BeaconstacDelegate protocol
 

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,8 @@ - (void)beaconstac:(Beaconstac *)beaconstac triggeredRuleWithRuleName:(NSString`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
	`211`	`+#pragma mark - Webhook delegate`
	`212`	`+`
`211`	`213`	`- (BOOL)webhookShouldExecute:(MSWebhook *)webhook`
`212`	`214`	`{`
`213`	`215`	`return YES;`
`@@ -223,6 +225,7 @@ - (void)webhook:(MSWebhook )webhook executedWithResponse:(NSURLResponse )respo`
`223`	`225`	`}`
`224`	`226`
`225`	`227`	`#pragma mark - Music Card delegate`
	`228`	`+`
`226`	`229`	`- (void)mediaCardButtonClickedAtIndex:(int)index`
`227`	`230`	`{`
`228`	`231`	`switch (index) {`
`@@ -252,6 +255,8 @@ - (void)mediaCardButtonClickedAtIndex:(int)index`
`252`	`255`	`}`
`253`	`256`	`}`
`254`	`257`
	`258`	`+#pragma mark - Summary Card delegate`
	`259`	`+`
`255`	`260`	`- (void)summaryButtonClickedAtIndex:(int)index`
`256`	`261`	`{`
`257`	`262`	`switch (index) {`
`@@ -280,6 +285,8 @@ - (void)summaryButtonClickedAtIndex:(int)index`
`280`	`285`	`}`
`281`	`286`	`}`
`282`	`287`
	`288`	`+#pragma mark - Photo Card delegate`
	`289`	`+`
`283`	`290`	`- (void)photoCardButtonClickedAtIndex:(int)index`
`284`	`291`	`{`
`285`	`292`	`switch (index)`
`@@ -309,6 +316,8 @@ - (void)photoCardButtonClickedAtIndex:(int)index`
`309`	`316`	`}`
`310`	`317`	`}`
`311`	`318`
	`319`	`+#pragma mark - Page Card delegate`
	`320`	`+`
`312`	`321`	`- (void)pageButtonClickedAtIndex:(int)index`
`313`	`322`	`{`
`314`	`323`	`switch (index) {`
`@@ -317,7 +326,9 @@ - (void)pageButtonClickedAtIndex:(int)index`
`317`	`326`	`[UIView animateWithDuration:0.35 animations:^{`
`318`	`327`	`self.visibleCardView.frame = CGRectMake(0, self.visibleCardView.frame.size.height, self.visibleCardView.frame.size.width, self.visibleCardView.frame.size.height);`
`319`	`328`	`} completion:^(BOOL finished) {`
	`329`	`+ [pageCardView removeFromSuperview];`
`320`	`330`	`self.visibleCardView = nil;`
	`331`	`+ self.navigationController.navigationBarHidden = NO;`
`321`	`332`	`}];`
`322`	`333`	`}`
`323`	`334`	`break;`
`@@ -457,7 +468,6 @@ - (void)showCard:(MSCard*)card`
`457`	`468`	`if (!self.visibleCardView) {`
`458`	`469`	`[self.view addSubview:pageCardView];`
`459`	`470`	`pageCardView.frame = CGRectMake(0, self.view.frame.size.height, self.view.frame.size.width, self.view.frame.size.height);`
`460`		`- pageCardView.layer.masksToBounds = YES;`
`461`	`471`	`pageCardView.delegate = self;`
`462`	`472`	`pageCardView.titleLabel.text = visibleCard.title;`
`463`	`473`	`pageCardView.summaryView.text = visibleCard.body;`