尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Justin R. Miller
Commit b114d1113db6710163d46d7132e40cae129f52b8 1 parent 4bca0cb8

first cut of tracking button iOS 7 fixes

Inline Side-by-side
Showing 17 changed files with 143 additions and 25 deletions
... ... @@ -32,9 +32,10 @@
#import "RMUserLocation.h"
typedef enum {
RMUserTrackingButtonStateActivity = 0,
RMUserTrackingButtonStateLocation = 1,
RMUserTrackingButtonStateHeading = 2
RMUserTrackingButtonStateNone = 0,
RMUserTrackingButtonStateActivity = 1,
RMUserTrackingButtonStateLocation = 2,
RMUserTrackingButtonStateHeading = 3
} RMUserTrackingButtonState;
@interface RMUserTrackingBarButtonItem ()
... ... @@ -45,7 +46,7 @@ typedef enum {
@property (nonatomic, assign) RMUserTrackingButtonState state;
- (void)createBarButtonItem;
- (void)updateAppearance;
- (void)updateState;
- (void)changeMode:(id)sender;
@end
... ... @@ -85,21 +86,26 @@ typedef enum {
- (void)createBarButtonItem
{
_segmentedControl = [[UISegmentedControl alloc] initWithItems:[NSArray arrayWithObject:@""]];
_segmentedControl.segmentedControlStyle = UISegmentedControlStyleBar;
[_segmentedControl setWidth:32.0 forSegmentAtIndex:0];
_segmentedControl.userInteractionEnabled = NO;
_segmentedControl.tintColor = self.tintColor;
_segmentedControl.center = self.customView.center;
[self.customView addSubview:_segmentedControl];
if (RMPreVersion7)
{
_segmentedControl = [[UISegmentedControl alloc] initWithItems:[NSArray arrayWithObject:@""]];
_segmentedControl.segmentedControlStyle = UISegmentedControlStyleBar;
[_segmentedControl setWidth:32.0 forSegmentAtIndex:0];
_segmentedControl.userInteractionEnabled = NO;
_segmentedControl.tintColor = self.tintColor;
_segmentedControl.center = self.customView.center;
[self.customView addSubview:_segmentedControl];
}
_buttonImageView = [[UIImageView alloc] initWithImage:[RMMapView resourceImageNamed:@"TrackingLocation.png"]];
_buttonImageView = [[UIImageView alloc] initWithImage:nil];
_buttonImageView.contentMode = UIViewContentModeCenter;
_buttonImageView.frame = CGRectMake(0, 0, 32, 32);
_buttonImageView.center = self.customView.center;
_buttonImageView.userInteractionEnabled = NO;
[self updateImage];
[self.customView addSubview:_buttonImageView];
_activityView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
... ... @@ -111,7 +117,7 @@ typedef enum {
[((UIControl *)self.customView) addTarget:self action:@selector(changeMode:) forControlEvents:UIControlEventTouchUpInside];
_state = RMUserTrackingButtonStateLocation;
_state = RMUserTrackingButtonStateNone;
}
- (void)dealloc
... ... @@ -133,7 +139,7 @@ typedef enum {
[_mapView addObserver:self forKeyPath:@"userTrackingMode" options:NSKeyValueObservingOptionNew context:nil];
[_mapView addObserver:self forKeyPath:@"userLocation.location" options:NSKeyValueObservingOptionNew context:nil];
[self updateAppearance];
[self updateState];
}
}
... ... @@ -141,23 +147,81 @@ typedef enum {
{
[super setTintColor:newTintColor];
_segmentedControl.tintColor = newTintColor;
if (RMPreVersion7)
_segmentedControl.tintColor = newTintColor;
else
[self updateImage];
}
#pragma mark -
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
{
[self updateAppearance];
[self updateState];
}
#pragma mark -
- (void)updateAppearance
- (void)updateImage
{
if (RMPreVersion7)
{
if (_mapView.userTrackingMode == RMUserTrackingModeFollowWithHeading)
_buttonImageView.image = [RMMapView resourceImageNamed:@"TrackingHeading.png"];
else
_buttonImageView.image = [RMMapView resourceImageNamed:@"TrackingLocation.png"];
}
else
{
CGRect rect = CGRectMake(0, 0, self.customView.bounds.size.width, self.customView.bounds.size.height);
UIGraphicsBeginImageContextWithOptions(rect.size, NO, [[UIScreen mainScreen] scale]);
CGContextRef context = UIGraphicsGetCurrentContext();
UIImage *image;
if (_mapView.userTrackingMode == RMUserTrackingModeNone || ! _mapView)
image = [RMMapView resourceImageNamed:@"TrackingLocationOffMask.png"];
else if (_mapView.userTrackingMode == RMUserTrackingModeFollow)
image = [RMMapView resourceImageNamed:@"TrackingLocationMask.png"];
else if (_mapView.userTrackingMode == RMUserTrackingModeFollowWithHeading)
image = [RMMapView resourceImageNamed:@"TrackingHeadingMask.png"];
UIGraphicsPushContext(context);
[image drawAtPoint:CGPointMake((rect.size.width - image.size.width) / 2, (rect.size.height - image.size.height) / 2)];
UIGraphicsPopContext();
CGContextSetBlendMode(context, kCGBlendModeSourceIn);
CGContextSetFillColorWithColor(context, self.tintColor.CGColor);
CGContextFillRect(context, rect);
_buttonImageView.image = UIGraphicsGetImageFromCurrentImageContext();
UIGraphicsEndImageContext();
if (_mapView.userTrackingMode == RMUserTrackingModeFollow || _mapView.userTrackingMode == RMUserTrackingModeFollowWithHeading)
{
_buttonImageView.layer.backgroundColor = CGColorCreateCopyWithAlpha(self.tintColor.CGColor, 0.1);
_buttonImageView.layer.cornerRadius = 4;
}
else
{
_buttonImageView.layer.backgroundColor = [[UIColor clearColor] CGColor];
_buttonImageView.layer.cornerRadius = 0;
}
}
}
- (void)updateState
{
// "selection" state
//
_segmentedControl.selectedSegmentIndex = (_mapView.userTrackingMode == RMUserTrackingModeNone ? UISegmentedControlNoSegment : 0);
if (RMPreVersion7)
_segmentedControl.selectedSegmentIndex = (_mapView.userTrackingMode == RMUserTrackingModeNone ? UISegmentedControlNoSegment : 0);
// activity/image state
//
... ... @@ -190,7 +254,8 @@ typedef enum {
}
else
{
if ((_mapView.userTrackingMode != RMUserTrackingModeFollowWithHeading && _state != RMUserTrackingButtonStateLocation) ||
if ((_mapView.userTrackingMode == RMUserTrackingModeNone && _state != RMUserTrackingButtonStateNone) ||
(_mapView.userTrackingMode == RMUserTrackingModeFollow && _state != RMUserTrackingButtonStateLocation) ||
(_mapView.userTrackingMode == RMUserTrackingModeFollowWithHeading && _state != RMUserTrackingButtonStateHeading))
{
// if image state doesn't match mode, update it
... ... @@ -205,7 +270,8 @@ typedef enum {
}
completion:^(BOOL finished)
{
_buttonImageView.image = [RMMapView resourceImageNamed:(_mapView.userTrackingMode == RMUserTrackingModeFollowWithHeading ? @"TrackingHeading.png" : @"TrackingLocation.png")];
[self updateImage];
_buttonImageView.hidden = NO;
[_activityView stopAnimating];
... ... @@ -217,7 +283,12 @@ typedef enum {
}];
}];
_state = (_mapView.userTrackingMode == RMUserTrackingModeFollowWithHeading ? RMUserTrackingButtonStateHeading : RMUserTrackingButtonStateLocation);
if (_mapView.userTrackingMode == RMUserTrackingModeNone)
_state = RMUserTrackingButtonStateNone;
else if (_mapView.userTrackingMode == RMUserTrackingModeFollow)
_state = RMUserTrackingButtonStateLocation;
else if (_mapView.userTrackingMode == RMUserTrackingModeFollowWithHeading)
_state = RMUserTrackingButtonStateHeading;
}
}
}
... ... @@ -253,7 +324,7 @@ typedef enum {
}
}
[self updateAppearance];
[self updateState];
}
@end
... ...
... ... @@ -139,6 +139,17 @@
DD97C11616489678007C4652 /* libProj4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD97C11516489678007C4652 /* libProj4.a */; };
DD98B6FA14D76B930092882F /* RMMapBoxSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DD98B6F814D76B930092882F /* RMMapBoxSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD98B6FB14D76B930092882F /* RMMapBoxSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD98B6F914D76B930092882F /* RMMapBoxSource.m */; };
DDA257011798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F61798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png */; };
DDA257021798A95600BBB325 /* TrackingLocationOffMask@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F71798A95600BBB325 /* TrackingLocationOffMask@2x.png */; };
DDA257031798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F81798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png */; };
DDA257041798A95600BBB325 /* TrackingLocationMask@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F91798A95600BBB325 /* TrackingLocationMask@2x.png */; };
DDA257051798A95600BBB325 /* TrackingHeadingMaskLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256FA1798A95600BBB325 /* TrackingHeadingMaskLandscape@2x.png */; };
DDA257061798A95600BBB325 /* TrackingHeadingMask@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256FB1798A95600BBB325 /* TrackingHeadingMask@2x.png */; };
DDA257071798A95600BBB325 /* Compass@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256FC1798A95600BBB325 /* Compass@2x.png */; };
DDA257081798A95600BBB325 /* Compass.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256FD1798A95600BBB325 /* Compass.png */; };
DDA257091798A95600BBB325 /* TrackingHeadingMask.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256FE1798A95600BBB325 /* TrackingHeadingMask.png */; };
DDA2570A1798A95600BBB325 /* TrackingLocationOffMask.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256FF1798A95600BBB325 /* TrackingLocationOffMask.png */; };
DDA2570B1798A95600BBB325 /* TrackingLocationMask.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA257001798A95600BBB325 /* TrackingLocationMask.png */; };
DDA6B8BD155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h in Headers */ = {isa = PBXBuildFile; fileRef = DDA6B8BB155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
DDA6B8BE155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DDA6B8BC155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.m */; };
DDC4BED5152E3BD700089409 /* RMInteractiveSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DDC4BED3152E3BD700089409 /* RMInteractiveSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
... ... @@ -300,6 +311,17 @@
DD97C11516489678007C4652 /* libProj4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libProj4.a; path = ../Proj4/libProj4.a; sourceTree = "<group>"; };
DD98B6F814D76B930092882F /* RMMapBoxSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapBoxSource.h; sourceTree = "<group>"; };
DD98B6F914D76B930092882F /* RMMapBoxSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapBoxSource.m; sourceTree = "<group>"; };
DDA256F61798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationOffMaskLandscape@2x.png"; path = "Map/Resources/TrackingLocationOffMaskLandscape@2x.png"; sourceTree = "<group>"; };
DDA256F71798A95600BBB325 /* TrackingLocationOffMask@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationOffMask@2x.png"; path = "Map/Resources/TrackingLocationOffMask@2x.png"; sourceTree = "<group>"; };
DDA256F81798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationMaskLandscape@2x.png"; path = "Map/Resources/TrackingLocationMaskLandscape@2x.png"; sourceTree = "<group>"; };
DDA256F91798A95600BBB325 /* TrackingLocationMask@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationMask@2x.png"; path = "Map/Resources/TrackingLocationMask@2x.png"; sourceTree = "<group>"; };
DDA256FA1798A95600BBB325 /* TrackingHeadingMaskLandscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingHeadingMaskLandscape@2x.png"; path = "Map/Resources/TrackingHeadingMaskLandscape@2x.png"; sourceTree = "<group>"; };
DDA256FB1798A95600BBB325 /* TrackingHeadingMask@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingHeadingMask@2x.png"; path = "Map/Resources/TrackingHeadingMask@2x.png"; sourceTree = "<group>"; };
DDA256FC1798A95600BBB325 /* Compass@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Compass@2x.png"; path = "Map/Resources/Compass@2x.png"; sourceTree = "<group>"; };
DDA256FD1798A95600BBB325 /* Compass.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Compass.png; path = Map/Resources/Compass.png; sourceTree = "<group>"; };
DDA256FE1798A95600BBB325 /* TrackingHeadingMask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TrackingHeadingMask.png; path = Map/Resources/TrackingHeadingMask.png; sourceTree = "<group>"; };
DDA256FF1798A95600BBB325 /* TrackingLocationOffMask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TrackingLocationOffMask.png; path = Map/Resources/TrackingLocationOffMask.png; sourceTree = "<group>"; };
DDA257001798A95600BBB325 /* TrackingLocationMask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TrackingLocationMask.png; path = Map/Resources/TrackingLocationMask.png; sourceTree = "<group>"; };
DDA6B8BB155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMUserTrackingBarButtonItem.h; sourceTree = "<group>"; };
DDA6B8BC155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMUserTrackingBarButtonItem.m; sourceTree = "<group>"; };
DDC4BED3152E3BD700089409 /* RMInteractiveSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMInteractiveSource.h; sourceTree = "<group>"; };
... ... @@ -597,8 +619,12 @@
DD932BC1165C287600D69D49 /* Resources */ = {
isa = PBXGroup;
children = (
DD280D1216EFDDD30014B549 /* examples.map-z2effxa8.json */,
DD280D1316EFDDD30014B549 /* examples.map-zswgei2n.json */,
DD932BA5165C287000D69D49 /* mapbox.png */,
DD932BA6165C287000D69D49 /* mapbox@2x.png */,
DDA256FD1798A95600BBB325 /* Compass.png */,
DDA256FC1798A95600BBB325 /* Compass@2x.png */,
DD932BA9165C287000D69D49 /* HeadingAngleSmall.png */,
DD932BAA165C287000D69D49 /* HeadingAngleSmall@2x.png */,
DD94D46816C2E064003D5739 /* HeadingAngleMedium.png */,
... ... @@ -613,10 +639,17 @@
DD932BAE165C287000D69D49 /* TrackingDotHalo@2x.png */,
DD932BAF165C287000D69D49 /* TrackingHeading.png */,
DD932BB0165C287000D69D49 /* TrackingHeading@2x.png */,
DDA256FE1798A95600BBB325 /* TrackingHeadingMask.png */,
DDA256FB1798A95600BBB325 /* TrackingHeadingMask@2x.png */,
DDA256FA1798A95600BBB325 /* TrackingHeadingMaskLandscape@2x.png */,
DD932BB1165C287000D69D49 /* TrackingLocation.png */,
DD932BB2165C287000D69D49 /* TrackingLocation@2x.png */,
DD280D1216EFDDD30014B549 /* examples.map-z2effxa8.json */,
DD280D1316EFDDD30014B549 /* examples.map-zswgei2n.json */,
DDA257001798A95600BBB325 /* TrackingLocationMask.png */,
DDA256F91798A95600BBB325 /* TrackingLocationMask@2x.png */,
DDA256F81798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png */,
DDA256FF1798A95600BBB325 /* TrackingLocationOffMask.png */,
DDA256F71798A95600BBB325 /* TrackingLocationOffMask@2x.png */,
DDA256F61798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png */,
);
name = Resources;
path = ..;
... ... @@ -805,6 +838,7 @@
DD932BB3165C287000D69D49 /* mapbox.png in Resources */,
DD932BB4165C287000D69D49 /* mapbox@2x.png in Resources */,
DD932BB7165C287000D69D49 /* HeadingAngleSmall.png in Resources */,
DDA257071798A95600BBB325 /* Compass@2x.png in Resources */,
DD932BB8165C287000D69D49 /* HeadingAngleSmall@2x.png in Resources */,
DD932BB9165C287000D69D49 /* LoadingTile.png in Resources */,
DD932BBA165C287000D69D49 /* LoadingTileZoom.png in Resources */,
... ... @@ -812,15 +846,25 @@
DD932BB6165C287000D69D49 /* TrackingDot@2x.png in Resources */,
DD932BBB165C287000D69D49 /* TrackingDotHalo.png in Resources */,
DD932BBC165C287000D69D49 /* TrackingDotHalo@2x.png in Resources */,
DDA257031798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png in Resources */,
DDA257051798A95600BBB325 /* TrackingHeadingMaskLandscape@2x.png in Resources */,
DDA257061798A95600BBB325 /* TrackingHeadingMask@2x.png in Resources */,
DD932BBD165C287000D69D49 /* TrackingHeading.png in Resources */,
DDA2570B1798A95600BBB325 /* TrackingLocationMask.png in Resources */,
DD932BBE165C287000D69D49 /* TrackingHeading@2x.png in Resources */,
DDA257091798A95600BBB325 /* TrackingHeadingMask.png in Resources */,
DD932BBF165C287000D69D49 /* TrackingLocation.png in Resources */,
DD932BC0165C287000D69D49 /* TrackingLocation@2x.png in Resources */,
DDA2570A1798A95600BBB325 /* TrackingLocationOffMask.png in Resources */,
DDA257011798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png in Resources */,
DDA257041798A95600BBB325 /* TrackingLocationMask@2x.png in Resources */,
DDA257081798A95600BBB325 /* Compass.png in Resources */,
DD94D46A16C2E064003D5739 /* HeadingAngleLarge.png in Resources */,
DD94D46B16C2E064003D5739 /* HeadingAngleLarge@2x.png in Resources */,
DD94D46C16C2E064003D5739 /* HeadingAngleMedium.png in Resources */,
DD94D46D16C2E064003D5739 /* HeadingAngleMedium@2x.png in Resources */,
DD280D1416EFDDD30014B549 /* examples.map-z2effxa8.json in Resources */,
DDA257021798A95600BBB325 /* TrackingLocationOffMask@2x.png in Resources */,
DD280D1516EFDDD30014B549 /* examples.map-zswgei2n.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
... ...
... ... @@ -23,3 +23,6 @@
#define WarnDeprecated()
#define NS_BLOCK_ASSERTIONS 1
#endif
#define RMPostVersion7 ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0)
#define RMPreVersion7 ([[[UIDevice currentDevice] systemVersion] floatValue] < 7.0)
... ...