Classes/Controllers/ChatBubbleCell.h Classes/Controllers/ChatBubbleCell.m Classes/Controllers/ChatBubbleView.h Classes/Controllers/ChatBubbleView.m Classes/Controllers/DMConversationController.h Classes/Controllers/DMConversationController.m Classes/Controllers/DMTimelineController.h Classes/Controllers/DMTimelineController.m Classes/Controllers/DMTimelineDataSource.h Classes/Controllers/DMTimelineDataSource.m Classes/Controllers/DirectMessageCell.h Classes/Controllers/DirectMessageCell.m Classes/Controllers/DirectMessageCellView.h Classes/Controllers/DirectMessageCellView.m Classes/Models/DirectMessage.h Classes/Models/DirectMessage.m Interfaces/DirectMessage.xib update_v12_to_v13.sql @@ -10,11 +10,11 @@ static sqlite3* theDatabase = nil; const char *delete_tweets = "BEGIN;" //"DELETE FROM statuses;" -//"DELETE FROM messages;" +//"DELETE FROM direct_messages;" //"DELETE FROM images;" //"DELETE FROM statuses WHERE type = 0 and id > (SELECT id FROM statuses WHERE type = 0 ORDER BY id DESC LIMIT 1 OFFSET 1);" //"DELETE FROM statuses WHERE type = 1 and id > (SELECT id FROM statuses WHERE type = 1 ORDER BY id DESC LIMIT 1 OFFSET 1);" -//"DELETE FROM messages WHERE id > (SELECT id FROM messages ORDER BY id DESC LIMIT 1 OFFSET 1);" +"DELETE FROM direct_messages WHERE id > (SELECT id FROM direct_messages ORDER BY id DESC LIMIT 1 OFFSET 10);" "COMMIT"; #endif @@ -59,7 +59,7 @@ const char *delete_tweets = const char *delete_message_cache_sql = "BEGIN;" "DELETE FROM statuses;" -"DELETE FROM messages;" +"DELETE FROM direct_messages;" "DELETE FROM users;" "DELETE FROM followees;" "COMMIT;" @@ -100,11 +100,11 @@ const char *cleanup_sql = const char *optimize_sql = "REINDEX statuses;" -"REINDEX messages;" +"REINDEX direct_messages;" "REINDEX images;" "REINDEX users;" "ANALYZE statuses;" -"ANALYZE messages;" +"ANALYZE direct_messages;" "ANALYZE images;" "ANALYZE users;" "VACUUM;"; @@ -143,15 +143,20 @@ const char *optimize_sql = NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); NSString *documentsDirectory = [paths objectAtIndex:0]; NSString *writableDBPath = [documentsDirectory stringByAppendingPathComponent:MAIN_DATABASE_NAME]; - -#if 0 - // Update database + + // + // migration + // + // Update from version 1.2.* + // NSString *oldDBPath = [documentsDirectory stringByAppendingPathComponent:@"db1.2.sql"]; success = [fileManager fileExistsAtPath:oldDBPath]; if (success) { sqlite3 *db12 = [DBConnection openDatabase:@"db1.2.sql"]; char *errmsg; - if (sqlite3_exec(db12, update_v12_to_v13, NULL, NULL, &errmsg) == SQLITE_OK) { + NSString *migrateSQL = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"update_v12_to_v13.sql"]; + NSData *sqldata = [fileManager contentsAtPath:migrateSQL]; + if (sqlite3_exec(db12, [sqldata bytes], NULL, NULL, &errmsg) == SQLITE_OK) { // succeeded to update. [fileManager moveItemAtPath:oldDBPath toPath:writableDBPath error:&error]; NSLog(@"Updated database from version 1.2 to 1.3."); @@ -160,8 +165,9 @@ const char *optimize_sql = NSLog(@"Failed to update database (Reason: %s). Discard version 1.2 data...", errmsg); [fileManager removeItemAtPath:oldDBPath error:&error]; } -#endif + // No exists any database file. Create new one. + // success = [fileManager fileExistsAtPath:writableDBPath]; if (success) return; // The writable database does not exist, so copy the default to the appropriate location. Classes/Models/DBConnection.m @@ -16,7 +16,7 @@ typedef enum { TWEET_CELL_TYPE_DETAIL, } TweetCellType; -@interface Tweet : NSObject +@interface Tweet : ImageStoreReceiver { NSString* text; Classes/Models/Tweet.h @@ -14,4 +14,5 @@ + (UIColor*)navigationColorForTab:(int)tab; + (UIColor*)cellColorForTab:(int)tab; + (UIColor*)cellLabelColor; ++ (UIColor*)conversationBackground; @end \ No newline at end of file Classes/OtherSources/ColorUtils.h @@ -15,11 +15,11 @@ static UIColor *gUnreadCellColors[5]; + (void) initTwitterFonColorScheme { - gUnreadCellColors[0] = [[UIColor colorWithRed:0.827 green:1.000 blue:1.000 alpha:1.0] retain]; - gUnreadCellColors[1] = [[UIColor colorWithRed:0.827 green:1.000 blue:0.820 alpha:1.0] retain]; - gUnreadCellColors[2] = [[UIColor colorWithRed:0.988 green:0.812 blue:0.820 alpha:1.0] retain]; - gUnreadCellColors[3] = [[UIColor colorWithRed:0.988 green:0.812 blue:0.820 alpha:1.0] retain]; - gUnreadCellColors[4] = [[UIColor colorWithRed:0.996 green:0.929 blue:0.820 alpha:1.0] retain]; + gUnreadCellColors[0] = [[UIColor colorWithRed:0.827 green:1.000 blue:1.000 alpha:1.0] retain]; // friends + gUnreadCellColors[1] = [[UIColor colorWithRed:0.827 green:1.000 blue:0.820 alpha:1.0] retain]; // replies + gUnreadCellColors[2] = [[UIColor colorWithRed:0.992 green:0.878 blue:0.820 alpha:1.0] retain]; // DM + gUnreadCellColors[3] = [[UIColor colorWithRed:0.988 green:0.812 blue:0.820 alpha:1.0] retain]; // favorites + gUnreadCellColors[4] = [[UIColor colorWithRed:0.996 green:0.929 blue:0.820 alpha:1.0] retain]; // search // Navigation Bar Color gNavigationBarColors[0] = [[UIColor colorWithRed:0.341 green:0.643 blue:0.859 alpha:1.0] retain]; @@ -44,4 +44,8 @@ static UIColor *gUnreadCellColors[5]; return [UIColor colorWithRed:0.195 green:0.309 blue:0.520 alpha:1.0]; } ++ (UIColor*)conversationBackground +{ + return [UIColor colorWithRed:0.827 green:0.851 blue:0.910 alpha:1.0]; +} @end Classes/OtherSources/ColorUtils.m Images/Balloon_2.png @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="106"/> + <integer value="196"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -26,30 +26,43 @@ <object class="IBUITabBarController" id="1034742383"> <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/> <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> - <object class="IBUINavigationController" key="IBUISelectedViewController" id="785888307"> - <object class="IBUITabBarItem" key="IBUITabBarItem" id="1016338279"> - <int key="IBUISystemItemIdentifier">8</int> + <object class="IBUINavigationController" key="IBUISelectedViewController" id="742009202"> + <string key="IBUITitle">Messages</string> + <object class="IBUITabBarItem" key="IBUITabBarItem" id="857933852"> + <int key="IBUITag">2</int> + <string key="IBUITitle">Messages</string> + <object class="NSCustomResource" key="IBUIImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">messages.png</string> + </object> <reference key="IBUITabBar"/> </object> <reference key="IBUIParentViewController" ref="1034742383"/> - <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> - <object class="IBUINavigationBar" key="IBUINavigationBar" id="801319795"> + <object class="IBUINavigationBar" key="IBUINavigationBar" id="284537482"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> - <string key="NSFrameSize">{0, 0}</string> + <string key="NSFrameSize">{320, 44}</string> <bool key="IBUIOpaque">NO</bool> <bool key="IBUIClipsSubviews">YES</bool> <bool key="IBUIMultipleTouchEnabled">YES</bool> </object> <object class="NSMutableArray" key="IBUIViewControllers"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBUIViewController" id="871911376"> - <object class="IBUINavigationItem" key="IBUINavigationItem" id="668766300"> + <object class="IBUIViewController" id="422638560"> + <object class="IBUINavigationItem" key="IBUINavigationItem" id="726267129"> <reference key="IBUINavigationBar"/> - <string key="IBUITitle">Search</string> + <string key="IBUITitle">Messages</string> + <object class="IBUIBarButtonItem" key="IBUILeftBarButtonItem" id="554924916"> + <int key="IBUIStyle">1</int> + <int key="IBUISystemItemIdentifier">13</int> + </object> + <object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="337418855"> + <int key="IBUIStyle">1</int> + <int key="IBUISystemItemIdentifier">7</int> + </object> </object> - <reference key="IBUIParentViewController" ref="785888307"/> - <string key="IBUINibName">SearchView</string> + <reference key="IBUIParentViewController" ref="742009202"/> + <string key="IBUINibName">DirectMessage</string> </object> </object> </object> @@ -133,81 +146,33 @@ </object> </object> </object> - <object class="IBUINavigationController" id="742009202"> - <string key="IBUITitle">Messages</string> - <object class="IBUITabBarItem" key="IBUITabBarItem" id="857933852"> - <int key="IBUITag">2</int> - <string key="IBUITitle">Messages</string> - <object class="NSCustomResource" key="IBUIImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">messages.png</string> - </object> + <reference ref="742009202"/> + <object class="IBUINavigationController" id="785888307"> + <object class="IBUITabBarItem" key="IBUITabBarItem" id="1016338279"> + <int key="IBUISystemItemIdentifier">8</int> <reference key="IBUITabBar"/> </object> <reference key="IBUIParentViewController" ref="1034742383"/> - <object class="IBUINavigationBar" key="IBUINavigationBar" id="284537482"> + <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> + <object class="IBUINavigationBar" key="IBUINavigationBar" id="801319795"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> - <string key="NSFrameSize">{320, 44}</string> + <string key="NSFrameSize">{0, 0}</string> <bool key="IBUIOpaque">NO</bool> <bool key="IBUIClipsSubviews">YES</bool> <bool key="IBUIMultipleTouchEnabled">YES</bool> </object> <object class="NSMutableArray" key="IBUIViewControllers"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBUIViewController" id="422638560"> - <object class="IBUINavigationItem" key="IBUINavigationItem" id="726267129"> - <string key="IBUITitle">Messages</string> - <object class="IBUIBarButtonItem" key="IBUILeftBarButtonItem" id="554924916"> - <int key="IBUIStyle">1</int> - <int key="IBUISystemItemIdentifier">13</int> - </object> - <object class="IBUISegmentedControl" key="IBUITitleView" id="899874125"> - <nil key="NSNextResponder"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{96, 7}, {128, 30}}</string> - <bool key="IBUIOpaque">NO</bool> - <bool key="IBUIClearsContextBeforeDrawing">NO</bool> - <int key="IBSegmentControlStyle">2</int> - <int key="IBNumberOfSegments">2</int> - <int key="IBSelectedSegmentIndex">0</int> - <object class="NSArray" key="IBSegmentTitles"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>Inbox</string> - <string>Sent</string> - </object> - <object class="NSMutableArray" key="IBSegmentWidths"> - <bool key="EncodedWithXMLCoder">YES</bool> - <real value="0.000000e+00"/> - <real value="0.000000e+00"/> - </object> - <object class="NSMutableArray" key="IBSegmentEnabledStates"> - <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1" id="5"/> - <reference ref="5"/> - </object> - <object class="NSMutableArray" key="IBSegmentContentOffsets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>{0, 0}</string> - <string>{0, 0}</string> - </object> - <object class="NSMutableArray" key="IBSegmentImages"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSNull" id="4"/> - <reference ref="4"/> - </object> - </object> - <object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="337418855"> - <int key="IBUIStyle">1</int> - <int key="IBUISystemItemIdentifier">7</int> - </object> + <object class="IBUIViewController" id="871911376"> + <object class="IBUINavigationItem" key="IBUINavigationItem" id="668766300"> + <string key="IBUITitle">Search</string> </object> - <reference key="IBUIParentViewController" ref="742009202"/> - <string key="IBUINibName">TimelineView</string> + <reference key="IBUIParentViewController" ref="785888307"/> + <string key="IBUINibName">SearchView</string> </object> </object> </object> - <reference ref="785888307"/> </object> <object class="IBUITabBar" key="IBUITabBar" id="795333663"> <nil key="NSNextResponder"/> @@ -326,15 +291,6 @@ </object> <int key="connectionID">372</int> </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchEventConnection" key="connection"> - <string key="label">segmentDidChange:</string> - <reference key="source" ref="899874125"/> - <reference key="destination" ref="422638560"/> - <int key="IBEventType">13</int> - </object> - <int key="connectionID">412</int> - </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -465,7 +421,6 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="554924916"/> <reference ref="337418855"/> - <reference ref="899874125"/> </object> <reference key="parent" ref="422638560"/> </object> @@ -581,11 +536,6 @@ <reference key="object" ref="1016338279"/> <reference key="parent" ref="785888307"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">406</int> - <reference key="object" ref="899874125"/> - <reference key="parent" ref="726267129"/> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -614,21 +564,20 @@ <string>358.IBPluginDependency</string> <string>359.IBPluginDependency</string> <string>360.IBPluginDependency</string> - <string>406.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>UIApplication</string> <string>UIResponder</string> <string>TabBarController</string> - <string>{{292, 340}, {320, 480}}</string> + <string>{{318, 468}, {320, 480}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>FriendsTimelineController</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>FriendsTimelineController</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>FriendsTimelineController</string> + <string>DMTimelineController</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -648,7 +597,6 @@ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -677,6 +625,18 @@ <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> + <string key="className">DMTimelineController</string> + <string key="superclassName">UITableViewController</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">reload:</string> + <string key="NS.object.0">id</string> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Classes/Controllers/DMTimelineController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">FriendsTimelineController</string> <string key="superclassName">UITableViewController</string> <object class="NSMutableDictionary" key="actions"> @@ -701,7 +661,7 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Classes/JSON/NSObject+SBJSON.h</string> + <string key="minorKey">Classes/OtherSources/JSON/NSObject+SBJSON.h</string> </object> </object> <object class="IBPartialClassDescription"> Interfaces/MainWindow.xib @@ -2,13 +2,12 @@ <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.02"> <data> <int key="IBDocument.SystemTarget">512</int> - <string key="IBDocument.SystemVersion">9F33</string> + <string key="IBDocument.SystemVersion">9G55</string> <string key="IBDocument.InterfaceBuilderVersion">672</string> - <string key="IBDocument.AppKitVersion">949.34</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="122"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -23,10 +22,9 @@ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string> </object> <object class="IBUITableView" id="596785787"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">310</int> <string key="NSFrameSize">{320, 460}</string> - <reference key="NSSuperview"/> <object class="NSColor" key="IBUIBackgroundColor"> <int key="NSColorSpace">1</int> <bytes key="NSRGB">MSAxIDEAA</bytes> @@ -52,7 +50,7 @@ <reference key="source" ref="372490531"/> <reference key="destination" ref="596785787"/> </object> - <int key="connectionID">511</int> + <int key="connectionID">512</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -95,7 +93,7 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>TimelineViewController</string> + <string>FriendsTimelineController</string> <string>UIResponder</string> <string>{{999, 104}, {320, 460}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> @@ -121,28 +119,37 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">511</int> + <int key="maxID">512</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> + <string key="className">FriendsTimelineController</string> + <string key="superclassName">UITableViewController</string> + <object class="NSMutableDictionary" key="actions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>reload:</string> + <string>segmentDidChange:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Classes/JSON/NSObject+SBJSON.h</string> + <string key="minorKey">Classes/Controllers/FriendsTimelineController.h</string> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">TimelineViewController</string> - <string key="superclassName">UITableViewController</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">reload:</string> - <string key="NS.object.0">id</string> - </object> + <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Classes/Controllers/TimelineViewController.h</string> + <string key="minorKey">Classes/OtherSources/JSON/NSObject+SBJSON.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -160,7 +167,7 @@ </object> </object> <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.LastKnownRelativeProjectPath">TwitterFon.xcodeproj</string> + <string key="IBDocument.LastKnownRelativeProjectPath">../TwitterFon.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> </data> </archive> Interfaces/TimelineView.xib @@ -76,6 +76,16 @@ 6E943A900E64C4FF00E8ECF2 /* TimeUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E943A8F0E64C4FF00E8ECF2 /* TimeUtils.m */; }; 6E943F1B0E6527C600E8ECF2 /* usercell_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E943F1A0E6527C600E8ECF2 /* usercell_background.png */; }; 6E97A5E60EF8A91100168291 /* DirectMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E97A5E50EF8A91100168291 /* DirectMessage.m */; }; + 6E97A75E0EF8C78000168291 /* DMTimelineController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E97A75C0EF8C78000168291 /* DMTimelineController.m */; }; + 6E97A8820EF8F7DA00168291 /* DirectMessage.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E97A8810EF8F7DA00168291 /* DirectMessage.xib */; }; + 6E97AA8F0EF9142900168291 /* DMConversationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E97AA8E0EF9142900168291 /* DMConversationController.m */; }; + 6E97ABBB0EF91EC100168291 /* ChatBubbleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E97ABBA0EF91EC100168291 /* ChatBubbleCell.m */; }; + 6E97ABBE0EF91F6C00168291 /* Balloon_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E97ABBC0EF91F6C00168291 /* Balloon_2.png */; }; + 6E97ABBF0EF91F6C00168291 /* Balloon_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E97ABBD0EF91F6C00168291 /* Balloon_1.png */; }; + 6E97ABE40EF920FE00168291 /* ChatBubbleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E97ABE30EF920FE00168291 /* ChatBubbleView.m */; }; + 6E97AD160EF93AB800168291 /* update_v12_to_v13.sql in Resources */ = {isa = PBXBuildFile; fileRef = 6E97AD150EF93AB800168291 /* update_v12_to_v13.sql */; }; + 6E97AD680EF94B5000168291 /* DirectMessageCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E97AD670EF94B5000168291 /* DirectMessageCellView.m */; }; + 6E97AD750EF94CE800168291 /* DirectMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E97AD740EF94CE800168291 /* DirectMessageCell.m */; }; 6EA0C19C0EBB1305000C0CD4 /* friends_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 6EA0C19B0EBB1305000C0CD4 /* friends_small.png */; }; 6EADBC090EBD8F8E00093782 /* PostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EADBC080EBD8F8E00093782 /* PostViewController.m */; }; 6EADC0A20EBDC48D00093782 /* FolloweeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EADC09F0EBDC48D00093782 /* FolloweeCell.m */; }; @@ -221,6 +231,22 @@ 6E943F1A0E6527C600E8ECF2 /* usercell_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = usercell_background.png; sourceTree = "<group>"; }; 6E97A5E40EF8A91100168291 /* DirectMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectMessage.h; sourceTree = "<group>"; }; 6E97A5E50EF8A91100168291 /* DirectMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DirectMessage.m; sourceTree = "<group>"; }; + 6E97A75B0EF8C78000168291 /* DMTimelineController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DMTimelineController.h; path = Controllers/DMTimelineController.h; sourceTree = "<group>"; }; + 6E97A75C0EF8C78000168291 /* DMTimelineController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DMTimelineController.m; path = Controllers/DMTimelineController.m; sourceTree = "<group>"; }; + 6E97A8810EF8F7DA00168291 /* DirectMessage.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectMessage.xib; path = Interfaces/DirectMessage.xib; sourceTree = "<group>"; }; + 6E97AA8D0EF9142900168291 /* DMConversationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DMConversationController.h; path = Controllers/DMConversationController.h; sourceTree = "<group>"; }; + 6E97AA8E0EF9142900168291 /* DMConversationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DMConversationController.m; path = Controllers/DMConversationController.m; sourceTree = "<group>"; }; + 6E97ABB90EF91EC100168291 /* ChatBubbleCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChatBubbleCell.h; path = Controllers/ChatBubbleCell.h; sourceTree = "<group>"; }; + 6E97ABBA0EF91EC100168291 /* ChatBubbleCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ChatBubbleCell.m; path = Controllers/ChatBubbleCell.m; sourceTree = "<group>"; }; + 6E97ABBC0EF91F6C00168291 /* Balloon_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Balloon_2.png; sourceTree = "<group>"; }; + 6E97ABBD0EF91F6C00168291 /* Balloon_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Balloon_1.png; sourceTree = "<group>"; }; + 6E97ABE20EF920FE00168291 /* ChatBubbleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChatBubbleView.h; path = Controllers/ChatBubbleView.h; sourceTree = "<group>"; }; + 6E97ABE30EF920FE00168291 /* ChatBubbleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ChatBubbleView.m; path = Controllers/ChatBubbleView.m; sourceTree = "<group>"; }; + 6E97AD150EF93AB800168291 /* update_v12_to_v13.sql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = update_v12_to_v13.sql; sourceTree = "<group>"; }; + 6E97AD660EF94B5000168291 /* DirectMessageCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectMessageCellView.h; path = Controllers/DirectMessageCellView.h; sourceTree = "<group>"; }; + 6E97AD670EF94B5000168291 /* DirectMessageCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectMessageCellView.m; path = Controllers/DirectMessageCellView.m; sourceTree = "<group>"; }; + 6E97AD730EF94CE800168291 /* DirectMessageCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectMessageCell.h; path = Controllers/DirectMessageCell.h; sourceTree = "<group>"; }; + 6E97AD740EF94CE800168291 /* DirectMessageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectMessageCell.m; path = Controllers/DirectMessageCell.m; sourceTree = "<group>"; }; 6EA0C19B0EBB1305000C0CD4 /* friends_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = friends_small.png; sourceTree = "<group>"; }; 6EADBC070EBD8F8E00093782 /* PostViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PostViewController.h; path = Controllers/PostViewController.h; sourceTree = "<group>"; }; 6EADBC080EBD8F8E00093782 /* PostViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PostViewController.m; path = Controllers/PostViewController.m; sourceTree = "<group>"; }; @@ -383,6 +409,7 @@ 6EED14400E33E5BF00C71EA4 /* Images */, 8D1107310486CEB800E47090 /* Info.plist */, 6E1FAE8C0EDAC4D7009407F6 /* db1.3.sql */, + 6E97AD150EF93AB800168291 /* update_v12_to_v13.sql */, 6E382E930EB41E9000B0CE69 /* Settings.bundle */, ); name = Resources; @@ -485,6 +512,12 @@ 6E1BE7BF0EF7C0370075881E /* DirectMessage */ = { isa = PBXGroup; children = ( + 6E97AD730EF94CE800168291 /* DirectMessageCell.h */, + 6E97AD740EF94CE800168291 /* DirectMessageCell.m */, + 6E97AD660EF94B5000168291 /* DirectMessageCellView.h */, + 6E97AD670EF94B5000168291 /* DirectMessageCellView.m */, + 6E97A75B0EF8C78000168291 /* DMTimelineController.h */, + 6E97A75C0EF8C78000168291 /* DMTimelineController.m */, ); name = DirectMessage; sourceTree = "<group>"; @@ -591,6 +624,28 @@ name = Settings; sourceTree = "<group>"; }; + 6E97ABC00EF91F7100168291 /* Conversation */ = { + isa = PBXGroup; + children = ( + 6E97ABBD0EF91F6C00168291 /* Balloon_1.png */, + 6E97ABBC0EF91F6C00168291 /* Balloon_2.png */, + ); + name = Conversation; + sourceTree = "<group>"; + }; + 6E97AE610EF951FC00168291 /* Conversation */ = { + isa = PBXGroup; + children = ( + 6E97AA8D0EF9142900168291 /* DMConversationController.h */, + 6E97AA8E0EF9142900168291 /* DMConversationController.m */, + 6E97ABB90EF91EC100168291 /* ChatBubbleCell.h */, + 6E97ABBA0EF91EC100168291 /* ChatBubbleCell.m */, + 6E97ABE20EF920FE00168291 /* ChatBubbleView.h */, + 6E97ABE30EF920FE00168291 /* ChatBubbleView.m */, + ); + name = Conversation; + sourceTree = "<group>"; + }; 6EAE759B0EF3870700BF6CD4 /* Links */ = { isa = PBXGroup; children = ( @@ -691,6 +746,7 @@ 6E6DC5990EC077FD00F9EB74 /* TimelineView.xib */, 6E6DC59B0EC077FD00F9EB74 /* WebView.xib */, 6E6DC59C0EC077FD00F9EB74 /* FolloweesView.xib */, + 6E97A8810EF8F7DA00168291 /* DirectMessage.xib */, ); name = interfaces; sourceTree = "<group>"; @@ -714,6 +770,7 @@ 6EAE81540EF5B54100BF6CD4 /* FriendsTimeline */, 6E74D0E20EF7B440003BB7B1 /* Tweets */, 6E1BE7BF0EF7C0370075881E /* DirectMessage */, + 6E97AE610EF951FC00168291 /* Conversation */, 6E6846AC0EE2D7D6009847F3 /* UserTimeline */, 6E1FAB400EDA6A39009407F6 /* Profile */, 6EBEE5790EB2F58E00C18F0A /* Search */, @@ -765,6 +822,7 @@ 6E08A3660EDFC226000D25FE /* Search */, 6E08A3630EDFC1AD000D25FE /* Post */, 6E08A3540EDFC169000D25FE /* WebView */, + 6E97ABC00EF91F7100168291 /* Conversation */, 6E08A3530EDFC147000D25FE /* CustomSearchBar */, 6EED14410E33E5BF00C71EA4 /* Icon.png */, 6E2BD11E0E35B3D2003A8F69 /* Default.png */, @@ -859,6 +917,10 @@ 6E08ABE40EE0999C000D25FE /* SearchBarLeftPressed.png in Resources */, 6E0378320EF352A20045CD12 /* deleteButton_pressed.png in Resources */, 6E0378330EF352A20045CD12 /* deleteButton.png in Resources */, + 6E97A8820EF8F7DA00168291 /* DirectMessage.xib in Resources */, + 6E97ABBE0EF91F6C00168291 /* Balloon_2.png in Resources */, + 6E97ABBF0EF91F6C00168291 /* Balloon_1.png in Resources */, + 6E97AD160EF93AB800168291 /* update_v12_to_v13.sql in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -931,6 +993,12 @@ 6E3B13AB0EF835FC00070525 /* Tweet.m in Sources */, 6E3B13B80EF8383300070525 /* Status.m in Sources */, 6E97A5E60EF8A91100168291 /* DirectMessage.m in Sources */, + 6E97A75E0EF8C78000168291 /* DMTimelineController.m in Sources */, + 6E97AA8F0EF9142900168291 /* DMConversationController.m in Sources */, + 6E97ABBB0EF91EC100168291 /* ChatBubbleCell.m in Sources */, + 6E97ABE40EF920FE00168291 /* ChatBubbleView.m in Sources */, + 6E97AD680EF94B5000168291 /* DirectMessageCellView.m in Sources */, + 6E97AD750EF94CE800168291 /* DirectMessageCell.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; TwitterFon.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ CREATE TABLE statuses ( 'in_reply_to_screen_name' TEXT, PRIMARY KEY(type, id) ); +CREATE INDEX statuses_in_reply_to_status_id on statuses(in_reply_to_status_id); CREATE TABLE direct_messages ( 'id' INTEGER, @@ -23,15 +24,8 @@ CREATE TABLE direct_messages ( 'recipient_screen_name' TEXT, PRIMARY KEY(id) ); - -CREATE TABLE senders ( - 'id' INTEGER, - 'screen_name' TEXT, - 'text' TEXT, - 'unread' INTEGER, - 'updated_at' INTEGER, -PRIMARY KEY(id) -); +CREATE INDEX direct_messages_sender_id on direct_messages(sender_id); +CREATE INDEX direct_messages_recipient_id on direct_messages(recipient_id); CREATE TABLE users ( 'user_id' INTEGER PRIMARY KEY, create.sql db1.3.sql bc86d4c62cfbd079b2a436ee18e6be59de0567ad kaz kaz@542e9493-1a22-0410-9183-c10453d2b9ee http://github.com/jpick/twitterfon/commit/f35719d59deb63f147d14159ab11c9d14d0ec703 f35719d59deb63f147d14159ab11c9d14d0ec703 2008-12-17T12:39:47-08:00 2008-12-17T12:39:47-08:00 Refs #264 * Re-design direct message UI git-svn-id: http://naan.net/svn/trunk/TwitterFon@1533 542e9493-1a22-0410-9183-c10453d2b9ee 55a4458bf3fde0e15269b7113c6f95ff6419c693 kaz kaz@542e9493-1a22-0410-9183-c10453d2b9ee