Allow mapLoadingIndicator reuse for searching (#10)

Includes renaming and structural changes to get customizable layout
margins.

Author: hlfcoding

Pod/Assets/MapViewController.xib

@@ -10,9 +10,11 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="HLFMapViewController">
             <connections>
-                <outlet property="mapLoadingIndicator" destination="bFc-3I-HFj" id="sMc-oj-9X1"/>
+                <outlet property="mapIndicator" destination="bFc-3I-HFj" id="jLy-Sh-HqJ"/>
                 <outlet property="mapView" destination="G8V-3k-Wdt" id="Pbp-yq-GB5"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+                <outletCollection property="mapIndicatorLoadingConstraints" destination="Uvs-bg-zhB" collectionClass="NSMutableArray" id="65V-0D-RqI"/>
+                <outletCollection property="mapIndicatorLoadingConstraints" destination="Wcc-GI-BGc" collectionClass="NSMutableArray" id="bZg-Dm-TM7"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -26,18 +28,30 @@
                         <outlet property="delegate" destination="-1" id="4j0-hg-bdI"/>
                     </connections>
                 </mapView>
-                <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="bFc-3I-HFj">
-                    <rect key="frame" x="169.5" y="315.5" width="37" height="37"/>
-                </activityIndicatorView>
+                <view opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hCJ-Hd-eKb">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <subviews>
+                        <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="bFc-3I-HFj">
+                            <rect key="frame" x="169" y="315" width="37" height="37"/>
+                        </activityIndicatorView>
+                    </subviews>
+                    <constraints>
+                        <constraint firstItem="bFc-3I-HFj" firstAttribute="centerY" secondItem="hCJ-Hd-eKb" secondAttribute="centerY" id="Uvs-bg-zhB"/>
+                        <constraint firstItem="bFc-3I-HFj" firstAttribute="centerX" secondItem="hCJ-Hd-eKb" secondAttribute="centerX" id="Wcc-GI-BGc"/>
+                    </constraints>
+                    <edgeInsets key="layoutMargins" top="15" left="15" bottom="15" right="15"/>
+                </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
+                <constraint firstAttribute="bottom" secondItem="hCJ-Hd-eKb" secondAttribute="bottom" id="2UX-Bg-q95"/>
                 <constraint firstAttribute="bottom" secondItem="G8V-3k-Wdt" secondAttribute="bottom" id="2li-I6-lwV"/>
+                <constraint firstItem="hCJ-Hd-eKb" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="5Lu-yQ-tsF"/>
+                <constraint firstItem="hCJ-Hd-eKb" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="DQ2-Ij-jNe"/>
+                <constraint firstAttribute="trailing" secondItem="hCJ-Hd-eKb" secondAttribute="trailing" id="HLk-RL-IFa"/>
                 <constraint firstItem="G8V-3k-Wdt" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Yfl-bA-srW"/>
                 <constraint firstAttribute="trailing" secondItem="G8V-3k-Wdt" secondAttribute="trailing" id="aIN-cg-n6x"/>
-                <constraint firstItem="bFc-3I-HFj" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="eh2-WS-8M2"/>
                 <constraint firstItem="G8V-3k-Wdt" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="mrn-7J-SUz"/>
-                <constraint firstItem="bFc-3I-HFj" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="xL3-Sj-dNo"/>
             </constraints>
         </view>
     </objects>

Pod/Classes/MapViewController.swift

@@ -36,7 +36,12 @@ open class MapViewController: UIViewController {
     /** Not required, but this view controller is pretty useless without a delegate. */
     open weak var delegate: MapViewControllerDelegate?
 
-    @IBOutlet open weak var mapLoadingIndicator: UIActivityIndicatorView!
+    @available(*, deprecated, renamed: "mapIndicator")
+    open var mapLoadingIndicator: UIActivityIndicatorView! {
+        get { return mapIndicator }
+        set { mapIndicator = newValue }
+    }
+    @IBOutlet open var mapIndicator: UIActivityIndicatorView!
     @IBOutlet open var mapView: MKMapView!
 
     open fileprivate(set) var locationManager: CLLocationManager!
@@ -56,7 +61,7 @@ open class MapViewController: UIViewController {
 
         initLocationManager()
         initSearchController()
-        mapLoadingIndicator.color = view.tintColor
+        mapIndicator.color = view.tintColor
 
         // TODO: Handle location loading timeout.
     }
@@ -81,6 +86,17 @@ open class MapViewController: UIViewController {
 
     // MARK: Implementation
 
+    @IBOutlet fileprivate var mapIndicatorLoadingConstraints: [NSLayoutConstraint]!
+    fileprivate lazy var mapIndicatorSearchingConstraints: [NSLayoutConstraint] = {
+        let container = self.mapIndicator.superview!
+        return [
+            self.mapIndicator.topAnchor.constraint(
+                equalTo: self.topLayoutGuide.bottomAnchor, constant: container.layoutMargins.top),
+            self.mapIndicator.trailingAnchor.constraint(
+                equalTo: container.layoutMarginsGuide.trailingAnchor),
+        ]
+    }()
+
     fileprivate var hasSearch: Bool {
         return !preparedSearchQuery.isEmpty
     }
@@ -234,7 +250,9 @@ open class MapViewController: UIViewController {
     fileprivate func revealMapView(completion: (() -> Void)? = nil) {
         guard mapView.isHidden else { return }
 
-        mapLoadingIndicator.stopAnimating()
+        mapIndicator.stopAnimating()
+        NSLayoutConstraint.deactivate(mapIndicatorLoadingConstraints)
+        NSLayoutConstraint.activate(mapIndicatorSearchingConstraints)
 
         mapView.alpha = 0
         mapView.isHidden = false