Skip to content
This repository has been archived by the owner on Mar 7, 2023. It is now read-only.

Commit

Permalink
Add new default Featured Collections tab
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmpatierno
dmpatierno committed Nov 10, 2011
1 parent 4cef3bc commit ef7a0ed
Show file tree
Hide file tree
Showing 32 changed files with 1,017 additions and 143 deletions.
55 changes: 8 additions & 47 deletions Classes/DetailView.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.iPad.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1280</int>
<string key="IBDocument.SystemVersion">11B2118</string>
<string key="IBDocument.InterfaceBuilderVersion">1923</string>
<string key="IBDocument.AppKitVersion">1138.1</string>
<string key="IBDocument.HIToolboxVersion">566.00</string>
<string key="IBDocument.SystemVersion">11C74</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1138.23</string>
<string key="IBDocument.HIToolboxVersion">567.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">919</string>
<string key="NS.object.0">933</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand Down Expand Up @@ -53,15 +53,6 @@
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSMutableArray" key="IBUIItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIBarButtonItem" id="229923592">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">splashButton.png</string>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIStyle">1</int>
<reference key="IBUIToolbar" ref="410698538"/>
</object>
<object class="IBUIBarButtonItem" id="110546682">
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<reference key="IBUIToolbar" ref="410698538"/>
Expand Down Expand Up @@ -109,7 +100,6 @@
<string key="NSFrame">{{0, 44}, {1024, 704}}</string>
<reference key="NSSuperview" ref="647120888"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
Expand Down Expand Up @@ -180,14 +170,6 @@
</object>
<int key="connectionID">79</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">showSplash:</string>
<reference key="source" ref="229923592"/>
<reference key="destination" ref="841351856"/>
</object>
<int key="connectionID">84</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
Expand Down Expand Up @@ -231,7 +213,6 @@
<reference ref="69973950"/>
<reference ref="767121731"/>
<reference ref="867349467"/>
<reference ref="229923592"/>
</object>
<reference key="parent" ref="647120888"/>
</object>
Expand Down Expand Up @@ -265,11 +246,6 @@
<reference key="object" ref="867349467"/>
<reference key="parent" ref="410698538"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">82</int>
<reference key="object" ref="229923592"/>
<reference key="parent" ref="410698538"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
Expand All @@ -289,7 +265,6 @@
<string>8.IBPluginDependency</string>
<string>80.IBPluginDependency</string>
<string>81.IBPluginDependency</string>
<string>82.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand All @@ -306,7 +281,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">
Expand All @@ -329,17 +303,6 @@
<object class="IBPartialClassDescription">
<string key="className">DetailViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">showSplash:</string>
<string key="NS.object.0">UIBarButtonItem</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">showSplash:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">showSplash:</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
Expand Down Expand Up @@ -419,15 +382,13 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>back.png</string>
<string>forward.png</string>
<string>splashButton.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{20, 20}</string>
<string>{20, 20}</string>
<string>{19, 19}</string>
<string>{14, 17}</string>
<string>{14, 17}</string>
</object>
</object>
<string key="IBCocoaTouchPluginVersion">919</string>
<string key="IBCocoaTouchPluginVersion">933</string>
</data>
</archive>
2 changes: 0 additions & 2 deletions Classes/DetailViewController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,4 @@
@property (nonatomic, retain) IBOutlet UIBarButtonItem *fwdButton;
@property (nonatomic, retain) UIPopoverController *popoverController;

- (IBAction)showSplash:(UIBarButtonItem *)button;

@end
11 changes: 0 additions & 11 deletions Classes/DetailViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,6 @@ - (void)viewDidLoad {
backButton.action = @selector(goBack);
fwdButton.target = webView;
fwdButton.action = @selector(goForward);

// Hide the splash button if on a Dozuki site.
if ([Config currentConfig].dozuki) {
NSMutableArray *items = [[toolbar items] mutableCopy];
[items removeObjectAtIndex:0];
[toolbar setItems:items animated:YES];
}
}

- (NSDictionary *)treeMatchInTree:(NSDictionary *)tree forURL:(NSString *)url {
Expand Down Expand Up @@ -221,10 +214,6 @@ - (void)viewDidUnload {
self.fwdButton = nil;
}

- (IBAction)showSplash:(UIBarButtonItem *)button {
[(iFixitAppDelegate *)[[UIApplication sharedApplication] delegate] showSplash];
}

#pragma mark -
#pragma mark Memory management

Expand Down
27 changes: 27 additions & 0 deletions Classes/FeaturedViewController.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//
// FeaturedViewController.h
// iFixit
//
// Created by David Patierno on 11/7/11.
// Copyright (c) 2011 iFixit. All rights reserved.
//

#import "DMPGridViewDelegate.h"
#import "PastFeaturesViewDelegate.h"

@class PastFeaturesViewController;
@class DMPGridViewController;
@class WBProgressHUD;

@interface FeaturedViewController : UINavigationController <UIAlertViewDelegate, DMPGridViewDelegate, PastFeaturesViewDelegate>

@property (retain, nonatomic) UIPopoverController *poc;
@property (assign, nonatomic) PastFeaturesViewController *pvc;
@property (assign, nonatomic) DMPGridViewController *gvc;
@property (retain, nonatomic) NSDictionary *collection;
@property (retain, nonatomic) NSArray *guides;
@property (retain, nonatomic) WBProgressHUD *loading;

- (void)showPastFeatures:(id)sender;

@end
Loading

0 comments on commit ef7a0ed

Please sign in to comment.