<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>Classes/Controllers/FavoritesViewController.h</filename>
    </added>
    <added>
      <filename>Classes/Controllers/FavoritesViewController.m</filename>
    </added>
    <added>
      <filename>Interfaces/FavoritesView.xib</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -141,32 +141,6 @@
     [twitterClient getTimeline:tweetType params:param];
 }
 
-- (void)getFavorites
-{
-    if (twitterClient) return;
-	twitterClient = [[TwitterClient alloc] initWithTarget:self action:@selector(timelineDidReceive:obj:)];
-    
-    insertPosition = 0;
-    
-    NSMutableDictionary *param = [NSMutableDictionary dictionary];
-    
-    int since_id = 0;
-    for (int i = 0; i &lt; [timeline countStatuses]; ++i) {
-        Status* sts = [timeline statusAtIndex:i];
-        if ([TwitterFonAppDelegate isMyScreenName:sts.user.screenName] == false) {
-            since_id = sts.statusId;
-            break;
-        }
-    }
-    
-    if (since_id) {
-        [param setObject:[NSString stringWithFormat:@&quot;%d&quot;, since_id] forKey:@&quot;since_id&quot;];
-        [param setObject:@&quot;200&quot; forKey:@&quot;count&quot;];
-    }
-    
-    [twitterClient getTimeline:tweetType params:param];
-}
-
 - (void)timelineDidReceive:(TwitterClient*)sender obj:(NSObject*)obj
 {
     twitterClient = nil;</diff>
      <filename>Classes/Controllers/FriendsTimelineDataSource.m</filename>
    </modified>
    <modified>
      <diff>@@ -10,6 +10,7 @@
 #import &quot;FriendsViewController.h&quot;
 #import &quot;ProfileViewController.h&quot;
 #import &quot;LoadCell.h&quot;
+#import &quot;Followee.h&quot;
 #import &quot;FolloweeCell.h&quot;
 
 @implementation FriendsViewController</diff>
      <filename>Classes/Controllers/FriendsViewController.m</filename>
    </modified>
    <modified>
      <diff>@@ -12,6 +12,7 @@
 #import &quot;WebViewController.h&quot;
 #import &quot;FriendsViewController.h&quot;
 #import &quot;UserTimelineController.h&quot;
+#import &quot;FavoritesViewController.h&quot;
 #import &quot;Followee.h&quot;
 #import &quot;ColorUtils.h&quot;
 
@@ -21,7 +22,7 @@ enum {
     ROW_FRIENDS,
     ROW_FOLLOWERS,
     ROW_UPDATES,
-//    ROW_FAVORITES,
+    ROW_FAVORITES,
     NUM_ROWS,
 };
 
@@ -119,16 +120,14 @@ enum {
                 cell.text = [NSString stringWithFormat:@&quot; %d following&quot;, user.friendsCount];
                 break;
             case ROW_FOLLOWERS:
-                cell.text = [NSString stringWithFormat:@&quot; %d follower%s&quot;, user.followersCount, (user.followersCount) ? &quot;s&quot; : &quot;&quot;];
+                cell.text = [NSString stringWithFormat:@&quot; %d follower%s&quot;, user.followersCount, (user.followersCount&gt; 1) ? &quot;s&quot; : &quot;&quot;];
                 break;
             case ROW_UPDATES:
-                cell.text = [NSString stringWithFormat:@&quot; %d update%s&quot;, user.statusesCount, (user.statusesCount) ? &quot;s&quot; : &quot;&quot;];
+                cell.text = [NSString stringWithFormat:@&quot; %d update%s&quot;, user.statusesCount, (user.statusesCount &gt; 1) ? &quot;s&quot; : &quot;&quot;];
                 break;
-#if 0
             case ROW_FAVORITES:
-                cell.text = [NSString stringWithFormat:@&quot; %d favorite%s&quot;, user.favoritesCount, (user.favoritesCount) ? &quot;s&quot; : &quot;&quot;];
+                cell.text = [NSString stringWithFormat:@&quot; %d favorite%s&quot;, user.favoritesCount, (user.favoritesCount &gt; 1) ? &quot;s&quot; : &quot;&quot;];
                 break;
-#endif
         }
     }
     else if (indexPath.section == 1) {
@@ -147,12 +146,14 @@ enum {
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath 
 {
     if (indexPath.section == 0) {
-#if 0
         if (indexPath.row == ROW_FAVORITES) {
+            if (user.favoritesCount != 0) {
+                FavoritesViewController *c = [[FavoritesViewController alloc] initWithNibName:@&quot;FavoritesView&quot; bundle:nil];
+                [c loadTimeline:user.screenName];
+                [self.navigationController pushViewController:c animated:true];
+            }
         }
-        else
-#endif
-        if (indexPath.row == ROW_UPDATES) {
+        else if (indexPath.row == ROW_UPDATES) {
             if (user.statusesCount != 0) {
                 UserTimelineController* userTimeline = [[[UserTimelineController alloc] init] autorelease];
                 [userTimeline loadUserTimeline:user.screenName];
@@ -236,7 +237,7 @@ enum {
                               [NSIndexPath indexPathForRow:0 inSection:0],
                               [NSIndexPath indexPathForRow:1 inSection:0],
                               [NSIndexPath indexPathForRow:2 inSection:0],
-//                              [NSIndexPath indexPathForRow:3 inSection:0],
+                              [NSIndexPath indexPathForRow:3 inSection:0],
                               nil];
         [self.tableView beginUpdates];
         [self.tableView insertRowsAtIndexPaths:indexPath withRowAnimation:UITableViewRowAnimationTop];</diff>
      <filename>Classes/Controllers/ProfileViewController.m</filename>
    </modified>
    <modified>
      <diff>@@ -33,6 +33,8 @@
 
 - (void)updateFavorite:(Status*)status;
 
+- (void)sortByDate;
+
 - (TimelineCell*)getTimelineCell:(UITableView*)tableView atIndex:(int)index;
 
 @end</diff>
      <filename>Classes/Controllers/Timeline.h</filename>
    </modified>
    <modified>
      <diff>@@ -5,6 +5,20 @@
 #import &quot;TimeUtils.h&quot;
 #import &quot;DBConnection.h&quot;
 
+static NSInteger sortByDate(id a, id b, void *context)
+{
+    Status* dma = (Status*)a;
+    Status* dmb = (Status*)b;
+    int diff = dmb.createdAt - dma.createdAt;
+    if (diff &gt; 0)
+        return 1;
+    else if (diff &lt; 0)
+        return -1;
+    else
+        return 0;
+}
+
+
 @implementation Timeline
 
 #define MAX_ROW_COUNT   200
@@ -86,6 +100,11 @@
     }
 }
 
+- (void)sortByDate
+{
+    [statuses sortUsingFunction:sortByDate context:nil];    
+}
+
 - (void)appendStatus:(Status*)status
 {
     [statuses addObject:status];</diff>
      <filename>Classes/Controllers/Timeline.m</filename>
    </modified>
    <modified>
      <diff>@@ -251,11 +251,16 @@ int sTextWidth[] = {
 {
     static Statement *stmt = nil;
     if (stmt == nil) {
-        stmt = [DBConnection statementWithQuery:&quot;INSERT INTO statuses VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)&quot;];
+        stmt = [DBConnection statementWithQuery:&quot;REPLACE INTO statuses VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)&quot;];
         [stmt retain];
     }
     [stmt bindInt64:statusId    forIndex:1];
-    [stmt bindInt32:type        forIndex:2];
+    if (type == TWEET_TYPE_FAVORITES) {
+        [stmt bindInt32:TWEET_TYPE_FRIENDS forIndex:2];
+    }
+    else {
+        [stmt bindInt32:type        forIndex:2];
+    }
     [stmt bindInt32:user.userId forIndex:3];
     
     [stmt bindString:text       forIndex:4];
@@ -268,7 +273,7 @@ int sTextWidth[] = {
     [stmt bindInt32:inReplyToUserId      forIndex:10];
     [stmt bindString:inReplyToScreenName forIndex:11];
     
-    if ([stmt step] == SQLITE_ERROR) {
+    if ([stmt step] != SQLITE_DONE) {
         [DBConnection alert];
     }
     [stmt reset];</diff>
      <filename>Classes/Models/Status.m</filename>
    </modified>
    <modified>
      <diff>@@ -8,6 +8,7 @@ typedef enum {
     TWEET_TYPE_MESSAGES,
     TWEET_TYPE_SENT,
     TWEET_TYPE_SEARCH_RESULT,
+    TWEET_TYPE_FAVORITES,
 } TweetType;
 
 typedef enum {</diff>
      <filename>Classes/Models/Tweet.h</filename>
    </modified>
    <modified>
      <diff>@@ -40,7 +40,8 @@ typedef enum {
 - (void)send:(NSString*)text to:(NSString*)screen_name;
 - (void)getFriends:(NSString*)screen_name page:(int)page isFollowers:(BOOL)isFollowers;
 - (void)destroy:(Tweet*)tweet;
-- (void)favorite:(Status*)status;
+- (void)favorites:(NSString*)screenName page:(int)page;
+- (void)toggleFavorite:(Status*)status;
 - (void)friendship:(NSString*)screen_name create:(BOOL)create;
 - (void)search:(NSString*)query;
 - (void)existFriendship:(NSString*)screen_name;</diff>
      <filename>Classes/Network/TwitterClient.h</filename>
    </modified>
    <modified>
      <diff>@@ -171,7 +171,22 @@ NSString* sMethods[4] = {
     [self post:url body:@&quot;&quot;];
 }
 
-- (void)favorite:(Status*)status
+- (void)favorites:(NSString*)screenName page:(int)page
+{
+    needAuth = true;
+    NSString *url;
+    
+    if (screenName) {
+        url = [NSString stringWithFormat:@&quot;https://twitter.com/favorites/%@.json?page=%d&quot;, screenName, page];
+    }
+    else {
+        url = @&quot;https://twitter.com/favorites.json&quot;;
+    }
+    
+    [self get:url];
+}
+
+- (void)toggleFavorite:(Status*)status
 {
     needAuth = true;
     request = (status.favorited) ? TWITTER_REQUEST_DESTROY_FAVORITE : TWITTER_REQUEST_FAVORITE;</diff>
      <filename>Classes/Network/TwitterClient.m</filename>
    </modified>
    <modified>
      <diff>@@ -8,7 +8,7 @@
 
 #import &quot;ColorUtils.h&quot;
 
-static UIColor *gNavigationBarColors[4];
+static UIColor *gNavigationBarColors[5];
 static UIColor *gUnreadCellColors[5];
 
 @implementation UIColor (UIColorUtils)
@@ -25,8 +25,8 @@ static UIColor *gUnreadCellColors[5];
     gNavigationBarColors[0] = [[UIColor colorWithRed:0.341 green:0.643 blue:0.859 alpha:1.0] retain];
     gNavigationBarColors[1] = [[UIColor colorWithRed:0.459 green:0.663 blue:0.557 alpha:1.0] retain];
     gNavigationBarColors[2] = [[UIColor colorWithRed:0.686 green:0.502 blue:0.447 alpha:1.0] retain];
-//    gNavigationBarColors[2] = [[UIColor colorWithRed:0.701 green:0.447 blue:0.459 alpha:1.0] retain];
-    gNavigationBarColors[3] = [UIColor whiteColor];
+    gNavigationBarColors[3] = [[UIColor colorWithRed:0.701 green:0.447 blue:0.459 alpha:1.0] retain];
+    gNavigationBarColors[4] = [UIColor whiteColor];
     
 }
 </diff>
      <filename>Classes/OtherSources/ColorUtils.m</filename>
    </modified>
    <modified>
      <diff>@@ -17,6 +17,7 @@ typedef enum {
     TAB_FRIENDS,
     TAB_REPLIES,
     TAB_MESSAGES,
+    TAB_FAVORITES,
     TAB_SEARCH,
 } TAB_ITEM;
 </diff>
      <filename>Classes/OtherSources/TwitterFonAppDelegate.h</filename>
    </modified>
    <modified>
      <diff>@@ -531,7 +531,7 @@ static NSString *hashRegexp = @&quot;(#[-a-zA-Z0-9_.+:=]+)&quot;;
 {
     TwitterClient *client = [[TwitterClient alloc] initWithTarget:self action:@selector(favoriteDidChange:obj:)];
     client.context = [status  retain];
-    [client favorite:status];
+    [client toggleFavorite:status];
 }
 
 - (void)favoriteDidChange:(TwitterClient*)sender obj:(NSObject*)obj
@@ -568,6 +568,15 @@ static NSString *hashRegexp = @&quot;(#[-a-zA-Z0-9_.+:=]+)&quot;;
     if ([c respondsToSelector:@selector(updateFavorite:)]) {
         [c updateFavorite:sts];
     }
+
+    // Add/remove from favorites tab
+    if (selectedTab != TAB_FAVORITES) {
+        nav = (UINavigationController*)[tabBarController.viewControllers objectAtIndex:TAB_FAVORITES];
+        c = [nav.viewControllers objectAtIndex:0];
+        if ([c respondsToSelector:@selector(updateFavorite:)]) {
+            [c updateFavorite:sts];
+        }
+    }
     [sts release];
 }
 </diff>
      <filename>Classes/OtherSources/TwitterFonAppDelegate.m</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>Images/Default.png</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>Images/Default.psd</filename>
    </modified>
    <modified>
      <diff>@@ -8,7 +8,7 @@
 		&lt;string key=&quot;IBDocument.HIToolboxVersion&quot;&gt;353.00&lt;/string&gt;
 		&lt;object class=&quot;NSMutableArray&quot; key=&quot;IBDocument.EditedObjectIDs&quot;&gt;
 			&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
-			&lt;integer value=&quot;196&quot;/&gt;
+			&lt;integer value=&quot;421&quot;/&gt;
 		&lt;/object&gt;
 		&lt;object class=&quot;NSArray&quot; key=&quot;IBDocument.PluginDependencies&quot;&gt;
 			&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
@@ -26,43 +26,38 @@
 			&lt;object class=&quot;IBUITabBarController&quot; id=&quot;1034742383&quot;&gt;
 				&lt;object class=&quot;IBUISimulatedTabBarMetrics&quot; key=&quot;IBUISimulatedBottomBarMetrics&quot;/&gt;
 				&lt;object class=&quot;IBUISimulatedStatusBarMetrics&quot; key=&quot;IBUISimulatedStatusBarMetrics&quot;/&gt;
-				&lt;object class=&quot;IBUINavigationController&quot; key=&quot;IBUISelectedViewController&quot; id=&quot;742009202&quot;&gt;
-					&lt;string key=&quot;IBUITitle&quot;&gt;Messages&lt;/string&gt;
-					&lt;object class=&quot;IBUITabBarItem&quot; key=&quot;IBUITabBarItem&quot; id=&quot;857933852&quot;&gt;
-						&lt;int key=&quot;IBUITag&quot;&gt;2&lt;/int&gt;
-						&lt;string key=&quot;IBUITitle&quot;&gt;Messages&lt;/string&gt;
-						&lt;object class=&quot;NSCustomResource&quot; key=&quot;IBUIImage&quot;&gt;
-							&lt;string key=&quot;NSClassName&quot;&gt;NSImage&lt;/string&gt;
-							&lt;string key=&quot;NSResourceName&quot;&gt;messages.png&lt;/string&gt;
-						&lt;/object&gt;
+				&lt;object class=&quot;IBUINavigationController&quot; key=&quot;IBUISelectedViewController&quot; id=&quot;304137578&quot;&gt;
+					&lt;object class=&quot;IBUITabBarItem&quot; key=&quot;IBUITabBarItem&quot; id=&quot;240979084&quot;&gt;
+						&lt;int key=&quot;IBUISystemItemIdentifier&quot;&gt;1&lt;/int&gt;
 						&lt;reference key=&quot;IBUITabBar&quot;/&gt;
 					&lt;/object&gt;
 					&lt;reference key=&quot;IBUIParentViewController&quot; ref=&quot;1034742383&quot;/&gt;
-					&lt;object class=&quot;IBUINavigationBar&quot; key=&quot;IBUINavigationBar&quot; id=&quot;284537482&quot;&gt;
+					&lt;object class=&quot;IBUISimulatedStatusBarMetrics&quot; key=&quot;IBUISimulatedStatusBarMetrics&quot;/&gt;
+					&lt;object class=&quot;IBUINavigationBar&quot; key=&quot;IBUINavigationBar&quot; id=&quot;2285971&quot;&gt;
 						&lt;nil key=&quot;NSNextResponder&quot;/&gt;
 						&lt;int key=&quot;NSvFlags&quot;&gt;256&lt;/int&gt;
-						&lt;string key=&quot;NSFrameSize&quot;&gt;{320, 44}&lt;/string&gt;
+						&lt;string key=&quot;NSFrameSize&quot;&gt;{0, 0}&lt;/string&gt;
 						&lt;bool key=&quot;IBUIOpaque&quot;&gt;NO&lt;/bool&gt;
 						&lt;bool key=&quot;IBUIClipsSubviews&quot;&gt;YES&lt;/bool&gt;
 						&lt;bool key=&quot;IBUIMultipleTouchEnabled&quot;&gt;YES&lt;/bool&gt;
 					&lt;/object&gt;
 					&lt;object class=&quot;NSMutableArray&quot; key=&quot;IBUIViewControllers&quot;&gt;
 						&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
-						&lt;object class=&quot;IBUIViewController&quot; id=&quot;422638560&quot;&gt;
-							&lt;object class=&quot;IBUINavigationItem&quot; key=&quot;IBUINavigationItem&quot; id=&quot;726267129&quot;&gt;
+						&lt;object class=&quot;IBUIViewController&quot; id=&quot;408977018&quot;&gt;
+							&lt;object class=&quot;IBUINavigationItem&quot; key=&quot;IBUINavigationItem&quot; id=&quot;619424054&quot;&gt;
 								&lt;reference key=&quot;IBUINavigationBar&quot;/&gt;
-								&lt;string key=&quot;IBUITitle&quot;&gt;Messages&lt;/string&gt;
-								&lt;object class=&quot;IBUIBarButtonItem&quot; key=&quot;IBUILeftBarButtonItem&quot; id=&quot;554924916&quot;&gt;
+								&lt;string key=&quot;IBUITitle&quot;&gt;Favorites&lt;/string&gt;
+								&lt;object class=&quot;IBUIBarButtonItem&quot; key=&quot;IBUILeftBarButtonItem&quot; id=&quot;27368624&quot;&gt;
 									&lt;int key=&quot;IBUIStyle&quot;&gt;1&lt;/int&gt;
 									&lt;int key=&quot;IBUISystemItemIdentifier&quot;&gt;13&lt;/int&gt;
 								&lt;/object&gt;
-								&lt;object class=&quot;IBUIBarButtonItem&quot; key=&quot;IBUIRightBarButtonItem&quot; id=&quot;337418855&quot;&gt;
+								&lt;object class=&quot;IBUIBarButtonItem&quot; key=&quot;IBUIRightBarButtonItem&quot; id=&quot;205447070&quot;&gt;
 									&lt;int key=&quot;IBUIStyle&quot;&gt;1&lt;/int&gt;
 									&lt;int key=&quot;IBUISystemItemIdentifier&quot;&gt;7&lt;/int&gt;
 								&lt;/object&gt;
 							&lt;/object&gt;
-							&lt;reference key=&quot;IBUIParentViewController&quot; ref=&quot;742009202&quot;/&gt;
-							&lt;string key=&quot;IBUINibName&quot;&gt;DirectMessage&lt;/string&gt;
+							&lt;reference key=&quot;IBUIParentViewController&quot; ref=&quot;304137578&quot;/&gt;
+							&lt;string key=&quot;IBUINibName&quot;&gt;FavoritesView&lt;/string&gt;
 						&lt;/object&gt;
 					&lt;/object&gt;
 				&lt;/object&gt;
@@ -146,7 +141,46 @@
 							&lt;/object&gt;
 						&lt;/object&gt;
 					&lt;/object&gt;
-					&lt;reference ref=&quot;742009202&quot;/&gt;
+					&lt;object class=&quot;IBUINavigationController&quot; id=&quot;742009202&quot;&gt;
+						&lt;string key=&quot;IBUITitle&quot;&gt;Messages&lt;/string&gt;
+						&lt;object class=&quot;IBUITabBarItem&quot; key=&quot;IBUITabBarItem&quot; id=&quot;857933852&quot;&gt;
+							&lt;int key=&quot;IBUITag&quot;&gt;2&lt;/int&gt;
+							&lt;string key=&quot;IBUITitle&quot;&gt;Messages&lt;/string&gt;
+							&lt;object class=&quot;NSCustomResource&quot; key=&quot;IBUIImage&quot;&gt;
+								&lt;string key=&quot;NSClassName&quot;&gt;NSImage&lt;/string&gt;
+								&lt;string key=&quot;NSResourceName&quot;&gt;messages.png&lt;/string&gt;
+							&lt;/object&gt;
+							&lt;reference key=&quot;IBUITabBar&quot;/&gt;
+						&lt;/object&gt;
+						&lt;reference key=&quot;IBUIParentViewController&quot; ref=&quot;1034742383&quot;/&gt;
+						&lt;object class=&quot;IBUINavigationBar&quot; key=&quot;IBUINavigationBar&quot; id=&quot;284537482&quot;&gt;
+							&lt;nil key=&quot;NSNextResponder&quot;/&gt;
+							&lt;int key=&quot;NSvFlags&quot;&gt;256&lt;/int&gt;
+							&lt;string key=&quot;NSFrameSize&quot;&gt;{320, 44}&lt;/string&gt;
+							&lt;bool key=&quot;IBUIOpaque&quot;&gt;NO&lt;/bool&gt;
+							&lt;bool key=&quot;IBUIClipsSubviews&quot;&gt;YES&lt;/bool&gt;
+							&lt;bool key=&quot;IBUIMultipleTouchEnabled&quot;&gt;YES&lt;/bool&gt;
+						&lt;/object&gt;
+						&lt;object class=&quot;NSMutableArray&quot; key=&quot;IBUIViewControllers&quot;&gt;
+							&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
+							&lt;object class=&quot;IBUIViewController&quot; id=&quot;422638560&quot;&gt;
+								&lt;object class=&quot;IBUINavigationItem&quot; key=&quot;IBUINavigationItem&quot; id=&quot;726267129&quot;&gt;
+									&lt;string key=&quot;IBUITitle&quot;&gt;Messages&lt;/string&gt;
+									&lt;object class=&quot;IBUIBarButtonItem&quot; key=&quot;IBUILeftBarButtonItem&quot; id=&quot;554924916&quot;&gt;
+										&lt;int key=&quot;IBUIStyle&quot;&gt;1&lt;/int&gt;
+										&lt;int key=&quot;IBUISystemItemIdentifier&quot;&gt;13&lt;/int&gt;
+									&lt;/object&gt;
+									&lt;object class=&quot;IBUIBarButtonItem&quot; key=&quot;IBUIRightBarButtonItem&quot; id=&quot;337418855&quot;&gt;
+										&lt;int key=&quot;IBUIStyle&quot;&gt;1&lt;/int&gt;
+										&lt;int key=&quot;IBUISystemItemIdentifier&quot;&gt;7&lt;/int&gt;
+									&lt;/object&gt;
+								&lt;/object&gt;
+								&lt;reference key=&quot;IBUIParentViewController&quot; ref=&quot;742009202&quot;/&gt;
+								&lt;string key=&quot;IBUINibName&quot;&gt;DirectMessage&lt;/string&gt;
+							&lt;/object&gt;
+						&lt;/object&gt;
+					&lt;/object&gt;
+					&lt;reference ref=&quot;304137578&quot;/&gt;
 					&lt;object class=&quot;IBUINavigationController&quot; id=&quot;785888307&quot;&gt;
 						&lt;object class=&quot;IBUITabBarItem&quot; key=&quot;IBUITabBarItem&quot; id=&quot;1016338279&quot;&gt;
 							&lt;int key=&quot;IBUISystemItemIdentifier&quot;&gt;8&lt;/int&gt;
@@ -291,6 +325,22 @@
 					&lt;/object&gt;
 					&lt;int key=&quot;connectionID&quot;&gt;372&lt;/int&gt;
 				&lt;/object&gt;
+				&lt;object class=&quot;IBConnectionRecord&quot;&gt;
+					&lt;object class=&quot;IBCocoaTouchEventConnection&quot; key=&quot;connection&quot;&gt;
+						&lt;string key=&quot;label&quot;&gt;reload:&lt;/string&gt;
+						&lt;reference key=&quot;source&quot; ref=&quot;27368624&quot;/&gt;
+						&lt;reference key=&quot;destination&quot; ref=&quot;408977018&quot;/&gt;
+					&lt;/object&gt;
+					&lt;int key=&quot;connectionID&quot;&gt;420&lt;/int&gt;
+				&lt;/object&gt;
+				&lt;object class=&quot;IBConnectionRecord&quot;&gt;
+					&lt;object class=&quot;IBCocoaTouchEventConnection&quot; key=&quot;connection&quot;&gt;
+						&lt;string key=&quot;label&quot;&gt;post:&lt;/string&gt;
+						&lt;reference key=&quot;source&quot; ref=&quot;205447070&quot;/&gt;
+						&lt;reference key=&quot;destination&quot; ref=&quot;664661524&quot;/&gt;
+					&lt;/object&gt;
+					&lt;int key=&quot;connectionID&quot;&gt;422&lt;/int&gt;
+				&lt;/object&gt;
 			&lt;/object&gt;
 			&lt;object class=&quot;IBMutableOrderedSet&quot; key=&quot;objectRecords&quot;&gt;
 				&lt;object class=&quot;NSArray&quot; key=&quot;orderedObjects&quot;&gt;
@@ -324,6 +374,7 @@
 							&lt;reference ref=&quot;742009202&quot;/&gt;
 							&lt;reference ref=&quot;740728481&quot;/&gt;
 							&lt;reference ref=&quot;785888307&quot;/&gt;
+							&lt;reference ref=&quot;304137578&quot;/&gt;
 						&lt;/object&gt;
 						&lt;reference key=&quot;parent&quot; ref=&quot;957960031&quot;/&gt;
 					&lt;/object&gt;
@@ -536,6 +587,56 @@
 						&lt;reference key=&quot;object&quot; ref=&quot;1016338279&quot;/&gt;
 						&lt;reference key=&quot;parent&quot; ref=&quot;785888307&quot;/&gt;
 					&lt;/object&gt;
+					&lt;object class=&quot;IBObjectRecord&quot;&gt;
+						&lt;int key=&quot;objectID&quot;&gt;413&lt;/int&gt;
+						&lt;reference key=&quot;object&quot; ref=&quot;304137578&quot;/&gt;
+						&lt;object class=&quot;NSMutableArray&quot; key=&quot;children&quot;&gt;
+							&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
+							&lt;reference ref=&quot;408977018&quot;/&gt;
+							&lt;reference ref=&quot;2285971&quot;/&gt;
+							&lt;reference ref=&quot;240979084&quot;/&gt;
+						&lt;/object&gt;
+						&lt;reference key=&quot;parent&quot; ref=&quot;1034742383&quot;/&gt;
+					&lt;/object&gt;
+					&lt;object class=&quot;IBObjectRecord&quot;&gt;
+						&lt;int key=&quot;objectID&quot;&gt;414&lt;/int&gt;
+						&lt;reference key=&quot;object&quot; ref=&quot;408977018&quot;/&gt;
+						&lt;object class=&quot;NSMutableArray&quot; key=&quot;children&quot;&gt;
+							&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
+							&lt;reference ref=&quot;619424054&quot;/&gt;
+						&lt;/object&gt;
+						&lt;reference key=&quot;parent&quot; ref=&quot;304137578&quot;/&gt;
+					&lt;/object&gt;
+					&lt;object class=&quot;IBObjectRecord&quot;&gt;
+						&lt;int key=&quot;objectID&quot;&gt;415&lt;/int&gt;
+						&lt;reference key=&quot;object&quot; ref=&quot;2285971&quot;/&gt;
+						&lt;reference key=&quot;parent&quot; ref=&quot;304137578&quot;/&gt;
+					&lt;/object&gt;
+					&lt;object class=&quot;IBObjectRecord&quot;&gt;
+						&lt;int key=&quot;objectID&quot;&gt;416&lt;/int&gt;
+						&lt;reference key=&quot;object&quot; ref=&quot;619424054&quot;/&gt;
+						&lt;object class=&quot;NSMutableArray&quot; key=&quot;children&quot;&gt;
+							&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
+							&lt;reference ref=&quot;27368624&quot;/&gt;
+							&lt;reference ref=&quot;205447070&quot;/&gt;
+						&lt;/object&gt;
+						&lt;reference key=&quot;parent&quot; ref=&quot;408977018&quot;/&gt;
+					&lt;/object&gt;
+					&lt;object class=&quot;IBObjectRecord&quot;&gt;
+						&lt;int key=&quot;objectID&quot;&gt;417&lt;/int&gt;
+						&lt;reference key=&quot;object&quot; ref=&quot;240979084&quot;/&gt;
+						&lt;reference key=&quot;parent&quot; ref=&quot;304137578&quot;/&gt;
+					&lt;/object&gt;
+					&lt;object class=&quot;IBObjectRecord&quot;&gt;
+						&lt;int key=&quot;objectID&quot;&gt;418&lt;/int&gt;
+						&lt;reference key=&quot;object&quot; ref=&quot;27368624&quot;/&gt;
+						&lt;reference key=&quot;parent&quot; ref=&quot;619424054&quot;/&gt;
+					&lt;/object&gt;
+					&lt;object class=&quot;IBObjectRecord&quot;&gt;
+						&lt;int key=&quot;objectID&quot;&gt;421&lt;/int&gt;
+						&lt;reference key=&quot;object&quot; ref=&quot;205447070&quot;/&gt;
+						&lt;reference key=&quot;parent&quot; ref=&quot;619424054&quot;/&gt;
+					&lt;/object&gt;
 				&lt;/object&gt;
 			&lt;/object&gt;
 			&lt;object class=&quot;NSMutableDictionary&quot; key=&quot;flattenedProperties&quot;&gt;
@@ -564,13 +665,20 @@
 					&lt;string&gt;358.IBPluginDependency&lt;/string&gt;
 					&lt;string&gt;359.IBPluginDependency&lt;/string&gt;
 					&lt;string&gt;360.IBPluginDependency&lt;/string&gt;
+					&lt;string&gt;413.IBPluginDependency&lt;/string&gt;
+					&lt;string&gt;414.CustomClassName&lt;/string&gt;
+					&lt;string&gt;414.IBPluginDependency&lt;/string&gt;
+					&lt;string&gt;415.IBPluginDependency&lt;/string&gt;
+					&lt;string&gt;416.IBPluginDependency&lt;/string&gt;
+					&lt;string&gt;418.IBPluginDependency&lt;/string&gt;
+					&lt;string&gt;421.IBPluginDependency&lt;/string&gt;
 				&lt;/object&gt;
 				&lt;object class=&quot;NSMutableArray&quot; key=&quot;dict.values&quot;&gt;
 					&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
 					&lt;string&gt;UIApplication&lt;/string&gt;
 					&lt;string&gt;UIResponder&lt;/string&gt;
 					&lt;string&gt;TabBarController&lt;/string&gt;
-					&lt;string&gt;{{318, 468}, {320, 480}}&lt;/string&gt;
+					&lt;string&gt;{{311, 549}, {320, 480}}&lt;/string&gt;
 					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
 					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
 					&lt;string&gt;FriendsTimelineController&lt;/string&gt;
@@ -597,6 +705,13 @@
 					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
 					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
 					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
+					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
+					&lt;string&gt;FavoritesViewController&lt;/string&gt;
+					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
+					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
+					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
+					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
+					&lt;string&gt;com.apple.InterfaceBuilder.IBCocoaTouchPlugin&lt;/string&gt;
 				&lt;/object&gt;
 			&lt;/object&gt;
 			&lt;object class=&quot;NSMutableDictionary&quot; key=&quot;unlocalizedProperties&quot;&gt;
@@ -619,7 +734,7 @@
 				&lt;/object&gt;
 			&lt;/object&gt;
 			&lt;nil key=&quot;sourceID&quot;/&gt;
-			&lt;int key=&quot;maxID&quot;&gt;412&lt;/int&gt;
+			&lt;int key=&quot;maxID&quot;&gt;422&lt;/int&gt;
 		&lt;/object&gt;
 		&lt;object class=&quot;IBClassDescriber&quot; key=&quot;IBDocument.Classes&quot;&gt;
 			&lt;object class=&quot;NSMutableArray&quot; key=&quot;referencedPartialClassDescriptions&quot;&gt;
@@ -637,20 +752,23 @@
 					&lt;/object&gt;
 				&lt;/object&gt;
 				&lt;object class=&quot;IBPartialClassDescription&quot;&gt;
+					&lt;string key=&quot;className&quot;&gt;FavoritesViewController&lt;/string&gt;
+					&lt;string key=&quot;superclassName&quot;&gt;UITableViewController&lt;/string&gt;
+					&lt;object class=&quot;NSMutableDictionary&quot; key=&quot;actions&quot;&gt;
+						&lt;string key=&quot;NS.key.0&quot;&gt;reload:&lt;/string&gt;
+						&lt;string key=&quot;NS.object.0&quot;&gt;id&lt;/string&gt;
+					&lt;/object&gt;
+					&lt;object class=&quot;IBClassDescriptionSource&quot; key=&quot;sourceIdentifier&quot;&gt;
+						&lt;string key=&quot;majorKey&quot;&gt;IBProjectSource&lt;/string&gt;
+						&lt;string key=&quot;minorKey&quot;&gt;Classes/Controllers/FavoritesViewController.h&lt;/string&gt;
+					&lt;/object&gt;
+				&lt;/object&gt;
+				&lt;object class=&quot;IBPartialClassDescription&quot;&gt;
 					&lt;string key=&quot;className&quot;&gt;FriendsTimelineController&lt;/string&gt;
 					&lt;string key=&quot;superclassName&quot;&gt;UITableViewController&lt;/string&gt;
 					&lt;object class=&quot;NSMutableDictionary&quot; key=&quot;actions&quot;&gt;
-						&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
-						&lt;object class=&quot;NSMutableArray&quot; key=&quot;dict.sortedKeys&quot;&gt;
-							&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
-							&lt;string&gt;reload:&lt;/string&gt;
-							&lt;string&gt;segmentDidChange:&lt;/string&gt;
-						&lt;/object&gt;
-						&lt;object class=&quot;NSMutableArray&quot; key=&quot;dict.values&quot;&gt;
-							&lt;bool key=&quot;EncodedWithXMLCoder&quot;&gt;YES&lt;/bool&gt;
-							&lt;string&gt;id&lt;/string&gt;
-							&lt;string&gt;id&lt;/string&gt;
-						&lt;/object&gt;
+						&lt;string key=&quot;NS.key.0&quot;&gt;reload:&lt;/string&gt;
+						&lt;string key=&quot;NS.object.0&quot;&gt;id&lt;/string&gt;
 					&lt;/object&gt;
 					&lt;object class=&quot;IBClassDescriptionSource&quot; key=&quot;sourceIdentifier&quot;&gt;
 						&lt;string key=&quot;majorKey&quot;&gt;IBProjectSource&lt;/string&gt;</diff>
      <filename>Interfaces/MainWindow.xib</filename>
    </modified>
    <modified>
      <diff>@@ -103,6 +103,9 @@
 		6EAE82B10EF5CBCB00BF6CD4 /* TimelineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EAE82B00EF5CBCB00BF6CD4 /* TimelineDataSource.m */; };
 		6EBEE5840EB2F65400C18F0A /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EBEE5830EB2F65400C18F0A /* SearchViewController.m */; };
 		6EC261130F0F4A7B00C31A13 /* DMDetailCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC261120F0F4A7B00C31A13 /* DMDetailCellView.m */; };
+		6EC2637C0F0F989500C31A13 /* FavoritesView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC2637B0F0F989500C31A13 /* FavoritesView.xib */; };
+		6EC263830F0F98E600C31A13 /* FavoritesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC263820F0F98E600C31A13 /* FavoritesViewController.m */; };
+		6EC266F80F1020D700C31A13 /* FolloweeCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC266F70F1020D700C31A13 /* FolloweeCellView.m */; };
 		6EC53C420EF805FE009BCC92 /* DBConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC53C390EF805FE009BCC92 /* DBConnection.m */; };
 		6EC53C430EF805FE009BCC92 /* Followee.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC53C3B0EF805FE009BCC92 /* Followee.m */; };
 		6EC53C460EF805FE009BCC92 /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC53C410EF805FE009BCC92 /* User.m */; };
@@ -287,6 +290,11 @@
 		6EBEE5830EB2F65400C18F0A /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SearchViewController.m; path = Controllers/SearchViewController.m; sourceTree = &quot;&lt;group&gt;&quot;; };
 		6EC261110F0F4A7B00C31A13 /* DMDetailCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DMDetailCellView.h; path = Controllers/DMDetailCellView.h; sourceTree = &quot;&lt;group&gt;&quot;; };
 		6EC261120F0F4A7B00C31A13 /* DMDetailCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DMDetailCellView.m; path = Controllers/DMDetailCellView.m; sourceTree = &quot;&lt;group&gt;&quot;; };
+		6EC2637B0F0F989500C31A13 /* FavoritesView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = FavoritesView.xib; path = Interfaces/FavoritesView.xib; sourceTree = &quot;&lt;group&gt;&quot;; };
+		6EC263810F0F98E600C31A13 /* FavoritesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FavoritesViewController.h; path = Controllers/FavoritesViewController.h; sourceTree = &quot;&lt;group&gt;&quot;; };
+		6EC263820F0F98E600C31A13 /* FavoritesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FavoritesViewController.m; path = Controllers/FavoritesViewController.m; sourceTree = &quot;&lt;group&gt;&quot;; };
+		6EC266F60F1020D700C31A13 /* FolloweeCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FolloweeCellView.h; path = Controllers/FolloweeCellView.h; sourceTree = &quot;&lt;group&gt;&quot;; };
+		6EC266F70F1020D700C31A13 /* FolloweeCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FolloweeCellView.m; path = Controllers/FolloweeCellView.m; sourceTree = &quot;&lt;group&gt;&quot;; };
 		6EC53C380EF805FE009BCC92 /* DBConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBConnection.h; sourceTree = &quot;&lt;group&gt;&quot;; };
 		6EC53C390EF805FE009BCC92 /* DBConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBConnection.m; sourceTree = &quot;&lt;group&gt;&quot;; };
 		6EC53C3A0EF805FE009BCC92 /* Followee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Followee.h; sourceTree = &quot;&lt;group&gt;&quot;; };
@@ -703,6 +711,8 @@
 			children = (
 				6EADC09E0EBDC48D00093782 /* FolloweeCell.h */,
 				6EADC09F0EBDC48D00093782 /* FolloweeCell.m */,
+				6EC266F60F1020D700C31A13 /* FolloweeCellView.h */,
+				6EC266F70F1020D700C31A13 /* FolloweeCellView.m */,
 				6EAE76020EF3904600BF6CD4 /* FriendsViewController.h */,
 				6EAE76030EF3904600BF6CD4 /* FriendsViewController.m */,
 			);
@@ -744,6 +754,15 @@
 			name = Search;
 			sourceTree = &quot;&lt;group&gt;&quot;;
 		};
+		6EC263800F0F98C500C31A13 /* Favorites */ = {
+			isa = PBXGroup;
+			children = (
+				6EC263810F0F98E600C31A13 /* FavoritesViewController.h */,
+				6EC263820F0F98E600C31A13 /* FavoritesViewController.m */,
+			);
+			name = Favorites;
+			sourceTree = &quot;&lt;group&gt;&quot;;
+		};
 		6EC53C370EF805FE009BCC92 /* Models */ = {
 			isa = PBXGroup;
 			children = (
@@ -790,6 +809,7 @@
 				6E6DC5990EC077FD00F9EB74 /* TimelineView.xib */,
 				6E6DC59B0EC077FD00F9EB74 /* WebView.xib */,
 				6E6DC59C0EC077FD00F9EB74 /* FolloweesView.xib */,
+				6EC2637B0F0F989500C31A13 /* FavoritesView.xib */,
 				6E97A8810EF8F7DA00168291 /* DirectMessage.xib */,
 			);
 			name = interfaces;
@@ -815,6 +835,7 @@
 				6E74D0E20EF7B440003BB7B1 /* Tweets */,
 				6E1BE7BF0EF7C0370075881E /* DirectMessage */,
 				6E97AE610EF951FC00168291 /* Conversation */,
+				6EC263800F0F98C500C31A13 /* Favorites */,
 				6E6846AC0EE2D7D6009847F3 /* UserTimeline */,
 				6E1FAB400EDA6A39009407F6 /* Profile */,
 				6EBEE5790EB2F58E00C18F0A /* Search */,
@@ -968,6 +989,7 @@
 				6E97AD160EF93AB800168291 /* update_v12_to_v13.sql in Resources */,
 				6E79DE330F0DB173006E0525 /* EarlierButton.png in Resources */,
 				6E79DE3D0F0DB746006E0525 /* EalierButtonPressed.png in Resources */,
+				6EC2637C0F0F989500C31A13 /* FavoritesView.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1053,6 +1075,8 @@
 				6E49DB580F0EC8C2007EA8F5 /* DMDetailViewController.m in Sources */,
 				6E41FE230F0ED77B0038D075 /* DMDetailCell.m in Sources */,
 				6EC261130F0F4A7B00C31A13 /* DMDetailCellView.m in Sources */,
+				6EC263830F0F98E600C31A13 /* FavoritesViewController.m in Sources */,
+				6EC266F80F1020D700C31A13 /* FolloweeCellView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};</diff>
      <filename>TwitterFon.xcodeproj/project.pbxproj</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>8b0633ae58a28853308c0c51b726db33aed26a3b</id>
    </parent>
  </parents>
  <author>
    <name>kaz</name>
    <email>kaz@542e9493-1a22-0410-9183-c10453d2b9ee</email>
  </author>
  <url>http://github.com/jpick/gogotwitter/commit/cb4b68595fba3ffdad8196885e6311a59ce749b6</url>
  <id>cb4b68595fba3ffdad8196885e6311a59ce749b6</id>
  <committed-date>2009-01-04T00:34:05-08:00</committed-date>
  <authored-date>2009-01-04T00:34:05-08:00</authored-date>
  <message>Closed #267
 * Implemented favorites tab and friend's favorites view

git-svn-id: http://naan.net/svn/trunk/TwitterFon@1648 542e9493-1a22-0410-9183-c10453d2b9ee</message>
  <tree>1f203ccd4de8482c93f549e23cc43ea7205da8c4</tree>
  <committer>
    <name>kaz</name>
    <email>kaz@542e9493-1a22-0410-9183-c10453d2b9ee</email>
  </committer>
</commit>
