public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding in posting and keyboard logic

Browse source
This commit is contained in:
Roy Yang 2012-06-27 15:18:51 -07:00
parent b99e667bfe
commit 28c6ca9f92
5 changed files with 77 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/iphone/Classes/NewsBlurAppDelegate.h
View file

@ -13,7 +13,7 @@
#define STORY_DETAIL_VIEW_TAG 1000002
#define FEED_TITLE_GRADIENT_TAG 100003
#define FEED_DASHBOARD_VIEW_TAG 100004
#define SHARE_MODAL_HEIGHT 225
#define SHARE_MODAL_HEIGHT 140
@class NewsBlurViewController;
@class FeedDetailViewController;

3
media/iphone/Classes/NewsBlurAppDelegate.m
View file

@ -534,8 +534,7 @@
}
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
splitStoryDetailViewController.navigationItem.title = [NSString stringWithFormat:@"%@",
[activeStory objectForKey:@"story_title"]];
splitStoryDetailViewController.navigationItem.title = [NSString stringWithFormat:@""];
// With some valid UIView *view:
NSArray *subviews = [[splitStoryDetailViewController.view subviews] copy];
for (UIView *subview in subviews) {

2
media/iphone/Classes/ShareViewController.h
View file

@ -14,8 +14,6 @@
}
@property (retain, nonatomic) IBOutlet UIImageView *siteFavicon;
@property (retain, nonatomic) IBOutlet UILabel *siteInformation;
@property (retain, nonatomic) IBOutlet UITextView *commentField;
@property (nonatomic, retain) IBOutlet NewsBlurAppDelegate *appDelegate;
@property (retain, nonatomic) IBOutlet UIButton *facebookButton;

46
media/iphone/Classes/ShareViewController.m
View file

@ -20,8 +20,6 @@
@synthesize submitButton;
@synthesize toolbarTitle;
@synthesize siteFavicon;
@synthesize siteInformation;
@synthesize commentField;
@synthesize appDelegate;
@ -54,8 +52,6 @@
- (void)viewDidUnload
{
[self setCommentField:nil];
[self setSiteInformation:nil];
[self setSiteFavicon:nil];
[self setFacebookButton:nil];
[self setTwitterButton:nil];
[self setSubmitButton:nil];
@ -78,8 +74,6 @@
- (void)dealloc {
[appDelegate release];
[commentField release];
[siteInformation release];
[siteFavicon release];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[facebookButton release];
[twitterButton release];
@ -124,27 +118,9 @@
[submitButton setTitle:@"Post"];
[submitButton setAction:(@selector(doShareThisStory:))];
}
[self.siteInformation setNumberOfLines:2];
NSString *siteInfoString = [NSString stringWithFormat:@"%@: %@",
[appDelegate.activeFeed objectForKey:@"feed_title"],
[appDelegate.activeStory objectForKey:@"story_title"]];
[self.siteInformation setText:siteInfoString];
// vertical align label
CGRect resizedLabel = [self.siteInformation textRectForBounds:self.siteInformation.bounds limitedToNumberOfLines:2];
CGRect newResizedLabelFrame = self.siteInformation.frame;
newResizedLabelFrame.size.height = resizedLabel.size.height;
self.siteInformation.frame = newResizedLabelFrame;
// adding in favicon
NSString *feedIdStr = [NSString stringWithFormat:@"%@", [appDelegate.activeStory objectForKey:@"story_feed_id"]];
[siteFavicon setImage:[Utilities getImage:feedIdStr]];
}
- (IBAction)doShareThisStory:(id)sender {
NSString *urlString = [NSString stringWithFormat:@"http://%@/social/share_story",
NEWSBLUR_URL];
@ -227,9 +203,15 @@
CGRect storyDetailViewFrame = appDelegate.storyDetailViewController.view.frame;
//NSLog(@"Keyboard y is %f", keyboardFrame.size.height);
shareViewFrame.origin.y = shareViewFrame.origin.y + keyboardFrame.size.height;
storyDetailViewFrame.size.height = storyDetailViewFrame.size.height + keyboardFrame.size.height;
if (UIInterfaceOrientationIsPortrait(self.interfaceOrientation)) {
shareViewFrame.origin.y = shareViewFrame.origin.y + keyboardFrame.size.height;
storyDetailViewFrame.size.height = storyDetailViewFrame.size.height + keyboardFrame.size.height;
} else {
shareViewFrame.origin.y = shareViewFrame.origin.y + keyboardFrame.size.width;
storyDetailViewFrame.size.height = storyDetailViewFrame.size.height + keyboardFrame.size.width;
}
[UIView animateWithDuration:duration
delay:0
options:UIViewAnimationOptionBeginFromCurrentState | curve
@ -250,9 +232,13 @@
CGRect shareViewFrame = self.view.frame;
CGRect storyDetailViewFrame = appDelegate.storyDetailViewController.view.frame;
//NSLog(@"Keyboard y is %f", keyboardFrame.size.height);
shareViewFrame.origin.y = shareViewFrame.origin.y - keyboardFrame.size.height;
storyDetailViewFrame.size.height = storyDetailViewFrame.size.height - keyboardFrame.size.height;
if (UIInterfaceOrientationIsPortrait(self.interfaceOrientation)) {
shareViewFrame.origin.y = shareViewFrame.origin.y - keyboardFrame.size.height;
storyDetailViewFrame.size.height = storyDetailViewFrame.size.height - keyboardFrame.size.height;
} else {
shareViewFrame.origin.y = shareViewFrame.origin.y - keyboardFrame.size.width;
storyDetailViewFrame.size.height = storyDetailViewFrame.size.height - keyboardFrame.size.width;
}
[UIView animateWithDuration:duration
delay:0

222
media/iphone/Classes/ShareViewController.xib
View file

@ -11,14 +11,13 @@
<string key="NS.object.0">1181</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBUIButton</string>
<string>IBUIView</string>
<string>IBUIBarButtonItem</string>
<string>IBUILabel</string>
<string>IBProxyObject</string>
<string>IBUIToolbar</string>
<string>IBUIImageView</string>
<string>IBUILabel</string>
<string>IBUITextView</string>
<string>IBUIView</string>
<string>IBUIButton</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -46,7 +45,7 @@
<string key="NSFrameSize">{704, 44}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="407067893"/>
<reference key="NSNextKeyView" ref="505763753"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -92,10 +91,10 @@
<object class="IBUITextView" id="993868796">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">293</int>
<string key="NSFrame">{{87, 140}, {412, 60}}</string>
<string key="NSFrame">{{72, 73}, {625, 60}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="505763753"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@ -123,7 +122,7 @@
<object class="IBUIButton" id="161540210">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">293</int>
<string key="NSFrame">{{544, 140}, {60, 60}}</string>
<string key="NSFrame">{{20, 97}, {36, 36}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="993868796"/>
@ -168,9 +167,10 @@
<object class="IBUIButton" id="505763753">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">293</int>
<string key="NSFrame">{{612, 140}, {60, 60}}</string>
<string key="NSFrame">{{20, 53}, {36, 36}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="670048759"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -196,58 +196,10 @@
<reference key="IBUIFontDescription" ref="562180707"/>
<reference key="IBUIFont" ref="774498236"/>
</object>
<object class="IBUIImageView" id="163383208">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">293</int>
<string key="NSFrame">{{87, 66}, {16, 16}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="249744356"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">world.png</string>
</object>
</object>
<object class="IBUILabel" id="249744356">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">293</int>
<string key="NSFrame">{{111, 66}, {388, 39}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="670048759"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">Site Name: Story Titlesdaf asdfsda fsdaf sdaf sda fsdaf sdaf sda fsda f</string>
<object class="NSColor" key="IBUITextColor" id="990279131">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDAAA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUINumberOfLines">2</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">1</int>
<double key="pointSize">16</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica</string>
<double key="NSSize">16</double>
<int key="NSfFlags">16</int>
</object>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="670048759">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">293</int>
<string key="NSFrame">{{87, 117}, {84, 21}}</string>
<string key="NSFrame">{{72, 50}, {84, 21}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="189558015"/>
@ -258,45 +210,27 @@
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">Comments</string>
<reference key="IBUITextColor" ref="990279131"/>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDAAA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="105494283">
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">1</int>
<double key="pointSize">13</double>
</object>
<object class="NSFont" key="IBUIFont" id="43220877">
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica</string>
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUILabel" id="407067893">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">293</int>
<string key="NSFrame">{{544, 117}, {84, 21}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="163383208"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">Also Post to:</string>
<reference key="IBUITextColor" ref="990279131"/>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<reference key="IBUIFontDescription" ref="105494283"/>
<reference key="IBUIFont" ref="43220877"/>
</object>
<object class="IBUILabel" id="189558015">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">293</int>
<string key="NSFrame">{{415, 118}, {84, 21}}</string>
<string key="NSFrame">{{613, 50}, {84, 21}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="161540210"/>
@ -326,7 +260,7 @@
</object>
</object>
</array>
<string key="NSFrameSize">{704, 225}</string>
<string key="NSFrameSize">{704, 140}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="975114462"/>
@ -368,22 +302,6 @@
</object>
<int key="connectionID">29</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">siteInformation</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="249744356"/>
</object>
<int key="connectionID">31</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">siteFavicon</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="163383208"/>
</object>
<int key="connectionID">32</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">facebookButton</string>
@ -400,14 +318,6 @@
</object>
<int key="connectionID">37</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">submitButton</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="905208122"/>
</object>
<int key="connectionID">38</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">toolbarTitle</string>
@ -416,6 +326,14 @@
</object>
<int key="connectionID">43</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">submitButton</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="905208122"/>
</object>
<int key="connectionID">38</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">doShareThisStory:</string>
@ -476,43 +394,13 @@
<array class="NSMutableArray" key="children">
<reference ref="975114462"/>
<reference ref="993868796"/>
<reference ref="163383208"/>
<reference ref="249744356"/>
<reference ref="670048759"/>
<reference ref="189558015"/>
<reference ref="161540210"/>
<reference ref="505763753"/>
<reference ref="407067893"/>
<reference ref="670048759"/>
<reference ref="189558015"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">12</int>
<reference key="object" ref="975114462"/>
<array class="NSMutableArray" key="children">
<reference ref="905208122"/>
<reference ref="285077905"/>
<reference ref="876218419"/>
<reference ref="602475399"/>
<reference ref="238852457"/>
</array>
<reference key="parent" ref="766721923"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">13</int>
<reference key="object" ref="905208122"/>
<reference key="parent" ref="975114462"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">14</int>
<reference key="object" ref="285077905"/>
<reference key="parent" ref="975114462"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="876218419"/>
<reference key="parent" ref="975114462"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">19</int>
<reference key="object" ref="993868796"/>
@ -528,16 +416,6 @@
<reference key="object" ref="505763753"/>
<reference key="parent" ref="766721923"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">27</int>
<reference key="object" ref="163383208"/>
<reference key="parent" ref="766721923"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">28</int>
<reference key="object" ref="249744356"/>
<reference key="parent" ref="766721923"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">33</int>
<reference key="object" ref="670048759"/>
@ -549,9 +427,21 @@
<reference key="parent" ref="766721923"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">41</int>
<reference key="object" ref="602475399"/>
<reference key="parent" ref="975114462"/>
<int key="objectID">47</int>
<reference key="object" ref="714861901"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">12</int>
<reference key="object" ref="975114462"/>
<array class="NSMutableArray" key="children">
<reference ref="905208122"/>
<reference ref="285077905"/>
<reference ref="876218419"/>
<reference ref="602475399"/>
<reference ref="238852457"/>
</array>
<reference key="parent" ref="766721923"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">42</int>
@ -559,14 +449,24 @@
<reference key="parent" ref="975114462"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">47</int>
<reference key="object" ref="714861901"/>
<reference key="parent" ref="0"/>
<int key="objectID">41</int>
<reference key="object" ref="602475399"/>
<reference key="parent" ref="975114462"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">50</int>
<reference key="object" ref="407067893"/>
<reference key="parent" ref="766721923"/>
<int key="objectID">17</int>
<reference key="object" ref="876218419"/>
<reference key="parent" ref="975114462"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">14</int>
<reference key="object" ref="285077905"/>
<reference key="parent" ref="975114462"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">13</int>
<reference key="object" ref="905208122"/>
<reference key="parent" ref="975114462"/>
</object>
</array>
</object>
@ -585,14 +485,11 @@
<real value="0.0" key="20.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0" key="21.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="41.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="42.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="50.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
@ -1704,7 +1601,6 @@
<string key="208-facebook.png">{60, 60}</string>
<string key="32-Twitter-Green.png">{60, 60}</string>
<string key="32-Twitter.png">{60, 60}</string>
<string key="world.png">{16, 16}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1181</string>
</data>