Merge branch 'release/0.8' of github.com:woocommerce/woocommerce-ios into issue/open-beta-analytics-mark1

bummytime · bummytime · commit 8a476e235b8f · 2018-09-26T23:02:48.000-05:00
* 'release/0.8' of github.com:woocommerce/woocommerce-ios:
  OrderDetailsViewController: Fixing Typo
  SettingsViewController: Fixing Typo
  BillingDetailsTableViewCell: Applying gesture recognizer to the main view
  OrderDetailsViewController: Email Composer Appearance
  Updating Info.plist
  Project: ARCHS_STANDARD_64_BIT by  default
  Podfile: 64 Bit Workaround

# Conflicts:
#	WooCommerce/Classes/ViewRelated/Orders/OrderDetails/OrderDetailsViewController.swift
diff --git a/Networking/Networking.xcodeproj/project.pbxproj b/Networking/Networking.xcodeproj/project.pbxproj
@@ -871,6 +871,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -928,6 +929,7 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VALIDATE_PRODUCT = YES;
+				VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
diff --git a/Podfile b/Podfile
@@ -111,17 +111,29 @@ target 'Storage' do
 end
 
 
-# Workaround: Set SWIFT_VERSION = 4.0 in dependencies that do not have an explicit setting.
-# Xcode is bumping them up to 4.2, and the project just won't build.
-#
-# TODO: Remove as soon as the dependencies get updated!
+
+# Workarounds:
+# ============
 #
 post_install do |installer|
+
+  # Workaround: SWIFT_VERSION = 4.0 in dependencies that need it
+  # ============================================================
+  #
+  # TODO: Remove as soon as the dependencies get updated!
+  #
   installer.pods_project.targets.each do |target|
       if ['XLPagerTabStrip'].include? target.name
           target.build_configurations.each do |config|
               config.build_settings['SWIFT_VERSION'] = '4.0'
           end
       end
   end
+
+  # Workaround: Drop 32 Bit Architectures
+  # =====================================
+  #
+  installer.pods_project.build_configuration_list.build_configurations.each do |configuration|
+    configuration.build_settings['VALID_ARCHS'] = '$(ARCHS_STANDARD_64_BIT)'
+  end
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -142,6 +142,6 @@ SPEC CHECKSUMS:
   wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4
   XLPagerTabStrip: c908b17cbf42fcd2598ee1adfc49bae25444d88a
 
-PODFILE CHECKSUM: 981be965167cc86fe91da27bdad699c37a296081
+PODFILE CHECKSUM: 8f65818d967811f7366275f2d16515dd15ac0f9e
 
 COCOAPODS: 1.5.3
diff --git a/Storage/Storage.xcodeproj/project.pbxproj b/Storage/Storage.xcodeproj/project.pbxproj
@@ -568,6 +568,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -625,6 +626,7 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VALIDATE_PRODUCT = YES;
+				VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/SettingsViewController.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/SettingsViewController.swift
@@ -174,7 +174,7 @@ private extension SettingsViewController {
 
     func displaySupportEmailComposer() {
         // Workaround: MFMailCompose isn't *FULLY* picking up UINavigationBar's WC's appearance. Title / Buttons look awful.
-        // We're falling back to iOS's default appearence
+        // We're falling back to iOS's default appearance
         UINavigationBar.applyDefaultAppearance()
 
         // Subject + Composer
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/BillingDetailsTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/BillingDetailsTableViewCell.swift
@@ -34,7 +34,7 @@ class BillingDetailsTableViewCell: UITableViewCell {
             self?.onTouchUp?()
         }
 
-        contentView.gestureRecognizers = [gestureRecognizer]
+        addGestureRecognizer(gestureRecognizer)
     }
 
     func configure(text: String?, image: UIImage) {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/OrderDetailsViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/OrderDetailsViewController.swift
@@ -608,19 +608,23 @@ extension OrderDetailsViewController: MFMessageComposeViewControllerDelegate {
 //
 extension OrderDetailsViewController: MFMailComposeViewControllerDelegate {
     func sendEmailIfPossible() {
-        if MFMailComposeViewController.canSendMail() {
-            guard let email = viewModel.order.billingAddress?.email else {
-                return
-            }
+        guard let email = viewModel.order.billingAddress?.email, MFMailComposeViewController.canSendMail() else {
+            return
+        }
 
-            sendEmail(to: email)
+        sendEmail(to: email)
             WooAnalytics.shared.track(.orderContactAction, withProperties: ["id": viewModel.order.orderID,
                                                                             "status": viewModel.order.status.rawValue,
                                                                             "type": "email"])
         }
     }
 
     private func sendEmail(to email: String) {
+        // Workaround: MFMailCompose isn't *FULLY* picking up UINavigationBar's WC's appearance. Title / Buttons look awful.
+        // We're falling back to iOS's default appearance
+        UINavigationBar.applyDefaultAppearance()
+
+        // Composer
         let controller = MFMailComposeViewController()
         controller.setToRecipients([email])
         controller.mailComposeDelegate = self
@@ -629,6 +633,9 @@ extension OrderDetailsViewController: MFMailComposeViewControllerDelegate {
 
     func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
         controller.dismiss(animated: true, completion: nil)
+
+        // Workaround: Restore WC's navBar appearance
+        UINavigationBar.applyWooAppearance()
     }
 }
 
diff --git a/WooCommerce/Resources/Info.plist b/WooCommerce/Resources/Info.plist
@@ -70,7 +70,7 @@
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-		<string>armv7</string>
+		<string>arm64</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -1426,7 +1426,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WooCommerce-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				VALID_ARCHS = "$(inherited)";
+				VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 			};
 			name = Debug;
 		};
@@ -1480,7 +1480,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WooCommerce-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VALIDATE_PRODUCT = YES;
-				VALID_ARCHS = "$(inherited)";
+				VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 			};
 			name = Release;
 		};
@@ -1506,7 +1506,6 @@
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
-				VALID_ARCHS = "$(inherited)";
 			};
 			name = Debug;
 		};
@@ -1532,7 +1531,6 @@
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
-				VALID_ARCHS = "$(inherited)";
 			};
 			name = Release;
 		};
diff --git a/Yosemite/Yosemite.xcodeproj/project.pbxproj b/Yosemite/Yosemite.xcodeproj/project.pbxproj
@@ -674,6 +674,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -731,6 +732,7 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VALIDATE_PRODUCT = YES;
+				VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -760,7 +762,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "$(inherited)";
 			};
 			name = Debug;
 		};
@@ -788,7 +789,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "$(inherited)";
 			};
 			name = Release;
 		};

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class BillingDetailsTableViewCell: UITableViewCell {`
`34`	`34`	`self?.onTouchUp?()`
`35`	`35`	`}`
`36`	`36`
`37`		`- contentView.gestureRecognizers = [gestureRecognizer]`
	`37`	`+ addGestureRecognizer(gestureRecognizer)`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`func configure(text: String?, image: UIImage) {`