From a95ed4bd900dcfef1ad5db30af5ae971222601a1 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Wed, 23 Mar 2016 22:19:55 +0100 Subject: [PATCH] Refactor, changed / to - on keyboard --- .../xcdebugger/Breakpoints_v2.xcbkptlist | 82 ------------------- FMC Planner 2/SharedDeclerations.h | 2 + FMC Planner 2/SharedDeclerations.m | 8 ++ FMC Planner 2/ViewController.m | 23 ++---- FMC Planner 2/ViewControllerKeyboard.m | 4 +- 5 files changed, 20 insertions(+), 99 deletions(-) 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 22de5ab..fe2b454 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,86 +2,4 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/FMC Planner 2/SharedDeclerations.h b/FMC Planner 2/SharedDeclerations.h index c2b0ca5..085d12e 100644 --- a/FMC Planner 2/SharedDeclerations.h +++ b/FMC Planner 2/SharedDeclerations.h @@ -22,4 +22,6 @@ withMinimumSize:(NSInteger)minSize withMod:(float)mod; ++ (NSString *)savePathForFile:(NSString *)file; + @end diff --git a/FMC Planner 2/SharedDeclerations.m b/FMC Planner 2/SharedDeclerations.m index 1697c34..c03239e 100644 --- a/FMC Planner 2/SharedDeclerations.m +++ b/FMC Planner 2/SharedDeclerations.m @@ -49,4 +49,12 @@ return [UIFont systemFontOfSize:mid]; } ++ (NSString *)savePathForFile:(NSString *)file { + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, + NSUserDomainMask, YES); + NSString *documentsPath = [paths objectAtIndex:0]; + return [documentsPath + stringByAppendingString:[NSString stringWithFormat:@"/%@", file]]; +} + @end diff --git a/FMC Planner 2/ViewController.m b/FMC Planner 2/ViewController.m index 4d709ea..961453e 100644 --- a/FMC Planner 2/ViewController.m +++ b/FMC Planner 2/ViewController.m @@ -39,27 +39,20 @@ - (void)saveToFile:(NSDictionary *)save { if (!([_save valueForKey:@"MENU@LSKR1"] == nil || [[_save valueForKey:@"MENU@LSKR1"] isEqualToString:@""])) { - NSArray *paths = NSSearchPathForDirectoriesInDomains( - NSDocumentDirectory, NSUserDomainMask, YES); - NSString *documentsPath = [paths objectAtIndex:0]; - [_save writeToFile:[documentsPath - stringByAppendingString: - [NSString - stringWithFormat: - @"/%@", + [_save writeToFile:[SharedDeclerations + savePathForFile: + [SharedDeclerations + savePathForFile: [_save valueForKey:@"MENU@LSKR1"]]] atomically:YES]; } } - (void)loadSave:(NSString *)file { - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, - NSUserDomainMask, YES); - NSString *documentsPath = [paths objectAtIndex:0]; - NSString *filePath = [documentsPath - stringByAppendingString:[NSString stringWithFormat:@"/%@", file]]; - if ([[NSFileManager defaultManager] fileExistsAtPath:filePath]) { - _save = [[NSMutableDictionary alloc] initWithContentsOfFile:filePath]; + if ([[NSFileManager defaultManager] + fileExistsAtPath:[SharedDeclerations savePathForFile:file]]) { + _save = [[NSMutableDictionary alloc] + initWithContentsOfFile:[SharedDeclerations savePathForFile:file]]; } } diff --git a/FMC Planner 2/ViewControllerKeyboard.m b/FMC Planner 2/ViewControllerKeyboard.m index 6ee1d73..b40c47c 100644 --- a/FMC Planner 2/ViewControllerKeyboard.m +++ b/FMC Planner 2/ViewControllerKeyboard.m @@ -6,8 +6,8 @@ // Copyright © 2016 Kilian Hofmann. All rights reserved. // -#import "ViewControllerKeyboard.h" #import "ViewController.h" +#import "ViewControllerKeyboard.h" @implementation ViewControllerKeyboard @@ -71,7 +71,7 @@ @"", @".", @"0", - @"/", + @"-", @"", @"", @"",