diff --git a/FMC Planner 2.xcodeproj/project.pbxproj b/FMC Planner 2.xcodeproj/project.pbxproj index 3464290..db1fb98 100644 --- a/FMC Planner 2.xcodeproj/project.pbxproj +++ b/FMC Planner 2.xcodeproj/project.pbxproj @@ -26,6 +26,7 @@ E2763C721CA6C8AE001E4EDA /* LSKs.plist in Resources */ = {isa = PBXBuildFile; fileRef = E2763C711CA6C8AE001E4EDA /* LSKs.plist */; }; E2763C751CA6E777001E4EDA /* ViewControllerServiceMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = E2763C741CA6E777001E4EDA /* ViewControllerServiceMenu.m */; }; E280F3A41CA7C71500DF2A05 /* TableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E280F3A31CA7C71500DF2A05 /* TableViewController.m */; }; + E28AD13D1CC291E400FEDDBA /* ViewControllerRouteRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = E28AD13C1CC291E400FEDDBA /* ViewControllerRouteRequest.m */; }; E28E106D1C9FF93D006E2C6B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E28E106C1C9FF93D006E2C6B /* QuartzCore.framework */; }; E28E10711CA01EC9006E2C6B /* MENU.plist in Resources */ = {isa = PBXBuildFile; fileRef = E28E10701CA01EC9006E2C6B /* MENU.plist */; }; E28E10731CA0375F006E2C6B /* ROUTE.plist in Resources */ = {isa = PBXBuildFile; fileRef = E28E10721CA0375F006E2C6B /* ROUTE.plist */; }; @@ -92,6 +93,8 @@ E2763C741CA6E777001E4EDA /* ViewControllerServiceMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewControllerServiceMenu.m; sourceTree = ""; }; E280F3A21CA7C71500DF2A05 /* TableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableViewController.h; sourceTree = ""; }; E280F3A31CA7C71500DF2A05 /* TableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableViewController.m; sourceTree = ""; }; + E28AD13B1CC291E400FEDDBA /* ViewControllerRouteRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewControllerRouteRequest.h; sourceTree = ""; }; + E28AD13C1CC291E400FEDDBA /* ViewControllerRouteRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewControllerRouteRequest.m; sourceTree = ""; }; E28E106C1C9FF93D006E2C6B /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; E28E10701CA01EC9006E2C6B /* MENU.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = MENU.plist; sourceTree = ""; }; E28E10721CA0375F006E2C6B /* ROUTE.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ROUTE.plist; sourceTree = ""; }; @@ -229,6 +232,8 @@ children = ( E2A9270C1CA2FD6D00606E07 /* Implementation */, E2A9270B1CA2FD6000606E07 /* Header */, + E28AD13B1CC291E400FEDDBA /* ViewControllerRouteRequest.h */, + E28AD13C1CC291E400FEDDBA /* ViewControllerRouteRequest.m */, ); name = ViewControllers; sourceTree = ""; @@ -570,6 +575,7 @@ E22EE9D71C9DB7B3001F5BC0 /* ViewController.m in Sources */, E22EE9D41C9DB7B3001F5BC0 /* AppDelegate.m in Sources */, E2549C761CAB2D3F00562602 /* DropboxV2ObjC.m in Sources */, + E28AD13D1CC291E400FEDDBA /* ViewControllerRouteRequest.m in Sources */, E22EE9D11C9DB7B3001F5BC0 /* main.m in Sources */, E2A927161CA30CEE00606E07 /* SharedDeclerations.m in Sources */, E227C7831C9F42AB00DE0CA4 /* ViewControllerKeyboard.m in Sources */, diff --git a/FMC Planner 2/Base.lproj/Main.storyboard b/FMC Planner 2/Base.lproj/Main.storyboard index 68667df..e258704 100644 --- a/FMC Planner 2/Base.lproj/Main.storyboard +++ b/FMC Planner 2/Base.lproj/Main.storyboard @@ -1063,6 +1063,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FMC Planner 2/LSKs.plist b/FMC Planner 2/LSKs.plist index c3910cf..38bab65 100644 --- a/FMC Planner 2/LSKs.plist +++ b/FMC Planner 2/LSKs.plist @@ -12,7 +12,7 @@ - + RTE SERACH CLEAR ENTRY EXPORT SERVICE diff --git a/FMC Planner 2/LaunchScreen.storyboard b/FMC Planner 2/LaunchScreen.storyboard index 673e0f7..88f3676 100644 --- a/FMC Planner 2/LaunchScreen.storyboard +++ b/FMC Planner 2/LaunchScreen.storyboard @@ -1,7 +1,8 @@ - + - + + diff --git a/FMC Planner 2/ViewControllerRouteRequest.h b/FMC Planner 2/ViewControllerRouteRequest.h new file mode 100644 index 0000000..30db0d7 --- /dev/null +++ b/FMC Planner 2/ViewControllerRouteRequest.h @@ -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 + +@interface ViewControllerRouteRequest : UIViewController + +#pragma mark - Refrence to other views in app + +@property (strong, nonatomic) ViewController *main; + +- (IBAction)ok:(UIButton *)sender; + +@end diff --git a/FMC Planner 2/ViewControllerRouteRequest.m b/FMC Planner 2/ViewControllerRouteRequest.m new file mode 100644 index 0000000..d8520a8 --- /dev/null +++ b/FMC Planner 2/ViewControllerRouteRequest.m @@ -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 diff --git a/FMC Planner 2/ViewControllerScreen.h b/FMC Planner 2/ViewControllerScreen.h index f3061dc..13ef817 100644 --- a/FMC Planner 2/ViewControllerScreen.h +++ b/FMC Planner 2/ViewControllerScreen.h @@ -9,6 +9,7 @@ #import "NavDataParser.h" #import "SharedDeclerations.h" #import "ViewController.h" +#import "ViewControllerRouteRequest.h" #import "ViewControllerServiceMenu.h" #import diff --git a/FMC Planner 2/ViewControllerScreen.m b/FMC Planner 2/ViewControllerScreen.m index 1679e21..cabcd0e 100644 --- a/FMC Planner 2/ViewControllerScreen.m +++ b/FMC Planner 2/ViewControllerScreen.m @@ -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];