Merge branch 'release/1.0.0' into develop

Author: bcylin

CHANGELOG.md

@@ -0,0 +1,8 @@
+## v1.0.0
+
+Initial release written in Swift 2.1.
+
+#### Added
+
+* `ICKeyboardDismissTextField` with an accessory view to dismiss keyboard.
+* `ICTokenField`, a text field that groups input texts as tokens.

Example/Example.xcodeproj/project.pbxproj

@@ -402,7 +402,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -440,7 +440,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -457,6 +457,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.polydice.ICInputAccessoryExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -470,6 +471,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.polydice.ICInputAccessoryExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};

Example/Example/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.0</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

ICInputAccessory.podspec

@@ -1,8 +1,19 @@
 Pod::Spec.new do |s|
   s.name          = "ICInputAccessory"
-  s.version       = "0.1.0"
-  s.summary       = "A customized input accessory UI to dismiss keyboard."
+  s.version       = "1.0.0"
+  s.summary       = "Customized text fields used in the iCook app."
+  s.description   = <<-DESC
+                     ICKeyboardDismissTextField:
+                     * An input accessory view with a button to dismiss keyboard.
 
+                     ICTokenField:
+                     * A horizontal scrolling UI that groups input texts.
+                     * Easy to add and delete tokens.
+                     * Customizable icon and colors.
+                    DESC
+
+  s.screenshots   = "https://raw.githubusercontent.com/polydice/ICInputAccessory/gh-pages/screenshots/ICKeyboardDismissTextField.png",
+                    "https://raw.githubusercontent.com/polydice/ICInputAccessory/gh-pages/screenshots/ICTokenField.png"
   s.homepage      = "https://github.com/polydice/ICInputAccessory"
   s.license       = { type: "MIT", file: "LICENSE" }
   s.authors       = "bcylin", "trisix"

ICInputAccessory.xcodeproj/project.pbxproj

@@ -217,7 +217,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -259,7 +259,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

ICInputAccessory/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.0</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Makefile

@@ -9,3 +9,7 @@ bundle-install:
 
 pod-install:
 	bundle exec pod install --no-repo-update
+
+setup: brew-install
+	bundle install
+	bundle exec pod install --no-repo-update

Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - ICInputAccessory (0.1.0)
+  - ICInputAccessory (1.0.0)
 
 DEPENDENCIES:
   - ICInputAccessory (from `./`)
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
-  ICInputAccessory: 99d2957193e587e3d82c4b3a045c58c3b02c120c
+  ICInputAccessory: 341225aaa67a035b266880a5795001b363d1b1da
 
 COCOAPODS: 0.39.0

README.md

@@ -1,9 +1,13 @@
 # ICInputAccessory
 
-Customized text fields used in the iCook app.
+Customized text fields used in the [iCook app](https://itunes.apple.com/app/id554065086).
+Try <https://testflight.icook.tw>.
 
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![Build Status](https://travis-ci.org/polydice/ICInputAccessory.svg?branch=develop)](https://travis-ci.org/polydice/ICInputAccessory)
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/ICInputAccessory.svg)](https://img.shields.io/cocoapods/v/ICInputAccessory.svg)
+![Platform](https://img.shields.io/cocoapods/p/ICInputAccessory.svg?style=flat)
+![Swift 2.1.1](https://img.shields.io/badge/Swift-2.1.1-orange.svg)
 
 ### ICKeyboardDismissTextField
 
@@ -12,20 +16,14 @@ Customized text fields used in the iCook app.
 ### ICTokenField
 
 * A horizontal scrolling UI that groups input texts.
-* Easy to add and delete tokens.
+* Easy to add, select and delete tokens.
 * Customizable icon and colors.
 
-<table>
-  <tr>
-    <th>ICKeyboardDismissTextField</th>
-    <th rowspan="2"></th>
-    <th>ICTokenField</th>
-  </tr>
-  <tr>
-    <th><img src="https://raw.githubusercontent.com/polydice/ICInputAccessory/gh-pages/screenshots/ICKeyboardDismissTextField.png" width="90%" /></th>
-    <th><img src="https://raw.githubusercontent.com/polydice/ICInputAccessory/gh-pages/screenshots/ICTokenField.png" width="90%" /></th>
-  </tr>
-</table>
+![ICTokenField](https://raw.githubusercontent.com/polydice/ICInputAccessory/gh-pages/screenshots/ICTokenField.gif)
+
+## Requirements
+
+iOS 8.0+ with Xcode 7.2 or above.
 
 ## Installation
 
@@ -37,21 +35,22 @@ Customized text fields used in the iCook app.
   github "polydice/ICInputAccessory"
   ```
 
-* On your application targets' **General** settings tab, in the **Linked Frameworks and Libraries** section, drag and drop `ICInputAccessory.framework` from the Carthage/Build directory.
+* Follow the [instruction](https://github.com/Carthage/Carthage#if-youre-building-for-ios) to add the framework to an iOS project.
 
-* On your application targets’ **Build Phases** settings tab, click the **+** icon and choose **New Run Script Phase**. Create a Run Script with the following contents:
+### Install via [CocoaPods](http://guides.cocoapods.org/)
 
-  ```
-  /usr/local/bin/carthage copy-frameworks
-  ```
+* Create a `Podfile` with the following specification and run `pod install`.
 
-  and add the following path to **Input Files**:
+  ```rb
+  platform :ios, '8.0'
+  use_frameworks!
 
-  ```
-  $(SRCROOT)/Carthage/Build/iOS/ICInputAccessory.framework
+  pod 'ICInputAccessory'
   ```
 
-* For more information, please check out the [Carthage Documentation](https://github.com/Carthage/Carthage#if-youre-building-for-ios).
+### Install Manually
+
+* Everything you need resides in the `Source` directory. Drag those files to a project.
 
 ## Usage
 
@@ -107,7 +106,7 @@ public var normalTokenAttributes: [String : NSObject]? { get set }
 public var highlightedTokenAttributes: [String : NSObject]? { get set }
 ```
 
-  See `Example/CustomizedTokenField.swift` for more detail.
+See `Example/CustomizedTokenField.swift` for more details.
 
 #### ICTokenFieldDelegate
 
@@ -118,3 +117,33 @@ public var highlightedTokenAttributes: [String : NSObject]? { get set }
 * `tokenFieldWillReturn(_:)`
 * `tokenField(_:didEnterText:)`
 * `tokenField(_:didDeleteText:atIndex:)`
+
+## Development
+
+Meke sure you have [Homebrew](http://brew.sh/) installed, then run in the project root:
+
+```
+make setup
+```
+
+Tasks for testing:
+
+```
+rake -T
+```
+
+## Contributing
+
+Thank you for being interested in contributing to this project. We'd love to hear your ideas!
+
+Please fork this repository, create a branch named like `feature/some-new-feature` and send us a pull request to make this project better.
+
+## Contact
+
+[![Twitter](https://img.shields.io/badge/twitter-@polydice-blue.svg?style=flat)](https://twitter.com/polydice)
+
+## License
+
+Copyright (c) 2016 [Polydice, Inc.](https://polydice.com)
+
+**ICInputAccessory** is released under the MIT license. See [LICENSE](https://github.com/polydice/ICInputAccessory/blob/master/LICENSE) for details.

Source/ICKeyboardDismissTextField.swift

@@ -38,23 +38,31 @@ public class ICKeyboardDismissTextField: UITextField {
 
   override public init(frame: CGRect) {
     super.init(frame: frame)
-    inputAccessoryView = accessoryView
+    setUpAccessoryView()
   }
 
   required public init?(coder aDecoder: NSCoder) {
     super.init(coder: aDecoder)
-    inputAccessoryView = accessoryView
+    setUpAccessoryView()
   }
 
   // MARK: - UIResponder
 
   override public func becomeFirstResponder() -> Bool {
-    accessoryView.alpha = 1
+    if UI_USER_INTERFACE_IDIOM() == .Phone {
+      accessoryView.alpha = 1
+    }
     return super.becomeFirstResponder()
   }
 
   // MARK: - Private Methods
 
+  private func setUpAccessoryView() {
+    if UI_USER_INTERFACE_IDIOM() == .Phone {
+      inputAccessoryView = accessoryView
+    }
+  }
+
   @IBAction private func dismiss(sender: UIButton) {
     resignFirstResponder()
     UIView.animateWithDuration(0.3) {