Kilian/FMCPlanner2
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prep of RTE Finding an parsing

Browse Source
This commit is contained in:
Kilian Hofmann
2016-04-16 17:45:05 +02:00
parent 0504483b00
commit 7320e8db77
8 changed files with 117 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FMC Planner 2/Base.lproj/Main.storyboard
+55
View File
@@ -1063,6 +1063,61 @@
</objects>
<point key="canvasLocation" x="361" y="966"/>
</scene>
<!--View Controller Route Request-->
<scene sceneID="k8O-60-FO7">
<objects>
<viewController storyboardIdentifier="RTEFINDER" useStoryboardIdentifierAsRestorationIdentifier="YES" id="OL3-89-hAR" customClass="ViewControllerRouteRequest" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="7NQ-Aq-zoJ"/>
<viewControllerLayoutGuide type="bottom" id="Ftu-sy-5oA"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="nAS-0c-kXL">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S10-Dt-JJr">
<rect key="frame" x="0.0" y="20" width="320" height="449"/>
<color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="deviceRGB"/>
</webView>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="Copy Route to here" translatesAutoresizingMaskIntoConstraints="NO" id="ixb-cc-5YB">
<rect key="frame" x="0.0" y="470" width="320" height="98"/>
<color key="backgroundColor" red="0.82352941176470584" green="0.82352941176470584" blue="0.82352941176470584" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="98" id="yH5-fB-FIQ"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zgq-zj-adN">
<rect key="frame" x="290" y="538" width="30" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="2wj-bA-6gx"/>
<constraint firstAttribute="height" constant="30" id="n2L-ok-AgD"/>
</constraints>
<state key="normal" title="OK"/>
<connections>
<action selector="ok:" destination="OL3-89-hAR" eventType="touchUpInside" id="Jmk-1Z-273"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="ixb-cc-5YB" firstAttribute="leading" secondItem="nAS-0c-kXL" secondAttribute="leading" id="50B-pd-fEq"/>
<constraint firstAttribute="trailing" secondItem="ixb-cc-5YB" secondAttribute="trailing" id="7pv-Eg-dJx"/>
<constraint firstItem="Ftu-sy-5oA" firstAttribute="top" secondItem="ixb-cc-5YB" secondAttribute="bottom" id="7qg-Xp-HYt"/>
<constraint firstItem="S10-Dt-JJr" firstAttribute="top" secondItem="7NQ-Aq-zoJ" secondAttribute="bottom" id="9wF-BU-irC"/>
<constraint firstItem="ixb-cc-5YB" firstAttribute="top" secondItem="S10-Dt-JJr" secondAttribute="bottom" constant="1" id="NuN-Qi-AjC"/>
<constraint firstItem="S10-Dt-JJr" firstAttribute="leading" secondItem="nAS-0c-kXL" secondAttribute="leading" id="Tze-Ns-MRN"/>
<constraint firstItem="Ftu-sy-5oA" firstAttribute="top" secondItem="Zgq-zj-adN" secondAttribute="bottom" id="V8X-at-K05"/>
<constraint firstAttribute="trailing" secondItem="S10-Dt-JJr" secondAttribute="trailing" id="cG9-5s-gvC"/>
<constraint firstAttribute="trailing" secondItem="Zgq-zj-adN" secondAttribute="trailing" id="kgS-5h-tb1"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="E5B-vG-8p2" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="856" y="960"/>
</scene>
</scenes>
<resources>
<image name="tri" width="15" height="21"/>
FMC Planner 2/LSKs.plist
+1 -1
View File
@@ -12,7 +12,7 @@
<string></string>
<string></string>
<string></string>
<string></string>
<string>RTE SERACH</string>
<string>CLEAR ENTRY</string>
<string>EXPORT</string>
<string>SERVICE</string>
FMC Planner 2/LaunchScreen.storyboard
+3 -2
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes/>
</document>
FMC Planner 2/ViewControllerRouteRequest.h
+21
View File
@@ -0,0 +1,21 @@
//
// RouteRequestViewController.h
// FMC Planner 2
//
// Created by Kilian Hofmann on 16.04.16.
// Copyright © 2016 Kilian Hofmann. All rights reserved.
//
#import "SharedDeclerations.h"
#import "ViewController.h"
#import <UIKit/UIKit.h>
@interface ViewControllerRouteRequest : UIViewController
#pragma mark - Refrence to other views in app
@property (strong, nonatomic) ViewController *main;
- (IBAction)ok:(UIButton *)sender;
@end
FMC Planner 2/ViewControllerRouteRequest.m
+23
View File
@@ -0,0 +1,23 @@
//
// RouteRequestViewController.m
// FMC Planner 2
//
// Created by Kilian Hofmann on 16.04.16.
// Copyright © 2016 Kilian Hofmann. All rights reserved.
//
#import "ViewControllerRouteRequest.h"
@implementation ViewControllerRouteRequest
- (void)viewDidLoad
{
[super viewDidLoad];
// Do any additional setup after loading the view.
}
- (IBAction)ok:(UIButton *)sender
{
[self dismissViewControllerAnimated:YES completion:nil];
}
@end
FMC Planner 2/ViewControllerScreen.h
+1
View File
@@ -9,6 +9,7 @@
#import "NavDataParser.h"
#import "SharedDeclerations.h"
#import "ViewController.h"
#import "ViewControllerRouteRequest.h"
#import "ViewControllerServiceMenu.h"
#import <UIKit/UIKit.h>
FMC Planner 2/ViewControllerScreen.m
+7
View File
@@ -96,6 +96,13 @@ NavDataParser *parser = nil;
((UILabel *)tapReg.view).text = _Scratchpad.text;
_Scratchpad.text = @"";
}
else if ([((UILabel *)tapReg.view)
.restorationIdentifier isEqualToString:@"LSKR3"]) {
ViewControllerRouteRequest *rq = [self.storyboard
instantiateViewControllerWithIdentifier:@"RTEFINDER"];
rq.main = _main;
[self presentViewController:rq animated:YES completion:nil];
}
else if ([((UILabel *)tapReg.view)
.restorationIdentifier isEqualToString:@"LSKR4"]) {
[_main saveToFile:_main.save];