Added chat input history which can be cycled through with the up and down arrow keys. Added Notification preferences, you can now change the text size and base position of notifications and preview how they will be displayed. Some general code cleanup.

dubsdotla · dubsdotla · commit 2577da925101 · 2025-09-05T22:14:19.000-07:00
diff --git a/decline/AppDelegate.h b/decline/AppDelegate.h
@@ -11,6 +11,8 @@
 #import "PreferencesWindowController.h"
 #import "HotlineClient.h"
 
+extern NSUserDefaults *defaults;
+
 @interface AppDelegate : NSObject <NSApplicationDelegate>
 
 @property (strong) PreferencesWindowController *preferencesWindowController;
diff --git a/decline/AppDelegate.m b/decline/AppDelegate.m
@@ -29,6 +29,8 @@ @interface AppDelegate ()
 
 @end
 
+NSUserDefaults *defaults;
+
 @implementation AppDelegate
 
 - (IBAction)showPreferences:(id)sender {
@@ -233,21 +235,25 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
     [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
     [NSApp activateIgnoringOtherApps:YES];
     
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    
+    defaults = [NSUserDefaults standardUserDefaults];
+
     [defaults registerDefaults:@{
         @"DefaultNick": @"decline n00b",
         @"DefaultIcon": @"148",
         @"ShowJoinLeaveMessages": @NO,
         @"ShowNickChangeMessages": @NO,
         @"ShowUserlistOnRightSide" : @YES,
-        @"ShowChatSendButton" : @NO
+        @"ShowChatSendButton" : @NO,
+        @"NotificationsEnabled" : @YES,
+        @"NotificationTextSize" : @(NotificationTextSizeMedium),
+        @"NotificationPosition" : @(NotificationPositionCenter),
+        @"NotificationSticky" : @YES
     }];
        
     //Nuke prefs
     /*NSString *appDomain = [[NSBundle mainBundle] bundleIdentifier];
-    [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:appDomain];
-    [[NSUserDefaults standardUserDefaults] synchronize];*/
+    [defaults removePersistentDomainForName:appDomain];
+    [defaults synchronize];*/
     
     [AppIconManager updateDockIconToMatchCurrentAppearance];
         
diff --git a/decline/HotlineClient.h b/decline/HotlineClient.h
@@ -35,7 +35,7 @@
 #import "FileTransferManager.h"
 #import "UserTransactions.h"
 
-@interface HotlineClient : NSObject <NSStreamDelegate, NSToolbarDelegate, NSToolbarItemValidation, NSTableViewDataSource, NSTableViewDelegate, NSComboBoxDelegate, NSWindowDelegate, FileTransferManagerDelegate>
+@interface HotlineClient : NSObject <NSControlTextEditingDelegate, NSStreamDelegate, NSToolbarDelegate, NSToolbarItemValidation, NSTableViewDataSource, NSTableViewDelegate, NSComboBoxDelegate, NSWindowDelegate, FileTransferManagerDelegate>
 
 // uuid
 @property (nonatomic, strong) NSUUID *uuid;
@@ -69,6 +69,11 @@
 @property (strong) NSTextView   *chatTextView;
 @property (strong) NSTableView  *userListView;
 @property (strong) NSTextField  *messageField;
+
+@property (nonatomic) NSMutableArray<NSString *> *history;
+@property (nonatomic) NSInteger historyIndex;   // == history.count means "live buffer"
+@property (nonatomic) NSString *stash;          // stash current typing before history
+
 @property (strong) NSButton     *sendButton;
 
 // News UI
diff --git a/decline/Preferences/GeneralPreferencesViewController.m b/decline/Preferences/GeneralPreferencesViewController.m
@@ -11,13 +11,25 @@ @interface GeneralPreferencesViewController ()
 
 @implementation GeneralPreferencesViewController
 
+- (void)viewDidLayout {
+    [super viewDidLayout];
+
+    // Compute once the view has a real layout
+    NSView *v = self.view;
+    NSSize s = v.translatesAutoresizingMaskIntoConstraints ? v.bounds.size : v.fittingSize;
+    if (s.width  < 400) s.width  = 400;   // optional floor
+    if (s.height < 250) s.height = 250;   // optional floor
+
+    // Only update if it actually changed (prevents resize loops)
+    if (!NSEqualSizes(self.preferredContentSize, s)) {
+        self.preferredContentSize = s;    // <-- use the property, don't override the method
+    }
+}
+
 - (void)loadView {
     NSView *v = [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 400, 250)];
     v.translatesAutoresizingMaskIntoConstraints = NO;
     self.view = v;
-    
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    // ensure defaults are registered (in case showPreferences called first)
 
     // --- Default Nick ---
     NSTextField *nickLabel = [NSTextField labelWithString:@"Default Nick:"];
@@ -113,56 +125,56 @@ - (void)viewWillAppear {
     [super viewWillAppear];
     
     // Populate its initial state from defaults
-    BOOL showJoin = [[NSUserDefaults standardUserDefaults] boolForKey:@"ShowJoinLeaveMessages"];
+    BOOL showJoin = [defaults boolForKey:@"ShowJoinLeaveMessages"];
     self.joinLeaveCheckbox.state = showJoin ? NSControlStateValueOn : NSControlStateValueOff;
     
-    BOOL showNick = [[NSUserDefaults standardUserDefaults] boolForKey:@"ShowNickChangeMessages"];
+    BOOL showNick = [defaults boolForKey:@"ShowNickChangeMessages"];
     self.nickChangeCheckbox.state = showNick ? NSControlStateValueOn : NSControlStateValueOff;
     
-    BOOL showRight = [[NSUserDefaults standardUserDefaults] boolForKey:@"ShowUserlistOnRightSide"];
+    BOOL showRight = [defaults boolForKey:@"ShowUserlistOnRightSide"];
     self.showUserlistRightCheckbox.state = showRight ? NSControlStateValueOn : NSControlStateValueOff;
     
-    BOOL showSend = [[NSUserDefaults standardUserDefaults] boolForKey:@"ShowChatSendButton"];
+    BOOL showSend = [defaults boolForKey:@"ShowChatSendButton"];
     self.showChatSendButtonCheckbox.state = showSend ? NSControlStateValueOn : NSControlStateValueOff;
 }
 
 - (void)defaultNickChanged:(NSTextField *)sender {
-    [[NSUserDefaults standardUserDefaults] setObject:sender.stringValue forKey:@"DefaultNick"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
+    [defaults setObject:sender.stringValue forKey:@"DefaultNick"];
+    [defaults synchronize];
 }
 
 - (void)defaultIconChanged:(NSTextField *)sender {
-    [[NSUserDefaults standardUserDefaults] setObject:sender.stringValue forKey:@"DefaultIcon"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
+    [defaults setObject:sender.stringValue forKey:@"DefaultIcon"];
+    [defaults synchronize];
 }
 
 #pragma mark – Action
 
 - (void)toggleJoinLeave:(NSButton*)sender {
     BOOL newVal = (sender.state == NSControlStateValueOn);
-    [[NSUserDefaults standardUserDefaults] setBool:newVal forKey:@"ShowJoinLeaveMessages"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
+    [defaults setBool:newVal forKey:@"ShowJoinLeaveMessages"];
+    [defaults synchronize];
 }
 
 - (void)toggleNickChange:(NSButton*)sender {
     BOOL newVal = (sender.state == NSControlStateValueOn);
-    [[NSUserDefaults standardUserDefaults] setBool:newVal forKey:@"ShowNickChangeMessages"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
+    [defaults setBool:newVal forKey:@"ShowNickChangeMessages"];
+    [defaults synchronize];
 }
 
 - (void)toggleUserlistSide:(NSButton*)sender {
     BOOL newVal = (sender.state == NSControlStateValueOn);
-    [[NSUserDefaults standardUserDefaults] setBool:newVal forKey:@"ShowUserlistOnRightSide"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
+    [defaults setBool:newVal forKey:@"ShowUserlistOnRightSide"];
+    [defaults synchronize];
     
     AppDelegate *appDel = (AppDelegate *)[NSApp delegate];
     [appDel updateChatView];
 }
 
 - (void)toggleSendButton:(NSButton*)sender {
     BOOL newVal = (sender.state == NSControlStateValueOn);
-    [[NSUserDefaults standardUserDefaults] setBool:newVal forKey:@"ShowChatSendButton"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
+    [defaults setBool:newVal forKey:@"ShowChatSendButton"];
+    [defaults synchronize];
     
     AppDelegate *appDel = (AppDelegate *)[NSApp delegate];
     [appDel updateChatView];
diff --git a/decline/Preferences/NotificationsPreferencesViewController.h b/decline/Preferences/NotificationsPreferencesViewController.h
@@ -0,0 +1,15 @@
+//
+//  NotificationsPreferencesViewController.h
+//  decline
+//
+//  Created by Derek Scott on 8/26/25.
+//
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NotificationsPreferencesViewController : NSViewController
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/decline/Preferences/PreferencesWindowController.h b/decline/Preferences/PreferencesWindowController.h
@@ -1,6 +1,11 @@
 // PreferencesWindowController.h
 #import <Cocoa/Cocoa.h>
 
-@interface PreferencesWindowController : NSWindowController
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PreferencesWindowController : NSWindowController <NSToolbarDelegate>
 + (instancetype)sharedController;
+- (void)showGeneralPane;        // convenience if you want to jump directly
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/decline/Preferences/PreferencesWindowController.m b/decline/Preferences/PreferencesWindowController.m
@@ -1,32 +1,173 @@
 // PreferencesWindowController.m
 #import "PreferencesWindowController.h"
 #import "GeneralPreferencesViewController.h"
+#import "NotificationsPreferencesViewController.h"
+#import "AppDelegate.h"
+
+static NSString * const kPrefsToolbarID          = @"la.dubs.decline.preferences.toolbar";
+static NSString * const kPaneIDGeneral           = @"general";
+static NSString * const kPaneIDNotifications     = @"notifications";
+static NSString * const kLastSelectedPaneDefaultsKey = @"prefs.lastSelectedPane";
+
+@interface PreferencesWindowController ()
+@property (nonatomic, strong) NSToolbar *toolbar;
+@property (nonatomic, strong) NSDictionary<NSString *, NSViewController *> *panes;
+@property (nonatomic, copy)   NSString *currentPaneID;
+@end
 
 @implementation PreferencesWindowController
+
 + (instancetype)sharedController {
     static PreferencesWindowController *shared;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        // Create your prefs view controller
-        GeneralPreferencesViewController *vc = [[GeneralPreferencesViewController alloc] init];
-
-        // Make an NSWindow with the desired size & style
-        NSRect frame = NSMakeRect(0, 0, 400, 250);
-        NSUInteger style = NSWindowStyleMaskTitled
-        | NSWindowStyleMaskClosable;
-        NSWindow *win = [[NSWindow alloc] initWithContentRect:frame
-                                                    styleMask:style
+        // Create the window itself
+        NSWindow *win = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 400, 250)
+                                                    styleMask:(NSWindowStyleMaskTitled
+                                                               | NSWindowStyleMaskClosable
+                                                               | NSWindowStyleMaskMiniaturizable)
                                                       backing:NSBackingStoreBuffered
                                                         defer:NO];
+        if (@available(macOS 11.0, *)) {
+            win.toolbarStyle = NSWindowToolbarStylePreference;   // <<< gives the pill look
+            win.titlebarSeparatorStyle = NSTitlebarSeparatorStyleAutomatic; // remove hairline
+        }
+        win.releasedWhenClosed = NO;
+        win.animationBehavior = NSWindowAnimationBehaviorDocumentWindow;
 
-        // Embed your VC in that window
-        win.contentViewController = vc;
-        win.title = @"Preferences";
-        [win center];
-
-        // Finally hook it up to your NSWindowController
         shared = [[self alloc] initWithWindow:win];
+        [shared setupToolbarAndPanes];
+        [shared centerInitial];
     });
     return shared;
 }
+
+- (void)setupToolbarAndPanes {
+    // Build panes
+    GeneralPreferencesViewController *generalVC = [[GeneralPreferencesViewController alloc] init];
+    NotificationsPreferencesViewController *notifVC = [[NotificationsPreferencesViewController alloc] init];
+
+    self.panes = @{
+        kPaneIDGeneral: generalVC,
+        kPaneIDNotifications: notifVC,
+    };
+
+    // Toolbar
+    self.toolbar = [[NSToolbar alloc] initWithIdentifier:kPrefsToolbarID];
+    self.toolbar.delegate = self;
+    self.toolbar.allowsUserCustomization = NO;
+    self.toolbar.autosavesConfiguration  = NO;
+    self.toolbar.displayMode = NSToolbarDisplayModeIconAndLabel; // classic Xcode-like look
+    self.toolbar.sizeMode    = NSToolbarSizeModeDefault;
+    self.window.toolbar      = self.toolbar;
+
+    // Select last pane or default to General
+    NSString *last = [defaults stringForKey:kLastSelectedPaneDefaultsKey] ?: kPaneIDGeneral;
+    [self switchToPane:last animate:NO];
+    [self.toolbar setSelectedItemIdentifier:last];
+}
+
+- (void)centerInitial {
+    [self.window center];
+}
+
+#pragma mark - Public API
+
+- (void)showGeneralPane {
+    [self showWindow:nil];
+    [self.toolbar setSelectedItemIdentifier:kPaneIDGeneral];
+    [self switchToPane:kPaneIDGeneral animate:YES];
+}
+
+#pragma mark - Switching
+
+- (void)switchToPane:(NSString *)paneID animate:(BOOL)animate {
+    NSViewController *vc = self.panes[paneID];
+    if (!vc) return;
+
+    // Make sure the view exists and is laid out so preferredContentSize is meaningful
+    (void)vc.view;
+    [vc.view layoutSubtreeIfNeeded];
+
+    NSSize target = vc.preferredContentSize;
+    if (NSEqualSizes(target, NSZeroSize)) {
+        // Fallbacks if the VC hasn't reported one yet
+        target = vc.view.translatesAutoresizingMaskIntoConstraints ? vc.view.bounds.size : vc.view.fittingSize;
+        if (NSEqualSizes(target, NSZeroSize)) target = NSMakeSize(350, 250);
+    }
+
+    NSRect contentRect = NSMakeRect(0, 0, target.width, target.height);
+    NSRect newFrame    = [self.window frameRectForContentRect:contentRect];
+
+    // Keep top edge fixed
+    NSRect cur = self.window.frame;
+    newFrame.origin.x = cur.origin.x;
+    newFrame.origin.y = NSMaxY(cur) - newFrame.size.height;
+
+    if (animate) [self.window setFrame:newFrame display:YES animate:YES];
+    else         [self.window setFrame:newFrame display:YES];
+
+    self.window.contentViewController = vc;
+    
+    if([paneID isEqualTo:kPaneIDNotifications]) {
+        self.window.title = @"Notifications";
+    }
+    
+    else {
+        self.window.title = @"General";
+    }
+    
+    [self.toolbar setSelectedItemIdentifier:paneID];
+}
+
+#pragma mark - NSToolbarDelegate
+
+- (NSArray<NSToolbarItemIdentifier> *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar {
+    return @[kPaneIDGeneral, kPaneIDNotifications];
+}
+
+- (NSArray<NSToolbarItemIdentifier> *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar {
+    return @[kPaneIDGeneral, kPaneIDNotifications];
+}
+
+- (NSArray<NSToolbarItemIdentifier> *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar {
+    return @[kPaneIDGeneral, kPaneIDNotifications];
+}
+
+- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar
+    itemForItemIdentifier:(NSToolbarItemIdentifier)itemIdentifier
+ willBeInsertedIntoToolbar:(BOOL)flag
+{
+    NSToolbarItem *item = [[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier];
+
+    if ([itemIdentifier isEqualToString:kPaneIDGeneral]) {
+        item.label = @"General";
+        item.paletteLabel = @"General";
+        item.target = self;
+        item.action = @selector(onToolbarSelect:);
+        if (@available(macOS 11.0, *)) {
+            item.image = [NSImage imageWithSystemSymbolName:@"gearshape" accessibilityDescription:@"General"];
+        } else {
+            item.image = [NSImage imageNamed:NSImageNamePreferencesGeneral];
+        }
+    } else if ([itemIdentifier isEqualToString:kPaneIDNotifications]) {
+        item.label = @"Notifications";
+        item.paletteLabel = @"Notifications";
+        item.target = self;
+        item.action = @selector(onToolbarSelect:);
+        if (@available(macOS 11.0, *)) {
+            item.image = [NSImage imageWithSystemSymbolName:@"bell" accessibilityDescription:@"Notifications"];
+        } else {
+            item.image = [NSImage imageNamed:NSImageNameCaution]; // fallback icon
+        }
+    }
+
+    return item;
+}
+
+- (void)onToolbarSelect:(NSToolbarItem *)sender {
+    NSString *paneID = sender.itemIdentifier;
+    [self switchToPane:paneID animate:YES];
+}
+
 @end
diff --git a/decline/Utilities/CustomNotificationManager.h b/decline/Utilities/CustomNotificationManager.h
diff --git a/decline/Utilities/CustomNotificationManager.m b/decline/Utilities/CustomNotificationManager.m
