Bug fixes and Xcode 11 Updates

README.md

@@ -30,7 +30,7 @@ iOS 9.0+ | Xcode 8.3+ | Swift 3.0+
 ### CocoaPods
 
 ```ruby
-pod 'RSSelectionMenu' or pod 'RSSelectionMenu', '~> 6.0.4'
+pod 'RSSelectionMenu' or pod 'RSSelectionMenu', '~> 6.0.5'
 ```
 
 ### Carthage

RSSelectionMenu.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 	s.name         = "RSSelectionMenu"
-  	s.version      = "6.0.4"
+  	s.version      = "6.0.5"
 
     s.summary      = "An elegant selection list or dropdown menu for iOS with single or multiple selections."
   	s.description  = <<-DESC

RSSelectionMenu.xcworkspace/xcuserdata/rushisangani.xcuserdatad/IDEFindNavigatorScopes.plist

@@ -0,0 +1,5 @@
+<?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">
+<array/>
+</plist>

RSSelectionMenu/RSSelectionMenu.xcodeproj/project.pbxproj

@@ -167,7 +167,7 @@
 		D83570FE1F87986400185B73 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = "Rushi Sangani";
 				TargetAttributes = {
 					D83571061F87986400185B73 = {
@@ -370,8 +370,9 @@
 		D83571101F87986400185B73 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = T5CX5N9HK9;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -381,6 +382,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rushi.RSSelectionMenu;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -394,6 +396,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = T5CX5N9HK9;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -403,6 +406,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rushi.RSSelectionMenu;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

RSSelectionMenu/RSSelectionMenu.xcodeproj/xcshareddata/xcschemes/RSSelectionMenu.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:RSSelectionMenu.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

RSSelectionMenu/RSSelectionMenu/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0.4</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

RSSelectionMenu/RSSelectionMenu/Source/RSSelectionMenuController.swift

@@ -324,7 +324,7 @@ extension RSSelectionMenu {
             switch self?.menuPresentationStyle {
             case .push?:
                 self?.navigationController?.popViewController(animated: animated!)
-            case .present?, .popover?, .formSheet?, .alert?, .actionSheet?:
+            case .present?, .popover?, .formSheet?, .alert?, .actionSheet?, .bottomSheet?:
                self?.dismiss(animated: animated!, completion: nil)
             case .none:
                 break
@@ -407,12 +407,21 @@ extension RSSelectionMenu {
 
             // present as popover for iPad
             if let popoverController = tobePresentController.popoverPresentationController {
-                popoverController.sourceView = self.view
-                popoverController.permittedArrowDirections = []
-                popoverController.sourceRect = CGRect(x: self.view.bounds.midX, y: self.view.bounds.midY, width: 0, height: 0)
+                popoverController.sourceView = from.view
+                popoverController.permittedArrowDirections = .any
+                popoverController.sourceRect = CGRect(x: from.view.bounds.midX, y: from.view.bounds.midY, width: 0, height: 0)
+            }
+        }
+        else if case let .bottomSheet(barButton, height) = with {
+            tobePresentController = getAlertViewController(style: .actionSheet, title: nil, action: nil, height: height)
+            tobePresentController.setValue(self, forKey: contentViewController)
+
+            // present as popover for iPad
+            if let popoverController = tobePresentController.popoverPresentationController {
+                popoverController.barButtonItem = barButton
+                popoverController.permittedArrowDirections = .any
             }
         }
-
         from.present(tobePresentController, animated: true, completion: nil)
     }
 

RSSelectionMenu/RSSelectionMenu/Utilities/Enums.swift

@@ -43,6 +43,7 @@ public enum PresentationStyle {
     case popover(sourceView: UIView, size: CGSize?)
     case alert(title: String?, action: String?, height: Double?)
     case actionSheet(title: String?, action: String?, height: Double?)
+    case bottomSheet(barButton: UIBarButtonItem, height: Double?)
 }
 
 

RSSelectionMenuExample/RSSelectionMenuExample.xcodeproj/project.pbxproj

@@ -344,6 +344,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = T5CX5N9HK9;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -366,6 +367,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = T5CX5N9HK9;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

RSSelectionMenuExample/RSSelectionMenuExample.xcodeproj/xcshareddata/xcschemes/RSSelectionMenuExample.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1100"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A29317771F87FC3F0076A0C4"
+               BuildableName = "RSSelectionMenuExample.app"
+               BlueprintName = "RSSelectionMenuExample"
+               ReferencedContainer = "container:RSSelectionMenuExample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A29317771F87FC3F0076A0C4"
+            BuildableName = "RSSelectionMenuExample.app"
+            BlueprintName = "RSSelectionMenuExample"
+            ReferencedContainer = "container:RSSelectionMenuExample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A29317771F87FC3F0076A0C4"
+            BuildableName = "RSSelectionMenuExample.app"
+            BlueprintName = "RSSelectionMenuExample"
+            ReferencedContainer = "container:RSSelectionMenuExample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

RSSelectionMenuExample/RSSelectionMenuExample/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.2</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>