Support Swift 4.1

data-for-change · Sep 25, 2018 · 8c66044 · 8c66044
1 parent d6cc788
commit 8c66044
Show file tree

Hide file tree

Showing 490 changed files with 36,535 additions and 22,118 deletions.
diff --git a/Anyway.xcodeproj/project.pbxproj b/Anyway.xcodeproj/project.pbxproj
@@ -431,7 +431,6 @@
 				30D6E5AA1A92639500337FDB /* Resources */,
 				30673C631C1F3D3800CEB5FB /* Run Script | Set Build To "DEVELOPMENT" */,
 				EE6970D3164DFFA9D86A01CE /* [CP] Embed Pods Frameworks */,
-				37080D3EA49B66589C1F3E91 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -455,7 +454,7 @@
 				TargetAttributes = {
 					30D6E5AB1A92639500337FDB = {
 						CreatedOnToolsVersion = 6.1.1;
-						DevelopmentTeam = 85JPBD89LM;
+						DevelopmentTeam = KMG627KSFF;
 						LastSwiftMigration = 0820;
 						ProvisioningStyle = Automatic;
 					};
@@ -524,30 +523,26 @@
 			shellPath = /bin/sh;
 			shellScript = "/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion DEVELOPMENT\" \"${PROJECT_DIR}/${INFOPLIST_FILE}\"";
 		};
-		37080D3EA49B66589C1F3E91 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Anyway/Pods-Anyway-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		EE6970D3164DFFA9D86A01CE /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Anyway/Pods-Anyway-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
+				"${BUILT_PRODUCTS_DIR}/Eureka/Eureka.framework",
+				"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
+				"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
+				"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Eureka.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -560,13 +555,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Anyway-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -699,6 +697,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -712,6 +711,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEVELOPMENT_TEAM = KMG627KSFF;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/build/Debug-iphoneos",
@@ -724,7 +724,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Anyway/Anyway-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -763,7 +763,8 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -777,7 +778,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = KMG627KSFF;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/build/Debug-iphoneos",
@@ -790,7 +791,7 @@
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Anyway/Anyway-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/Anyway/DetailCells.swift b/Anyway/DetailCells.swift
@@ -202,14 +202,14 @@ private struct StaticData {
         case (2, let i): return marker?.roadConditionData.safeRetrieveElement(i)?.1 ?? ""
 
         case (3, 1): return "\(data.created.longDate), \(data.created.shortTime)"
-        case (3, 2): return Localization.sug_YOM[data.dayType] ?? ""
+        case (3, 2): return Localization.SUG_YOM[data.dayType] ?? ""
         case (3, 3): return data.address
 
         case (4, let i): return fieldValue(i, rawInfos: persons)
         case (5, let i): return fieldValue(i, rawInfos: vehicles)
 
-        case (6, 1): return Localization.status_IGUN[data.intactness] ?? "" //TODO: is right param?
-        case (6, 2): return Localization.yehida[data.unit] ?? ""
+        case (6, 1): return Localization.STATUS_IGUN[data.intactness] ?? "" //TODO: is right param?
+        case (6, 2): return Localization.YEHIDA[data.unit] ?? ""
 
         default: return ""
         }

diff --git a/Anyway/DetailViewController.swift b/Anyway/DetailViewController.swift
@@ -49,9 +49,9 @@ class DetailViewController: UIViewController, UITableViewDelegate, UITableViewDa
     func handleMarkerChanged() {
         guard let marker = detailData else {return}
 
-        network.getMarkerDetails(markerId: marker.id) { [weak self] in
-            self?.persons = $0.0
-            self?.vehicles = $0.1
+        network.getMarkerDetails(markerId: marker.id) { [weak self] personList,vehicleList in
+            self?.persons = personList ;//$0.0
+            self?.vehicles = vehicleList ;//$0.1
             self?.tableView.reloadData()
         }
 

diff --git a/Anyway/HistoryPosition.swift b/Anyway/HistoryPosition.swift
@@ -11,8 +11,8 @@ import RealmSwift
 
 class HistoryPosition: Object {
 
-    dynamic var locationData: Data?
-    dynamic var locationPLacemark: Data?
+    @objc dynamic var locationData: Data?
+    @objc dynamic var locationPLacemark: Data?
     var markers = List<Marker>()
 
 }
diff --git a/Anyway/Images.xcassets/AppIcon.appiconset/Contents.json b/Anyway/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -97,6 +97,11 @@
       "idiom" : "ipad",
       "filename" : "[email protected]",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/Anyway/Localization.swift b/Anyway/Localization.swift
@@ -26,20 +26,47 @@ import Foundation
 enum Localization {
 
     // Road Conditions
-    case sug_DERECH, yehida, sug_YOM, humrat_TEUNA, sug_TEUNA,
-         zurat_DEREH, had_MASLUL, rav_MASLUL, mehirut_MUTERET,
-         tkinut, rohav, simun_TIMRUR, teura, bakara, mezeg_AVIR,
-         pne_KVISH, sug_EZEM, merhak_EZEM, lo_HAZA, ofen_HAZIYA,
-         mekom_HAZIYA, kivun_HAZIYA, status_IGUN
+    case    SUG_DERECH,
+            YEHIDA,
+            SUG_YOM,
+            HUMRAT_TEUNA,
+            SUG_TEUNA,
+            ZURAT_DEREH,
+            HAD_MASLUL,
+            RAV_MASLUL,
+            MHIRUT_MUTERET,
+            TKINUT,
+            ROHAV,
+            SIMUN_TIMRUR,
+            TEURA,
+            BAKARA,
+            MEZEG_AVIR,
+            PNE_KVISH,
+            SUG_EZEM,
+            MERHAK_EZEM,
+            LO_HAZA,
+            OFEN_HAZIYA,
+            MEKOM_HAZIYA,
+            KIVUN_HAZIYA,
+            STATUS_IGUN
 
     // Vehicle Description
-    case matzav_REHEV, shiyuh_REHEV_LMS, sug_REHEV_LMS
+    case    MATSAV_REHEV,
+            SHIYUH_REHEV_LMS,
+            SUG_REHEV_LMS
 
     // Involved Person Description
-    case sug_MEORAV, min, emzae_BETIHUT,
-         humrat_PGIA, sug_NIFGA_LMS, peulat_NIFGA_LMS,
-         pazua_USHPAZ, madad_RAFUI, yaad_SHIHRUR,
-         shimush_BE_AVIZAREY_BETIHOT, ptira_MEUHERET
+    case    SUG_MEORAV,
+            MIN,
+            EMZAE_BETIHUT,
+            HUMRAT_PGIA,
+            SUG_NIFGA_LMS,
+            PEULAT_NIFGA_LMS,
+            PAZUA_USHPAZ,
+            MADAD_RAFUI,
+            YAAD_SHIHRUR,
+            SHIMUSH_BE_AVIZAREY_BETIHOT,
+            PTIRA_MEUHERET
 
 
     subscript(val: Int) -> String? {

diff --git a/Anyway/Marker.swift b/Anyway/Marker.swift
@@ -12,46 +12,47 @@ import RealmSwift
 
 class Marker: Object, MarkerAnnotation {
 
-    dynamic var coordinateLat: Double = 0
-    dynamic var coordinateLon: Double = 0
 
-    dynamic var address: String = ""
-    dynamic var descriptionContent: String = ""
-    dynamic var titleAccident: String = ""
-    dynamic var created: Date = Date(timeIntervalSince1970: 0)
+    @objc dynamic var coordinateLat: Double = 0
+    @objc dynamic var coordinateLon: Double = 0
+
+    @objc dynamic var address: String = ""
+    @objc dynamic var descriptionContent: String = ""
+    @objc dynamic var titleAccident: String = ""
+    @objc dynamic var created: Date = Date(timeIntervalSince1970: 0)
     var followers: [AnyObject] = []
-    dynamic var following: Bool = false
-    dynamic var id: Int = 0
-    dynamic var locationAccuracy: Int = 0
-    dynamic var severity: Int = 0
-    dynamic var subtype: Int = 0
-    dynamic var type: Int = 0
-    dynamic var user: String = ""
-
-    dynamic var roadShape: Int = -1
-    dynamic var cross_mode: Int = -1
-    dynamic var secondaryStreet: String = ""
-    dynamic var cross_location: Int = -1
-    dynamic var one_lane: Int = -1
-    dynamic var speed_limit: Int = -1
-    dynamic var weather: Int = -1
-    dynamic var provider_code: Int = -1
-    dynamic var road_object: Int = -1
-    dynamic var didnt_cross: Int = -1
-    dynamic var object_distance: Int = -1
-    dynamic var road_sign: Int = -1
-    dynamic var intactness: Int = -1
-    dynamic var junction: String = ""
-    dynamic var road_control: Int = -1
-    dynamic var road_light: Int = -1
-    dynamic var multi_lane: Int = -1
-    dynamic var dayType: Int = -1
-    dynamic var unit: Int = -1
-    dynamic var road_width: Int = -1
-    dynamic var cross_direction: Int = -1
-    dynamic var roadType: Int = -1
-    dynamic var road_surface: Int = -1
-    dynamic var mainStreet: String = ""
+    @objc dynamic var following: Bool = false
+    @objc dynamic var id: Int = 0
+    @objc dynamic var locationAccuracy: Int = 0
+    @objc dynamic var severity: Int = 0
+    @objc dynamic var subtype: Int = 0
+    @objc dynamic var type: Int = 0
+    @objc dynamic var user: String = ""
+
+    @objc dynamic var roadShape: Int = -1
+    @objc dynamic var cross_mode: Int = -1
+    @objc dynamic var secondaryStreet: String = ""
+    @objc dynamic var cross_location: Int = -1
+    @objc dynamic var one_lane: Int = -1
+    @objc dynamic var speed_limit: Int = -1
+    @objc dynamic var weather: Int = -1
+    @objc dynamic var provider_code: Int = -1
+    @objc dynamic var road_object: Int = -1
+    @objc dynamic var didnt_cross: Int = -1
+    @objc dynamic var object_distance: Int = -1
+    @objc dynamic var road_sign: Int = -1
+    @objc dynamic var intactness: Int = -1
+    @objc dynamic var junction: String = ""
+    @objc dynamic var road_control: Int = -1
+    @objc dynamic var road_light: Int = -1
+    @objc dynamic var multi_lane: Int = -1
+    @objc dynamic var dayType: Int = -1
+    @objc dynamic var unit: Int = -1
+    @objc dynamic var road_width: Int = -1
+    @objc dynamic var cross_direction: Int = -1
+    @objc dynamic var roadType: Int = -1
+    @objc dynamic var road_surface: Int = -1
+    @objc dynamic var mainStreet: String = ""
 
 
     /// Properties ignored by Realm
@@ -104,16 +105,16 @@ extension Marker: PairsData {
 
     var roadConditionData: [(Title, Detail)] {
         return [
-            Marker.pair(forType: .sug_DERECH, value: roadType),
-            Marker.pair(forType: .zurat_DEREH, value: roadShape),
-            Marker.pair(forType: .had_MASLUL, value: one_lane),
-            Marker.pair(forType: .mehirut_MUTERET, value: speed_limit),
-            Marker.pair(forType: .tkinut, value: intactness),
-            Marker.pair(forType: .rohav, value: road_width),
-            Marker.pair(forType: .simun_TIMRUR, value: road_sign),
-            Marker.pair(forType: .teura, value: road_light),
-            Marker.pair(forType: .bakara, value: road_control),
-            Marker.pair(forType: .mezeg_AVIR, value: weather)
+            Marker.pair(forType: .SUG_DERECH, value: roadType),
+            Marker.pair(forType: .ZURAT_DEREH, value: roadShape),
+            Marker.pair(forType: .HAD_MASLUL, value: one_lane),
+            Marker.pair(forType: .MHIRUT_MUTERET, value: speed_limit),
+            Marker.pair(forType: .TKINUT, value: intactness),
+            Marker.pair(forType: .ROHAV, value: road_width),
+            Marker.pair(forType: .SIMUN_TIMRUR, value: road_sign),
+            Marker.pair(forType: .TEURA, value: road_light),
+            Marker.pair(forType: .BAKARA, value: road_control),
+            Marker.pair(forType: .MEZEG_AVIR, value: weather)
             ].flatMap{ $0 }
     }
 
@@ -129,15 +130,15 @@ extension Marker: VisualMarker {
     //MARK: Localized Info
 
     var localizedSubtype: String {
-        return Localization.sug_TEUNA[subtype] ?? ""
+        return Localization.SUG_TEUNA[subtype] ?? ""
     }
 
     var localizedSeverity: String {
-        return Localization.humrat_TEUNA[severity] ?? ""
+        return Localization.HUMRAT_TEUNA[severity] ?? ""
     }
 
     var localizedAccuracy: String {
-        return Localization.status_IGUN[locationAccuracy] ?? ""
+        return Localization.STATUS_IGUN[locationAccuracy] ?? ""
     }
 
     var color: UIColor {

diff --git a/Anyway/MarkerViews.swift b/Anyway/MarkerViews.swift
@@ -105,7 +105,7 @@ class IconPinView: UIView {
         didSet {
             // whenever the color changes > change
             //  the tint for any subview
-            for i in subviews.flatMap({ $0 as? UIImageView }) {
+            for i in subviews.compactMap({ $0 as? UIImageView }) {
                 i.tintColor = color
             }
         }
@@ -164,9 +164,13 @@ class MarkerView: MKAnnotationView {
         self.init(annotation: marker, reuseIdentifier: reuseIdentifier)
 
         isEnabled = true
+        //rightCalloutAccessoryView = UIButton(type: .detailDisclosure) as UIView
+
+        rightCalloutAccessoryView = UIButton.init(type: UIButtonType.detailDisclosure)
+
         canShowCallout = true
 
-        rightCalloutAccessoryView = UIButton(type: .detailDisclosure) as UIView
+        isUserInteractionEnabled = true
 
         setupIcon(marker)
     }