From 56cd67407701ecce010a3d0af75a2c8d5bdb5a2c Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Wed, 8 Apr 2015 23:44:57 -0700 Subject: 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 (limited to 'ios') diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm index 28ac68589a..fc7ad3cb57 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 0000000000..9ec0567a3f Binary files /dev/null and b/ios/app/img/TrackingHeadingMask.png differ diff --git a/ios/app/img/TrackingHeadingMask@2x.png b/ios/app/img/TrackingHeadingMask@2x.png new file mode 100644 index 0000000000..0df8ccc229 Binary files /dev/null and b/ios/app/img/TrackingHeadingMask@2x.png differ diff --git a/ios/app/img/TrackingHeadingMask@3x.png b/ios/app/img/TrackingHeadingMask@3x.png new file mode 100644 index 0000000000..e4b93e42e7 Binary files /dev/null and b/ios/app/img/TrackingHeadingMask@3x.png differ diff --git a/ios/app/img/TrackingLocationMask.png b/ios/app/img/TrackingLocationMask.png new file mode 100644 index 0000000000..bb7348c482 Binary files /dev/null and b/ios/app/img/TrackingLocationMask.png differ diff --git a/ios/app/img/TrackingLocationMask@2x.png b/ios/app/img/TrackingLocationMask@2x.png new file mode 100644 index 0000000000..35c5a293ec Binary files /dev/null and b/ios/app/img/TrackingLocationMask@2x.png differ diff --git a/ios/app/img/TrackingLocationMask@3x.png b/ios/app/img/TrackingLocationMask@3x.png new file mode 100644 index 0000000000..af523975a5 Binary files /dev/null and b/ios/app/img/TrackingLocationMask@3x.png differ diff --git a/ios/app/img/TrackingLocationOffMask.png b/ios/app/img/TrackingLocationOffMask.png new file mode 100644 index 0000000000..87b26c5710 Binary files /dev/null and b/ios/app/img/TrackingLocationOffMask.png differ diff --git a/ios/app/img/TrackingLocationOffMask@2x.png b/ios/app/img/TrackingLocationOffMask@2x.png new file mode 100644 index 0000000000..232d534b41 Binary files /dev/null and b/ios/app/img/TrackingLocationOffMask@2x.png differ diff --git a/ios/app/img/TrackingLocationOffMask@3x.png b/ios/app/img/TrackingLocationOffMask@3x.png new file mode 100644 index 0000000000..b609fbe84e Binary files /dev/null and b/ios/app/img/TrackingLocationOffMask@3x.png differ diff --git a/ios/app/img/locateUser.png b/ios/app/img/locateUser.png deleted file mode 100644 index aa8d1cf52e..0000000000 Binary files a/ios/app/img/locateUser.png and /dev/null differ diff --git a/ios/app/img/locateUser@2x.png b/ios/app/img/locateUser@2x.png deleted file mode 100644 index 29c4905938..0000000000 Binary files a/ios/app/img/locateUser@2x.png and /dev/null differ diff --git a/ios/app/img/locateUser@3x.png b/ios/app/img/locateUser@3x.png deleted file mode 100644 index 206a5ae80f..0000000000 Binary files a/ios/app/img/locateUser@3x.png and /dev/null differ -- cgit v1.2.1