Organise more! Part 2

Author: npyl

Manage Conky/MCObjects/MCObjects.h

@@ -25,6 +25,12 @@ static const NSString *kMCThemeSourceKey = @"source";
 static const NSString *kMCThemeCreatorKey = @"creator";
 static const NSString *kMCThemeScalingKey = @"scaling";
 
+static NSString *kMCRunConkyAtStartupKey = @"runConkyAtStartup";
+static NSString *kMCKeepAliveConkyKey = @"keepAlive";
+static NSString *kMCConkyStartupDelayKey = @"startupDelay";
+static NSString *kMCConkyConfigsLocationKey = @"configsLocation";
+static NSString *kMCConkyAdditionalSearchPathsKey = @"additionalSearchPaths";
+
 typedef enum : NSUInteger
 {
     FillScreen = 0,

Manage Conky/MCObjects/MCObjects.m

@@ -66,59 +66,59 @@ + (instancetype)sharedSettings
 - (void)setConkyRunsAtStartup:(BOOL)a
 {
     [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:a]
-                                              forKey:@"runConkyAtStartup"];
+                                              forKey:kMCRunConkyAtStartupKey];
 }
 - (BOOL)conkyRunsAtStartup
 {
-    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"runConkyAtStartup"] boolValue];
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:kMCRunConkyAtStartupKey] boolValue];
 }
 
 - (void)setKeepAliveConky:(BOOL)a
 {
     [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:a]
-                                              forKey:@"keepAlive"];
+                                              forKey:kMCKeepAliveConkyKey];
 }
 - (BOOL)keepAliveConky
 {
-    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"keepAlive"] boolValue];
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:kMCKeepAliveConkyKey] boolValue];
 }
 
 - (void)setConkyStartupDelay:(NSInteger)startupDelay
 {
     [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithInteger:startupDelay]
-                                              forKey:@"startupDelay"];
+                                              forKey:kMCConkyStartupDelayKey];
 }
 - (NSInteger)conkyStartupDelay
 {
-    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"starupDelay"] integerValue];
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:kMCConkyStartupDelayKey] integerValue];
 }
 
 - (void)setConfigsLocation:(NSString *)a
 {
     [[NSUserDefaults standardUserDefaults] setObject:a
-                                              forKey:@"configsLocation"];
+                                              forKey:kMCConkyConfigsLocationKey];
 }
 - (NSString *)configsLocation
 {
-    return [[NSUserDefaults standardUserDefaults] objectForKey:@"configsLocation"];
+    return [[NSUserDefaults standardUserDefaults] objectForKey:kMCConkyConfigsLocationKey];
 }
 
 - (NSArray *)additionalSearchPaths
 {
-    return [[NSUserDefaults standardUserDefaults] objectForKey:@"additionalSearchPaths"];
+    return [[NSUserDefaults standardUserDefaults] objectForKey:kMCConkyAdditionalSearchPathsKey];
 }
 - (void)addAdditionalSearchPath:(NSString *)path
 {
-    NSMutableArray *arr = [[[NSUserDefaults standardUserDefaults] objectForKey:@"additionalSearchPaths"] mutableCopy];
+    NSMutableArray *arr = [[[NSUserDefaults standardUserDefaults] objectForKey:kMCConkyAdditionalSearchPathsKey] mutableCopy];
     if (arr)
         [arr addObject:path];
     else
         arr = [NSMutableArray arrayWithObject:path];
-    [[NSUserDefaults standardUserDefaults] setObject:arr forKey:@"additionalSearchPaths"];
+    [[NSUserDefaults standardUserDefaults] setObject:arr forKey:kMCConkyAdditionalSearchPathsKey];
 }
 - (void)setAdditionalSearchPaths:(NSArray *)array
 {
-    [[NSUserDefaults standardUserDefaults] setObject:array forKey:@"additionalSearchPaths"];
+    [[NSUserDefaults standardUserDefaults] setObject:array forKey:kMCConkyAdditionalSearchPathsKey];
 }
 
 - (void)setMainViewController:(ViewController *)vc