Merge pull request #28 from Carifio24/v3-4-0

Version 3.4.0

Data/UpdateInfo.xml

@@ -29,4 +29,9 @@
         <item name="title">Version 3.1.0 update</item>
         <item name="description">This update adds a button to the spell slots screen to regain all slots.</item>
     </section>
+    <section name="v_3_4_0">
+        <item name="title">Version 3.4.0 update</item>
+        <item name="description">The spellbook has been updated with the following new features:&lt;br/&gt;&lt;br/&gt;&#8226; The ability to filter spells by royalty has been added.&lt;br/&gt;&lt;br/&gt;&#8226; The count for each spell list is now shown next to the list name in both the side menu and the bottom navigation bar.&lt;br/&gt;&lt;br/&gt;Additionally, this update fixes some typos and mistakes in the text for a few spells.</item>
+            </item>
+    </section>
 </root>

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 = 43;
+				CURRENT_PROJECT_VERSION = 46;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = RSR87G74R7;
 				EXCLUDED_ARCHS = "";
@@ -1019,7 +1019,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.4.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 = 43;
+				CURRENT_PROJECT_VERSION = 46;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = RSR87G74R7;
 				EXCLUDED_ARCHS = "";
@@ -1048,7 +1048,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dnd.jon.Spellbook;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Spellbook/SpellSlotsController.swift

@@ -17,9 +17,12 @@ class SpellSlotsController: UITableViewController {
 
     static let cellReuseIdentifier = "spellSlotCell"
     static let spellSlotsManagerIdentifier = "spellSlotsManager"
+    private var hideNavBarOnSwipeWhenDismissed: Bool = true
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        hideNavBarOnSwipeWhenDismissed = navigationController?.hidesBarsOnSwipe ?? true
+        navigationController?.hidesBarsOnSwipe = false
         store.subscribe(self) {
             $0.select {
                 $0.profile?.spellSlotStatus.totalSlots
@@ -60,14 +63,15 @@ class SpellSlotsController: UITableViewController {
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         Controllers.spellSlotsController = nil
+        navigationController?.hidesBarsOnSwipe = hideNavBarOnSwipeWhenDismissed
     }
-    
+
     @objc func openSlotManager() {
         let controller = storyboard?.instantiateViewController(withIdentifier: SpellSlotsController.spellSlotsManagerIdentifier) as! SpellSlotsManagerController
         controller.modalPresentationStyle = .pageSheet
         self.present(controller, animated: true, completion: nil)
     }
-    
+
     @objc func regainSpentSlots() {
         store.dispatch(RegainAllSlotsAction())
         tableView.reloadData()
@@ -109,6 +113,16 @@ class SpellSlotsController: UITableViewController {
         return cell
     }
 
+    // We don't want the cells to be selectable
+    override func tableView(_ tableView: UITableView, willSelectRowAt indexPath: IndexPath) -> IndexPath? {
+        return nil
+    }
+
+    // Prevent the row from highlight flickering when pressed
+    override func tableView(_ tableView: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool {
+        return false
+    }
+
 }
 
 extension SpellSlotsController: StoreSubscriber {

Spellbook/VersionInfo.swift

@@ -11,8 +11,8 @@ import SWXMLHash
 
 class VersionInfo {
 
-    static let version = Version(major: 3, minor: 1, patch: 0)
-    static let previousVersion = Version(major: 3, minor: 0, patch: 0)
+    static let version = Version(major: 3, minor: 4, patch: 0)
+    static let previousVersion = Version(major: 3, minor: 3, patch: 0)
 
     static let currentVersionKey = "v_" + version.string(separator: "_")