Skip to content

Commit

Permalink
Added a bunch of different images for things like tab bar and stuff.
Browse files Browse the repository at this point in the history 
changed the "favstar.." icon in the weather details, course details, and score tracker views.
  • Loading branch information
Rob King authored and Rob King committed Aug 2, 2011
1 parent 499cd78 commit 24fc3e3
Show file tree
Hide file tree
Showing 22 changed files with 128 additions and 103 deletions.
64 changes: 40 additions & 24 deletions ECaddy.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions ECaddy/CourseDetailView.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<object class="IBUIButton" id="580662269">
<reference key="NSNextResponder" ref="341082237"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{276, 16}, {39, 37}}</string>
<string key="NSFrame">{{276, 16}, {35, 35}}</string>
<reference key="NSSuperview" ref="341082237"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="470346596"/>
Expand All @@ -110,7 +110,7 @@
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">favstar_deselected.png</string>
<string key="NSResourceName">favstarreleased.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="1052641706">
<string key="name">Helvetica-Bold</string>
Expand Down Expand Up @@ -141,6 +141,7 @@
<string key="NSFrame">{{0, 70}, {320, 297}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">10</int>
<object class="NSImage" key="NSImage">
Expand Down Expand Up @@ -563,8 +564,8 @@ AAgACAAIAAEAAQABAAE</bytes>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">favstar_deselected.png</string>
<string key="NS.object.0">{128, 128}</string>
<string key="NS.key.0">favstarreleased.png</string>
<string key="NS.object.0">{100, 99}</string>
</object>
<string key="IBCocoaTouchPluginVersion">894</string>
</data>
Expand Down
8 changes: 4 additions & 4 deletions ECaddy/CourseDetailViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ - (void)viewDidLoad

// Set the inital state of the favorite star
BOOL isFav = [[self.courseObj favorite] boolValue];
[self.favstarBtn setImage: [UIImage imageNamed: (isFav ? @"favstar_selected.png" :
@"favstar_deselected.png")] forState:UIControlStateNormal];
[self.favstarBtn setImage: [UIImage imageNamed: (isFav ? @"favstarpressed.png" :
@"favstarreleased.png")] forState:UIControlStateNormal];

self.manObjCon = nil;
}
Expand Down Expand Up @@ -180,8 +180,8 @@ - (IBAction) favstarPressed:(id)sender
BOOL fav = [[self.courseObj favorite] boolValue];

fav = !fav;
[self.favstarBtn setImage: [UIImage imageNamed: (fav ? @"favstar_selected.png" :
@"favstar_deselected.png")] forState: UIControlStateNormal];
[self.favstarBtn setImage: [UIImage imageNamed: (fav ? @"favstarpressed.png" :
@"favstarreleased.png")] forState: UIControlStateNormal];

[self.courseObj setFavorite: [NSNumber numberWithBool: fav]];

Expand Down
29 changes: 12 additions & 17 deletions ECaddy/ScoreTrackerView.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1280</int>
<string key="IBDocument.SystemVersion">10K540</string>
<string key="IBDocument.InterfaceBuilderVersion">1881</string>
<string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<string key="IBDocument.SystemVersion">11A511</string>
<string key="IBDocument.InterfaceBuilderVersion">1900</string>
<string key="IBDocument.AppKitVersion">1138</string>
<string key="IBDocument.HIToolboxVersion">566.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">876</string>
<string key="NS.object.0">894</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand Down Expand Up @@ -46,7 +46,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{-5, 0}, {325, 59}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="876290978"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
Expand Down Expand Up @@ -78,9 +77,8 @@
<object class="IBUIButton" id="876290978">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 11}, {45, 37}}</string>
<string key="NSFrame">{{20, 11}, {35, 35}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="166806902"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
Expand All @@ -100,7 +98,7 @@
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">favstar_deselected.png</string>
<string key="NSResourceName">favstarreleased.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<string key="name">Helvetica-Bold</string>
Expand All @@ -119,7 +117,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, 325}, {320, 42}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
Expand All @@ -132,8 +129,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, 57}, {320, 42}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<reference key="NSNextKeyView" ref="641299357"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC45ODc1MzQwNDI3IDAuOTUzMTQ2NTI3IDEAA</bytes>
Expand All @@ -145,7 +141,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 99}, {320, 226}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="531482243"/>
<reference key="IBUIBackgroundColor" ref="1069081834"/>
<bool key="IBUIClipsSubviews">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
Expand All @@ -160,7 +156,6 @@
</object>
<string key="NSFrame">{{0, 64}, {320, 367}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="990430617"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
Expand Down Expand Up @@ -475,9 +470,9 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">favstar_deselected.png</string>
<string key="NS.object.0">{128, 128}</string>
<string key="NS.key.0">favstarreleased.png</string>
<string key="NS.object.0">{100, 99}</string>
</object>
<string key="IBCocoaTouchPluginVersion">876</string>
<string key="IBCocoaTouchPluginVersion">894</string>
</data>
</archive>
6 changes: 3 additions & 3 deletions ECaddy/ScoreTrackerViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ - (void)viewDidLoad

[dateF release];

[self.favstarBtn setImage: [UIImage imageNamed: ([[self.scorecard.course favorite] boolValue] ? @"favstar_selected.png" : @"favstar_deselected.png")] forState: UIControlStateNormal];
[self.favstarBtn setImage: [UIImage imageNamed: ([[self.scorecard.course favorite] boolValue] ? @"favstarpressed.png" : @"favstarreleased.png")] forState: UIControlStateNormal];

NSUInteger num = [[self.scorecard numplayers] unsignedIntegerValue];

Expand Down Expand Up @@ -400,8 +400,8 @@ - (IBAction)favstarPressed:(id)sender {
BOOL fav = [[self.scorecard.course favorite] boolValue];

fav = !fav;
[self.favstarBtn setImage: [UIImage imageNamed: (fav ? @"favstar_selected.png" :
@"favstar_deselected.png")] forState: UIControlStateNormal];
[self.favstarBtn setImage: [UIImage imageNamed: (fav ? @"favstarpressed.png" :
@"favstarreleased.png")] forState: UIControlStateNormal];

[self.scorecard.course setFavorite: [NSNumber numberWithBool: fav]];

Expand Down
8 changes: 4 additions & 4 deletions ECaddy/WeatherDetails.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ - (void)viewDidLoad
//courseDetailsLbl.layer.borderWidth = 2.0;

// Set the initial state of the favorite star
[self.favstarBtn setImage: [UIImage imageNamed: ([[self.courseObj favorite] boolValue] ? @"favstar_selected.png" :
@"favstar_deselected.png")] forState: UIControlStateNormal];
[self.favstarBtn setImage: [UIImage imageNamed: ([[self.courseObj favorite] boolValue] ? @"favstarpressed.png" :
@"favstarreleased.png")] forState: UIControlStateNormal];

}

Expand Down Expand Up @@ -189,8 +189,8 @@ - (IBAction)favstarPressed:(id)sender {
BOOL fav = [[self.courseObj favorite] boolValue];

fav = !fav;
[self.favstarBtn setImage: [UIImage imageNamed: (fav ? @"favstar_selected.png" :
@"favstar_deselected.png")] forState: UIControlStateNormal];
[self.favstarBtn setImage: [UIImage imageNamed: (fav ? @"favstarpressed.png" :
@"favstarreleased.png")] forState: UIControlStateNormal];

[self.courseObj setFavorite: [NSNumber numberWithBool: fav]];

Expand Down
9 changes: 5 additions & 4 deletions ECaddy/WeatherDetails.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<object class="IBUIButton" id="742083628">
<reference key="NSNextResponder" ref="542969145"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{276, 16}, {39, 37}}</string>
<string key="NSFrame">{{276, 16}, {35, 35}}</string>
<reference key="NSSuperview" ref="542969145"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="310809148"/>
Expand All @@ -199,7 +199,7 @@
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">favstar_deselected.png</string>
<string key="NSResourceName">favstarreleased.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<string key="name">Helvetica-Bold</string>
Expand Down Expand Up @@ -612,6 +612,7 @@
<string key="NSFrame">{{20, 99}, {120, 21}}</string>
<reference key="NSSuperview" ref="759083108"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
Expand Down Expand Up @@ -1485,13 +1486,13 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>favstar_deselected.png</string>
<string>favstarreleased.png</string>
<string>sadweather.png</string>
<string>wind_arrow.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{128, 128}</string>
<string>{100, 99}</string>
<string>{202, 202}</string>
<string>{49, 49}</string>
</object>
Expand Down
Binary file removed ECaddy/directory_tab.png
View file
Binary file not shown.
Binary file removed ECaddy/directory_tab@2x.png
View file
Binary file not shown.
Binary file added ECaddy/directorytab.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ECaddy/directorytab@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
98 changes: 55 additions & 43 deletions ECaddy/en.lproj/MainWindow.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,51 +76,24 @@
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
<object class="IBUINavigationController" key="IBUISelectedViewController" id="460962664">
<string key="IBUITitle">Map</string>
<object class="IBUITabBarItem" key="IBUITabBarItem" id="689761767">
<string key="IBUITitle">Map</string>
<object class="IBUITableViewController" key="IBUISelectedViewController" id="275420067">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="349044925">
<string key="IBUITitle">Settings</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">settingstab.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIParentViewController" ref="1034742383"/>
<string key="IBUINibName">SettingsView</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
<object class="IBUINavigationBar" key="IBUINavigationBar" id="390072355">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{0, 0}</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIBarStyle">1</int>
<object class="NSColor" key="IBUITintColor">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MCAwLjMwMTk2MDc5NjEgMC4xNzY0NzA1OTI2AA</bytes>
</object>
</object>
<object class="NSMutableArray" key="IBUIViewControllers">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIViewController" id="411097943">
<object class="IBUINavigationItem" key="IBUINavigationItem" id="355159094">
<string key="IBUITitle">Course Map</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIParentViewController" ref="460962664"/>
<string key="IBUINibName">MapView</string>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
</object>
</object>
<object class="NSMutableArray" key="IBUIViewControllers">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand Down Expand Up @@ -190,7 +163,7 @@
<string key="IBUITitle">Directory</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">directory_tab.png</string>
<string key="NSResourceName">directorytab.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
Expand Down Expand Up @@ -237,6 +210,10 @@
<object class="IBUINavigationController" id="9080343">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="347090170">
<string key="IBUITitle">Weather</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">weathertab.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIParentViewController" ref="1034742383"/>
Expand Down Expand Up @@ -279,22 +256,53 @@
</object>
</object>
</object>
<reference ref="460962664"/>
<object class="IBUITableViewController" id="275420067">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="349044925">
<string key="IBUITitle">Settings</string>
<object class="IBUINavigationController" id="460962664">
<string key="IBUITitle">Map</string>
<object class="IBUITabBarItem" key="IBUITabBarItem" id="689761767">
<string key="IBUITitle">Map</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIParentViewController" ref="1034742383"/>
<string key="IBUINibName">SettingsView</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
<object class="IBUINavigationBar" key="IBUINavigationBar" id="390072355">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{0, 0}</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIBarStyle">1</int>
<object class="NSColor" key="IBUITintColor">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MCAwLjMwMTk2MDc5NjEgMC4xNzY0NzA1OTI2AA</bytes>
</object>
</object>
<object class="NSMutableArray" key="IBUIViewControllers">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIViewController" id="411097943">
<object class="IBUINavigationItem" key="IBUINavigationItem" id="355159094">
<string key="IBUITitle">Course Map</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIParentViewController" ref="460962664"/>
<string key="IBUINibName">MapView</string>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
</object>
</object>
<reference ref="275420067"/>
</object>
<object class="IBUITabBar" key="IBUITabBar" id="795333663">
<reference key="NSNextResponder"/>
Expand Down Expand Up @@ -674,13 +682,17 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>directory_tab.png</string>
<string>directorytab.png</string>
<string>scorecard_tab.png</string>
<string>settingstab.png</string>
<string>weathertab.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{30, 30}</string>
<string>{30, 26}</string>
<string>{33, 33}</string>
<string>{28, 28}</string>
<string>{31, 30}</string>
</object>
</object>
<string key="IBCocoaTouchPluginVersion">894</string>
Expand Down
Binary file removed ECaddy/favstar_deselected.png
View file
Binary file not shown.
Binary file removed ECaddy/favstar_selected.png
View file
Binary file not shown.
Binary file added ECaddy/favstarpressed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ECaddy/favstarreleased.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ECaddy/settingstab.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ECaddy/settingstab@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ECaddy/weathertab.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ECaddy/weathertab@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified greenicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified greenicon@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 24fc3e3

Please sign in to comment.