Add usernames to account menu

alex-taffe · Jan 3, 2019 · 64861a5 · 64861a5
1 parent 583b495
commit 64861a5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/BetteReddit/AppDelegate.h b/BetteReddit/AppDelegate.h
@@ -15,6 +15,8 @@
 @property (readonly, strong) NSPersistentContainer *persistentContainer;
 @property (strong, atomic) NSMutableArray<BRUser *> *loggedinUsers;
 @property (strong, atomic) BRUser *currentUser;
+@property (strong) IBOutlet NSMenu *accountsMenu;
+@property (strong) IBOutlet NSMenu *signOutMenu;
 
 @end
 
diff --git a/BetteReddit/AppDelegate.m b/BetteReddit/AppDelegate.m
@@ -50,7 +50,21 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
             dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
             self.currentUser = self.loggedinUsers.firstObject;
             [[NSNotificationCenter defaultCenter] postNotificationName:LOGGED_IN object:weakSelf];
+            for(BRUser *user in self.loggedinUsers){
+                NSMenuItem *chooseItem = [[NSMenuItem alloc] init];
+                chooseItem.title = user.username;
+                if(self.currentUser == user)
+                    chooseItem.state = NSControlStateValueOn;
+
+                [self.accountsMenu insertItem:chooseItem atIndex:0];
+
+                NSMenuItem *signoutItem = [[NSMenuItem alloc] init];
+                signoutItem.title = user.username;
+                [self.signOutMenu insertItem:signoutItem atIndex:0];
+            }
         });
+    } else {
+        self.accountsMenu.itemArray[0].state = NSControlStateValueOn;
     }
 
 }

diff --git a/BetteReddit/Base.lproj/Main.storyboard b/BetteReddit/Base.lproj/Main.storyboard
@@ -360,12 +360,20 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Accounts" id="keU-0M-lEL">
                                     <items>
+                                        <menuItem title="Guest" id="5Zn-Lb-zDT">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="r9E-48-mfO"/>
                                         <menuItem title="Sign In" id="8eY-Iw-yuD">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="newSignin:" target="Voe-Tx-rLC" id="xhV-Df-nNg"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="Sign Out" id="D52-Vr-pfi">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Sign Out" id="QKI-Rg-LLx"/>
+                                        </menuItem>
                                     </items>
                                 </menu>
                             </menuItem>
@@ -723,7 +731,12 @@
                         <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
                     </connections>
                 </application>
-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate">
+                    <connections>
+                        <outlet property="accountsMenu" destination="keU-0M-lEL" id="tqc-az-m4F"/>
+                        <outlet property="signOutMenu" destination="QKI-Rg-LLx" id="5OR-IQ-WUD"/>
+                    </connections>
+                </customObject>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <customObject id="xnH-i6-PHB" customClass="SUUpdater"/>