From 56cd67407701ecce010a3d0af75a2c8d5bdb5a2c Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Wed, 8 Apr 2015 23:44:57 -0700 Subject: [PATCH] Add simple tracking mode button to demo app --- ios/app/MBXViewController.mm | 23 ++++++++++++++++++++- ios/app/img/TrackingHeadingMask.png | Bin 0 -> 250 bytes ios/app/img/TrackingHeadingMask@2x.png | Bin 0 -> 467 bytes ios/app/img/TrackingHeadingMask@3x.png | Bin 0 -> 672 bytes ios/app/img/TrackingLocationMask.png | Bin 0 -> 407 bytes ios/app/img/TrackingLocationMask@2x.png | Bin 0 -> 680 bytes ios/app/img/TrackingLocationMask@3x.png | Bin 0 -> 903 bytes ios/app/img/TrackingLocationOffMask.png | Bin 0 -> 493 bytes ios/app/img/TrackingLocationOffMask@2x.png | Bin 0 -> 973 bytes ios/app/img/TrackingLocationOffMask@3x.png | Bin 0 -> 1407 bytes ios/app/img/locateUser.png | Bin 1111 -> 0 bytes ios/app/img/locateUser@2x.png | Bin 1696 -> 0 bytes ios/app/img/locateUser@3x.png | Bin 521 -> 0 bytes 13 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ios/app/img/TrackingHeadingMask.png create mode 100644 ios/app/img/TrackingHeadingMask@2x.png create mode 100644 ios/app/img/TrackingHeadingMask@3x.png create mode 100644 ios/app/img/TrackingLocationMask.png create mode 100644 ios/app/img/TrackingLocationMask@2x.png create mode 100644 ios/app/img/TrackingLocationMask@3x.png create mode 100644 ios/app/img/TrackingLocationOffMask.png create mode 100644 ios/app/img/TrackingLocationOffMask@2x.png create mode 100644 ios/app/img/TrackingLocationOffMask@3x.png delete mode 100644 ios/app/img/locateUser.png delete mode 100644 ios/app/img/locateUser@2x.png delete mode 100644 ios/app/img/locateUser@3x.png diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm index 28ac68589..fc7ad3cb5 100644 --- a/ios/app/MBXViewController.mm +++ b/ios/app/MBXViewController.mm @@ -85,7 +85,7 @@ mbgl::Settings_NSUserDefaults *settings = nullptr; [titleButton addTarget:self action:@selector(cycleStyles) forControlEvents:UIControlEventTouchUpInside]; self.navigationItem.titleView = titleButton; - self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"locateUser.png"] + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"TrackingLocationOffMask.png"] style:UIBarButtonItemStylePlain target:self action:@selector(locateUser)]; @@ -290,6 +290,27 @@ mbgl::Settings_NSUserDefaults *settings = nullptr; return YES; } +- (void)mapView:(MGLMapView *)mapView didChangeUserTrackingMode:(MGLUserTrackingMode)mode animated:(BOOL)animated +{ + UIImage *newButtonImage; + + switch (mode) { + case MGLUserTrackingModeNone: + newButtonImage = [UIImage imageNamed:@"TrackingLocationOffMask.png"]; + break; + + case MGLUserTrackingModeFollow: + newButtonImage = [UIImage imageNamed:@"TrackingLocationMask.png"]; + break; + + case MGLUserTrackingModeFollowWithHeading: + newButtonImage = [UIImage imageNamed:@"TrackingHeadingMask.png"]; + break; + } + + self.navigationItem.rightBarButtonItem.image = newButtonImage; +} + #pragma clang diagnostic pop @end diff --git a/ios/app/img/TrackingHeadingMask.png b/ios/app/img/TrackingHeadingMask.png new file mode 100644 index 0000000000000000000000000000000000000000..9ec0567a3f0fcf62b0807293dd2a82721d293932 GIT binary patch literal 250 zcmVXOWVU&f$cu&%1t<^TWy07*qoM6N<$f_2Sq AV*mgE literal 0 HcmV?d00001 diff --git a/ios/app/img/TrackingHeadingMask@2x.png b/ios/app/img/TrackingHeadingMask@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0df8ccc229d0e7990f1124cfa22a225a64d228fc GIT binary patch literal 467 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 literal 0 HcmV?d00001 diff --git a/ios/app/img/TrackingLocationOffMask.png b/ios/app/img/TrackingLocationOffMask.png new file mode 100644 index 0000000000000000000000000000000000000000..87b26c57100529ff8158bff69e98a8ae126126d7 GIT binary patch literal 493 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