summaryrefslogtreecommitdiff
path: root/platform/ios/app
diff options
context:
space:
mode:
Diffstat (limited to 'platform/ios/app')
-rw-r--r--platform/ios/app/MBXTestViewController.h17
-rw-r--r--platform/ios/app/MBXTestViewController.m27
-rw-r--r--platform/ios/app/MBXViewController.m2
-rw-r--r--platform/ios/app/Main.storyboard26
4 files changed, 59 insertions, 13 deletions
diff --git a/platform/ios/app/MBXTestViewController.h b/platform/ios/app/MBXTestViewController.h
new file mode 100644
index 0000000000..b068462f24
--- /dev/null
+++ b/platform/ios/app/MBXTestViewController.h
@@ -0,0 +1,17 @@
+//
+// MBXTestViewController.h
+// iosapp
+//
+// Created by Jordan on 4/17/19.
+// Copyright © 2019 Mapbox. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MBXTestViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/platform/ios/app/MBXTestViewController.m b/platform/ios/app/MBXTestViewController.m
new file mode 100644
index 0000000000..9083fe164b
--- /dev/null
+++ b/platform/ios/app/MBXTestViewController.m
@@ -0,0 +1,27 @@
+//
+// MBXTestViewController.m
+// iosapp
+//
+// Created by Jordan on 4/17/19.
+// Copyright © 2019 Mapbox. All rights reserved.
+//
+
+#import "MBXTestViewController.h"
+
+@interface MBXTestViewController ()
+
+@end
+
+@implementation MBXTestViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+}
+
+- (IBAction)dismissVC:(id)sender {
+ NSLog(@"BYEEEEE");
+ [self dismissViewControllerAnimated:NO completion:nil];
+}
+
+@end
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index a1dd2d81be..f421266d44 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -294,7 +294,7 @@ CLLocationCoordinate2D randomWorldCoordinate() {
}
}
[self.mapView addGestureRecognizer:singleTap];
-
+ [self.mapView removeAnnotations:self.mapView.annotations];
// Display a secondary map on any connected external display.
// https://developer.apple.com/documentation/uikit/windows_and_screens/displaying_content_on_a_connected_screen?language=objc
self.helperWindows = [NSMutableArray array];
diff --git a/platform/ios/app/Main.storyboard b/platform/ios/app/Main.storyboard
index 22dda1d937..9acd874a85 100644
--- a/platform/ios/app/Main.storyboard
+++ b/platform/ios/app/Main.storyboard
@@ -466,10 +466,10 @@
</objects>
<point key="canvasLocation" x="2073" y="1082"/>
</scene>
- <!--View Controller-->
+ <!--Test View Controller-->
<scene sceneID="CA1-w0-WrG">
<objects>
- <viewController storyboardIdentifier="TestViewContraller" modalPresentationStyle="overCurrentContext" useStoryboardIdentifierAsRestorationIdentifier="YES" id="GJx-bG-Csz" sceneMemberID="viewController">
+ <viewController storyboardIdentifier="TestViewContraller" modalPresentationStyle="overCurrentContext" useStoryboardIdentifierAsRestorationIdentifier="YES" id="GJx-bG-Csz" customClass="MBXTestViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="lfe-Lv-9UZ">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -477,33 +477,35 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ebb-JT-aem">
<rect key="frame" x="67" y="225" width="241" height="237"/>
<subviews>
- <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uwx-u1-cIQ">
- <rect key="frame" x="66" y="84" width="109" height="68"/>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uwx-u1-cIQ">
+ <rect key="frame" x="66" y="109" width="109" height="36"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="GO BACK ">
<color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="titleShadowColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
- <action selector="dismissVC:" destination="Mkp-39-rGL" eventType="touchUpInside" id="CLv-FL-ZC5"/>
- <segue destination="PSe-Ot-7Ff" kind="show" id="Y1W-H4-LaP"/>
+ <action selector="dismissVC:" destination="GJx-bG-Csz" eventType="touchUpInside" id="RW1-bw-3Jm"/>
+ <action selector="dismissVC:" destination="Mkp-39-rGL" eventType="touchUpInside" id="bfi-qP-4VL"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.7713280857" green="0.154259277" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
- <constraint firstItem="Uwx-u1-cIQ" firstAttribute="centerX" secondItem="Ebb-JT-aem" secondAttribute="centerX" id="kf5-XQ-IKQ"/>
- <constraint firstItem="Uwx-u1-cIQ" firstAttribute="centerY" secondItem="Ebb-JT-aem" secondAttribute="centerY" id="zDh-sq-na8"/>
+ <constraint firstItem="Uwx-u1-cIQ" firstAttribute="centerY" secondItem="Ebb-JT-aem" secondAttribute="centerY" constant="8.5" id="4we-wY-elJ"/>
+ <constraint firstItem="Uwx-u1-cIQ" firstAttribute="top" secondItem="Ebb-JT-aem" secondAttribute="top" constant="109" id="Snn-Ni-gaq"/>
+ <constraint firstItem="Uwx-u1-cIQ" firstAttribute="centerX" secondItem="Ebb-JT-aem" secondAttribute="centerX" id="b2Y-Mo-bRc"/>
+ <constraint firstItem="Uwx-u1-cIQ" firstAttribute="leading" secondItem="Ebb-JT-aem" secondAttribute="leading" constant="66" id="mOc-Gv-MYH"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
- <constraint firstItem="Ebb-JT-aem" firstAttribute="top" secondItem="fqA-v0-5jT" secondAttribute="top" constant="205" id="45n-9z-nv8"/>
- <constraint firstItem="Ebb-JT-aem" firstAttribute="leading" secondItem="fqA-v0-5jT" secondAttribute="leading" constant="67" id="RDZ-Cn-F9L"/>
- <constraint firstItem="Ebb-JT-aem" firstAttribute="centerX" secondItem="fqA-v0-5jT" secondAttribute="centerX" id="nGy-4p-ZoI"/>
- <constraint firstItem="Ebb-JT-aem" firstAttribute="centerY" secondItem="fqA-v0-5jT" secondAttribute="centerY" id="qFA-1a-taz"/>
+ <constraint firstItem="Ebb-JT-aem" firstAttribute="leading" secondItem="fqA-v0-5jT" secondAttribute="leading" constant="67" id="1xa-vy-dQT"/>
+ <constraint firstItem="Ebb-JT-aem" firstAttribute="top" secondItem="fqA-v0-5jT" secondAttribute="top" constant="205" id="4cg-Uy-IYx"/>
+ <constraint firstItem="Ebb-JT-aem" firstAttribute="centerX" secondItem="lfe-Lv-9UZ" secondAttribute="centerX" id="8wP-QZ-7Hy"/>
+ <constraint firstItem="fqA-v0-5jT" firstAttribute="bottom" secondItem="Ebb-JT-aem" secondAttribute="bottom" constant="205" id="AER-B5-Jtz"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fqA-v0-5jT"/>
</view>
View Lorry Controller Status