Change search to dismiss keyboard on "done" but not dismiss search results.

Author: bradhowes

SoundFontsFramework/SoundFontsFramework/Fonts, Presets, Tags/Fonts/FontsTableViewController.swift

@@ -71,10 +71,8 @@ extension FontsTableViewController {
   }
 
   override func viewDidLayoutSubviews() {
-
     if !isSearching && tableView.isDragging && tableView.contentOffset.y < -60 {
       beginSearch()
-      return
     }
   }
 
@@ -206,7 +204,7 @@ extension FontsTableViewController: UISearchBarDelegate {
 
   func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
     log.debug("searchBarSearchButtonClicked - \(searchBar.isFirstResponder)")
-    endSearch()
+    searchBar.resignFirstResponder()
   }
 
   func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {

SoundFontsFramework/SoundFontsFramework/Fonts, Presets, Tags/Presets/PresetsTableViewController.swift

@@ -255,7 +255,7 @@ extension PresetsTableViewController: UISearchBarDelegate {
 
   func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
     log.debug("searchBarSearchButtonClicked - \(searchBar.isFirstResponder)")
-    endSearch()
+    searchBar.resignFirstResponder()
   }
 
   func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {

SoundFontsFramework/SoundFontsFramework/UI/Views/FontsTableView.storyboard

@@ -19,7 +19,7 @@
                         <searchBar key="tableHeaderView" contentMode="redraw" barStyle="black" searchBarStyle="minimal" placeholder="Name" showsCancelButton="YES" translucent="NO" id="E1M-c5-9UF" userLabel="Filter">
                             <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
-                            <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" returnKeyType="done" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
+                            <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" returnKeyType="done" enablesReturnKeyAutomatically="YES" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
                             <scopeButtonTitles>
                                 <string>Title</string>
                                 <string>Title</string>

SoundFontsFramework/SoundFontsFramework/UI/Views/PresetsTableView.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="boy-lS-5Eb">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="boy-lS-5Eb">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -17,9 +17,9 @@
                         <color key="backgroundColor" red="0.078431372550000003" green="0.078431372550000003" blue="0.078431372550000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="sectionIndexColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <searchBar key="tableHeaderView" contentMode="redraw" barStyle="black" searchBarStyle="minimal" placeholder="Name" showsCancelButton="YES" translucent="NO" id="Qdk-w4-6Xp" userLabel="Filter">
-                            <rect key="frame" x="0.0" y="0.0" width="414" height="56"/>
+                            <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
-                            <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" returnKeyType="done" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
+                            <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" returnKeyType="done" enablesReturnKeyAutomatically="YES" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
                             <scopeButtonTitles>
                                 <string>Title</string>
                                 <string>Title</string>