Merge pull request #19 from anlcan/master

OK Button
2026-04-28 20:05:09 +08:00 · 2014-12-08 17:10:48 +00:00
parent ead49e0e62 7268d8db72
commit 8cb5a694d9
73 changed files with 3236 additions and 2969 deletions
--- a/1
+++ b/1
@@ -1,3 +1,4 @@
+source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '7.0'

 pod 'UIColor+FlatColors','~>0.0.2'
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -3,11 +3,11 @@ PODS:
  - UIColor+FlatColors (0.0.2)

 DEPENDENCIES:
-  - pop
-  - UIColor+FlatColors
+  - pop (~> 1.0.6)
+  - UIColor+FlatColors (~> 0.0.2)

 SPEC CHECKSUMS:
  pop: e518794da38942c05255eb64b36d894e70cb4f00
  UIColor+FlatColors: 15506ef6472e26a751033f2f2469283800bcb906

-COCOAPODS: 0.33.1
+COCOAPODS: 0.34.2
--- a/Pods/BuildHeaders/UIColor+FlatColors/UIColor+FlatColors.h
+++ b/Pods/BuildHeaders/UIColor+FlatColors/UIColor+FlatColors.h
@@ -1 +0,0 @@
-../../UIColor+FlatColors/UIColor+FlatColors/UIColor+FlatColors.h
--- a/Pods/BuildHeaders/pop/FloatConversion.h
+++ b/Pods/BuildHeaders/pop/FloatConversion.h
@@ -1 +0,0 @@
-../../pop/pop/WebCore/FloatConversion.h
--- a/Pods/BuildHeaders/pop/POP.h
+++ b/Pods/BuildHeaders/pop/POP.h
@@ -1 +0,0 @@
-../../pop/pop/POP.h
--- a/Pods/BuildHeaders/pop/POPAction.h
+++ b/Pods/BuildHeaders/pop/POPAction.h
@@ -1 +0,0 @@
-../../pop/pop/POPAction.h
--- a/Pods/BuildHeaders/pop/POPAnimatableProperty.h
+++ b/Pods/BuildHeaders/pop/POPAnimatableProperty.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimatableProperty.h
--- a/Pods/BuildHeaders/pop/POPAnimation.h
+++ b/Pods/BuildHeaders/pop/POPAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimation.h
--- a/Pods/BuildHeaders/pop/POPAnimationEvent.h
+++ b/Pods/BuildHeaders/pop/POPAnimationEvent.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationEvent.h
--- a/Pods/BuildHeaders/pop/POPAnimationEventInternal.h
+++ b/Pods/BuildHeaders/pop/POPAnimationEventInternal.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationEventInternal.h
--- a/Pods/BuildHeaders/pop/POPAnimationExtras.h
+++ b/Pods/BuildHeaders/pop/POPAnimationExtras.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationExtras.h
--- a/Pods/BuildHeaders/pop/POPAnimationInternal.h
+++ b/Pods/BuildHeaders/pop/POPAnimationInternal.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationInternal.h
--- a/Pods/BuildHeaders/pop/POPAnimationPrivate.h
+++ b/Pods/BuildHeaders/pop/POPAnimationPrivate.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationPrivate.h
--- a/Pods/BuildHeaders/pop/POPAnimationRuntime.h
+++ b/Pods/BuildHeaders/pop/POPAnimationRuntime.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationRuntime.h
--- a/Pods/BuildHeaders/pop/POPAnimationTracer.h
+++ b/Pods/BuildHeaders/pop/POPAnimationTracer.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationTracer.h
--- a/Pods/BuildHeaders/pop/POPAnimationTracerInternal.h
+++ b/Pods/BuildHeaders/pop/POPAnimationTracerInternal.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationTracerInternal.h
--- a/Pods/BuildHeaders/pop/POPAnimator.h
+++ b/Pods/BuildHeaders/pop/POPAnimator.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimator.h
--- a/Pods/BuildHeaders/pop/POPAnimatorPrivate.h
+++ b/Pods/BuildHeaders/pop/POPAnimatorPrivate.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimatorPrivate.h
--- a/Pods/BuildHeaders/pop/POPBasicAnimation.h
+++ b/Pods/BuildHeaders/pop/POPBasicAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPBasicAnimation.h
--- a/Pods/BuildHeaders/pop/POPBasicAnimationInternal.h
+++ b/Pods/BuildHeaders/pop/POPBasicAnimationInternal.h
@@ -1 +0,0 @@
-../../pop/pop/POPBasicAnimationInternal.h
--- a/Pods/BuildHeaders/pop/POPCGUtils.h
+++ b/Pods/BuildHeaders/pop/POPCGUtils.h
@@ -1 +0,0 @@
-../../pop/pop/POPCGUtils.h
--- a/Pods/BuildHeaders/pop/POPCustomAnimation.h
+++ b/Pods/BuildHeaders/pop/POPCustomAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPCustomAnimation.h
--- a/Pods/BuildHeaders/pop/POPDecayAnimation.h
+++ b/Pods/BuildHeaders/pop/POPDecayAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPDecayAnimation.h
--- a/Pods/BuildHeaders/pop/POPDecayAnimationInternal.h
+++ b/Pods/BuildHeaders/pop/POPDecayAnimationInternal.h
@@ -1 +0,0 @@
-../../pop/pop/POPDecayAnimationInternal.h
--- a/Pods/BuildHeaders/pop/POPDefines.h
+++ b/Pods/BuildHeaders/pop/POPDefines.h
@@ -1 +0,0 @@
-../../pop/pop/POPDefines.h
--- a/Pods/BuildHeaders/pop/POPGeometry.h
+++ b/Pods/BuildHeaders/pop/POPGeometry.h
@@ -1 +0,0 @@
-../../pop/pop/POPGeometry.h
--- a/Pods/BuildHeaders/pop/POPLayerExtras.h
+++ b/Pods/BuildHeaders/pop/POPLayerExtras.h
@@ -1 +0,0 @@
-../../pop/pop/POPLayerExtras.h
--- a/Pods/BuildHeaders/pop/POPMath.h
+++ b/Pods/BuildHeaders/pop/POPMath.h
@@ -1 +0,0 @@
-../../pop/pop/POPMath.h
--- a/Pods/BuildHeaders/pop/POPPropertyAnimation.h
+++ b/Pods/BuildHeaders/pop/POPPropertyAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPPropertyAnimation.h
--- a/Pods/BuildHeaders/pop/POPPropertyAnimationInternal.h
+++ b/Pods/BuildHeaders/pop/POPPropertyAnimationInternal.h
@@ -1 +0,0 @@
-../../pop/pop/POPPropertyAnimationInternal.h
--- a/Pods/BuildHeaders/pop/POPSpringAnimation.h
+++ b/Pods/BuildHeaders/pop/POPSpringAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPSpringAnimation.h
--- a/Pods/BuildHeaders/pop/POPSpringAnimationInternal.h
+++ b/Pods/BuildHeaders/pop/POPSpringAnimationInternal.h
@@ -1 +0,0 @@
-../../pop/pop/POPSpringAnimationInternal.h
--- a/Pods/BuildHeaders/pop/POPSpringSolver.h
+++ b/Pods/BuildHeaders/pop/POPSpringSolver.h
@@ -1 +0,0 @@
-../../pop/pop/POPSpringSolver.h
--- a/Pods/BuildHeaders/pop/POPVector.h
+++ b/Pods/BuildHeaders/pop/POPVector.h
@@ -1 +0,0 @@
-../../pop/pop/POPVector.h
--- a/Pods/BuildHeaders/pop/TransformationMatrix.h
+++ b/Pods/BuildHeaders/pop/TransformationMatrix.h
@@ -1 +0,0 @@
-../../pop/pop/WebCore/TransformationMatrix.h
--- a/Pods/BuildHeaders/pop/UnitBezier.h
+++ b/Pods/BuildHeaders/pop/UnitBezier.h
@@ -1 +0,0 @@
-../../pop/pop/WebCore/UnitBezier.h
--- a/Pods/Headers/UIColor+FlatColors/UIColor+FlatColors.h
+++ b/Pods/Headers/UIColor+FlatColors/UIColor+FlatColors.h
@@ -1 +0,0 @@
-../../UIColor+FlatColors/UIColor+FlatColors/UIColor+FlatColors.h
--- a/Pods/Headers/pop/POP.h
+++ b/Pods/Headers/pop/POP.h
@@ -1 +0,0 @@
-../../pop/pop/POP.h
--- a/Pods/Headers/pop/POPAnimatableProperty.h
+++ b/Pods/Headers/pop/POPAnimatableProperty.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimatableProperty.h
--- a/Pods/Headers/pop/POPAnimation.h
+++ b/Pods/Headers/pop/POPAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimation.h
--- a/Pods/Headers/pop/POPAnimationEvent.h
+++ b/Pods/Headers/pop/POPAnimationEvent.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationEvent.h
--- a/Pods/Headers/pop/POPAnimationExtras.h
+++ b/Pods/Headers/pop/POPAnimationExtras.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationExtras.h
--- a/Pods/Headers/pop/POPAnimationTracer.h
+++ b/Pods/Headers/pop/POPAnimationTracer.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimationTracer.h
--- a/Pods/Headers/pop/POPAnimator.h
+++ b/Pods/Headers/pop/POPAnimator.h
@@ -1 +0,0 @@
-../../pop/pop/POPAnimator.h
--- a/Pods/Headers/pop/POPBasicAnimation.h
+++ b/Pods/Headers/pop/POPBasicAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPBasicAnimation.h
--- a/Pods/Headers/pop/POPCustomAnimation.h
+++ b/Pods/Headers/pop/POPCustomAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPCustomAnimation.h
--- a/Pods/Headers/pop/POPDecayAnimation.h
+++ b/Pods/Headers/pop/POPDecayAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPDecayAnimation.h
--- a/Pods/Headers/pop/POPDefines.h
+++ b/Pods/Headers/pop/POPDefines.h
@@ -1 +0,0 @@
-../../pop/pop/POPDefines.h
--- a/Pods/Headers/pop/POPGeometry.h
+++ b/Pods/Headers/pop/POPGeometry.h
@@ -1 +0,0 @@
-../../pop/pop/POPGeometry.h
--- a/Pods/Headers/pop/POPLayerExtras.h
+++ b/Pods/Headers/pop/POPLayerExtras.h
@@ -1 +0,0 @@
-../../pop/pop/POPLayerExtras.h
--- a/Pods/Headers/pop/POPPropertyAnimation.h
+++ b/Pods/Headers/pop/POPPropertyAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPPropertyAnimation.h
--- a/Pods/Headers/pop/POPSpringAnimation.h
+++ b/Pods/Headers/pop/POPSpringAnimation.h
@@ -1 +0,0 @@
-../../pop/pop/POPSpringAnimation.h
--- a/Pods/Manifest.lock
+++ b/Pods/Manifest.lock
@@ -3,11 +3,11 @@ PODS:
  - UIColor+FlatColors (0.0.2)

 DEPENDENCIES:
-  - pop
-  - UIColor+FlatColors
+  - pop (~> 1.0.6)
+  - UIColor+FlatColors (~> 0.0.2)

 SPEC CHECKSUMS:
  pop: e518794da38942c05255eb64b36d894e70cb4f00
  UIColor+FlatColors: 15506ef6472e26a751033f2f2469283800bcb906

-COCOAPODS: 0.33.1
+COCOAPODS: 0.34.2
--- a/Pods/Pods-UIColor+FlatColors-Private.xcconfig
+++ b/Pods/Pods-UIColor+FlatColors-Private.xcconfig
@@ -1,5 +0,0 @@
-#include "Pods-UIColor+FlatColors.xcconfig"
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/UIColor+FlatColors" "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/UIColor+FlatColors" "${PODS_ROOT}/Headers/pop"
-OTHER_LDFLAGS = -ObjC
-PODS_ROOT = ${SRCROOT}
--- a/Pods/Pods-UIColor+FlatColors-dummy.m
+++ b/Pods/Pods-UIColor+FlatColors-dummy.m
@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_Pods_UIColor_FlatColors : NSObject
-@end
-@implementation PodsDummy_Pods_UIColor_FlatColors
-@end
--- a/Pods/Pods-UIColor+FlatColors-prefix.pch
+++ b/Pods/Pods-UIColor+FlatColors-prefix.pch
@@ -1,5 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#endif
-
-#import "Pods-environment.h"
--- a/Pods/Pods-UIColor+FlatColors.xcconfig
+++ b/Pods/Pods-UIColor+FlatColors.xcconfig
--- a/Pods/Pods-acknowledgements.markdown
+++ b/Pods/Pods-acknowledgements.markdown
@@ -1,61 +0,0 @@
-# Acknowledgements
-This application makes use of the following third party libraries:
-
-## UIColor+FlatColors
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Giovanni Lodi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-## pop
-
-BSD License
-
-For Pop software
-
-Copyright (c) 2014, Facebook, Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Generated by CocoaPods - http://cocoapods.org
--- a/Pods/Pods-acknowledgements.plist
+++ b/Pods/Pods-acknowledgements.plist
@@ -1,95 +0,0 @@
-<?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>PreferenceSpecifiers</key>
-	<array>
-		<dict>
-			<key>FooterText</key>
-			<string>This application makes use of the following third party libraries:</string>
-			<key>Title</key>
-			<string>Acknowledgements</string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>The MIT License (MIT)
-
-Copyright (c) 2014 Giovanni Lodi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</string>
-			<key>Title</key>
-			<string>UIColor+FlatColors</string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>BSD License
-
-For Pop software
-
-Copyright (c) 2014, Facebook, Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-</string>
-			<key>Title</key>
-			<string>pop</string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>Generated by CocoaPods - http://cocoapods.org</string>
-			<key>Title</key>
-			<string></string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-	</array>
-	<key>StringsTable</key>
-	<string>Acknowledgements</string>
-	<key>Title</key>
-	<string>Acknowledgements</string>
-</dict>
-</plist>
--- a/Pods/Pods-dummy.m
+++ b/Pods/Pods-dummy.m
@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_Pods : NSObject
-@end
-@implementation PodsDummy_Pods
-@end
--- a/Pods/Pods-environment.h
+++ b/Pods/Pods-environment.h
@@ -1,20 +0,0 @@
-
-// To check if a library is compiled with CocoaPods you
-// can use the `COCOAPODS` macro definition which is
-// defined in the xcconfigs so it is available in
-// headers also when they are imported in the client
-// project.
-
-
-// UIColor+FlatColors
-#define COCOAPODS_POD_AVAILABLE_UIColor_FlatColors
-#define COCOAPODS_VERSION_MAJOR_UIColor_FlatColors 0
-#define COCOAPODS_VERSION_MINOR_UIColor_FlatColors 0
-#define COCOAPODS_VERSION_PATCH_UIColor_FlatColors 2
-
-// pop
-#define COCOAPODS_POD_AVAILABLE_pop
-#define COCOAPODS_VERSION_MAJOR_pop 1
-#define COCOAPODS_VERSION_MINOR_pop 0
-#define COCOAPODS_VERSION_PATCH_pop 6
-
--- a/Pods/Pods-pop-Private.xcconfig
+++ b/Pods/Pods-pop-Private.xcconfig
@@ -1,7 +0,0 @@
-#include "Pods-pop.xcconfig"
-CLANG_CXX_LANGUAGE_STANDARD = ${PODS_POP_CLANG_CXX_LANGUAGE_STANDARD}
-CLANG_CXX_LIBRARY = ${PODS_POP_CLANG_CXX_LIBRARY}
-GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/pop" "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/UIColor+FlatColors" "${PODS_ROOT}/Headers/pop"
-OTHER_LDFLAGS = -ObjC ${PODS_POP_OTHER_LDFLAGS}
-PODS_ROOT = ${SRCROOT}
--- a/Pods/Pods-pop-dummy.m
+++ b/Pods/Pods-pop-dummy.m
@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_Pods_pop : NSObject
-@end
-@implementation PodsDummy_Pods_pop
-@end
--- a/Pods/Pods-pop-prefix.pch
+++ b/Pods/Pods-pop-prefix.pch
@@ -1,5 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#endif
-
-#import "Pods-environment.h"
--- a/Pods/Pods-pop.xcconfig
+++ b/Pods/Pods-pop.xcconfig
@@ -1,3 +0,0 @@
-PODS_POP_CLANG_CXX_LANGUAGE_STANDARD = c++11
-PODS_POP_CLANG_CXX_LIBRARY = libc++
-PODS_POP_OTHER_LDFLAGS = -lc++
--- a/Pods/Pods-resources.sh
+++ b/Pods/Pods-resources.sh
@@ -1,68 +0,0 @@
-#!/bin/sh
-set -e
-
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
-> "$RESOURCES_TO_COPY"
-
-install_resource()
-{
-  case $1 in
-    *.storyboard)
-      echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
-      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
-      ;;
-    *.xib)
-        echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
-      ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
-      ;;
-    *.framework)
-      echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      ;;
-    *.xcdatamodel)
-      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\""
-      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom"
-      ;;
-    *.xcdatamodeld)
-      echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\""
-      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd"
-      ;;
-    *.xcassets)
-      ;;
-    /*)
-      echo "$1"
-      echo "$1" >> "$RESOURCES_TO_COPY"
-      ;;
-    *)
-      echo "${PODS_ROOT}/$1"
-      echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
-      ;;
-  esac
-}
-
-rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-if [[ "${ACTION}" == "install" ]]; then
-  rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-fi
-rm -f "$RESOURCES_TO_COPY"
-
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `xcrun --find actool` ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
-then
-  case "${TARGETED_DEVICE_FAMILY}" in 
-    1,2)
-      TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
-      ;;
-    1)
-      TARGET_DEVICE_ARGS="--target-device iphone"
-      ;;
-    2)
-      TARGET_DEVICE_ARGS="--target-device ipad"
-      ;;
-    *)
-      TARGET_DEVICE_ARGS="--target-device mac"
-      ;;  
-  esac 
-  find "${PWD}" -name "*.xcassets" -print0 | xargs -0 actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-fi
--- a/Pods/Pods.xcconfig
+++ b/Pods/Pods.xcconfig
@@ -1,7 +0,0 @@
-CLANG_CXX_LANGUAGE_STANDARD = c++11
-CLANG_CXX_LIBRARY = libc++
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/UIColor+FlatColors" "${PODS_ROOT}/Headers/pop"
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers" -isystem "${PODS_ROOT}/Headers/UIColor+FlatColors" -isystem "${PODS_ROOT}/Headers/pop"
-OTHER_LDFLAGS = -ObjC -lc++
-PODS_ROOT = ${SRCROOT}/Pods
--- a/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Pods/Pods.xcodeproj/project.pbxproj
--- a/VBFPopFlatButton.xcodeproj/project.pbxproj
+++ b/VBFPopFlatButton.xcodeproj/project.pbxproj
--- a/VBFPopFlatButton/Base.lproj/Main.storyboard
+++ b/VBFPopFlatButton/Base.lproj/Main.storyboard
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="14A379a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
    <dependencies>
+        <deployment defaultVersion="1792" identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
    </dependencies>
    <scenes>
@@ -196,6 +197,16 @@
                                    <action selector="buttonPressed:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="l2Q-Ei-MpP"/>
                                </connections>
                            </button>
+                            <button opaque="NO" tag="17" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TeS-AT-m1u">
+                                <rect key="frame" x="145" y="225" width="30" height="30"/>
+                                <state key="normal" title="OK">
+                                    <color key="titleColor" red="0.99989169840000003" green="1" blue="0.99988096950000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="buttonPressed:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="rkJ-a1-Cag"/>
+                                </connections>
+                            </button>
                        </subviews>
                        <color key="backgroundColor" red="0.23510167709999999" green="0.62573839249999996" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                    </view>
--- a/VBFPopFlatButton/VBFPopFlatButtonClasses/VBFPopFlatButton.h
+++ b/VBFPopFlatButton/VBFPopFlatButtonClasses/VBFPopFlatButton.h
@@ -28,6 +28,7 @@ typedef NS_ENUM(NSInteger, FlatButtonType) {
    buttonLeftTriangleType,
    buttonUpTriangleType,
    buttonDownTriangleType,
+    buttonOkType,
 };

 typedef NS_ENUM(NSInteger, FlatButtonStyle) {
--- a/VBFPopFlatButton/VBFPopFlatButtonClasses/VBFPopFlatButton.m
+++ b/VBFPopFlatButton/VBFPopFlatButtonClasses/VBFPopFlatButton.m
@@ -328,8 +328,16 @@
            secondOriginPoint.y += self.bounds.size.width/8;
            thirdOriginPoint.y -= self.bounds.size.width * 0.30;
            break;
-
-
+        case buttonOkType:
+            self.thirdSegment.opacity = 0.0;
+            [self.firstSegment moveToState:doubleSegmentBackSlashState45 animated:self.animateToStartPosition];
+            [self.secondSegment moveToState:doubleSegmentDownArrow animated:self.animateToStartPosition];
+            firstOriginPoint.y 	+= self.bounds.size.width/6;
+            secondOriginPoint.y += self.bounds.size.width/2;
+            firstOriginPoint.x  += self.bounds.size.width * 0.19;
+            secondOriginPoint.x -= self.bounds.size.width * 0.14;
+            break;
+            
        default:
            break;
    }
--- a/VBFPopFlatButton/ViewController.m
+++ b/VBFPopFlatButton/ViewController.m
@@ -10,7 +10,7 @@
 #import "UIColor+FlatColors.h"
 #import "VBFPopFlatButton.h"

-#define NUM_BUTTON_STATES 17
+#define NUM_BUTTON_STATES 18

@interface ViewController ()
@property (nonatomic, strong) VBFPopFlatButton *flatRoundedButton;
				`@@ -1 +0,0 @@`
				`../../UIColor+FlatColors/UIColor+FlatColors/UIColor+FlatColors.h`
				`@@ -1 +0,0 @@`
				`../../pop/pop/POPPropertyAnimationInternal.h`
				`@@ -1 +0,0 @@`
				`../../pop/pop/WebCore/TransformationMatrix.h`