Added Load next functionality.

RedditBar/AppDelegate.h

@@ -35,7 +35,7 @@
 
 @property (atomic, retain) IBOutlet NSMenu *statusMenu;
 @property (atomic, retain) IBOutlet NSApplication *application;
-@property (weak) IBOutlet NSMenuItem *firstMenuItem;
+@property (atomic, retain) IBOutlet NSMenuItem *firstMenuItem;
 
 @property (atomic, retain) NSStatusItem *statusItem;
 @property (atomic, retain) NSImage *statusImage;
@@ -45,6 +45,7 @@
 @property (atomic, retain) Reddit *api;
 @property (atomic, retain) NSArray *menuItems;
 @property (atomic, retain) NSArray *redditItems;
+@property (atomic, retain) NSString *lastFullName;
 
 -(IBAction)showPreferences:(id)sender;
 -(IBAction)showAbout:(id)sender;

RedditBar/AppDelegate.m

@@ -30,7 +30,7 @@
 
 @implementation AppDelegate
 
-@synthesize statusMenu, statusItem, statusImage, statusHighlightImage, prefWindow, currentState, application, api, firstMenuItem, menuItems, redditItems;
+@synthesize statusMenu, statusItem, statusImage, statusHighlightImage, prefWindow, currentState, application, api, firstMenuItem, menuItems, redditItems, lastFullName;
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
@@ -42,6 +42,7 @@
     [statusItem setMenu:statusMenu];
     [statusItem setToolTip:NSLocalizedString(@"RedditBar", @"Main Menuitem Tooltip")];
     [statusItem setHighlightMode:YES];
+    lastFullName = nil;
     currentState = [[StateModel alloc] init];
     [self defaultPreferences];
     [self loadPreferences];
@@ -90,6 +91,8 @@
         [firstMenuItem setHidden:NO];
         return;
     }
+    lastFullName = [items objectAtIndex:[items count] - 1]; // last link fullname is at end of array
+    items = [items subarrayWithRange:NSMakeRange(0, [items count] - 1)]; // Remove last item
     redditItems = items;
     [self clearMenuItems];
     [firstMenuItem setHidden:YES];
@@ -103,6 +106,8 @@
         [firstMenuItem setHidden:NO];
         return;
     }
+    lastFullName = [items objectAtIndex:[items count] - 1]; // last link fullname is at end of array
+    items = [items subarrayWithRange:NSMakeRange(0, [items count] - 1)]; // Remove last item
     redditItems = items;
     [self clearMenuItems];
     [firstMenuItem setHidden:YES];
@@ -135,6 +140,7 @@
     [firstMenuItem setTitle:NSLocalizedString(@"Loading...", @"Statusitem when user clicks reload")];
     [self clearMenuItems];
     [firstMenuItem setHidden:NO];
+    lastFullName = nil; // reload from start
     [self reloadListWithOptions];
 }
 
@@ -142,9 +148,7 @@
     [firstMenuItem setTitle:NSLocalizedString(@"Loading...", nil)];
     [self clearMenuItems];
     [firstMenuItem setHidden:NO];
-    
-    // TODO on list load, store after cookie??
-    // then use it here to load the list after the last item
+    [self reloadListWithOptions];
 }
 
 -(IBAction)linkToOpen:(id)sender {

RedditBar/Reddit.m

@@ -127,13 +127,25 @@ NSString *replaceTextForTitle = @"...";
         RedditItem *r = [RedditItem itemWithName:name Link:link Comments:comments Self:isSelf];
         [r setFullName:[current valueForKey:@"title"]];
         [array insertObject:r atIndex:i];
+        
+        if (i == ([children count] - 1)) {
+            NSString *name = [NSString stringWithFormat:@"%@_%@", [child valueForKey:@"kind"], [current valueForKey:@"id"]];
+            [array insertObject:name atIndex:i + 1];
+        }
     }
     return array;
 }
 
 -(void)readFrontpage:(id)parent {
     NSHTTPURLResponse *response;
-    NSString *url = [NSString stringWithFormat:@"hot.json?limit=%ld", (long)length];
+    
+    NSString *after = ((AppDelegate *)parent).lastFullName;
+    NSString *url;
+    if (after == nil)
+        url = [NSString stringWithFormat:@"hot.json?limit=%ld", (long)length];
+    else
+        url = [NSString stringWithFormat:@"hot.json?limit=%ld&after=%@", (long)length, after];
+        
     NSData *data = [self queryAPI:url withResponse:&response];
     if ((data == nil) || ([response statusCode] != 200)) {
         [parent performSelectorOnMainThread:@selector(reloadListHasFrontpageCallback:) withObject:nil waitUntilDone:false];
@@ -150,7 +162,14 @@ NSString *replaceTextForTitle = @"...";
             [subs appendString:@"+"];
         }
     }
-    NSString *url = [NSString stringWithFormat:@"%@/hot.json?limit=%ld", subs, (long)length];
+    
+    NSString *after = ((AppDelegate *)parent).lastFullName;
+    NSString *url;
+    if (after == nil)
+        url = [NSString stringWithFormat:@"%@/hot.json?limit=%ld", subs, (long)length];
+    else
+        url = [NSString stringWithFormat:@"%@/hot.json?limit=%ld&after=%@", subs, (long)length, after];
+    
     NSHTTPURLResponse *response;
     NSData *data = [self queryAPI:url withResponse:&response];
     if ((data == nil) || ([response statusCode] != 200)) {

RedditBar/RedditBar-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>169</string>
+	<string>174</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

RedditBar/de.lproj/MainMenu.strings

@@ -5,7 +5,7 @@
 "4ah-qP-9eP.title" = "About RedditBar";
 
 /* Class = "NSMenuItem"; title = "Reload"; ObjectID = "bQG-wq-9Zw"; */
-"bQG-wq-9Zw.title" = "Aktualisieren";
+"bQG-wq-9Zw.title" = "Neu laden";
 
 /* Class = "NSMenuItem"; title = "Load next"; ObjectID = "e8u-nc-P6x"; */
 "e8u-nc-P6x.title" = "Mehr laden";