summaryrefslogtreecommitdiff
path: root/platform/ios/app
diff options
context:
space:
mode:
authorLloyd Sheng <i@lloydsheng.com>2019-03-11 23:06:16 +0800
committerGitHub <noreply@github.com>2019-03-11 23:06:16 +0800
commit60ceac5efc3d77199f773f08400fe1d53d5a1b90 (patch)
tree782c821978c8d4b7da2aff2aef9ab24b3c70e88e /platform/ios/app
parent5ccc5b7c360827fe58698c28cae4df399310e4d1 (diff)
downloadqtlocation-mapboxgl-60ceac5efc3d77199f773f08400fe1d53d5a1b90.tar.gz
[iOS] Enable developers to change position of ornaments (#13911)
* APIs for change position of ornaments * Use anchors APIs and emove iOS8 layout code * Add ornaments layout tests
Diffstat (limited to 'platform/ios/app')
-rw-r--r--platform/ios/app/MBXOrnamentsViewController.h5
-rw-r--r--platform/ios/app/MBXOrnamentsViewController.m94
-rw-r--r--platform/ios/app/MBXViewController.m11
3 files changed, 109 insertions, 1 deletions
diff --git a/platform/ios/app/MBXOrnamentsViewController.h b/platform/ios/app/MBXOrnamentsViewController.h
new file mode 100644
index 0000000000..087101cdc0
--- /dev/null
+++ b/platform/ios/app/MBXOrnamentsViewController.h
@@ -0,0 +1,5 @@
+#import <UIKit/UIKit.h>
+
+@interface MBXOrnamentsViewController : UIViewController
+
+@end
diff --git a/platform/ios/app/MBXOrnamentsViewController.m b/platform/ios/app/MBXOrnamentsViewController.m
new file mode 100644
index 0000000000..5c7aac7f88
--- /dev/null
+++ b/platform/ios/app/MBXOrnamentsViewController.m
@@ -0,0 +1,94 @@
+#import "MBXOrnamentsViewController.h"
+
+@import Mapbox;
+
+@interface MBXOrnamentsViewController ()<MGLMapViewDelegate>
+
+@property (nonatomic) MGLMapView *mapView;
+@property (nonatomic) NSTimer *timer;
+@property (nonatomic) NSInteger currentPositionIndex;
+
+@end
+
+@implementation MBXOrnamentsViewController
+
+- (void)setCurrentPositionIndex:(NSInteger)currentPositionIndex {
+ MGLOrnamentPosition ornamentPositions[5][4] = {
+ {
+ MGLOrnamentPositionTopLeft,
+ MGLOrnamentPositionTopRight,
+ MGLOrnamentPositionBottomRight,
+ MGLOrnamentPositionBottomLeft
+ },
+ {
+ MGLOrnamentPositionTopRight,
+ MGLOrnamentPositionBottomRight,
+ MGLOrnamentPositionBottomLeft,
+ MGLOrnamentPositionTopLeft
+ },
+ {
+ MGLOrnamentPositionBottomRight,
+ MGLOrnamentPositionBottomLeft,
+ MGLOrnamentPositionTopLeft,
+ MGLOrnamentPositionTopRight
+ },
+ {
+ MGLOrnamentPositionBottomLeft,
+ MGLOrnamentPositionTopLeft,
+ MGLOrnamentPositionTopRight,
+ MGLOrnamentPositionBottomRight
+ },
+ {
+ MGLOrnamentPositionTopLeft,
+ MGLOrnamentPositionTopRight,
+ MGLOrnamentPositionBottomRight,
+ MGLOrnamentPositionBottomLeft
+ }
+ };
+ MGLOrnamentPosition *currentPosition = ornamentPositions[currentPositionIndex];
+ self.mapView.scaleBarPosition = currentPosition[0];
+ self.mapView.compassViewPosition = currentPosition[1];
+ self.mapView.logoViewPosition = currentPosition[2];
+ self.mapView.attributionButtonPosition = currentPosition[3];
+
+ _currentPositionIndex = currentPositionIndex;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ self.title = @"Ornaments";
+
+ MGLMapView *mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds];
+ mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+ [mapView setCenterCoordinate:CLLocationCoordinate2DMake(39.915143, 116.404053)
+ zoomLevel:16
+ direction:30
+ animated:NO];
+ mapView.delegate = self;
+ mapView.showsScale = YES;
+ [self.view addSubview:mapView];
+
+ self.mapView = mapView;
+}
+
+- (void)viewDidDisappear:(BOOL)animated {
+ [self.timer invalidate];
+ self.timer = nil;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+ self.timer = [NSTimer scheduledTimerWithTimeInterval:1
+ target:self
+ selector:@selector(onTimerTick)
+ userInfo:nil
+ repeats:YES];
+}
+
+- (void)onTimerTick {
+ self.currentPositionIndex ++;
+ if (self.currentPositionIndex >= 4) {
+ self.currentPositionIndex = 0;
+ }
+}
+
+@end
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index b2c6ca26b3..9c506cadfa 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -7,6 +7,7 @@
#import "MBXUserLocationAnnotationView.h"
#import "LimeGreenStyleLayer.h"
#import "MBXEmbeddedMapViewController.h"
+#import "MBXOrnamentsViewController.h"
#import "MBXFrameTimeGraphView.h"
@@ -104,8 +105,9 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
MBXSettingsMiscellaneousShowSnapshots,
MBXSettingsMiscellaneousShouldLimitCameraChanges,
MBXSettingsMiscellaneousShowCustomLocationManager,
+ MBXSettingsMiscellaneousOrnamentsPlacement,
MBXSettingsMiscellaneousPrintLogFile,
- MBXSettingsMiscellaneousDeleteLogFile,
+ MBXSettingsMiscellaneousDeleteLogFile
};
// Utility methods
@@ -499,6 +501,7 @@ CLLocationCoordinate2D randomWorldCoordinate() {
@"Show Snapshots",
[NSString stringWithFormat:@"%@ Camera Changes", (_shouldLimitCameraChanges ? @"Unlimit" : @"Limit")],
@"View Route Simulation",
+ @"Ornaments Placement",
]];
if (self.debugLoggingEnabled)
@@ -756,6 +759,12 @@ CLLocationCoordinate2D randomWorldCoordinate() {
}
break;
}
+ case MBXSettingsMiscellaneousOrnamentsPlacement:
+ {
+ MBXOrnamentsViewController *ornamentsViewController = [[MBXOrnamentsViewController alloc] init];
+ [self.navigationController pushViewController:ornamentsViewController animated:YES];
+ break;
+ }
default:
NSAssert(NO, @"All miscellaneous setting rows should be implemented");
break;