Merge pull request #31 from enmiller/develop

Develop

Author: enmiller

ENMBadgedBarButtonItem.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "ENMBadgedBarButtonItem"
-  s.version = "4.0.1"
+  s.version = "4.0.3"
   s.summary = "A UIBarButtonItem that can be badged!"
   s.license = { :type => "MIT", :file => "LICENSE" }
   s.author = { "Eric Miller" => "eric@ericnmiller.com" }

SampleApp-Swift/BadgedBarButtonItem/BadgedBarButtonItem.swift

@@ -224,7 +224,7 @@ fileprivate extension BadgedBarButtonItem {
 
     func removeBadge() {
         let duration = shouldAnimateBadge ? 0.08 : 0.0
-        
+
         let currentTransform = badgeLabel.layer.transform
         let tf = CATransform3DMakeScale(0.001, 0.001, 1.0)
         badgeLabel.layer.transform = tf
@@ -241,6 +241,11 @@ fileprivate extension BadgedBarButtonItem {
         opacityAnimation.isRemovedOnCompletion = true
         opacityAnimation.delegate = self
         badgeLabel.layer.add(opacityAnimation, forKey: "opacity")
+
+        CATransaction.begin()
+        CATransaction.setCompletionBlock({
+            self.badgeLabel.removeFromSuperview()
+        })
     }
 
     func createBadgeLabel() -> UILabel {

SampleApp-Swift/SampleApp-Swift.xcodeproj/project.pbxproj

@@ -234,7 +234,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Yogurt Salad";
 				TargetAttributes = {
 					7B8B2AB2193E252B00A5ABD3 = {
@@ -364,12 +364,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -416,12 +418,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

SampleApp-Swift/SampleApp-Swift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

SampleApp-Swift/SampleApp-Swift.xcodeproj/xcshareddata/xcschemes/BadgedBarButtonItem.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"