Permalink
Browse files

Moved the map button, displacing the hashtags to the description screen

  • Loading branch information...
1 parent 6d7e6f5 commit 5c83ba339ecc1751b57786a1b43eb413d5890977 @magicmonkey magicmonkey committed with magicmonkey Apr 4, 2010
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">768</int>
- <string key="IBDocument.SystemVersion">10C540</string>
+ <string key="IBDocument.SystemVersion">10D573</string>
<string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">460.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">62</string>
@@ -43,7 +43,7 @@
<object class="IBUITextView" id="862111034">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrameSize">{320, 357}</string>
+ <string key="NSFrameSize">{320, 332}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -87,6 +87,23 @@
<bytes key="NSWhite">MC41AA</bytes>
</object>
</object>
+ <object class="IBUILabel" id="60005757">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 340}, {280, 21}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="IBUIText">Hashtags</string>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
</object>
<string key="NSFrameSize">{320, 416}</string>
<reference key="NSSuperview"/>
@@ -139,6 +156,14 @@
</object>
<int key="connectionID">10</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">uiHashtag</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="60005757"/>
+ </object>
+ <int key="connectionID">12</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -156,6 +181,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="862111034"/>
<reference ref="784660234"/>
+ <reference ref="60005757"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -180,6 +206,11 @@
<reference key="object" ref="784660234"/>
<reference key="parent" ref="191373211"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">11</int>
+ <reference key="object" ref="60005757"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -190,6 +221,7 @@
<string>-2.CustomClassName</string>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
+ <string>11.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
</object>
@@ -201,6 +233,7 @@
<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">
@@ -219,7 +252,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">10</int>
+ <int key="maxID">12</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -236,11 +269,13 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>uiDescription</string>
+ <string>uiHashtag</string>
<string>uiWebsite</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UITextView</string>
+ <string>UILabel</string>
<string>UIButton</string>
</object>
</object>
@@ -402,6 +437,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UIResponder</string>
<string key="superclassName">NSObject</string>
<reference key="sourceIdentifier" ref="604567236"/>
@@ -14,11 +14,13 @@
EventDetailModel *event;
IBOutlet UITextView *uiDescription;
IBOutlet UIButton *uiWebsite;
+ IBOutlet UILabel *uiHashtag;
}
@property (nonatomic, retain) EventDetailModel *event;
@property (nonatomic, retain) UITextView *uiDescription;
@property (nonatomic, retain) UIButton *uiWebsite;
+@property (nonatomic, retain) UILabel *uiHashtag;
- (IBAction) uiWebsitePressed:(id)sender;
@@ -13,6 +13,7 @@ @implementation EventDescriptionViewController
@synthesize event;
@synthesize uiDescription;
@synthesize uiWebsite;
+@synthesize uiHashtag;
/*
// The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
@@ -40,6 +41,14 @@ - (void)viewWillAppear:(BOOL)animated {
} else {
self.uiWebsite.hidden = YES;
}
+
+ if (self.event.hashtag != nil && ![self.event.hashtag isEqualToString:@""]) {
+ self.uiHashtag.hidden = NO;
+ self.uiHashtag.text = self.event.hashtag;
+ } else {
+ self.uiHashtag.hidden = YES;
+ }
+
}
/*
@@ -31,16 +31,12 @@
IBOutlet UIActivityIndicatorView *uiAttendingIndicator;
IBOutlet UIButton *uiComments;
IBOutlet UIActivityIndicatorView *uiLoading;
- IBOutlet UILabel *uiHashtag;
IBOutlet UIButton *uiLocationButton;
-
- IBOutlet UIButton *uiHashtagButton;
}
- (IBAction)uiDescButtonPressed:(id)sender;
- (IBAction)uiAttendingButtonPressed:(id)sender;
- (IBAction)uiCommentsButtonPressed:(id)sender;
-- (IBAction)uiHashtagButtonPressed:(id)sender;
- (IBAction)uiLocationButtonPressed:(id)sender;
- (void)gotTalksForEvent:(TalkListModel *)tlm error:(APIError *)error;
@@ -64,9 +60,6 @@
@property (nonatomic, retain) UIActivityIndicatorView *uiAttendingIndicator;
@property (nonatomic, retain) UIButton *uiComments;
@property (nonatomic, retain) UIActivityIndicatorView *uiLoading;
-@property (nonatomic, retain) UILabel *uiHashtag;
@property (nonatomic, retain) UIButton *uiLocationButton;
-@property (nonatomic, retain) UIButton *uiHashtagButton;
-
@end
@@ -43,8 +43,6 @@ @implementation EventDetailViewController
@synthesize uiAttendingIndicator;
@synthesize uiComments;
@synthesize uiLoading;
-@synthesize uiHashtag;
-@synthesize uiHashtagButton;
@synthesize uiLocationButton;
#pragma mark View loaders
@@ -72,6 +70,12 @@ - (void)viewWillAppear:(BOOL)animated {
self.uiDesc.text = self.event.description;
self.uiLocation.text = self.event.location;
+ if (self.event.event_lat != 0) {
+ self.uiLocationButton.hidden = NO;
+ } else {
+ self.uiLocationButton.hidden = YES;
+ }
+
NSDateFormatter *outputFormatter = [[NSDateFormatter alloc] init];
[outputFormatter setDateFormat:@"d MMM yyyy"];
NSString *startDate = [outputFormatter stringFromDate:self.event.start];
@@ -88,13 +92,6 @@ - (void)viewWillAppear:(BOOL)animated {
self.uiDate.text = [NSString stringWithFormat:@"%@ - %@", startDate, endDate];
}
- if (self.event.hashtag != nil && ![self.event.hashtag isEqualToString:@""]) {
- self.uiHashtag.hidden = NO;
- self.uiHashtag.text = self.event.hashtag;
- } else {
- self.uiHashtag.hidden = YES;
- }
-
[self.uiLoading startAnimating];
[self.talks sort];
self.uiComments.hidden = YES;
@@ -146,6 +143,13 @@ - (void)gotEventDetailData:(EventDetailModel *)edm error:(APIError *)err {
[self.uiComments setTitle:btnLabel forState:UIControlStateNormal];
[self.uiComments setTitle:btnLabel forState:UIControlStateHighlighted];
+ if (self.event.event_lat != 0) {
+ self.uiLocationButton.hidden = NO;
+ } else {
+ self.uiLocationButton.hidden = YES;
+ }
+
+
}
- (void)nowNextBtnPressed {
@@ -400,9 +404,6 @@ - (IBAction)uiCommentsButtonPressed:(id)sender {
[ecvc release];
}
-- (IBAction)uiHashtagButtonPressed:(id)sender {
-}
-
- (IBAction)uiLocationButtonPressed:(id)sender {
EventLocationViewController *locVC = [[EventLocationViewController alloc] initWithNibName:@"EventLocationView" bundle:nil];
locVC.event = self.event;
@@ -12,8 +12,8 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="33"/>
<integer value="35"/>
+ <integer value="33"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -294,28 +294,10 @@
<bool key="IBUIUserInteractionEnabled">NO</bool>
<int key="IBUIStyle">2</int>
</object>
- <object class="IBUILabel" id="155575891">
- <reference key="NSNextResponder" ref="742448254"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{190, 47}, {120, 21}}</string>
- <reference key="NSSuperview" ref="742448254"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="IBUIText">Hashtag</string>
- <reference key="IBUIFont" ref="917963698"/>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
<object class="IBUIButton" id="776787362">
<reference key="NSNextResponder" ref="742448254"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{11, 168}, {54, 26}}</string>
+ <string key="NSFrame">{{230, 48}, {80, 19}}</string>
<reference key="NSSuperview" ref="742448254"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -327,7 +309,7 @@
<int key="NSfFlags">16</int>
</object>
<int key="IBUIButtonType">1</int>
- <string key="IBUINormalTitle">Location</string>
+ <string key="IBUINormalTitle">Map</string>
<reference key="IBUIHighlightedTitleColor" ref="4236891"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
@@ -478,14 +460,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">uiHashtag</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="155575891"/>
- </object>
- <int key="connectionID">68</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">uiLocationButton</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="776787362"/>
@@ -545,7 +519,6 @@
<reference ref="181056820"/>
<reference ref="982638234"/>
<reference ref="95806808"/>
- <reference ref="155575891"/>
<reference ref="776787362"/>
</object>
<reference key="parent" ref="0"/>
@@ -612,11 +585,6 @@
<reference key="parent" ref="742448254"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">67</int>
- <reference key="object" ref="155575891"/>
- <reference key="parent" ref="742448254"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">7</int>
<reference key="object" ref="95806808"/>
<reference key="parent" ref="742448254"/>
@@ -650,7 +618,6 @@
<string>60.IBPluginDependency</string>
<string>62.IBPluginDependency</string>
<string>65.IBPluginDependency</string>
- <string>67.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
<string>79.IBPluginDependency</string>
</object>
@@ -676,7 +643,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">

0 comments on commit 5c83ba3

Please sign in to comment.