From b71a7181fc093c4c071b14f04dee9f1235176704 Mon Sep 17 00:00:00 2001 From: Adar Porat Date: Sun, 13 Dec 2015 15:10:18 -0500 Subject: [PATCH] update project requirements to > iOS 7 --- KKProgressToolbar.podspec | 17 -- KKProgressToolbar.podspec.json | 24 ++ KKProgressToolbar/KKProgressToolbar.h | 16 +- KKProgressToolbar/KKProgressToolbar.m | 2 +- .../project.pbxproj | 6 +- .../en.lproj/MainViewController_iPhone.xib | 281 +++--------------- 6 files changed, 84 insertions(+), 262 deletions(-) delete mode 100644 KKProgressToolbar.podspec create mode 100644 KKProgressToolbar.podspec.json diff --git a/KKProgressToolbar.podspec b/KKProgressToolbar.podspec deleted file mode 100644 index 04227fc..0000000 --- a/KKProgressToolbar.podspec +++ /dev/null @@ -1,17 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'KKProgressToolbar' - s.version = '1.0.0' - s.license = 'Apache 2.0' - s.summary = 'SocialAccounts is an iOS framework that provides an easy way to manage social network accounts' - s.homepage = 'https://github.com/aporat/KKProgressToolbar.git' - s.author = { 'Adar Porat' => 'adar.porat@gmail.com' } - s.source = { :git => 'https://github.com/aporat/KKProgressToolbar.git' } - s.platform = :ios - - s.source_files = 'KKProgressToolbar' - - s.ios.deployment_target = '5.0' - - s.requires_arc = true - -end diff --git a/KKProgressToolbar.podspec.json b/KKProgressToolbar.podspec.json new file mode 100644 index 0000000..5293fdd --- /dev/null +++ b/KKProgressToolbar.podspec.json @@ -0,0 +1,24 @@ +{ + "name": "KKProgressToolbar", + "version": "2.0.0", + "summary": "KKProgressToolbar is an iOS drop-in class that displays a translucent UIToolbar with a progress indicator", + "homepage": "https://github.com/aporat/KKProgressToolbar", + "license": { + "type": "MIT" + }, + "authors": { + "Adar Porat": "http://github.com/aporat" + }, + "social_media_url": "http://twitter.com/aporat28", + "requires_arc": true, + "platforms": { + "ios": "7.0" + }, + "source": { + "git": "https://github.com/aporat/KKProgressToolbar.git", + "tag": "2.0.0" + }, + "source_files": [ + "KKProgressToolbar/*.{h,m}" + ] +} \ No newline at end of file diff --git a/KKProgressToolbar/KKProgressToolbar.h b/KKProgressToolbar/KKProgressToolbar.h index 92c43b6..2d93f55 100644 --- a/KKProgressToolbar/KKProgressToolbar.h +++ b/KKProgressToolbar/KKProgressToolbar.h @@ -27,7 +27,7 @@ typedef void(^KKProgressToolbarCompletionHandler)(BOOL finished); /** * called when the user cancels the action */ -- (void)didCancelButtonPressed:(KKProgressToolbar *)toolbar; +- (void)didCancelButtonPressed:(KKProgressToolbar * _Nonnull)toolbar; @end @@ -42,14 +42,14 @@ typedef void(^KKProgressToolbarCompletionHandler)(BOOL finished); UIProgressView *_progressBar; } -@property (nonatomic, strong) UIBarButtonItem *stopButtonItem; -@property (nonatomic, strong) UIActivityIndicatorView *activityIndicator; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UIProgressView *progressBar; +@property (nonatomic, strong, nullable) UIBarButtonItem *stopButtonItem; +@property (nonatomic, strong, nullable) UIActivityIndicatorView *activityIndicator; +@property (nonatomic, strong, nullable) UILabel *titleLabel; +@property (nonatomic, strong, nullable) UIProgressView *progressBar; -@property (nonatomic, weak) id actionDelegate; +@property (nonatomic, weak, nullable) id actionDelegate; -- (void)show:(BOOL)animated completion:(void (^)(BOOL finished))completion; -- (void)hide:(BOOL)animated completion:(void (^)(BOOL finished))completion; +- (void)show:(BOOL)animated completion:(void (^ _Nullable)(BOOL finished))completion; +- (void)hide:(BOOL)animated completion:(void (^ _Nullable)(BOOL finished))completion; @end diff --git a/KKProgressToolbar/KKProgressToolbar.m b/KKProgressToolbar/KKProgressToolbar.m index aef5fec..4d024d1 100644 --- a/KKProgressToolbar/KKProgressToolbar.m +++ b/KKProgressToolbar/KKProgressToolbar.m @@ -37,7 +37,7 @@ - (id)initWithFrame:(CGRect)frame { self.titleLabel.textColor = [UIColor whiteColor]; self.titleLabel.shadowColor = [UIColor blackColor]; self.titleLabel.shadowOffset = CGSizeMake(0, 0); - self.titleLabel.textAlignment = UITextAlignmentCenter; + self.titleLabel.textAlignment = NSTextAlignmentCenter; self.progressBar = [[UIProgressView alloc] initWithFrame:CGRectMake(0, 25, 200, 10)]; diff --git a/example/KKProgressToolbarDemo.xcodeproj/project.pbxproj b/example/KKProgressToolbarDemo.xcodeproj/project.pbxproj index aca725e..6df0ceb 100644 --- a/example/KKProgressToolbarDemo.xcodeproj/project.pbxproj +++ b/example/KKProgressToolbarDemo.xcodeproj/project.pbxproj @@ -252,7 +252,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -284,7 +284,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -298,6 +298,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "KKProgressToolbarDemo/KKProgressToolbarDemo-Prefix.pch"; INFOPLIST_FILE = "KKProgressToolbarDemo/KKProgressToolbarDemo-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; PRODUCT_BUNDLE_IDENTIFIER = "com.kosherpenguin.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; @@ -310,6 +311,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "KKProgressToolbarDemo/KKProgressToolbarDemo-Prefix.pch"; INFOPLIST_FILE = "KKProgressToolbarDemo/KKProgressToolbarDemo-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; PRODUCT_BUNDLE_IDENTIFIER = "com.kosherpenguin.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; diff --git a/example/KKProgressToolbarDemo/en.lproj/MainViewController_iPhone.xib b/example/KKProgressToolbarDemo/en.lproj/MainViewController_iPhone.xib index afb25d7..798fc07 100644 --- a/example/KKProgressToolbarDemo/en.lproj/MainViewController_iPhone.xib +++ b/example/KKProgressToolbarDemo/en.lproj/MainViewController_iPhone.xib @@ -1,234 +1,47 @@ - - - - 1552 - 12C3006 - 3084 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 2083 - - - IBProxyObject - IBUIButton - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 292 - {{100, 117}, {121, 37}} - - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - 1 - Start Loading - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - - 292 - {{100, 185}, {121, 37}} - - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - 1 - Stop Loading - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - - - - {{0, 20}, {320, 460}} - - - - - 3 - MC4yNQA - - 2 - - - NO - - IBCocoaTouchFramework - - - - - - - view - - - - 35 - - - - startUILoading - - - 7 - - 42 - - - - stopUILoading - - - 7 - - 43 - - - - - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 34 - - - - - - - - - 39 - - - - - 41 - - - - - - - MainViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 43 - - - - - MainViewController - UIViewController - - id - id - - - - startUILoading - id - - - stopUILoading - id - - - - IBProjectSource - ./Classes/MainViewController.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - YES - 3 - 2083 - - + + + + + + + + + + + + + + + + + + + + + + + + +