Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Mapbox to 3.3 #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions BCLRemoteApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
AF6E0DB91B4D580100E07918 /* SystemSettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AF6E0DB81B4D580100E07918 /* SystemSettingsViewController.xib */; };
AF6E0DBC1B4D584300E07918 /* BCLSystemSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AF6E0DBB1B4D584300E07918 /* BCLSystemSettingsViewController.m */; };
AF7B68381B4BFED9004027D7 /* BCLTriggerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = AF7B68371B4BFED9004027D7 /* BCLTriggerTableViewCell.m */; };
BA4D1AD51DDE487200FA295D /* BCLAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = BA4D1AD41DDE487200FA295D /* BCLAnnotation.m */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -108,6 +109,8 @@
AF7A1A4E1AF7ACAD0091DFF7 /* BCLRemoteApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BCLRemoteApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
AF7B68361B4BFED9004027D7 /* BCLTriggerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BCLTriggerTableViewCell.h; path = BCLRemoteApp/Main/BCLTriggerTableViewCell.h; sourceTree = SOURCE_ROOT; };
AF7B68371B4BFED9004027D7 /* BCLTriggerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BCLTriggerTableViewCell.m; path = BCLRemoteApp/Main/BCLTriggerTableViewCell.m; sourceTree = SOURCE_ROOT; };
BA4D1AD31DDE487200FA295D /* BCLAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BCLAnnotation.h; path = BCLRemoteApp/Main/BCLAnnotation.h; sourceTree = SOURCE_ROOT; };
BA4D1AD41DDE487200FA295D /* BCLAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BCLAnnotation.m; path = BCLRemoteApp/Main/BCLAnnotation.m; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -267,6 +270,8 @@
AF5A40B71BC2EB470044C486 /* BCLVendorChoiceViewController.m */,
AF5A40B91BC2FC5A0044C486 /* BCLVendorCell.h */,
AF5A40BA1BC2FC5A0044C486 /* BCLVendorCell.m */,
BA4D1AD31DDE487200FA295D /* BCLAnnotation.h */,
BA4D1AD41DDE487200FA295D /* BCLAnnotation.m */,
);
name = Main;
sourceTree = "<group>";
Expand Down Expand Up @@ -296,12 +301,12 @@
isa = PBXNativeTarget;
buildConfigurationList = AF7A1A741AF7ACAD0091DFF7 /* Build configuration list for PBXNativeTarget "BCLRemoteApp" */;
buildPhases = (
A4167EA327499F3735B077DF /* Check Pods Manifest.lock */,
A4167EA327499F3735B077DF /* [CP] Check Pods Manifest.lock */,
AF7A1A4A1AF7ACAD0091DFF7 /* Sources */,
AF7A1A4B1AF7ACAD0091DFF7 /* Frameworks */,
AF7A1A4C1AF7ACAD0091DFF7 /* Resources */,
030E5AAB9789D09E3D9A2C5F /* Copy Pods Resources */,
3B51988D0E0BDDE4D3538BF8 /* Embed Pods Frameworks */,
030E5AAB9789D09E3D9A2C5F /* [CP] Copy Pods Resources */,
3B51988D0E0BDDE4D3538BF8 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -324,7 +329,7 @@
TargetAttributes = {
AF7A1A4D1AF7ACAD0091DFF7 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = 8TQGM4U3PU;
DevelopmentTeam = WWKF65T5X4;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
Expand Down Expand Up @@ -373,44 +378,44 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
030E5AAB9789D09E3D9A2C5F /* Copy Pods Resources */ = {
030E5AAB9789D09E3D9A2C5F /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BCLRemoteApp/Pods-BCLRemoteApp-resources.sh\"\n";
showEnvVarsInLog = 0;
};
3B51988D0E0BDDE4D3538BF8 /* Embed Pods Frameworks */ = {
3B51988D0E0BDDE4D3538BF8 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BCLRemoteApp/Pods-BCLRemoteApp-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
A4167EA327499F3735B077DF /* Check Pods Manifest.lock */ = {
A4167EA327499F3735B077DF /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -443,6 +448,7 @@
7503CD091B445E1A00949512 /* BCLLoginViewController.m in Sources */,
7503CCFD1B445D9A00949512 /* BCLNotificationSetupViewController.m in Sources */,
7503CCEF1B445D4400949512 /* BLCZonesViewController.m in Sources */,
BA4D1AD51DDE487200FA295D /* BCLAnnotation.m in Sources */,
7503CCFC1B445D9A00949512 /* BCLMapViewController.m in Sources */,
7503CD081B445E1A00949512 /* BCLContainerViewController.m in Sources */,
AF6E0DBC1B4D584300E07918 /* BCLSystemSettingsViewController.m in Sources */,
Expand Down Expand Up @@ -550,7 +556,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.upnext.beaconctrl;
PRODUCT_NAME = BCLRemoteApp;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "d07fdb34-def5-40b2-84e9-e2ce2bcc46d1";
};
name = Debug;
};
Expand All @@ -567,7 +573,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.upnext.beaconctrl;
PRODUCT_NAME = BCLRemoteApp;
PROVISIONING_PROFILE = "c72e83d0-15fc-487e-b9c1-f0c842337a97";
PROVISIONING_PROFILE = "d07fdb34-def5-40b2-84e9-e2ce2bcc46d1";
};
name = Release;
};
Expand Down
3 changes: 0 additions & 3 deletions BCLRemoteApp/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#import "AppDelegate.h"
#import <BeaconCtrl/BCLBeaconCtrlAdmin.h>
#import "BeaconCtrlManager.h"
#import "RMConfiguration.h"
#import "BCLSystemSettingsViewController.h"
#import <CoreLocation/CoreLocation.h>

Expand All @@ -28,8 +27,6 @@ @implementation AppDelegate

- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch.
[[RMConfiguration sharedInstance] setAccessToken:@"pk.eyJ1IjoiYWNob2puYWNraSIsImEiOiJBNjFIdV8wIn0.Jm8FTlRfSHys8Og29_9WLg"];

UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:(UIRemoteNotificationTypeBadge
|UIRemoteNotificationTypeSound
|UIRemoteNotificationTypeAlert) categories:nil];
Expand Down
2 changes: 2 additions & 0 deletions BCLRemoteApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>MGLMapboxAccessToken</key>
<string>pk.eyJ1IjoiYWNob2puYWNraSIsImEiOiJBNjFIdV8wIn0.Jm8FTlRfSHys8Og29_9WLg</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
Expand Down
19 changes: 19 additions & 0 deletions BCLRemoteApp/Main/BCLAnnotation.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// BCLAnnotation.h
// BCLRemoteApp
//
// Created by minh on 17/11/16.
// Copyright © 2016 UpNext. All rights reserved.
//

#import <Foundation/Foundation.h>
#import "BCLBeacon.h"
@import Mapbox;

@interface BCLAnnotation : NSObject <MGLAnnotation>

@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
@property (nonatomic, strong, nullable) BCLBeacon* userInfo;
@property (nonatomic, copy, nonnull) NSString *reuseIdentifier;

@end
13 changes: 13 additions & 0 deletions BCLRemoteApp/Main/BCLAnnotation.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// BCLAnnotation.m
// BCLRemoteApp
//
// Created by minh on 17/11/16.
// Copyright © 2016 UpNext. All rights reserved.
//

#import "BCLAnnotation.h"

@implementation BCLAnnotation

@end
Loading