diff --git a/Example/Images.xcassets/KFBroadcastIcon.imageset/KFBroadcastIcon@2x.png b/Example/Images.xcassets/KFBroadcastIcon.imageset/KFBroadcastIcon@2x.png deleted file mode 100644 index a61ffc0..0000000 Binary files a/Example/Images.xcassets/KFBroadcastIcon.imageset/KFBroadcastIcon@2x.png and /dev/null differ diff --git a/Example/Images.xcassets/KFBroadcastIcon.imageset/Contents.json b/Example/Images.xcassets/KFInfoIcon.imageset/Contents.json similarity index 82% rename from Example/Images.xcassets/KFBroadcastIcon.imageset/Contents.json rename to Example/Images.xcassets/KFInfoIcon.imageset/Contents.json index 9a00c47..a69619c 100644 --- a/Example/Images.xcassets/KFBroadcastIcon.imageset/Contents.json +++ b/Example/Images.xcassets/KFInfoIcon.imageset/Contents.json @@ -7,7 +7,7 @@ { "idiom" : "universal", "scale" : "2x", - "filename" : "KFBroadcastIcon@2x.png" + "filename" : "KFInfoIcon@2x.png" } ], "info" : { diff --git a/Example/Images.xcassets/KFInfoIcon.imageset/KFInfoIcon@2x.png b/Example/Images.xcassets/KFInfoIcon.imageset/KFInfoIcon@2x.png new file mode 100755 index 0000000..eb62125 Binary files /dev/null and b/Example/Images.xcassets/KFInfoIcon.imageset/KFInfoIcon@2x.png differ diff --git a/Example/Images.xcassets/KFVideoCameraIcon.imageset/Contents.json b/Example/Images.xcassets/KFVideoCameraIcon.imageset/Contents.json new file mode 100644 index 0000000..73edcb3 --- /dev/null +++ b/Example/Images.xcassets/KFVideoCameraIcon.imageset/Contents.json @@ -0,0 +1,17 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "KFVideoCameraIcon@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Example/Images.xcassets/KFVideoCameraIcon.imageset/KFVideoCameraIcon@2x.png b/Example/Images.xcassets/KFVideoCameraIcon.imageset/KFVideoCameraIcon@2x.png new file mode 100644 index 0000000..868b207 Binary files /dev/null and b/Example/Images.xcassets/KFVideoCameraIcon.imageset/KFVideoCameraIcon@2x.png differ diff --git a/Example/Images.xcassets/LaunchImage.launchimage/Contents.json b/Example/Images.xcassets/LaunchImage.launchimage/Contents.json index 6f870a4..b82337d 100644 --- a/Example/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/Example/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -5,14 +5,16 @@ "idiom" : "iphone", "extent" : "full-screen", "minimum-system-version" : "7.0", + "filename" : "LaunchImage-3.5@2x.png", "scale" : "2x" }, { - "orientation" : "portrait", + "extent" : "full-screen", "idiom" : "iphone", "subtype" : "retina4", - "extent" : "full-screen", + "filename" : "LaunchImage-4@2x.png", "minimum-system-version" : "7.0", + "orientation" : "portrait", "scale" : "2x" }, { diff --git a/Example/Images.xcassets/LaunchImage.launchimage/LaunchImage-3.5@2x.png b/Example/Images.xcassets/LaunchImage.launchimage/LaunchImage-3.5@2x.png new file mode 100644 index 0000000..39e8b20 Binary files /dev/null and b/Example/Images.xcassets/LaunchImage.launchimage/LaunchImage-3.5@2x.png differ diff --git a/Example/Images.xcassets/LaunchImage.launchimage/LaunchImage-4@2x.png b/Example/Images.xcassets/LaunchImage.launchimage/LaunchImage-4@2x.png new file mode 100644 index 0000000..31327fe Binary files /dev/null and b/Example/Images.xcassets/LaunchImage.launchimage/LaunchImage-4@2x.png differ diff --git a/Example/KFDemoViewController.m b/Example/KFDemoViewController.m index 8b23d18..e4734eb 100644 --- a/Example/KFDemoViewController.m +++ b/Example/KFDemoViewController.m @@ -18,6 +18,7 @@ #import "KFStreamTableViewCell.h" #import #import "UIActionSheet+Blocks.h" +#import "VTAcknowledgementsViewController.h" static NSString * const kKFStreamView = @"kKFStreamView"; static NSString * const kKFStreamsGroup = @"kKFStreamsGroup"; @@ -112,7 +113,9 @@ - (void) setupDatabaseView { - (void) setupNavigationBarAppearance { self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; - [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}]; + NSDictionary *attributes = @{NSForegroundColorAttributeName : [UIColor whiteColor], + NSFontAttributeName : [UIFont fontWithName:@"HelveticaNeue-Light" size:20.0]}; + [self.navigationController.navigationBar setTitleTextAttributes:attributes]; self.navigationController.navigationBar.translucent = NO; self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.0 green:0.7 blue:0.0 alpha:1.0]; [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent]; @@ -132,6 +135,12 @@ - (void) setupTableView { [self.view addConstraints:constraints]; } +- (void) infoButtonPressed:(id)sender { + VTAcknowledgementsViewController *viewController = [VTAcknowledgementsViewController acknowledgementsViewController]; + viewController.headerText = NSLocalizedString(@"We love open source software.", nil); // optional + [self.navigationController pushViewController:viewController animated:YES]; +} + - (void) setupPullToRefresh { self.pullToRefreshView = [[SSPullToRefreshView alloc] initWithScrollView:self.streamsTableView delegate:self]; self.pullToRefreshView.contentView = [[SSPullToRefreshSimpleContentView alloc] initWithFrame:CGRectZero]; @@ -146,9 +155,12 @@ - (void)viewDidLoad self.title = @"Kickflip"; - UIBarButtonItem *broadcastBarButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"KFBroadcastIcon"] style:UIBarButtonItemStylePlain target:self action:@selector(broadcastButtonPressed:)]; + UIBarButtonItem *broadcastBarButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"KFVideoCameraIcon"] style:UIBarButtonItemStylePlain target:self action:@selector(broadcastButtonPressed:)]; self.navigationItem.rightBarButtonItem = broadcastBarButton; + UIBarButtonItem *infoBarButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"KFInfoIcon"] style:UIBarButtonItemStylePlain target:self action:@selector(infoButtonPressed:)]; + self.navigationItem.leftBarButtonItem = infoBarButton; + /* UIImageView *logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"KFLogoTransparent"]]; logoImageView.contentMode = UIViewContentModeScaleAspectFit; diff --git a/Example/Kickflip-Info.plist b/Example/Kickflip-Info.plist index 8863afc..4f2abb9 100644 --- a/Example/Kickflip-Info.plist +++ b/Example/Kickflip-Info.plist @@ -32,6 +32,10 @@ armv7 + UIStatusBarHidden + + UIStatusBarStyle + UIStatusBarStyleLightContent UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/Kickflip.xcodeproj/project.pbxproj b/Kickflip.xcodeproj/project.pbxproj index cf9bfdc..862980e 100644 --- a/Kickflip.xcodeproj/project.pbxproj +++ b/Kickflip.xcodeproj/project.pbxproj @@ -22,6 +22,7 @@ D945AF68189873900026F697 /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D945AF67189873900026F697 /* libc++.dylib */; }; D945AF6C189874B80026F697 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D945AF6A189874AB0026F697 /* SystemConfiguration.framework */; }; D945AF6E189874C80026F697 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D945AF6D189874C70026F697 /* MobileCoreServices.framework */; }; + D9F0C38718F75C5500DCED85 /* Pods-acknowledgements.plist in Resources */ = {isa = PBXBuildFile; fileRef = D9F0C38618F75C5500DCED85 /* Pods-acknowledgements.plist */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -48,6 +49,7 @@ D945AF6D189874C70026F697 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; D99912CE18984D3F00BFCBA4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; D99912DC18984D3F00BFCBA4 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + D9F0C38618F75C5500DCED85 /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Pods-acknowledgements.plist"; path = "Pods/Pods-acknowledgements.plist"; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -81,6 +83,7 @@ D945ADD3189854000026F697 /* KFAppDelegate.m */, D945AF3F1898635A0026F697 /* KFDemoViewController.h */, D945AF401898635A0026F697 /* KFDemoViewController.m */, + D9F0C38618F75C5500DCED85 /* Pods-acknowledgements.plist */, D945ADD4189854000026F697 /* Kickflip-Info.plist */, D945ADD5189854000026F697 /* Kickflip-Prefix.pch */, D945ADD6189854000026F697 /* main.m */, @@ -177,6 +180,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + D9F0C38718F75C5500DCED85 /* Pods-acknowledgements.plist in Resources */, D945ADD7189854000026F697 /* InfoPlist.strings in Resources */, D945ADD8189854000026F697 /* Images.xcassets in Resources */, ); diff --git a/Podfile b/Podfile index 48e1bc7..5a3303e 100644 --- a/Podfile +++ b/Podfile @@ -5,6 +5,7 @@ platform :ios, "7.0" pod 'Kickflip', :path => 'Submodules/kickflip-ios-sdk/Kickflip.podspec' #pod 'Kickflip', '~> 0.9' -pod 'YapDatabase' +pod 'YapDatabase', '~> 2.4' pod 'SSPullToRefresh', '~> 1.2' -pod 'UIAlertView-Blocks', '~> 1.0' \ No newline at end of file +pod 'UIAlertView-Blocks', '~> 1.0' +pod 'VTAcknowledgementsViewController', '~> 0.10' \ No newline at end of file diff --git a/Podfile.lock b/Podfile.lock index 1578ff3..1b3c735 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -39,6 +39,7 @@ PODS: - SSPullToRefresh (1.2.0) - UIAlertView-Blocks (1.0) - UIView+AutoLayout (1.3.0) + - VTAcknowledgementsViewController (0.10) - YapDatabase (2.4.1): - CocoaLumberjack (~> 1.6.3) @@ -46,6 +47,7 @@ DEPENDENCIES: - Kickflip (from `Submodules/kickflip-ios-sdk/Kickflip.podspec`) - SSPullToRefresh (~> 1.2) - UIAlertView-Blocks (~> 1.0) + - VTAcknowledgementsViewController (~> 0.10) - YapDatabase EXTERNAL SOURCES: @@ -68,6 +70,7 @@ SPEC CHECKSUMS: SSPullToRefresh: ecdc6efdee5322bba8b57dc77c1263ef6b4170bf UIAlertView-Blocks: f7be28a08e85ec21143951ec6797ca6474faf563 UIView+AutoLayout: 43373a18797954fd8ee3b1423af364f1b80a2af8 + VTAcknowledgementsViewController: 76b8edcea89b58b7be15876aaa5aba7fa8b221d7 YapDatabase: 96c3aed68fe5087d596a4b400087b861e43c93d3 COCOAPODS: 0.31.1 diff --git a/README.md b/README.md index dbab104..d2fa875 100644 --- a/README.md +++ b/README.md @@ -5,29 +5,31 @@ Example project for integration of the [Kickflip iOS SDK](https://github.com/Kic ## Cocoapods Setup -You'll need to install [Cocoapods](http://cocoapods.org) first. Because you're so bleeding edge, some of our dependencies aren't in the official Cocoapods repo yet, so you'll have to add our Specs repo. - - $ pod repo add kickflip git@github.com:Kickflip/Specs.git +You'll need to install [Cocoapods](http://cocoapods.org) first. ## Compiling -Grab the source code, check for changes to our Podspecs repo, and then update the dependencies. +Grab the source code, and then update the dependencies. $ git clone git@github.com:Kickflip/kickflip-ios-example.git $ cd kickflip-ios-example $ git submodule update --init - $ pod repo update kickflip $ pod If you would like to make modifications to the core SDK, you can integrate the SDK as a submodule as well (check the `Podfile` for more info). ## KFSecrets.h -You'll need to [sign up](http://kickflip.io), make a new app, and then put your API keys from and put them in a file called `KFSecrets.h` with the following contents: +You'll need to [sign up](https://kickflip.io), make a new app, and then put your API keys from and put them in a file called `KFSecrets.h` with the following contents: #define KICKFLIP_API_KEY @"Client ID from kickflip.io" #define KICKFLIP_API_SECRET @"Client Secret from kickflip.io" ## License -Apache 2.0 \ No newline at end of file +Apache 2.0 + +## Attribution + +* [Info](http://icons8.com/icons/#!/77/info) by [Icons 8](http://icons8.com) ([CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/)) +* [Camera Video](https://www.iconfinder.com/icons/172629/camera_video_icon) by [Icons 8](http://icons8.com) ([CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/)) \ No newline at end of file