Merge pull request #206 from Esri/v.next

iOS 13

README.md

@@ -26,7 +26,7 @@ The project also demonstrates some patterns for building real-world apps around
 * Swift KVO & NotificationCenter state handling
 
 ## Get Started
-You will need [Xcode 10.2](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) and the [ArcGIS Runtime SDK](https://developers.arcgis.com/ios/latest/swift/guide/install.htm#ESRI_SECTION1_D57435A2BEBC4D29AFA3A4CAA722506A) (v100.5 or later) installed locally.
+You will need [Xcode 11](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) and the [ArcGIS Runtime SDK](https://developers.arcgis.com/ios/latest/swift/guide/install.htm#ESRI_SECTION1_D57435A2BEBC4D29AFA3A4CAA722506A) (v100.5 or later) installed locally.
 
 ### Fork the repo
 **Fork** the [Data Collection](https://github.com/Esri/data-collection-ios/fork) repo
@@ -91,7 +91,7 @@ For OAuth configuration, create a new Application in your ArcGIS Portal to obtai
 Learn more about Esri Example Apps [here](https://developers.arcgis.com/example-apps).
 
 ## Requirements
-* [Xcode 10.2 and Swift 5](https://itunes.apple.com/us/app/xcode/id497799835?mt=12)
+* [Xcode 11 and Swift 5](https://itunes.apple.com/us/app/xcode/id497799835?mt=12)
 * [ArcGIS Runtime SDK for iOS](https://developers.arcgis.com/ios/)
 * To edit records or take a web map offline you will need an ArcGIS Online Organizational account, an ArcGIS Online Developer account or an ArcGIS Online account authenticated using a social login.
 * To consume your own web map you will need an ArcGIS Online Organizational account.

RELEASE.md

@@ -1,3 +1,7 @@
+# Release 1.1.1
+
+- Support for iOS 13
+
 # Release 1.1
 
 ## Major Features and Improvements

data-collection/Resources/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

data-collection/data-collection/View Controllers/AppContextAwareNavigationController.swift

@@ -38,7 +38,20 @@ class AppContextAwareNavigationController: UINavigationController {
     }
 
     private func adjustNavigationBarTintForWorkMode() {
-        navigationBar.barTintColor = appContext.workMode == .online ? .primary : .offline
+
+        if #available(iOS 13.0, *) {
+            let navBarAppearance = UINavigationBarAppearance()
+            navBarAppearance.configureWithOpaqueBackground()
+            navBarAppearance.titleTextAttributes = [.foregroundColor: UIColor.contrasting]
+            navBarAppearance.largeTitleTextAttributes = [.foregroundColor: UIColor.contrasting]
+            navBarAppearance.backgroundColor = appContext.workMode == .online ? .primary : .offline
+            navigationBar.standardAppearance = navBarAppearance
+            navigationBar.scrollEdgeAppearance = navBarAppearance
+            navigationBar.compactAppearance = navBarAppearance
+        }
+        else {
+            navigationBar.barTintColor = appContext.workMode == .online ? .primary : .offline
+        }
     }
 
     private func subscribeToWorkModeChange() {

data-collection/data-collection/View Controllers/Rich Popup View Controllers/Rich Popup View Controller/RichPopupViewController.swift

@@ -186,6 +186,12 @@ class RichPopupViewController: SegmentedViewController {
             self.navigationItem.leftBarButtonItem = self.dismissButton
         }
 
+        // Because iOS 13 introduces a new modal dismissal paradigm (swipe-down),
+        // we need to inform the view controller not to dismiss the view controller if editing.
+        if #available(iOS 13.0, *) {
+            isModalInPresentation = self.popupManager.isEditing
+        }
+
         // If this is a newly added record, we will need to add a delete button.
         conditionallyAddDeleteButton()
     }