Skip to content

Commit f6c7aee

Browse files
Eric WilliamsonEric Williamson
authored andcommitted
Remove maps from this project. Move to dedicated app.
1 parent 0ae061f commit f6c7aee

File tree

4 files changed

+18
-22
lines changed

4 files changed

+18
-22
lines changed

IR Remote.xcodeproj/project.pbxproj

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
07024B7C17397160000DD858 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07024B7B17397160000DD858 /* QuartzCore.framework */; };
1212
07024B7E1739716A000DD858 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 07024B7D1739716A000DD858 /* libz.dylib */; };
1313
07024B8017397171000DD858 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 07024B7F17397171000DD858 /* libsqlite3.dylib */; };
14-
07024B821739718A000DD858 /* MapBox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07024B811739718A000DD858 /* MapBox.framework */; };
15-
07024B86173971DC000DD858 /* MapBox.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 07024B85173971DC000DD858 /* MapBox.bundle */; };
16-
07024B8917397D14000DD858 /* BaseMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 07024B8817397D14000DD858 /* BaseMapViewController.m */; };
1714
07024B8C17397D85000DD858 /* Remote.m in Sources */ = {isa = PBXBuildFile; fileRef = 07024B8B17397D85000DD858 /* Remote.m */; };
1815
070B45AA17206B4A00B9D12E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 070B45A917206B4A00B9D12E /* UIKit.framework */; };
1916
070B45AC17206B4A00B9D12E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 070B45AB17206B4A00B9D12E /* Foundation.framework */; };
@@ -70,10 +67,6 @@
7067
07024B7B17397160000DD858 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
7168
07024B7D1739716A000DD858 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
7269
07024B7F17397171000DD858 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
73-
07024B811739718A000DD858 /* MapBox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MapBox.framework; sourceTree = "<group>"; };
74-
07024B85173971DC000DD858 /* MapBox.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MapBox.bundle; path = MapBox.framework/Versions/A/Resources/MapBox.bundle; sourceTree = SOURCE_ROOT; };
75-
07024B8717397D14000DD858 /* BaseMapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseMapViewController.h; sourceTree = "<group>"; };
76-
07024B8817397D14000DD858 /* BaseMapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseMapViewController.m; sourceTree = "<group>"; };
7770
07024B8A17397D85000DD858 /* Remote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Remote.h; sourceTree = "<group>"; };
7871
07024B8B17397D85000DD858 /* Remote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Remote.m; sourceTree = "<group>"; };
7972
070B45A617206B4A00B9D12E /* IR Remote.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "IR Remote.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -147,7 +140,6 @@
147140
070B45AA17206B4A00B9D12E /* UIKit.framework in Frameworks */,
148141
070B45AC17206B4A00B9D12E /* Foundation.framework in Frameworks */,
149142
070B45AE17206B4A00B9D12E /* CoreGraphics.framework in Frameworks */,
150-
07024B821739718A000DD858 /* MapBox.framework in Frameworks */,
151143
);
152144
runOnlyForDeploymentPostprocessing = 0;
153145
};
@@ -201,7 +193,6 @@
201193
070B45A817206B4A00B9D12E /* Frameworks */ = {
202194
isa = PBXGroup;
203195
children = (
204-
07024B811739718A000DD858 /* MapBox.framework */,
205196
07024B7F17397171000DD858 /* libsqlite3.dylib */,
206197
07024B7D1739716A000DD858 /* libz.dylib */,
207198
07024B7B17397160000DD858 /* QuartzCore.framework */,
@@ -219,8 +210,6 @@
219210
children = (
220211
070B45B817206B4A00B9D12E /* AppDelegate.h */,
221212
070B45B917206B4B00B9D12E /* AppDelegate.m */,
222-
07024B8717397D14000DD858 /* BaseMapViewController.h */,
223-
07024B8817397D14000DD858 /* BaseMapViewController.m */,
224213
07A7107C17206F2D0059213F /* BaseRemoteViewController.h */,
225214
07A7107D17206F2E0059213F /* BaseRemoteViewController.m */,
226215
07A2E2AF173C9E5700F50010 /* DirectTVRemoteViewController~iphone.xib */,
@@ -270,7 +259,6 @@
270259
070B45DE17206BBA00B9D12E /* Extern Libs */ = {
271260
isa = PBXGroup;
272261
children = (
273-
07024B85173971DC000DD858 /* MapBox.bundle */,
274262
07A7106017206E920059213F /* Lumberjack */,
275263
07A7105617206D940059213F /* MFSideMenu */,
276264
);
@@ -427,7 +415,6 @@
427415
077FCE7C1720E1F100939DFF /* barButtonBG_sel.png in Resources */,
428416
077FCE7D1720E1F100939DFF /* barButtonBG.png in Resources */,
429417
077FCE7E1720E1F100939DFF /* segCtrlSelected.png in Resources */,
430-
07024B86173971DC000DD858 /* MapBox.bundle in Resources */,
431418
07A2E2B0173C9E5700F50010 /* DirectTVRemoteViewController~iphone.xib in Resources */,
432419
);
433420
runOnlyForDeploymentPostprocessing = 0;
@@ -479,7 +466,6 @@
479466
07A7107B17206EB60059213F /* NSUserDefaults+Helper.m in Sources */,
480467
07A7107F17206F2E0059213F /* BaseRemoteViewController.m in Sources */,
481468
077FCE811720E22300939DFF /* APIHelper.m in Sources */,
482-
07024B8917397D14000DD858 /* BaseMapViewController.m in Sources */,
483469
07024B8C17397D85000DD858 /* Remote.m in Sources */,
484470
);
485471
runOnlyForDeploymentPostprocessing = 0;
@@ -589,7 +575,13 @@
589575
);
590576
GCC_PRECOMPILE_PREFIX_HEADER = YES;
591577
GCC_PREFIX_HEADER = "IR Remote/IR Remote-Prefix.pch";
578+
HEADER_SEARCH_PATHS = "";
592579
INFOPLIST_FILE = "IR Remote/IR Remote-Info.plist";
580+
LIBRARY_SEARCH_PATHS = (
581+
"$(inherited)",
582+
"\"$(SRCROOT)/IR Remote/extern/mapbox-ios-sdk/MapView/Map/GRMustache/lib\"",
583+
"\"$(SRCROOT)/IR Remote/extern/mapbox-ios-sdk/Proj4\"",
584+
);
593585
OTHER_LDFLAGS = "-ObjC";
594586
PRODUCT_NAME = "$(TARGET_NAME)";
595587
WRAPPER_EXTENSION = app;
@@ -605,7 +597,13 @@
605597
);
606598
GCC_PRECOMPILE_PREFIX_HEADER = YES;
607599
GCC_PREFIX_HEADER = "IR Remote/IR Remote-Prefix.pch";
600+
HEADER_SEARCH_PATHS = "";
608601
INFOPLIST_FILE = "IR Remote/IR Remote-Info.plist";
602+
LIBRARY_SEARCH_PATHS = (
603+
"$(inherited)",
604+
"\"$(SRCROOT)/IR Remote/extern/mapbox-ios-sdk/MapView/Map/GRMustache/lib\"",
605+
"\"$(SRCROOT)/IR Remote/extern/mapbox-ios-sdk/Proj4\"",
606+
);
609607
OTHER_LDFLAGS = "-ObjC";
610608
PRODUCT_NAME = "$(TARGET_NAME)";
611609
WRAPPER_EXTENSION = app;

IR Remote/APIHelper.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ -(void) connectToServerUsingCFStream:(NSString *) urlStr portNo: (uint) portNo {
6464

6565
-(void) sendCommandToServer:(NSString *) command {
6666

67-
if(![command hasSuffix:@"\r"])
67+
if(![command hasSuffix:@"\r"])
6868
command = [NSString stringWithFormat:@"%@\r", command];
6969

7070

@@ -102,6 +102,8 @@ - (void)stream:(NSStream *)stream handleEvent:(NSStreamEvent)eventCode {
102102

103103
data = nil;
104104
} break;
105+
default:
106+
break;
105107
}
106108

107109

IR Remote/BaseRemoteViewController.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
#import "BaseRemoteViewController.h"
1010

11-
#import <MapBox/MapBox.h>
11+
12+
1213

1314
#import "APIHelper.h"
1415
#import "NSUserDefaults+Helper.h"

IR Remote/SlidingMenuViewController.m

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#import "SlidingMenuViewController.h"
1010

1111
#import "AppDelegate.h"
12-
#import "BaseMapViewController.h"
1312
#import "BaseRemoteViewController.h"
1413
#import "StyleConsts.h"
1514

@@ -26,7 +25,7 @@ - (id)initWithStyle:(UITableViewStyle)style
2625

2726

2827
tableSectionTitles = [[NSMutableArray alloc] initWithObjects:
29-
@"REMOTES", @"OFFLINE MAPS", nil];
28+
@"REMOTES", nil];
3029

3130
NSMutableArray *remotes = [[NSMutableArray alloc] initWithCapacity:kNumRemoteTypes];
3231

@@ -36,7 +35,6 @@ - (id)initWithStyle:(UITableViewStyle)style
3635

3736
tableData = [[NSMutableArray alloc] initWithObjects:
3837
remotes,
39-
[[NSArray alloc] initWithObjects:@"Alaska", @"Mexico", @"Costa Rica", nil],
4038
nil];
4139

4240
}
@@ -157,9 +155,6 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
157155

158156
[(BaseRemoteViewController *)controller setRemoteID:indexPath.row];
159157
break;
160-
case 1:
161-
controller = [[BaseMapViewController alloc] init];
162-
break;
163158
default:
164159
break;
165160
}

0 commit comments

Comments
 (0)