mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
finishing the friends list UI
This commit is contained in:
Roy Yang
parent
2191127dcf
commit
78b229701a
8 changed files with 2364 additions and 70 deletions
|
|
@ -45,7 +45,7 @@
|
|||
[super viewDidLoad];
|
||||
|
||||
self.navigationItem.title = @"Find Friends";
|
||||
UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithTitle: @"Close"
|
||||
UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithTitle: @"Done"
|
||||
style: UIBarButtonSystemItemCancel
|
||||
target: self
|
||||
action: @selector(doCancelButton)];
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@
|
|||
- (void)hideFindingStoryHUD;
|
||||
|
||||
|
||||
- (void)showAddSite;
|
||||
- (void)showAddSiteModal;
|
||||
- (void)showMoveSite;
|
||||
- (void)loadFeedDetailView;
|
||||
- (void)loadTryFeedDetailView:(NSString *)feedId withStory:(NSString *)contentId isSocial:(BOOL)social withUser:(NSDictionary *)user;
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@
|
|||
#pragma mark -
|
||||
#pragma mark FeedsView
|
||||
|
||||
- (void)showAddSite {
|
||||
- (void)showAddSiteModal {
|
||||
UINavigationController *navController = self.navigationController;
|
||||
[navController dismissModalViewControllerAnimated:NO];
|
||||
|
||||
|
|
|
|||
|
|
@ -84,5 +84,7 @@
|
|||
- (void)showSettingsPopover:(id)sender;
|
||||
- (NSDate *)pullToRefreshViewLastUpdated:(PullToRefreshView *)view;
|
||||
- (void)fadeSelectedCell;
|
||||
- (IBAction)tapAddSite:(id)sender;
|
||||
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -153,6 +153,7 @@
|
|||
[self.feedTitlesTable deselectRowAtIndexPath:[self.feedTitlesTable indexPathForSelectedRow]
|
||||
animated:YES];
|
||||
}
|
||||
|
||||
- (void)viewWillDisappear:(BOOL)animated {
|
||||
[self.popoverController dismissPopoverAnimated:YES];
|
||||
self.popoverController = nil;
|
||||
|
|
@ -415,6 +416,10 @@
|
|||
[appDelegate showUserProfileModal:self.navigationItem.leftBarButtonItem];
|
||||
}
|
||||
|
||||
- (IBAction)tapAddSite:(id)sender {
|
||||
[appDelegate showAddSiteModal];
|
||||
}
|
||||
|
||||
- (void)showSettingsPopover:(id)sender {
|
||||
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
|
||||
[appDelegate.masterContainerViewController showFeedMenuPopover:sender];
|
||||
|
|
@ -440,10 +445,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
- (IBAction)showAddSite:(id)sender {
|
||||
[appDelegate showAddSite];
|
||||
}
|
||||
|
||||
- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
|
||||
if (alertView.tag == 2) {
|
||||
if (buttonIndex == 0) {
|
||||
|
|
|
|||
|
|
@ -89,7 +89,6 @@
|
|||
<string key="NSFrame">{{75, 8}, {170, 30}}</string>
|
||||
<reference key="NSSuperview" ref="895374018"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView"/>
|
||||
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
|
||||
<int key="IBSegmentControlStyle">2</int>
|
||||
<int key="IBNumberOfSegments">3</int>
|
||||
|
|
@ -262,11 +261,11 @@
|
|||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchEventConnection" key="connection">
|
||||
<string key="label">showMenuButton:</string>
|
||||
<string key="label">tapAddSite:</string>
|
||||
<reference key="source" ref="550003902"/>
|
||||
<reference key="destination" ref="372490531"/>
|
||||
</object>
|
||||
<int key="connectionID">90</int>
|
||||
<int key="connectionID">94</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBMutableOrderedSet" key="objectRecords">
|
||||
|
|
@ -413,7 +412,7 @@
|
|||
<reference key="dict.values" ref="0"/>
|
||||
</object>
|
||||
<nil key="sourceID"/>
|
||||
<int key="maxID">93</int>
|
||||
<int key="maxID">94</int>
|
||||
</object>
|
||||
<object class="IBClassDescriber" key="IBDocument.Classes">
|
||||
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
|
||||
|
|
@ -849,30 +848,17 @@
|
|||
<object class="IBPartialClassDescription">
|
||||
<string key="className">FeedsMenuViewController</string>
|
||||
<string key="superclassName">UIViewController</string>
|
||||
<object class="NSMutableDictionary" key="actions">
|
||||
<string key="NS.key.0">tapCancelButton:</string>
|
||||
<string key="NS.object.0">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="actionInfosByName">
|
||||
<string key="NS.key.0">tapCancelButton:</string>
|
||||
<object class="IBActionInfo" key="NS.object.0">
|
||||
<string key="name">tapCancelButton:</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="outlets">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>appDelegate</string>
|
||||
<string>menuTableView</string>
|
||||
<string>toolbar</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UITableView</string>
|
||||
<string>UIToolbar</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||
|
|
@ -881,7 +867,6 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>appDelegate</string>
|
||||
<string>menuTableView</string>
|
||||
<string>toolbar</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -893,10 +878,6 @@
|
|||
<string key="name">menuTableView</string>
|
||||
<string key="candidateClassName">UITableView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbar</string>
|
||||
<string key="candidateClassName">UIToolbar</string>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
|
|
@ -1510,16 +1491,14 @@
|
|||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>appDelegate</string>
|
||||
<string>friendSearchBar</string>
|
||||
<string>friendsTable</string>
|
||||
<string>searchBar</string>
|
||||
<string>searchDisplayController</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UITableView</string>
|
||||
<string>UISearchBar</string>
|
||||
<string>UISearchDisplayController</string>
|
||||
<string>UITableView</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||
|
|
@ -1527,9 +1506,8 @@
|
|||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>appDelegate</string>
|
||||
<string>friendSearchBar</string>
|
||||
<string>friendsTable</string>
|
||||
<string>searchBar</string>
|
||||
<string>searchDisplayController</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -1538,16 +1516,12 @@
|
|||
<string key="candidateClassName">NewsBlurAppDelegate</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">friendsTable</string>
|
||||
<string key="candidateClassName">UITableView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">searchBar</string>
|
||||
<string key="name">friendSearchBar</string>
|
||||
<string key="candidateClassName">UISearchBar</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">searchDisplayController</string>
|
||||
<string key="candidateClassName">UISearchDisplayController</string>
|
||||
<string key="name">friendsTable</string>
|
||||
<string key="candidateClassName">UITableView</string>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
|
|
@ -1994,7 +1968,6 @@
|
|||
<string>feedDetailViewController</string>
|
||||
<string>feedsMenuViewController</string>
|
||||
<string>feedsViewController</string>
|
||||
<string>findFriendsNavigationController</string>
|
||||
<string>firstTimeUserAddFriendsViewController</string>
|
||||
<string>firstTimeUserAddNewsBlurViewController</string>
|
||||
<string>firstTimeUserAddSitesViewController</string>
|
||||
|
|
@ -2021,7 +1994,6 @@
|
|||
<string>FeedDetailViewController</string>
|
||||
<string>FeedsMenuViewController</string>
|
||||
<string>NewsBlurViewController</string>
|
||||
<string>UINavigationController</string>
|
||||
<string>FirstTimeUserAddFriendsViewController</string>
|
||||
<string>FirstTimeUserAddNewsBlurViewController</string>
|
||||
<string>FirstTimeUserAddSitesViewController</string>
|
||||
|
|
@ -2051,7 +2023,6 @@
|
|||
<string>feedDetailViewController</string>
|
||||
<string>feedsMenuViewController</string>
|
||||
<string>feedsViewController</string>
|
||||
<string>findFriendsNavigationController</string>
|
||||
<string>firstTimeUserAddFriendsViewController</string>
|
||||
<string>firstTimeUserAddNewsBlurViewController</string>
|
||||
<string>firstTimeUserAddSitesViewController</string>
|
||||
|
|
@ -2096,10 +2067,6 @@
|
|||
<string key="name">feedsViewController</string>
|
||||
<string key="candidateClassName">NewsBlurViewController</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">findFriendsNavigationController</string>
|
||||
<string key="candidateClassName">UINavigationController</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">firstTimeUserAddFriendsViewController</string>
|
||||
<string key="candidateClassName">FirstTimeUserAddFriendsViewController</string>
|
||||
|
|
@ -2186,7 +2153,7 @@
|
|||
<string>sectionUntapped:</string>
|
||||
<string>sectionUntappedOutside:</string>
|
||||
<string>selectIntelligence</string>
|
||||
<string>showMenuButton:</string>
|
||||
<string>tapAddSite:</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -2205,7 +2172,7 @@
|
|||
<string>sectionUntapped:</string>
|
||||
<string>sectionUntappedOutside:</string>
|
||||
<string>selectIntelligence</string>
|
||||
<string>showMenuButton:</string>
|
||||
<string>tapAddSite:</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -2226,7 +2193,7 @@
|
|||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">showMenuButton:</string>
|
||||
<string key="name">tapAddSite:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
</object>
|
||||
|
|
@ -2562,6 +2529,7 @@
|
|||
<string>doNextStory</string>
|
||||
<string>doNextUnreadStory</string>
|
||||
<string>doPreviousStory</string>
|
||||
<string>showOriginalSubview:</string>
|
||||
<string>tapProgressBar:</string>
|
||||
<string>toggleFontSize:</string>
|
||||
</object>
|
||||
|
|
@ -2572,6 +2540,7 @@
|
|||
<string>id</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="actionInfosByName">
|
||||
|
|
@ -2581,6 +2550,7 @@
|
|||
<string>doNextStory</string>
|
||||
<string>doNextUnreadStory</string>
|
||||
<string>doPreviousStory</string>
|
||||
<string>showOriginalSubview:</string>
|
||||
<string>tapProgressBar:</string>
|
||||
<string>toggleFontSize:</string>
|
||||
</object>
|
||||
|
|
@ -2598,6 +2568,10 @@
|
|||
<string key="name">doPreviousStory</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">showOriginalSubview:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapProgressBar:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
<reference key="NSNextResponder"/>
|
||||
<int key="NSvFlags">274</int>
|
||||
<array class="NSMutableArray" key="NSSubviews">
|
||||
<object class="IBUITableView" id="514445297">
|
||||
<object class="IBUITableView" id="416916434">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">274</int>
|
||||
<string key="NSFrame">{{0, 44}, {320, 416}}</string>
|
||||
|
|
@ -58,16 +58,18 @@
|
|||
<float key="IBUISectionHeaderHeight">22</float>
|
||||
<float key="IBUISectionFooterHeight">22</float>
|
||||
</object>
|
||||
<object class="IBUISearchBar" id="752588573">
|
||||
<object class="IBUISearchBar" id="938796111">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">290</int>
|
||||
<string key="NSFrameSize">{320, 44}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="514445297"/>
|
||||
<reference key="NSNextKeyView" ref="416916434"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||
<int key="IBUIContentMode">3</int>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<string key="IBText"/>
|
||||
<string key="IBPlaceholder">Search by email or username</string>
|
||||
<object class="IBUITextInputTraits" key="IBTextInputTraits">
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
</object>
|
||||
|
|
@ -76,7 +78,7 @@
|
|||
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
|
||||
<reference key="NSSuperview"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="752588573"/>
|
||||
<reference key="NSNextKeyView" ref="938796111"/>
|
||||
<object class="NSColor" key="IBUIBackgroundColor">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MQA</bytes>
|
||||
|
|
@ -102,7 +104,7 @@
|
|||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">friendsTable</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="514445297"/>
|
||||
<reference key="destination" ref="416916434"/>
|
||||
</object>
|
||||
<int key="connectionID">6</int>
|
||||
</object>
|
||||
|
|
@ -110,14 +112,14 @@
|
|||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">friendSearchBar</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="752588573"/>
|
||||
<reference key="destination" ref="938796111"/>
|
||||
</object>
|
||||
<int key="connectionID">7</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">delegate</string>
|
||||
<reference key="source" ref="752588573"/>
|
||||
<reference key="source" ref="938796111"/>
|
||||
<reference key="destination" ref="372490531"/>
|
||||
</object>
|
||||
<int key="connectionID">10</int>
|
||||
|
|
@ -125,7 +127,7 @@
|
|||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">dataSource</string>
|
||||
<reference key="source" ref="514445297"/>
|
||||
<reference key="source" ref="416916434"/>
|
||||
<reference key="destination" ref="372490531"/>
|
||||
</object>
|
||||
<int key="connectionID">8</int>
|
||||
|
|
@ -133,7 +135,7 @@
|
|||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">delegate</string>
|
||||
<reference key="source" ref="514445297"/>
|
||||
<reference key="source" ref="416916434"/>
|
||||
<reference key="destination" ref="372490531"/>
|
||||
</object>
|
||||
<int key="connectionID">9</int>
|
||||
|
|
@ -151,8 +153,8 @@
|
|||
<int key="objectID">1</int>
|
||||
<reference key="object" ref="191373211"/>
|
||||
<array class="NSMutableArray" key="children">
|
||||
<reference ref="752588573"/>
|
||||
<reference ref="514445297"/>
|
||||
<reference ref="938796111"/>
|
||||
<reference ref="416916434"/>
|
||||
</array>
|
||||
<reference key="parent" ref="0"/>
|
||||
</object>
|
||||
|
|
@ -169,12 +171,12 @@
|
|||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">3</int>
|
||||
<reference key="object" ref="752588573"/>
|
||||
<reference key="object" ref="938796111"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">4</int>
|
||||
<reference key="object" ref="514445297"/>
|
||||
<reference key="object" ref="416916434"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
</array>
|
||||
|
|
@ -1283,6 +1285,7 @@
|
|||
<string key="sectionUntapped:">UIButton</string>
|
||||
<string key="sectionUntappedOutside:">UIButton</string>
|
||||
<string key="selectIntelligence">id</string>
|
||||
<string key="tapAddSite:">id</string>
|
||||
</dictionary>
|
||||
<dictionary class="NSMutableDictionary" key="actionInfosByName">
|
||||
<object class="IBActionInfo" key="sectionTapped:">
|
||||
|
|
@ -1301,6 +1304,10 @@
|
|||
<string key="name">selectIntelligence</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo" key="tapAddSite:">
|
||||
<string key="name">tapAddSite:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
</dictionary>
|
||||
<dictionary class="NSMutableDictionary" key="outlets">
|
||||
<string key="appDelegate">NewsBlurAppDelegate</string>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue