Skip to content

Commit

Permalink
readme plus modified browser view
Browse files Browse the repository at this point in the history
  • Loading branch information
@msencenb
msencenb committed Jan 31, 2012
1 parent 5bfd29a commit fd62b84
Show file tree
Hide file tree
Showing 8 changed files with 208 additions and 35 deletions.
1 change: 1 addition & 0 deletions README
View file
@@ -0,0 +1 @@
This code is for Episode 2 of www.iosdevscreencasts.com
34 changes: 17 additions & 17 deletions SimpleWebBrowser.xcodeproj/project.pbxproj
View file
Expand Up @@ -13,8 +13,8 @@
BBBCBDD714D89EEE00F83D39 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = BBBCBDD514D89EEE00F83D39 /* InfoPlist.strings */; };
BBBCBDD914D89EEE00F83D39 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BBBCBDD814D89EEE00F83D39 /* main.m */; };
BBBCBDDD14D89EEE00F83D39 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BBBCBDDC14D89EEE00F83D39 /* AppDelegate.m */; };
BBBCBDE014D89EEE00F83D39 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BBBCBDDF14D89EEE00F83D39 /* ViewController.m */; };
BBBCBDE314D89EEE00F83D39 /* ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBBCBDE114D89EEE00F83D39 /* ViewController.xib */; };
BBBCBDE014D89EEE00F83D39 /* SimpleBrowserViewcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = BBBCBDDF14D89EEE00F83D39 /* SimpleBrowserViewcontroller.m */; };
BBBCBDE314D89EEE00F83D39 /* SimpleBrowserViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBBCBDE114D89EEE00F83D39 /* SimpleBrowserViewController.xib */; };
BBBCBDEB14D89EEE00F83D39 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBBCBDEA14D89EEE00F83D39 /* SenTestingKit.framework */; };
BBBCBDEC14D89EEE00F83D39 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBBCBDCC14D89EEE00F83D39 /* UIKit.framework */; };
BBBCBDED14D89EEE00F83D39 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBBCBDCE14D89EEE00F83D39 /* Foundation.framework */; };
Expand All @@ -37,20 +37,20 @@
BBBCBDCC14D89EEE00F83D39 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
BBBCBDCE14D89EEE00F83D39 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
BBBCBDD014D89EEE00F83D39 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
BBBCBDD414D89EEE00F83D39 /* SimpleWebBrowser-Info.plist */ = {isa = PBXFileReference; path = "SimpleWebBrowser-Info.plist"; sourceTree = "<group>"; };
BBBCBDD414D89EEE00F83D39 /* SimpleWebBrowser-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SimpleWebBrowser-Info.plist"; sourceTree = "<group>"; };
BBBCBDD614D89EEE00F83D39 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
BBBCBDD814D89EEE00F83D39 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
BBBCBDDA14D89EEE00F83D39 /* SimpleWebBrowser-Prefix.pch */ = {isa = PBXFileReference; path = "SimpleWebBrowser-Prefix.pch"; sourceTree = "<group>"; };
BBBCBDDB14D89EEE00F83D39 /* AppDelegate.h */ = {isa = PBXFileReference; path = AppDelegate.h; sourceTree = "<group>"; };
BBBCBDDA14D89EEE00F83D39 /* SimpleWebBrowser-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SimpleWebBrowser-Prefix.pch"; sourceTree = "<group>"; };
BBBCBDDB14D89EEE00F83D39 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
BBBCBDDC14D89EEE00F83D39 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
BBBCBDDE14D89EEE00F83D39 /* ViewController.h */ = {isa = PBXFileReference; path = ViewController.h; sourceTree = "<group>"; };
BBBCBDDF14D89EEE00F83D39 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
BBBCBDE214D89EEE00F83D39 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController.xib; sourceTree = "<group>"; };
BBBCBDDE14D89EEE00F83D39 /* SimpleBrowserViewController.h */ = {isa = PBXFileReference; path = SimpleBrowserViewController.h; sourceTree = "<group>"; };
BBBCBDDF14D89EEE00F83D39 /* SimpleBrowserViewcontroller.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SimpleBrowserViewcontroller.m; sourceTree = "<group>"; };
BBBCBDE214D89EEE00F83D39 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/SimpleBrowserViewController.xib; sourceTree = "<group>"; };
BBBCBDE914D89EEE00F83D39 /* SimpleWebBrowserTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SimpleWebBrowserTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
BBBCBDEA14D89EEE00F83D39 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
BBBCBDF214D89EEE00F83D39 /* SimpleWebBrowserTests-Info.plist */ = {isa = PBXFileReference; path = "SimpleWebBrowserTests-Info.plist"; sourceTree = "<group>"; };
BBBCBDF214D89EEE00F83D39 /* SimpleWebBrowserTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SimpleWebBrowserTests-Info.plist"; sourceTree = "<group>"; };
BBBCBDF414D89EEE00F83D39 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
BBBCBDF614D89EEE00F83D39 /* SimpleWebBrowserTests.h */ = {isa = PBXFileReference; path = SimpleWebBrowserTests.h; sourceTree = "<group>"; };
BBBCBDF614D89EEE00F83D39 /* SimpleWebBrowserTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SimpleWebBrowserTests.h; sourceTree = "<group>"; };
BBBCBDF714D89EEE00F83D39 /* SimpleWebBrowserTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SimpleWebBrowserTests.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -113,9 +113,9 @@
children = (
BBBCBDDB14D89EEE00F83D39 /* AppDelegate.h */,
BBBCBDDC14D89EEE00F83D39 /* AppDelegate.m */,
BBBCBDDE14D89EEE00F83D39 /* ViewController.h */,
BBBCBDDF14D89EEE00F83D39 /* ViewController.m */,
BBBCBDE114D89EEE00F83D39 /* ViewController.xib */,
BBBCBDDE14D89EEE00F83D39 /* SimpleBrowserViewController.h */,
BBBCBDDF14D89EEE00F83D39 /* SimpleBrowserViewcontroller.m */,
BBBCBDE114D89EEE00F83D39 /* SimpleBrowserViewController.xib */,
BBBCBDD314D89EEE00F83D39 /* Supporting Files */,
);
path = SimpleWebBrowser;
Expand Down Expand Up @@ -223,7 +223,7 @@
buildActionMask = 2147483647;
files = (
BBBCBDD714D89EEE00F83D39 /* InfoPlist.strings in Resources */,
BBBCBDE314D89EEE00F83D39 /* ViewController.xib in Resources */,
BBBCBDE314D89EEE00F83D39 /* SimpleBrowserViewController.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -260,7 +260,7 @@
files = (
BBBCBDD914D89EEE00F83D39 /* main.m in Sources */,
BBBCBDDD14D89EEE00F83D39 /* AppDelegate.m in Sources */,
BBBCBDE014D89EEE00F83D39 /* ViewController.m in Sources */,
BBBCBDE014D89EEE00F83D39 /* SimpleBrowserViewcontroller.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -291,12 +291,12 @@
name = InfoPlist.strings;
sourceTree = "<group>";
};
BBBCBDE114D89EEE00F83D39 /* ViewController.xib */ = {
BBBCBDE114D89EEE00F83D39 /* SimpleBrowserViewController.xib */ = {
isa = PBXVariantGroup;
children = (
BBBCBDE214D89EEE00F83D39 /* en */,
);
name = ViewController.xib;
name = SimpleBrowserViewController.xib;
sourceTree = "<group>";
};
BBBCBDF314D89EEE00F83D39 /* InfoPlist.strings */ = {
Expand Down
7 changes: 7 additions & 0 deletions SimpleWebBrowser.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions SimpleWebBrowser/AppDelegate.h
View file
Expand Up @@ -8,12 +8,12 @@

#import <UIKit/UIKit.h>

@class ViewController;
@class SimpleBrowserViewController;

@interface AppDelegate : UIResponder <UIApplicationDelegate>

@property (strong, nonatomic) UIWindow *window;

@property (strong, nonatomic) ViewController *viewController;
@property (strong, nonatomic) SimpleBrowserViewController *viewController;

@end
4 changes: 2 additions & 2 deletions SimpleWebBrowser/AppDelegate.m
View file
Expand Up @@ -8,7 +8,7 @@

#import "AppDelegate.h"

#import "ViewController.h"
#import "SimpleBrowserViewController.h"

@implementation AppDelegate

Expand All @@ -26,7 +26,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
{
self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
// Override point for customization after application launch.
self.viewController = [[[ViewController alloc] initWithNibName:@"ViewController" bundle:nil] autorelease];
self.viewController = [[[SimpleBrowserViewController alloc] initWithNibName:@"SimpleBrowserViewController" bundle:nil] autorelease];
self.window.rootViewController = self.viewController;
[self.window makeKeyAndVisible];
return YES;
Expand Down
10 changes: 9 additions & 1 deletion SimpleWebBrowser/SimpleBrowserViewController.h
View file
Expand Up @@ -8,6 +8,14 @@

#import <UIKit/UIKit.h>

@interface ViewController : UIViewController
@interface SimpleBrowserViewController : UIViewController {
IBOutlet UIWebView *webView;
}

@property(nonatomic,retain)IBOutlet UIWebView *webView;

-(IBAction)goBack:(id)sender;
-(IBAction)goForward:(id)sender;


@end
20 changes: 18 additions & 2 deletions SimpleWebBrowser/SimpleBrowserViewcontroller.m
View file
Expand Up @@ -6,9 +6,22 @@
// Copyright (c) 2012 Stanford University. All rights reserved.
//

#import "ViewController.h"
#import "SimpleBrowserViewController.h"

@implementation ViewController
@implementation SimpleBrowserViewController
@synthesize webView;

-(IBAction)goBack:(id)sender {
if ([webView canGoBack]) {
[webView goBack];
}
}

-(IBAction)goForward:(id)sender {
if ([webView canGoForward]) {
[webView goForward];
}
}

- (void)didReceiveMemoryWarning
{
Expand All @@ -20,6 +33,9 @@ - (void)didReceiveMemoryWarning

- (void)viewDidLoad
{
NSURL *url = [NSURL URLWithString:@"http://www.google.com"];
NSURLRequest *request = [NSURLRequest requestWithURL:url];
[webView loadRequest:request];
[super viewDidLoad];
// Do any additional setup after loading the view, typically from a nib.
}
Expand Down

0 comments on commit fd62b84

Please sign in to comment.