diff --git a/Spellbook.xcodeproj/project.pbxproj b/Spellbook.xcodeproj/project.pbxproj
index 6cd84cdb..d8319290 100644
--- a/Spellbook.xcodeproj/project.pbxproj
+++ b/Spellbook.xcodeproj/project.pbxproj
@@ -1009,7 +1009,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_STYLE[sdk=iphoneos*]" = Automatic;
- CURRENT_PROJECT_VERSION = 38;
+ CURRENT_PROJECT_VERSION = 41;
DEFINES_MODULE = NO;
DEVELOPMENT_TEAM = RSR87G74R7;
EXCLUDED_ARCHS = "";
@@ -1019,7 +1019,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 3.1.0;
+ MARKETING_VERSION = 3.2.0;
PRODUCT_BUNDLE_IDENTIFIER = dnd.jon.Spellbook;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1038,7 +1038,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_STYLE[sdk=iphoneos*]" = Automatic;
- CURRENT_PROJECT_VERSION = 38;
+ CURRENT_PROJECT_VERSION = 41;
DEFINES_MODULE = NO;
DEVELOPMENT_TEAM = RSR87G74R7;
EXCLUDED_ARCHS = "";
@@ -1048,7 +1048,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 3.1.0;
+ MARKETING_VERSION = 3.2.0;
PRODUCT_BUNDLE_IDENTIFIER = dnd.jon.Spellbook;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Spellbook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Spellbook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 86b3af16..d30fbcfc 100644
--- a/Spellbook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Spellbook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,52 +1,49 @@
{
- "object": {
- "pins": [
- {
- "package": "ActionSheetPicker-3.0",
- "repositoryURL": "https://github.com/skywinder/ActionSheetPicker-3.0",
- "state": {
- "branch": null,
- "revision": "8d82c21036c2f478a47908a7fc107ec7027abcab",
- "version": null
- }
- },
- {
- "package": "ReSwift",
- "repositoryURL": "https://github.com/ReSwift/ReSwift.git",
- "state": {
- "branch": null,
- "revision": "cb5c3c02f652420ef413dea41e13ac5a76b6c0fd",
- "version": "6.1.1"
- }
- },
- {
- "package": "SimpleCheckbox",
- "repositoryURL": "https://github.com/BeauNouvelle/SimpleCheckbox.git",
- "state": {
- "branch": null,
- "revision": "96cf25c98bd8e595018df6a2466a9a1eb348fdb8",
- "version": "2.3.0"
- }
- },
- {
- "package": "SWXMLHash",
- "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git",
- "state": {
- "branch": null,
- "revision": "4d0f62f561458cbe1f732171e625f03195151b60",
- "version": "7.0.1"
- }
- },
- {
- "package": "Toast",
- "repositoryURL": "https://github.com/scalessec/Toast-Swift",
- "state": {
- "branch": null,
- "revision": "0c9493eeacb102cc614da385cfaaf475379f4ab4",
- "version": "5.0.1"
- }
+ "pins" : [
+ {
+ "identity" : "actionsheetpicker-3.0",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/skywinder/ActionSheetPicker-3.0",
+ "state" : {
+ "revision" : "8d82c21036c2f478a47908a7fc107ec7027abcab"
}
- ]
- },
- "version": 1
+ },
+ {
+ "identity" : "reswift",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/ReSwift/ReSwift.git",
+ "state" : {
+ "revision" : "cb5c3c02f652420ef413dea41e13ac5a76b6c0fd",
+ "version" : "6.1.1"
+ }
+ },
+ {
+ "identity" : "simplecheckbox",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/BeauNouvelle/SimpleCheckbox.git",
+ "state" : {
+ "revision" : "96cf25c98bd8e595018df6a2466a9a1eb348fdb8",
+ "version" : "2.3.0"
+ }
+ },
+ {
+ "identity" : "swxmlhash",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/drmohundro/SWXMLHash.git",
+ "state" : {
+ "revision" : "4d0f62f561458cbe1f732171e625f03195151b60",
+ "version" : "7.0.1"
+ }
+ },
+ {
+ "identity" : "toast-swift",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/scalessec/Toast-Swift",
+ "state" : {
+ "revision" : "0c9493eeacb102cc614da385cfaaf475379f4ab4",
+ "version" : "5.0.1"
+ }
+ }
+ ],
+ "version" : 2
}
diff --git a/Spellbook/Base.lproj/Main.storyboard b/Spellbook/Base.lproj/Main.storyboard
index 34b5c2aa..807ce3e8 100644
--- a/Spellbook/Base.lproj/Main.storyboard
+++ b/Spellbook/Base.lproj/Main.storyboard
@@ -463,7 +463,7 @@
-
+
-
+
@@ -1595,14 +1595,14 @@
-
+
-
+
@@ -1677,7 +1677,7 @@
@@ -1962,7 +1962,7 @@
-
+
@@ -2020,7 +2020,7 @@
-
+
@@ -2110,7 +2110,7 @@
-
+
@@ -2169,7 +2169,7 @@
-
+
@@ -2256,7 +2256,7 @@
-
+
@@ -2407,7 +2407,7 @@
-
+
@@ -2529,7 +2529,7 @@
-
+
@@ -2643,7 +2643,7 @@
-
+
@@ -2753,7 +2753,7 @@
-
+
@@ -2897,7 +2897,7 @@
-
+
@@ -3036,7 +3036,7 @@
-
+
diff --git a/Spellbook/TextFieldChooserDelegate.swift b/Spellbook/TextFieldChooserDelegate.swift
index 83ade282..398d3dc0 100644
--- a/Spellbook/TextFieldChooserDelegate.swift
+++ b/Spellbook/TextFieldChooserDelegate.swift
@@ -50,15 +50,14 @@ class TextFieldChooserDelegate: NSObject, UITextFieldDel
// Get the index of the selected option
let selectedItem = self.itemProvider()
- let selectedIndex: Int = items.firstIndex(of: selectedItem) ?? 0
var itemsToUse = self.items
if (self.itemFilter != nil) {
itemsToUse = self.items.filter(self.itemFilter!)
}
+ let selectedIndex: Int = itemsToUse.firstIndex(of: selectedItem) ?? 0
let pickerData = itemsToUse.map(self.nameGetter)
-
// Create the action sheet picker
let actionSheetPicker = ActionSheetStringPicker(title: title,
rows: pickerData,