From 18d73bd264cfcf8802b280d791db6b35531d7904 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Wed, 23 Mar 2016 19:34:51 +0100 Subject: [PATCH] refactoring, addition of dynamic route page adjust --- FMC Planner 2.xcodeproj/project.pbxproj | 6 ++ .../xcdebugger/Breakpoints_v2.xcbkptlist | 82 ++++++++++++++ FMC Planner 2/Base.lproj/Main.storyboard | 24 ++--- FMC Planner 2/SharedDeclerations.h | 25 +++++ FMC Planner 2/SharedDeclerations.m | 52 +++++++++ FMC Planner 2/ViewController.h | 1 + FMC Planner 2/ViewControllerKeyboard.h | 1 + FMC Planner 2/ViewControllerKeyboard.m | 92 +++++++++++++--- FMC Planner 2/ViewControllerScreen.h | 4 +- FMC Planner 2/ViewControllerScreen.m | 101 ++++++++---------- 10 files changed, 307 insertions(+), 81 deletions(-) create mode 100644 FMC Planner 2/SharedDeclerations.h create mode 100644 FMC Planner 2/SharedDeclerations.m diff --git a/FMC Planner 2.xcodeproj/project.pbxproj b/FMC Planner 2.xcodeproj/project.pbxproj index 2d603ec..b63051e 100644 --- a/FMC Planner 2.xcodeproj/project.pbxproj +++ b/FMC Planner 2.xcodeproj/project.pbxproj @@ -19,6 +19,7 @@ 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 */; }; + E2A927161CA30CEE00606E07 /* SharedDeclerations.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A927151CA30CEE00606E07 /* SharedDeclerations.m */; }; E2CC73E31CA2B7C7005B786E /* PERF INIT.plist in Resources */ = {isa = PBXBuildFile; fileRef = E2CC73E21CA2B7C7005B786E /* PERF INIT.plist */; }; /* End PBXBuildFile section */ @@ -62,6 +63,8 @@ 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 = ""; }; + E2A927141CA30CEE00606E07 /* SharedDeclerations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedDeclerations.h; sourceTree = ""; }; + E2A927151CA30CEE00606E07 /* SharedDeclerations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SharedDeclerations.m; sourceTree = ""; }; E2CC73E21CA2B7C7005B786E /* PERF INIT.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "PERF INIT.plist"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -202,6 +205,7 @@ E2A9270E1CA2FE5200606E07 /* Header */ = { isa = PBXGroup; children = ( + E2A927141CA30CEE00606E07 /* SharedDeclerations.h */, E22EE9D21C9DB7B3001F5BC0 /* AppDelegate.h */, ); name = Header; @@ -210,6 +214,7 @@ E2A9270F1CA2FE5900606E07 /* Implementation */ = { isa = PBXGroup; children = ( + E2A927151CA30CEE00606E07 /* SharedDeclerations.m */, E22EE9D31C9DB7B3001F5BC0 /* AppDelegate.m */, E22EE9D01C9DB7B3001F5BC0 /* main.m */, ); @@ -354,6 +359,7 @@ E22EE9D71C9DB7B3001F5BC0 /* ViewController.m in Sources */, E22EE9D41C9DB7B3001F5BC0 /* AppDelegate.m in Sources */, E22EE9D11C9DB7B3001F5BC0 /* main.m in Sources */, + E2A927161CA30CEE00606E07 /* SharedDeclerations.m in Sources */, E227C7831C9F42AB00DE0CA4 /* ViewControllerKeyboard.m in Sources */, E227C7861C9F474100DE0CA4 /* ViewControllerScreen.m in Sources */, ); diff --git a/FMC Planner 2.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FMC Planner 2.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index fe2b454..3ef9bda 100644 --- a/FMC Planner 2.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/FMC Planner 2.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,4 +2,86 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/FMC Planner 2/Base.lproj/Main.storyboard b/FMC Planner 2/Base.lproj/Main.storyboard index 8376a4c..2963cc7 100644 --- a/FMC Planner 2/Base.lproj/Main.storyboard +++ b/FMC Planner 2/Base.lproj/Main.storyboard @@ -487,13 +487,13 @@ -