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

adding in favicon and vertical align for uilabel

Browse source
This commit is contained in:
Roy Yang 2012-06-24 18:55:57 -07:00
parent 5061e5c861
commit 6f7144d63c
5 changed files with 44 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -313,6 +313,7 @@
- (void)showShareView {
[splitStoryDetailViewController.view addSubview:shareViewController.view];
[shareViewController setSiteInfo];
if (UIInterfaceOrientationIsPortrait(splitStoryDetailViewController.interfaceOrientation)) {
shareViewController.view.frame = CGRectMake(0,
@ -353,9 +354,7 @@
}
}
- (void)hideShareView {
[splitStoryDetailViewController.view addSubview:shareViewController.view];
- (void)hideShareView {
if (UIInterfaceOrientationIsPortrait(splitStoryDetailViewController.interfaceOrientation)) {
if ((960 - self.feedDetailPortraitYCoordinate) < SHARE_MODAL_HEIGHT) {
storyDetailViewController.view.frame = CGRectMake(0,
@ -383,8 +382,6 @@
768,
960 - self.feedDetailPortraitYCoordinate);
}];
}
}

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

@ -19,6 +19,7 @@
@property (retain, nonatomic) IBOutlet UITextView *commentField;
@property (nonatomic, retain) IBOutlet NewsBlurAppDelegate *appDelegate;
- (void)setSiteInfo;
- (IBAction)doCancelButton:(id)sender;
- (IBAction)doToggleButton:(id)sender;
- (IBAction)doShareThisStory:(id)sender;

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

@ -10,6 +10,7 @@
#import "NewsBlurAppDelegate.h"
#import "StoryDetailViewController.h"
#import <QuartzCore/QuartzCore.h>
#import "Utilities.h"
#import "ASIHTTPRequest.h"
@implementation ShareViewController
@ -48,6 +49,25 @@
// e.g. self.myOutlet = nil;
}
- (void)setSiteInfo {
[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]];
}
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
@ -59,11 +79,7 @@
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
NSString *siteInfoString = [NSString stringWithFormat:@"%@: %@",
[appDelegate.activeFeed objectForKey:@"feed_title"],
[appDelegate.activeStory objectForKey:@"story_title"]];
[self.siteInformation setText:siteInfoString];
}
- (void)dealloc {

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

@ -82,7 +82,7 @@
<object class="IBUITextView" id="993868796">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{155, 119}, {375, 144}}</string>
<string key="NSFrame">{{155, 136}, {375, 144}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="161540210"/>
@ -113,7 +113,7 @@
<object class="IBUIButton" id="161540210">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{554, 119}, {60, 60}}</string>
<string key="NSFrame">{{554, 136}, {60, 60}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="505763753"/>
@ -158,10 +158,9 @@
<object class="IBUIButton" id="505763753">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{554, 203}, {60, 60}}</string>
<string key="NSFrame">{{554, 220}, {60, 60}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -192,7 +191,7 @@
<string key="NSFrame">{{155, 64}, {16, 16}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="249744356"/>
<reference key="NSNextKeyView" ref="670048759"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -204,17 +203,17 @@
<object class="IBUILabel" id="249744356">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{179, 61}, {351, 21}}</string>
<string key="NSFrame">{{179, 60}, {435, 54}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="670048759"/>
<reference key="NSNextKeyView" ref="189558015"/>
<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 Title</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>
@ -222,23 +221,25 @@
<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">17</double>
<double key="pointSize">16</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica</string>
<double key="NSSize">17</double>
<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">292</int>
<string key="NSFrame">{{155, 96}, {84, 21}}</string>
<string key="NSFrame">{{155, 113}, {84, 21}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="189558015"/>
<reference key="NSNextKeyView" ref="249744356"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@ -263,7 +264,7 @@
<object class="IBUILabel" id="189558015">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{446, 96}, {84, 21}}</string>
<string key="NSFrame">{{446, 113}, {84, 21}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="993868796"/>
@ -405,13 +406,13 @@
<reference key="object" ref="766721923"/>
<array class="NSMutableArray" key="children">
<reference ref="975114462"/>
<reference ref="993868796"/>
<reference ref="161540210"/>
<reference ref="505763753"/>
<reference ref="670048759"/>
<reference ref="189558015"/>
<reference ref="163383208"/>
<reference ref="249744356"/>
<reference ref="993868796"/>
<reference ref="189558015"/>
<reference ref="670048759"/>
</array>
<reference key="parent" ref="0"/>
</object>
@ -501,7 +502,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">34</int>
<int key="maxID">35</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">

5
media/iphone/Classes/StoryDetailViewController.m
View file

@ -170,9 +170,8 @@
- (NSString *)getComments {
NSString *comments = @"";
int share_count = [[appDelegate.activeStory objectForKey:@"share_count"] intValue];
if (share_count) {
NSLog(@"the sharecount is %@", [appDelegate.activeStory objectForKey:@"share_count"]);
if ([appDelegate.activeStory objectForKey:@"share_count"] != [NSNull null]) {
NSArray *comments_array = [appDelegate.activeStory objectForKey:@"comments"];
comments = [comments stringByAppendingString:[NSString stringWithFormat:@
"<div class=\"NB-feed-story-comments\">"