Merge pull request #110 from AnyRead/master

Author: PhamBaTho

BTNavigationDropdownMenu.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.social_media_url   = "https://www.facebook.com/phambatho"
   s.platform     = :ios, '8.0'
   s.source       = { :git => "https://github.com/PhamBaTho/BTNavigationDropdownMenu.git", :tag => s.version.to_s }
-  s.source_files  = "Source/**/*.swift"
+  s.source_files  = "Source/**/**/*.swift"
   s.resources = "Source/*.bundle"
   s.requires_arc = true
 end

Demo/Demo.xcodeproj/project.pbxproj

@@ -6,13 +6,12 @@
 <!--[![Build Status](https://travis-ci.org/PhamBaTho/BTNavigationDropdownMenu.svg?branch=master)](https://travis-ci.org/PhamBaTho/BTNavigationDropdownMenu)-->
 
 ## Introduction:
-The elegant dropdown menu, written in **Swift**, appears underneath navigation bar to display a list of related items when a user click on the navigation title.
+This elegant **Swift** dropdown menu appears underneath the navigation bar to display a list of related items when a user clicks on the navigation title.
 
 ![alt tag](https://github.com/PhamBaTho/BTNavigationDropdownMenu/blob/master/Assets/Demo.gif)
 
 ## Installation:
-**BTNavigationDropdownMenu** is available through [CocoaPods](http://cocoapods.org). To install
-it, simply add the following line to your Podfile:
+**BTNavigationDropdownMenu** is available through [CocoaPods](http://cocoapods.org). To install it, simply add the following line to your Podfile:
 
 ```ruby
 use_frameworks!
@@ -22,33 +21,25 @@ Go ahead and **import** BTNavigationDropdownMenu into your own Swift files
 ```swift
 import BTNavigationDropdownMenu
 ```
-Note: This library mainly supports for **Xcode 7, Swift 2.2** and embedded frameworks.
-
-⚡⚡️⚡ **Swift 3.0 supporting** ⚡⚡⚡
-
-If you would like to use Swift 3.0, you can use these lines of code in your Podfile:
-
-```ruby
-pod 'BTNavigationDropdownMenu', :git => 'https://github.com/PhamBaTho/BTNavigationDropdownMenu.git', :branch => 'swift-3.0'
-```
+Note: This library supports for **Xcode 8.3 Swift 3.1** and embedded frameworks.
 
 ## Usage:
-### Instantiating
-Start by creating an Array that contains strings as **elements of dropdown list**:
+### Instantiate
+Start by creating an Array that contains strings as **elements of a dropdown list**:
 ```swift
 let items = ["Most Popular", "Latest", "Trending", "Nearest", "Top Picks"]
 ```
 Create a **new instance** of BTNavigationDropdownMenu:
 ```swift
 let menuView = BTNavigationDropdownMenu(navigationController: self.navigationController, containerView: self.navigationController!.view, title: "Dropdown Menu", items: items)
 ```
-or just simple like this:
+or like this:
 ```swift
 let menuView = BTNavigationDropdownMenu(title: items[0], items: items)
 ```
-By default, `navigationController` is the top most navigation controller and `containerView` is keyWindow. 
+By default, `navigationController` is the topmost navigation controller and `containerView` is keyWindow. 
 
-(`keyWindow` is recommended for `containerView` because in this way, the black overlay can cover the whole screen. But in some cases, `keyWindow` doesn't work properly, like using with side menu, (e.g. SWRevealViewController), the dropdown menu didn't move along with their parent view controller or navigation controller. To resolve this issue, you can use `self.navigationController!.view` instead.)
+(`keyWindow` is recommended for `containerView` because the black overlay can cover the whole screen. In some cases, `keyWindow` doesn't work properly, like using with side menu, (e.g. SWRevealViewController), the dropdown menu doesn't move along with the parent view or navigation controller. To workaround this issue, you can use `self.navigationController!.view`.)
 
 Set **title of navigation bar** as menuView:
 ```swift
@@ -61,56 +52,58 @@ menuView.didSelectItemAtIndexHandler = {[weak self] (indexPath: Int) -> () in
             self.selectedCellLabel.text = items[indexPath]
 }
 ```
-Use `menuView.show()` or `menuView.hide()` if you want to show or hide dropdown menu manually.
+`menuView.show()` or `menuView.hide()` to show or hide dropdown menu manually.
 
-Use `menuView.toggle()` to toogle dropdown menu shown/hide.
+`menuView.toggle()` to toogle dropdown menu shown/hide.
 
-Use `menuView.isShown` (Boolean type) property to check showing state of dropdown menu.
+`menuView.isShown` (Boolean type) property to check showing state of dropdown menu.
 
-Use `menuView.updateItems(items: [AnyObject])` to update items in dropdown menu if needed.
+`menuView.updateItems(items: [AnyObject])` to update items in dropdown menu.
 
 ### Customization
-Once you have assigned the items and frame for dropdown menu, you can custom the look and the feel of menu. You can override these properties for your favor:
+First, assign the items and frame for the dropdown menu. Then, customize the look and feel of the menu by overriding these properties:
+
+`cellHeight` **- Cell height** *Default is 50*
 
-`cellHeight` **- The height of the cell.** *Default is 50*
+`cellBackgroundColor` **- Cell background color** *Default is whiteColor()*
 
-`cellBackgroundColor` **- The color of the cell background.** *Default is whiteColor()*
+`cellSeparatorColor` **- Cell separator color** *Default is darkGrayColor()*
 
-`cellSeparatorColor` **- The color of the cell separator.** *Default is darkGrayColor()*
+`cellTextLabelColor` **- Text color inside of the cell** *Default is darkGrayColor()*
 
-`cellTextLabelColor` **- The color of the text inside cell.** *Default is darkGrayColor()*
+`cellTextLabelFont` **- Font inside the cell** *Default is HelveticaNeue-Bold, size 17*
 
-`cellTextLabelFont` **- The font of the text inside cell.** *Default is HelveticaNeue-Bold, size 17*
+`navigationBarTitleFont` **- Navigation bar title font** *Default is HelveticaNeue-Bold, size 17*
 
-`navigationBarTitleFont` **- The font of the navigation bar title.** *Default is HelveticaNeue-Bold, size 17*
+`cellTextLabelAlignment` **- Text alignment inside of the cell** *Default is .Left*
 
-`cellTextLabelAlignment` **- The alignment of the text inside cell.** *Default is .Left*
+`cellSelectionColor`  **- Selected color of the cell** *Default is lightGrayColor()*
 
-`cellSelectionColor`  **- The color of the cell when the cell is selected.** *Default is lightGrayColor()*
+`checkMarkImage`  **- Checkmark icon for the cell.**
 
-`checkMarkImage`  **- The checkmark icon of the cell.**
+`animationDuration`  **- Animation duration for showing/hiding of the menu** *Default is 0.5s*
 
-`animationDuration`  **- The animation duration of showing/hiding menu.** *Default is 0.5s*
+`arrowImage`  **- Arrow next to the navigation title**
 
-`arrowImage`  **- The arrow next to navigation title**
+`arrowPadding`  **- Padding between the navigation title and arrow.** *Default is 15*
 
-`arrowPadding`  **- The padding between navigation title and arrow.** *Default is 15*
+`maskBackgroundColor`  **- Mask layer color** *Default is blackColor()*
 
-`maskBackgroundColor`  **- The color of the mask layer.** *Default is blackColor()*
+`maskBackgroundOpacity`  **- Opacity of the mask layer** *Default is 0.3*
 
-`maskBackgroundOpacity`  **- The opacity of the mask layer.** *Default is 0.3*
+`menuTitleColor`  **- Title color displayed in the menu.** *Default is lightGrayColor()*
 
-`shouldKeepSelectedCellColor` **- The boolean value that decides if selected color of cell is visible when the menu is shown.** *Default is false*
+`shouldKeepSelectedCellColor` **- Selected cell color visibility when menu is shown** *Default is false*
 
-`shouldChangeTitleText` **- The boolean value that decides if you want to change the title text when a cell is selected.** *Default is true*
+`shouldChangeTitleText` **- Ability to change the selected title text** *Default is true*
 
-`selectedCellTextLabelColor`  **- The color of the selected cell text label.** *Default is darkGrayColor()*
+`selectedCellTextLabelColor`  **- Selected cell text label color** *Default is darkGrayColor()*
 
-`arrowTintColor`  **- The tint color of the arrow.** *Default is whiteColor()*
+`arrowTintColor`  **- Tint color of the arrow.** *Default is whiteColor()*
 
 ## Requirement
 - iOS 8.0+ (CocoaPods with Swift support will only work on iOS 8.0+. Alternatively, you will have to import library manually to your project)
-- Xcode 7.0+, Swift 2.0+
+- Xcode 8.0+, Swift 3.0+
 
 ## Changelog
 See the [CHANGELOG](https://github.com/PhamBaTho/BTNavigationDropdownMenu/blob/master/CHANGELOG.md) for details

Demo/DemoTests/Info.plist Demo/DemoTests/Supporting Files/Info.plist

@@ -237,29 +237,34 @@ open class BTNavigationDropdownMenu: UIView {
     required public init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
-    
-    /// Legacy init converted as a convenience initializer to call the default init
-    ///
-    /// - Parameters:
-    ///   - navigationController: navigation Controller
-    ///   - containerView: container view
-    ///   - title: raw title to display
-    ///   - items: items to select
+
+    /**
+
+     Legacy init converted as a convenience initializer to call the default init
+
+     - parameters:
+        - navigationController: The present and visible navigation controller.
+        - containerView: The container view. Default is keyWindow.
+        - title: A string to define title to be displayed.
+        - items: The array of items to select
+     */
     public convenience init(navigationController: UINavigationController? = nil, containerView: UIView = UIApplication.shared.keyWindow!, title: String, items: [String]) {
 
         self.init(navigationController: navigationController, containerView: containerView, title: BTTitle.title(title), items: items)
-        
     }
 
-    
-    /// Default init. This will allow the user to define a raw title or a index where the user can pre-define the index that is selected. This is specially handy for when it's necessary to restore from a saved state
-    ///
-    /// - Parameters:
-    ///   - navigationController: navigation controllre
-    ///   - containerView: container view
-    ///   - title: enum with the title to display
-    ///   - items: items to select
+    /**
+
+     Default init. This will allow the user to define a string or a index where the user can
+     pre-define as a default selected. This is specially handy for when it's necessary to
+     restore from a saved state
+
+     - parameters:
+        - navigationController: The present and visible navigation controller.
+        - containerView: The container view. Default is keyWindow.
+        - title: An enum to define title to be displayed, can be a string or index of items.
+        - items: The array of items to select
+     */
     public init(navigationController: UINavigationController? = nil, containerView: UIView = UIApplication.shared.keyWindow!, title: BTTitle, items: [String]) {
         // Key window
         guard let window = UIApplication.shared.keyWindow else {
@@ -500,7 +505,7 @@ open class BTNavigationDropdownMenu: UIView {
     func rotateArrow() {
         UIView.animate(withDuration: self.configuration.animationDuration, animations: {[weak self] () -> () in
             if let selfie = self {
-                selfie.menuArrow.transform = selfie.menuArrow.transform.rotated(by: 180 * CGFloat(M_PI/180))
+                selfie.menuArrow.transform = selfie.menuArrow.transform.rotated(by: 180 * CGFloat(Double.pi/180))
             }
             })
     }

README.md

@@ -1,21 +1,38 @@
 //
 //  BTTitle.swift
-//  Demo
 //
-//  Created by Manuel Gomes on 06/02/2017.
-//  Copyright © 2017 PHAM BA THO. All rights reserved.
+//  Copyright (c) 2017 PHAM BA THO ([email protected]). All rights reserved.
 //
+//  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.
 
 import Foundation
 
+/**
 
-/// Allows to define the type of title that I want. A default title or just onde of the items
-///
-/// - title: default title
-/// - index: index to fetch from the items
-public enum BTTitle{
+ An enum to set type of navigation title.
 
+ - parameters:
+    - title: Set navigation title as string.
+    - index: Set navigation title as index of items.
+             Items is defined from BTNavigationDropdownMenu initialization.
+ */
+public enum BTTitle {
     case title(String)
     case index(Int)
-    
 }

Source/BTNavigationDropdownMenu.swift

@@ -1,14 +1,28 @@
 //
 //  BTConfiguration.swift
-//  Demo
 //
-//  Created by Manuel Gomes on 06/02/2017.
-//  Copyright © 2017 PHAM BA THO. All rights reserved.
+//  Copyright (c) 2017 PHAM BA THO ([email protected]). All rights reserved.
 //
+//  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.
 
 import UIKit
 
-// MARK: BTConfiguration
 final class BTConfiguration {
     var menuTitleColor: UIColor?
     var cellHeight: CGFloat!

Source/BTTitle.swift

@@ -0,0 +1,57 @@
+//
+//  BTTableCellContentView.swift
+//
+//  Copyright (c) 2017 PHAM BA THO ([email protected]). All rights reserved.
+//
+//  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.
+
+import UIKit
+
+// Content view of table view cell
+class BTTableCellContentView: UIView {
+    var separatorColor: UIColor = UIColor.black
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        self.initialize()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        
+        self.initialize()
+    }
+    
+    func initialize() {
+        self.backgroundColor = UIColor.clear
+    }
+    
+    override func draw(_ rect: CGRect) {
+        super.draw(rect)
+        let context = UIGraphicsGetCurrentContext()
+        
+        // Set separator color of dropdown menu based on barStyle
+        context?.setStrokeColor(self.separatorColor.cgColor)
+        context?.setLineWidth(1)
+        context?.move(to: CGPoint(x: 0, y: self.bounds.size.height))
+        context?.addLine(to: CGPoint(x: self.bounds.size.width, y: self.bounds.size.height))
+        context?.strokePath()
+    }
+}

Source/BTConfiguration.swift Source/Internal/BTConfiguration.swift

@@ -1,14 +1,28 @@
 //
 //  BTTableView.swift
-//  Demo
 //
-//  Created by Manuel Gomes on 06/02/2017.
-//  Copyright © 2017 PHAM BA THO. All rights reserved.
+//  Copyright (c) 2017 PHAM BA THO ([email protected]). All rights reserved.
 //
+//  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.
 
 import UIKit
 
-// MARK: Table View
 class BTTableView: UITableView, UITableViewDelegate, UITableViewDataSource {
 
     // Public properties