Merge pull request #3 from poolqf/develop

Minor issues
polqf · Sep 2, 2015 · 12c3e70 · 12c3e70
2 parents 1dabcc8 + 00bbd20
commit 12c3e70
Show file tree

Hide file tree

Showing 10 changed files with 213 additions and 358 deletions.
diff --git a/Demo/FillableLoaders-Example.xcodeproj/project.pbxproj b/Demo/FillableLoaders-Example.xcodeproj/project.pbxproj
diff --git a/Demo/FillableLoaders-Example.xcodeproj/xcshareddata/xcschemes/FillableLoaders.xcscheme b/Demo/FillableLoaders-Example.xcodeproj/xcshareddata/xcschemes/FillableLoaders.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C1CF9DFC1B97857600DEA2EB"
+               BlueprintIdentifier = "C17B58FC1B9790A800717546"
                BuildableName = "FillableLoaders.framework"
                BlueprintName = "FillableLoaders"
                ReferencedContainer = "container:FillableLoaders-Example.xcodeproj">
@@ -23,29 +23,26 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C1CF9DFC1B97857600DEA2EB"
+            BlueprintIdentifier = "C17B58FC1B9790A800717546"
             BuildableName = "FillableLoaders.framework"
             BlueprintName = "FillableLoaders"
             ReferencedContainer = "container:FillableLoaders-Example.xcodeproj">
@@ -55,15 +52,15 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C1CF9DFC1B97857600DEA2EB"
+            BlueprintIdentifier = "C17B58FC1B9790A800717546"
             BuildableName = "FillableLoaders.framework"
             BlueprintName = "FillableLoaders"
             ReferencedContainer = "container:FillableLoaders-Example.xcodeproj">

diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/Demo/FillableLoaders-Example/ViewController.swift b/Demo/FillableLoaders-Example/ViewController.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import FillableLoaders
 
 class ViewController: UIViewController {
 

diff --git a/Demo/FillableLoaders-ExampleTests/FillableLoaders_ExampleTests.swift b/Demo/FillableLoaders-ExampleTests/FillableLoaders_ExampleTests.swift
diff --git a/Demo/FillableLoaders-ExampleTests/Info.plist b/Demo/FillableLoaders-ExampleTests/Info.plist
diff --git a/Demo/FillableLoaders/FillableLoaders.h b/Demo/FillableLoaders/FillableLoaders.h
@@ -3,7 +3,7 @@
 //  FillableLoaders
 //
 //  Created by Pol Quintana on 2/9/15.
-//  Copyright © 2015 Pol Quintana. All rights reserved.
+//  Copyright (c) 2015 Pol Quintana. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
@@ -12,4 +12,8 @@
 FOUNDATION_EXPORT double FillableLoadersVersionNumber;
 
 //! Project version string for FillableLoaders.
-FOUNDATION_EXPORT const unsigned char FillableLoadersVersionString[];
+FOUNDATION_EXPORT const unsigned char FillableLoadersVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <FillableLoaders/PublicHeader.h>
+
+
diff --git a/Demo/FillableLoaders/Info.plist b/Demo/FillableLoaders/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>com.polquintana.$(PRODUCT_NAME:rfc1034identifier)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/FillableLoaders.framework.zip b/FillableLoaders.framework.zip
diff --git a/Source/FillableLoader.swift b/Source/FillableLoader.swift
@@ -228,7 +228,7 @@ public class FillableLoader: UIView {
     /**
     Stops loader animations and removes it from its superview
     */
-    public func removeLoader(animated animated: Bool = true) {
+    public func removeLoader(animated: Bool = true) {
         let completion: () -> () = {
             self.hidden = false
             self.animate = false