Skip to content

Fix zh-Hant & Added initWithHTMLString to support load HTML's string #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SVWebViewController/SVWebViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@

- (id)initWithAddress:(NSString*)urlString;
- (id)initWithURL:(NSURL*)URL;
- (id)initWithHTMLString:(NSString*)HTMLString;
- (id)initWithHTMLString:(NSString*)HTMLString customURL:(NSURL*)URL;

@end
45 changes: 43 additions & 2 deletions SVWebViewController/SVWebViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ @interface SVWebViewController () <UIWebViewDelegate>

@property (nonatomic, strong) UIWebView *webView;
@property (nonatomic, strong) NSURL *URL;
@property (nonatomic, strong) NSString *tempFilePath;
@property (nonatomic, strong) NSURL *customURL;

- (id)initWithAddress:(NSString*)urlString;
- (id)initWithURL:(NSURL*)URL;
- (id)initWithHTMLString:(NSString*)HTMLString;
- (id)initWithHTMLString:(NSString*)HTMLString customURL:(NSURL*)URL;
- (void)loadURL:(NSURL*)URL;

- (void)updateToolbarItems;
Expand Down Expand Up @@ -59,6 +63,31 @@ - (id)initWithURL:(NSURL*)pageURL {
return self;
}

- (id)initWithHTMLString:(NSString*)pageHTMLString {

if(self = [super init]) {
NSURL *tmpDirURL = [NSURL fileURLWithPath:NSTemporaryDirectory() isDirectory:YES];
NSURL *filePath = [[tmpDirURL URLByAppendingPathComponent:@"SVWebTemp"] URLByAppendingPathExtension:@"html"];
self.tempFilePath = [filePath path];
[pageHTMLString writeToFile:self.tempFilePath atomically:YES encoding:NSUTF8StringEncoding error:nil];

self.URL = filePath;
}

return self;
}

- (id)initWithHTMLString:(NSString*)pageHTMLString customURL:(NSURL*)pageCustomURL {

if(self = [super init]) {
self = [self initWithHTMLString:pageHTMLString];

self.customURL = pageCustomURL;
}

return self;
}

- (void)loadURL:(NSURL *)pageURL {
[self.webView loadRequest:[NSURLRequest requestWithURL:pageURL]];
}
Expand Down Expand Up @@ -174,7 +203,13 @@ - (UIBarButtonItem *)actionBarButtonItem {
- (void)updateToolbarItems {
self.backBarButtonItem.enabled = self.self.webView.canGoBack;
self.forwardBarButtonItem.enabled = self.self.webView.canGoForward;
self.actionBarButtonItem.enabled = !self.self.webView.isLoading;

if ([[self.self.webView.request.URL path] isEqualToString:self.tempFilePath] && self.customURL == NULL) {
self.actionBarButtonItem.enabled = FALSE; //
}
else {
self.actionBarButtonItem.enabled = !self.self.webView.isLoading;
}

UIBarButtonItem *refreshStopBarButtonItem = self.self.webView.isLoading ? self.stopBarButtonItem : self.refreshBarButtonItem;

Expand Down Expand Up @@ -263,8 +298,14 @@ - (void)stopClicked:(UIBarButtonItem *)sender {

- (void)actionButtonClicked:(id)sender {
NSArray *activities = @[[SVWebViewControllerActivitySafari new], [SVWebViewControllerActivityChrome new]];
UIActivityViewController *activityController;

UIActivityViewController *activityController = [[UIActivityViewController alloc] initWithActivityItems:@[self.self.webView.request.URL] applicationActivities:activities];
if ([[self.self.webView.request.URL path] isEqualToString:self.tempFilePath]) { //&& self.customURL != NULL
activityController = [[UIActivityViewController alloc] initWithActivityItems:@[self.customURL] applicationActivities:activities];
}
else {
activityController = [[UIActivityViewController alloc] initWithActivityItems:@[self.self.webView.request.URL] applicationActivities:activities];
}
[self presentViewController:activityController animated:YES completion:nil];
}

Expand Down
6 changes: 3 additions & 3 deletions SVWebViewController/zh-Hant.lproj/SVWebViewController.strings
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Copyright (c) 2013 James Stout
"Open in Safari" = "打開Safari";
"Open in Chrome" = "打開Chrome";
// Copyright (c) 2013 Frank Wu
"Open in Safari" = "在 Safari 開啓";
"Open in Chrome" = "在 Chrome 開啓";