Added Swift 3 Examples #35

jmkiley · 2016-10-27T16:21:58Z

Added Swift 3.0 examples for each code example
Added Swift 2.3 build target as well as Swift 3.0

jmkiley

Renamed some files to clarify version of Swift

friedbunny

It looks like some of the .swift files ended up in the /Objective-C folder (on disk, rather than in the project). Let’s consolidate all of the .swift files in the /Swift folder.

friedbunny · 2016-10-27T18:23:02Z

Examples.xcodeproj/xcuserdata/jordankiley.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>


These files in /xcuserdata got committed accidentally — let’s remove them from this PR and add full macOS and Xcode exclusions to .gitignore.

boundsj

Looking 👍 so far! I'm interested to see how the ExampleProtocol evolves

boundsj · 2016-10-27T18:15:23Z

ExampleProtocol.h

+//
+//  Created by Jordan Kiley on 10/27/16.
+//  Copyright © 2016 Mapbox. All rights reserved.
+//


nit: remove these generated comments

I’ve left them in the project so far, but this could be a task we do across all files before this project reaches a wider audience.

boundsj · 2016-10-27T18:44:11Z

Examples/ObjectiveC/CustomAnnotationModelExample.swift

 import Mapbox

 @objc(CustomAnnotationModelExample_Swift)

 class CustomAnnotationModelExample_Swift: UIViewController, MGLMapViewDelegate {
    override func viewDidLoad() {
        super.viewDidLoad()
-
+        


nit: It looks like Xcode on your system is adding whitespace

boundsj · 2016-10-27T19:12:27Z

Examples.xcodeproj/project.pbxproj

@@ -575,7 +605,7 @@
 				TargetAttributes = {
 					9619628B1C581700002D3DAB = {
 						CreatedOnToolsVersion = 7.3;
-						DevelopmentTeam = U8B2JGE4C6;
+						DevelopmentTeam = 85826LGZGV;


Just noting this got checked in. Not a big deal and I'm not actually sure what is correct for this project.

boundsj · 2016-10-27T19:14:14Z

Examples.xcodeproj/project.pbxproj

@@ -27,6 +27,8 @@
 		3ECF46101DC1871B0089118A /* SatelliteStyleExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ECF460F1DC1871B0089118A /* SatelliteStyleExample.swift */; };
 		3ECF46121DC1874D0089118A /* SimpleMapViewExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ECF46111DC1874D0089118A /* SimpleMapViewExample.swift */; };
 		3ECF46141DC1878F0089118A /* UserTrackingModesExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ECF46131DC1878F0089118A /* UserTrackingModesExample.swift */; };
+		3ECF46151DC18DAA0089118A /* CustomAnnotationModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ECF45F11DC176090089118A /* CustomAnnotationModels.swift */; };


😁 feel free to add more details in the commit message to for reviewers with less context about the problem you fixed (i.e. added ____ and ____ files to the ___ target)

friedbunny · 2016-10-28T16:30:36Z

Examples/Examples.m

+                                                                   MBXExampleSimpleMapView,
+                                                                   MBXExampleUserTrackingModes,
+                                                                   ]];
+    


Let’s manually go back to the shorter indentation.

friedbunny · 2016-10-28T16:38:48Z

Examples/ObjectiveC/AnnotationViewExample.swift

+            CLLocationCoordinate2DMake(0, 33),
+            CLLocationCoordinate2DMake(0, 66),
+            CLLocationCoordinate2DMake(0, 99),
+            ]


Nit: align the indentation of the closing bracket with let.

friedbunny · 2016-10-28T16:40:54Z

Examples/ObjectiveC/CustomAnnotationModelExample.swift

@@ -31,15 +31,15 @@ class CustomAnnotationModelExample_Swift: UIViewController, MGLMapViewDelegate {
            CLLocationCoordinate2DMake(-15,  0),
            CLLocationCoordinate2DMake(-45, 10),
            CLLocationCoordinate2DMake(-45, 40),
-        ]
-
+            ]


Nit: align the indentation of the closing bracket with var.

friedbunny · 2016-10-28T16:42:40Z

Examples/ObjectiveC/DraggableAnnotationViewExample.swift

+            CLLocationCoordinate2DMake(0,  0),
+            CLLocationCoordinate2DMake(0, 35),
+            CLLocationCoordinate2DMake(0, 70),
+            ]


Nit: align the indentation of the closing bracket with let.

friedbunny · 2016-10-28T16:43:57Z

Examples/ObjectiveC/DraggableAnnotationViewExample.swift

+        UIView.animate(withDuration: 0.3, delay: 0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0, options: [], animations: {
+            self.layer.opacity = 0.8
+            self.transform = CGAffineTransform.identity.scaledBy(x: 1.5, y: 1.5)
+            }, completion: nil)


Nit: align the indentation of this closing brace with UIView.

friedbunny · 2016-10-28T17:02:06Z

Examples/Swift 3/OfflinePackExample.swift

+        let context = NSKeyedArchiver.archivedData(withRootObject: userInfo)
+
+
+


Let’s trim the excess blank lines here.

friedbunny · 2016-10-28T17:03:24Z

Examples/Swift 3/UserTrackingModesExample.swift

+
+
+
+            .lightGray


I’m kind of amazed that this works, lol.

friedbunny · 2016-10-28T17:04:50Z

Examples/Swift/AnnotationViewExample2.3.swift

 class AnnotationViewExample_Swift: UIViewController, MGLMapViewDelegate {
+
+    // #if !swift(>=3.0)


If we don’t need this, let’s remove it.

friedbunny · 2016-10-28T17:05:32Z

Examples/Swift/AnnotationViewExample2.3.swift

 }

 //
 // MGLAnnotationView subclass
 class CustomAnnotationView: MGLAnnotationView {
+    // #if !swift(>=3.0)


Let’s remove this if we don’t need it.

friedbunny · 2016-10-28T17:06:03Z

Examples/Swift/CustomAnnotationModelExample2.3.swift

+                CLLocationCoordinate2DMake(-15,  0),
+                CLLocationCoordinate2DMake(-45, 10),
+                CLLocationCoordinate2DMake(-45, 40),
+                ]


Nit: align this closing brace with var.

friedbunny · 2016-12-07T02:15:49Z

Thanks for beavering away on this. I think we’re good to merge and then address any potential style or organization issues as we notice them.

friedbunny and others added 6 commits October 26, 2016 12:31

Create separate Swift 2.3 target/scheme

657fa51

Use the same Info.plist for both targets

b602645

Swift 3.0 updates

a69929e

typo fix

9aabeb0

Copied CustomPolyline class into AnnotationModel file

21897a7

checked the ticky box and it fixed the problem

924ba3c

jmkiley added the update example label Oct 27, 2016

jmkiley self-assigned this Oct 27, 2016

jmkiley commented Oct 27, 2016

View reviewed changes

files organized by language

b85496f

jmkiley closed this Oct 27, 2016

friedbunny reopened this Oct 27, 2016

removed .ds_store

9d751fa

friedbunny suggested changes Oct 27, 2016

View reviewed changes

boundsj reviewed Oct 27, 2016

View reviewed changes

jmkiley and others added 5 commits October 27, 2016 16:18

Removed incomplete files & unnecessary whitespace

2f59504

Removed .DS_Store and xcuserdata

1b30288

Update .gitignore

fd45213

Removed undeclared class

7a498b0

Fixed .lightGray space

54444cf

friedbunny suggested changes Oct 28, 2016

View reviewed changes

jmkiley added 2 commits October 28, 2016 11:00

Reorganized files, cleaned up whitespace

f635332

Additional whitespace/comment cleanup

4cecf5f

CathrynStickel unassigned jmkiley Nov 1, 2016

friedbunny mentioned this pull request Dec 1, 2016

Make this project publicly available #40

Closed

Fixed a few spacing issues

ceb4a12

friedbunny approved these changes Dec 7, 2016

View reviewed changes

friedbunny assigned jmkiley Dec 7, 2016

resolved merge conflict in command line

633f3f2

jmkiley merged commit cbbf75e into master Dec 7, 2016

friedbunny deleted the swift3 branch December 8, 2016 00:45

1ec5 mentioned this pull request Dec 19, 2016

Provide Swift 3 examples #21

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added Swift 3 Examples #35

Added Swift 3 Examples #35

jmkiley commented Oct 27, 2016

jmkiley left a comment

friedbunny left a comment

friedbunny Oct 27, 2016

boundsj left a comment

boundsj Oct 27, 2016

friedbunny Oct 27, 2016

boundsj Oct 27, 2016

boundsj Oct 27, 2016

boundsj Oct 27, 2016

friedbunny Oct 28, 2016

friedbunny Oct 28, 2016

friedbunny Oct 28, 2016

friedbunny Oct 28, 2016

friedbunny Oct 28, 2016

friedbunny Oct 28, 2016

friedbunny Oct 28, 2016

friedbunny Oct 28, 2016

friedbunny Oct 28, 2016

friedbunny Oct 28, 2016

friedbunny commented Dec 7, 2016

		let context = NSKeyedArchiver.archivedData(withRootObject: userInfo)

		class AnnotationViewExample_Swift: UIViewController, MGLMapViewDelegate {

		// #if !swift(>=3.0)

Added Swift 3 Examples #35

Added Swift 3 Examples #35

Conversation

jmkiley commented Oct 27, 2016

jmkiley left a comment

Choose a reason for hiding this comment

friedbunny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

boundsj left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

friedbunny commented Dec 7, 2016