Manos Chorianopoulos

MapViewController part1

Showing 35 changed files with 204 additions and 2 deletions
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -73,6 +73,9 @@ ...@@ -73,6 +73,9 @@
73 1EDD0AC62E0D68B6005E162B /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = 1EDD0AC52E0D68B6005E162B /* SQLite */; }; 73 1EDD0AC62E0D68B6005E162B /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = 1EDD0AC52E0D68B6005E162B /* SQLite */; };
74 622DA0AE2F51CAEE00308AB8 /* CouponsetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 622DA0AD2F51CAEE00308AB8 /* CouponsetViewController.xib */; }; 74 622DA0AE2F51CAEE00308AB8 /* CouponsetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 622DA0AD2F51CAEE00308AB8 /* CouponsetViewController.xib */; };
75 622DA0AF2F51CAEE00308AB8 /* CouponsetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 622DA0AC2F51CAEE00308AB8 /* CouponsetViewController.swift */; }; 75 622DA0AF2F51CAEE00308AB8 /* CouponsetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 622DA0AC2F51CAEE00308AB8 /* CouponsetViewController.swift */; };
76 + 626AF6DB2F698FF1008BCA08 /* MerchantAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 626AF6DA2F698FF1008BCA08 /* MerchantAnnotation.swift */; };
77 + 626AF6DE2F699081008BCA08 /* MapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 626AF6DC2F699081008BCA08 /* MapViewController.swift */; };
78 + 626AF6DF2F699081008BCA08 /* MapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 626AF6DD2F699081008BCA08 /* MapViewController.xib */; };
76 62A0A6D32F67FEDC00508534 /* MyCouponsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62A0A6D12F67FEDC00508534 /* MyCouponsViewController.swift */; }; 79 62A0A6D32F67FEDC00508534 /* MyCouponsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62A0A6D12F67FEDC00508534 /* MyCouponsViewController.swift */; };
77 62A0A6D42F67FEDC00508534 /* MyCouponsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 62A0A6D22F67FEDC00508534 /* MyCouponsViewController.xib */; }; 80 62A0A6D42F67FEDC00508534 /* MyCouponsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 62A0A6D22F67FEDC00508534 /* MyCouponsViewController.xib */; };
78 62A0A6D82F680C6A00508534 /* MyCouponsHeaderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62A0A6D62F680C6A00508534 /* MyCouponsHeaderTableViewCell.swift */; }; 81 62A0A6D82F680C6A00508534 /* MyCouponsHeaderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62A0A6D62F680C6A00508534 /* MyCouponsHeaderTableViewCell.swift */; };
...@@ -154,6 +157,9 @@ ...@@ -154,6 +157,9 @@
154 1EDD0ABC2E0D308A005E162B /* XIBLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XIBLoader.swift; sourceTree = "<group>"; }; 157 1EDD0ABC2E0D308A005E162B /* XIBLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XIBLoader.swift; sourceTree = "<group>"; };
155 622DA0AC2F51CAEE00308AB8 /* CouponsetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CouponsetViewController.swift; sourceTree = "<group>"; }; 158 622DA0AC2F51CAEE00308AB8 /* CouponsetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CouponsetViewController.swift; sourceTree = "<group>"; };
156 622DA0AD2F51CAEE00308AB8 /* CouponsetViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CouponsetViewController.xib; sourceTree = "<group>"; }; 159 622DA0AD2F51CAEE00308AB8 /* CouponsetViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CouponsetViewController.xib; sourceTree = "<group>"; };
160 + 626AF6DA2F698FF1008BCA08 /* MerchantAnnotation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MerchantAnnotation.swift; sourceTree = "<group>"; };
161 + 626AF6DC2F699081008BCA08 /* MapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapViewController.swift; sourceTree = "<group>"; };
162 + 626AF6DD2F699081008BCA08 /* MapViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MapViewController.xib; sourceTree = "<group>"; };
157 62A0A6D12F67FEDC00508534 /* MyCouponsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyCouponsViewController.swift; sourceTree = "<group>"; }; 163 62A0A6D12F67FEDC00508534 /* MyCouponsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyCouponsViewController.swift; sourceTree = "<group>"; };
158 62A0A6D22F67FEDC00508534 /* MyCouponsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyCouponsViewController.xib; sourceTree = "<group>"; }; 164 62A0A6D22F67FEDC00508534 /* MyCouponsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyCouponsViewController.xib; sourceTree = "<group>"; };
159 62A0A6D62F680C6A00508534 /* MyCouponsHeaderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyCouponsHeaderTableViewCell.swift; sourceTree = "<group>"; }; 165 62A0A6D62F680C6A00508534 /* MyCouponsHeaderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyCouponsHeaderTableViewCell.swift; sourceTree = "<group>"; };
...@@ -331,6 +337,7 @@ ...@@ -331,6 +337,7 @@
331 1EA8E5B42DDF315600CD3418 /* screens */ = { 337 1EA8E5B42DDF315600CD3418 /* screens */ = {
332 isa = PBXGroup; 338 isa = PBXGroup;
333 children = ( 339 children = (
340 + 626AF6D92F698F96008BCA08 /* MapViewController */,
334 622DA0AB2F51CA9100308AB8 /* CouponsetViewController */, 341 622DA0AB2F51CA9100308AB8 /* CouponsetViewController */,
335 1EBE45642E02DDF90055A0D4 /* CampaignViewController */, 342 1EBE45642E02DDF90055A0D4 /* CampaignViewController */,
336 1E917CD32DDF6472002221D8 /* MyRewardsViewController */, 343 1E917CD32DDF6472002221D8 /* MyRewardsViewController */,
...@@ -449,6 +456,16 @@ ...@@ -449,6 +456,16 @@
449 path = CouponsetViewController; 456 path = CouponsetViewController;
450 sourceTree = "<group>"; 457 sourceTree = "<group>";
451 }; 458 };
459 + 626AF6D92F698F96008BCA08 /* MapViewController */ = {
460 + isa = PBXGroup;
461 + children = (
462 + 626AF6DA2F698FF1008BCA08 /* MerchantAnnotation.swift */,
463 + 626AF6DC2F699081008BCA08 /* MapViewController.swift */,
464 + 626AF6DD2F699081008BCA08 /* MapViewController.xib */,
465 + );
466 + path = MapViewController;
467 + sourceTree = "<group>";
468 + };
452 62A0A6D02F67FE8100508534 /* MyCouponsViewController */ = { 469 62A0A6D02F67FE8100508534 /* MyCouponsViewController */ = {
453 isa = PBXGroup; 470 isa = PBXGroup;
454 children = ( 471 children = (
...@@ -643,6 +660,7 @@ ...@@ -643,6 +660,7 @@
643 1EA8E5C02DDF427A00CD3418 /* PingLCG-Bold.otf in Resources */, 660 1EA8E5C02DDF427A00CD3418 /* PingLCG-Bold.otf in Resources */,
644 622DA0AE2F51CAEE00308AB8 /* CouponsetViewController.xib in Resources */, 661 622DA0AE2F51CAEE00308AB8 /* CouponsetViewController.xib in Resources */,
645 1E64E1832DE48E0600543217 /* MyRewardsOfferCollectionViewCell.xib in Resources */, 662 1E64E1832DE48E0600543217 /* MyRewardsOfferCollectionViewCell.xib in Resources */,
663 + 626AF6DF2F699081008BCA08 /* MapViewController.xib in Resources */,
646 1EA8E5C12DDF427A00CD3418 /* PingLCG-Light.otf in Resources */, 664 1EA8E5C12DDF427A00CD3418 /* PingLCG-Light.otf in Resources */,
647 1EA8E5C22DDF427A00CD3418 /* PingLCG-Regular.otf in Resources */, 665 1EA8E5C22DDF427A00CD3418 /* PingLCG-Regular.otf in Resources */,
648 1EB4F42B2DE0A0AF00D934C0 /* MyRewardsOffersScrollTableViewCell.xib in Resources */, 666 1EB4F42B2DE0A0AF00D934C0 /* MyRewardsOffersScrollTableViewCell.xib in Resources */,
...@@ -735,8 +753,10 @@ ...@@ -735,8 +753,10 @@
735 1E917CD72DDF64B2002221D8 /* MyRewardsViewController.swift in Sources */, 753 1E917CD72DDF64B2002221D8 /* MyRewardsViewController.swift in Sources */,
736 1E917CDC2DDF68C7002221D8 /* CouponViewController.swift in Sources */, 754 1E917CDC2DDF68C7002221D8 /* CouponViewController.swift in Sources */,
737 1E4C4CFB2DE6014500279AAD /* CopyableLabel.swift in Sources */, 755 1E4C4CFB2DE6014500279AAD /* CopyableLabel.swift in Sources */,
756 + 626AF6DE2F699081008BCA08 /* MapViewController.swift in Sources */,
738 1EDBAF112DE8443B00911E79 /* ProfileHeaderTableViewCell.swift in Sources */, 757 1EDBAF112DE8443B00911E79 /* ProfileHeaderTableViewCell.swift in Sources */,
739 1EDBAF052DE843CA00911E79 /* ProfileCouponTableViewCell.swift in Sources */, 758 1EDBAF052DE843CA00911E79 /* ProfileCouponTableViewCell.swift in Sources */,
759 + 626AF6DB2F698FF1008BCA08 /* MerchantAnnotation.swift in Sources */,
740 1EB4F4262DE09AAC00D934C0 /* MyRewardsBannerOffersScrollTableViewCell.swift in Sources */, 760 1EB4F4262DE09AAC00D934C0 /* MyRewardsBannerOffersScrollTableViewCell.swift in Sources */,
741 ); 761 );
742 runOnlyForDeploymentPostprocessing = 0; 762 runOnlyForDeploymentPostprocessing = 0;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
1 +{
2 + "images" : [
3 + {
4 + "filename" : "filter.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "filter 1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "filter 2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "ic_close_4.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "ic_close_4 1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "ic_close_4 2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "map_location.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "map_location 1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "map_location 2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "map_navigate.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "map_navigate 1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "map_navigate 2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "map_pin.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "map_pin 1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "map_pin 2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "map_pin_2.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "map_pin_2 1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "map_pin_2 2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +{
2 + "images" : [
3 + {
4 + "filename" : "map_telephone.png",
5 + "idiom" : "universal",
6 + "scale" : "1x"
7 + },
8 + {
9 + "filename" : "map_telephone 1.png",
10 + "idiom" : "universal",
11 + "scale" : "2x"
12 + },
13 + {
14 + "filename" : "map_telephone 2.png",
15 + "idiom" : "universal",
16 + "scale" : "3x"
17 + }
18 + ],
19 + "info" : {
20 + "author" : "xcode",
21 + "version" : 1
22 + }
23 +}
1 +//
2 +// MerchantAnnotation.swift
3 +// SwiftWarplyFramework
4 +//
5 +// Created by Manos Chorianopoulos on 17/3/26.
6 +//
7 +
8 +import Foundation
9 +import MapKit
10 +
11 +@objc public class MerchantAnnotation: NSObject, MKAnnotation {
12 + let model: MerchantModel
13 + public let coordinate: CLLocationCoordinate2D
14 +
15 +
16 + init(_ model: MerchantModel) {
17 + self.model = model
18 + self.coordinate = CLLocationCoordinate2D(latitude: model._latitude, longitude: model._longitude)
19 + super.init()
20 + }
21 +}