Added StateModel. Also added persistant storage.

RedditBar.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		E9341914184A1A1A00D03488 /* StateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E9341913184A1A1A00D03488 /* StateModel.m */; };
 		E9CF1F21184961010004AE02 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9CF1F20184961010004AE02 /* Cocoa.framework */; };
 		E9CF1F2B184961010004AE02 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E9CF1F29184961010004AE02 /* InfoPlist.strings */; };
 		E9CF1F2D184961010004AE02 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E9CF1F2C184961010004AE02 /* main.m */; };
@@ -35,6 +36,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		E9341912184A1A1A00D03488 /* StateModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StateModel.h; sourceTree = "<group>"; };
+		E9341913184A1A1A00D03488 /* StateModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StateModel.m; sourceTree = "<group>"; };
 		E9CF1F1D184961010004AE02 /* RedditBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RedditBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E9CF1F20184961010004AE02 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		E9CF1F23184961010004AE02 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -128,6 +131,8 @@
 				E9CF1F551849654F0004AE02 /* icon.png */,
 				E9CF1F32184961010004AE02 /* AppDelegate.h */,
 				E9CF1F33184961010004AE02 /* AppDelegate.m */,
+				E9341912184A1A1A00D03488 /* StateModel.h */,
+				E9341913184A1A1A00D03488 /* StateModel.m */,
 				E9CF1F35184961020004AE02 /* MainMenu.xib */,
 				E9CF1F5A1849685C0004AE02 /* PrefController.h */,
 				E9CF1F5B1849685C0004AE02 /* PrefController.m */,
@@ -270,6 +275,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				E9CF1F34184961010004AE02 /* AppDelegate.m in Sources */,
+				E9341914184A1A1A00D03488 /* StateModel.m in Sources */,
 				E9CF1F2D184961010004AE02 /* main.m in Sources */,
 				E9CF1F5C1849685C0004AE02 /* PrefController.m in Sources */,
 			);
@@ -482,6 +488,7 @@
 				E9CF1F50184961020004AE02 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		E9CF1F51184961020004AE02 /* Build configuration list for PBXNativeTarget "RedditBarTests" */ = {
 			isa = XCConfigurationList;
@@ -490,6 +497,7 @@
 				E9CF1F53184961020004AE02 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

RedditBar/AppDelegate.h

@@ -8,6 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import "PrefController.h"
+#import "StateModel.h"
 
 @interface AppDelegate : NSObject <NSApplicationDelegate>
 
@@ -17,9 +18,10 @@
 @property (atomic, retain) NSImage *statusImage;
 @property (atomic, retain) NSImage *statusHighlightImage;
 @property (atomic, retain) PrefController *prefWindow;
+@property (atomic, retain) StateModel *currentState;
 
 -(IBAction)showPreferences:(id)sender;
 
--(void)prefReturnName:(NSString *)name Pass:(NSString *)pass subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits;
+-(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits;
 
 @end

RedditBar/AppDelegate.m

@@ -10,7 +10,33 @@
 
 @implementation AppDelegate
 
-@synthesize statusMenu, statusItem, statusImage, statusHighlightImage, prefWindow;
+@synthesize statusMenu, statusItem, statusImage, statusHighlightImage, prefWindow, currentState;
+
+-(void)defaultPreferences {
+    NSUserDefaults *store = [NSUserDefaults standardUserDefaults];
+    NSMutableDictionary *appDefaults = [NSMutableDictionary dictionaryWithObject:@"" forKey:@"username"];
+    [appDefaults setValue:@"" forKey:@"modhash"];
+    [appDefaults setValue:[NSNumber numberWithBool:YES] forKey:@"subscriptions"];
+    [store registerDefaults:appDefaults];
+}
+
+-(void)savePreferences {
+    NSUserDefaults *store = [NSUserDefaults standardUserDefaults];
+    [store setObject:currentState.username forKey:@"username"];
+    [store setObject:currentState.modhash forKey:@"modhash"];
+    [store setBool:currentState.useSubsciptions forKey:@"subscriptions"];
+    [store setObject:currentState.subreddits forKey:@"subreddits"];
+    [store synchronize];
+}
+
+-(void)loadPreferences {
+    NSUserDefaults *store = [NSUserDefaults standardUserDefaults];
+    [store synchronize];
+    [currentState setUsername:[store stringForKey:@"username"]];
+    [currentState setModhash:[store stringForKey:@"modhash"]];
+    [currentState setUseSubsciptions:[store boolForKey:@"subscriptions"]];
+    [currentState setSubreddits:[store arrayForKey:@"subreddits"]];
+}
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
@@ -23,8 +49,11 @@
     [statusItem setToolTip:@"Reddit Bar"];
     [statusItem setHighlightMode:YES];
     
-    // TODO load preferences
-    // TODO apply config
+    [self defaultPreferences];
+    currentState = [[StateModel alloc] init];
+    [self loadPreferences]; // Fill currentState
+    
+    // TODO apply currentState
     // TODO reload menu list
 }
 
@@ -32,12 +61,18 @@
     [NSApp activateIgnoringOtherApps:YES];
     prefWindow = [[PrefController alloc] initWithWindowNibName:@"Prefs"];
     [prefWindow setParent:self];
+    [prefWindow setState:currentState];
     [prefWindow showWindow:self];
 }
 
--(void)prefReturnName:(NSString *)name Pass:(NSString *)pass subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits {
-    // TODO store preferences
-    // TODO apply config
+-(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits {
+    currentState.username = name;
+    currentState.modhash = modhash;
+    currentState.useSubsciptions = subscriptions;
+    currentState.subreddits = [subreddits componentsSeparatedByString: @"\n"];
+    [self savePreferences]; // write currentState
+    
+    // TODO apply currentState
     // TODO reload menu list
 }
 

RedditBar/PrefController.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "StateModel.h"
 
 @interface PrefController : NSWindowController
 
@@ -16,10 +17,9 @@
 @property (atomic, retain) IBOutlet NSTextView *subreddits;
 @property (atomic, retain) IBOutlet NSWindow *win;
 @property (atomic, retain) NSObject *parent;
+@property (atomic, retain) StateModel *state;
 
 -(IBAction)buttonSave:(id)sender;
 -(IBAction)toggleSubs:(id)sender;
 
--(void)setParent:(NSObject *)par;
-
 @end

RedditBar/PrefController.m

@@ -11,47 +11,65 @@
 
 @implementation PrefController
 
-@synthesize username, password, subscriptions, subreddits, win, parent;
+@synthesize username, password, subscriptions, subreddits, win, parent, state;
 
--(Boolean)isValidList:(NSString *)input validated:(NSString **)output {
-    // TODO: Check if subreddit input is valid
-    *output = input;
-    return TRUE;
+-(Boolean)isValidList:(NSString *)input {
+    NSCharacterSet *invalidChars = [[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_\n"] invertedSet];
+    if ([input rangeOfCharacterFromSet:invalidChars].location != NSNotFound) {
+        return FALSE;
+    } else {
+        return TRUE;
+    }
+}
+
+-(void)showWindow:(id)sender {
+    [super showWindow:sender];
+    
+    [username setStringValue:state.username];
+    
+    // TODO what to do with modhash and password field??
+    
+    [subscriptions setState:[NSNumber numberWithBool:state.useSubsciptions].integerValue];
+    [self toggleSubs:nil]; // Maybe the subreddits field needs to be editable
+    
+    NSMutableString *reddits = [[NSMutableString alloc] init];
+    for(int i = 0; i < [state.subreddits count]; i++) {
+        [reddits appendFormat:@"%@\n", [state.subreddits objectAtIndex:i]];
+    }
+    [subreddits setString:reddits];
 }
 
 -(IBAction)buttonSave:(id)sender {
     Boolean subs;
-    NSString *reddits;
     if (subscriptions.state != 0) {
         subs = TRUE;
     } else {
         subs = FALSE;
-        if (![self isValidList:subreddits.textStorage.string validated:&reddits]) {
-            // TODO show error message
+        if (![self isValidList:subreddits.textStorage.string]) {
+            NSAlert *alert = [[NSAlert alloc] init];
+            [alert addButtonWithTitle:@"OK"];
+            [alert setMessageText:@"Preferences Error"];
+            [alert setInformativeText:@"Subreddit List Invalid!"];
+            [alert setAlertStyle:NSCriticalAlertStyle];
+            [alert beginSheetModalForWindow:win modalDelegate:nil didEndSelector:nil contextInfo:nil];
             return;
         }
     }
+    
+    // TODO if username / password changed, get modhash! Else, use the one we got from init
+    NSString *modhash;
+    
     AppDelegate *app = (AppDelegate *)parent;
-    [app prefReturnName:username.stringValue Pass:password.stringValue subscriptions:subs subreddits:reddits];
+    [app prefReturnName:username.stringValue Modhash:modhash subscriptions:subs subreddits:subreddits.textStorage.string];
     [win performClose:self];
 }
 
 -(IBAction)toggleSubs:(id)sender {
     if (subscriptions.state != 0) {
-        // Use subscriptions
         [subreddits setEditable:FALSE];
-        [subreddits setString:@""];
     } else {
-        // Use userlist
         [subreddits setEditable:TRUE];
-        [subreddits setString:@"One Subreddit per line!"];
     }
 }
 
--(void)showWindow:(id)sender {
-    [super showWindow:sender];
-    
-    
-}
-
 @end

RedditBar/StateModel.h

@@ -0,0 +1,18 @@
+//
+//  StateModel.h
+//  RedditBar
+//
+//  Created by Thomas Buck on 30.11.13.
+//  Copyright (c) 2013 xythobuz. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface StateModel : NSObject
+
+@property (atomic, retain) NSString *username;
+@property (atomic, retain) NSString *modhash;
+@property (atomic) Boolean useSubsciptions;
+@property (atomic, retain) NSArray *subreddits;
+
+@end

RedditBar/StateModel.m

@@ -0,0 +1,15 @@
+//
+//  StateModel.m
+//  RedditBar
+//
+//  Created by Thomas Buck on 30.11.13.
+//  Copyright (c) 2013 xythobuz. All rights reserved.
+//
+
+#import "StateModel.h"
+
+@implementation StateModel
+
+@synthesize username, modhash, useSubsciptions, subreddits;
+
+@end