From 3564b1bb317e85d33f2699c8ed1860cd6a1884f3 Mon Sep 17 00:00:00 2001 From: Mike Parks Date: Tue, 8 Nov 2016 12:57:26 -0600 Subject: [PATCH 1/2] Points to the correct image resource location if TSMiniWebBrowser is built as a framework --- TSMiniWebBrowser/TSMiniWebBrowser.m | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/TSMiniWebBrowser/TSMiniWebBrowser.m b/TSMiniWebBrowser/TSMiniWebBrowser.m index 2024ba6..31a74d1 100644 --- a/TSMiniWebBrowser/TSMiniWebBrowser.m +++ b/TSMiniWebBrowser/TSMiniWebBrowser.m @@ -127,16 +127,21 @@ -(void) initToolBar { toolBar.barStyle = barStyle; [self.view addSubview:toolBar]; - buttonGoBack = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"back_icon.png"] style:UIBarButtonItemStylePlain target:self action:@selector(backButtonTouchUp:)]; + NSBundle *webBrowserBundle = [NSBundle bundleForClass:[TSMiniWebBrowser class]]; + NSString *backIconImagePath = [webBrowserBundle pathForResource:@"back_icon" ofType:@"png"]; + NSString *forwardIconImagePath = [webBrowserBundle pathForResource:@"forward_icon" ofType:@"png"]; + NSString *reloadIconImagePath = [webBrowserBundle pathForResource:@"reload_icon.png" ofType:@"png"]; + + buttonGoBack = [[UIBarButtonItem alloc] initWithImage:[UIImage imageWithContentsOfFile:backIconImagePath] style:UIBarButtonItemStylePlain target:self action:@selector(backButtonTouchUp:)]; UIBarButtonItem *fixedSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; fixedSpace.width = 30; - buttonGoForward = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"forward_icon.png"] style:UIBarButtonItemStylePlain target:self action:@selector(forwardButtonTouchUp:)]; + buttonGoForward = [[UIBarButtonItem alloc] initWithImage:[UIImage imageWithContentsOfFile:forwardIconImagePath] style:UIBarButtonItemStylePlain target:self action:@selector(forwardButtonTouchUp:)]; UIBarButtonItem *flexibleSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil]; - UIBarButtonItem *buttonReload = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"reload_icon.png"] style:UIBarButtonItemStylePlain target:self action:@selector(reloadButtonTouchUp:)]; + UIBarButtonItem *buttonReload = [[UIBarButtonItem alloc] initWithImage:[UIImage imageWithContentsOfFile:reloadIconImagePath] style:UIBarButtonItemStylePlain target:self action:@selector(reloadButtonTouchUp:)]; UIBarButtonItem *fixedSpace2 = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; fixedSpace2.width = 20; @@ -157,7 +162,7 @@ -(void) initToolBar { [toolBarButtons addObject:buttonGoForward]; [toolBarButtons addObject:flexibleSpace]; [toolBarButtons addObject:buttonContainer]; - if (showReloadButton) { + if (showReloadButton) { [toolBarButtons addObject:buttonReload]; } if (showActionButton) { From cb5561eff8cad61b56d59b57f12a162f8fb28091 Mon Sep 17 00:00:00 2001 From: Mike Parks Date: Tue, 8 Nov 2016 13:05:59 -0600 Subject: [PATCH 2/2] Changing the method used to create the toolbar UIImages --- TSMiniWebBrowser/TSMiniWebBrowser.m | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/TSMiniWebBrowser/TSMiniWebBrowser.m b/TSMiniWebBrowser/TSMiniWebBrowser.m index 31a74d1..77163bd 100644 --- a/TSMiniWebBrowser/TSMiniWebBrowser.m +++ b/TSMiniWebBrowser/TSMiniWebBrowser.m @@ -128,20 +128,17 @@ -(void) initToolBar { [self.view addSubview:toolBar]; NSBundle *webBrowserBundle = [NSBundle bundleForClass:[TSMiniWebBrowser class]]; - NSString *backIconImagePath = [webBrowserBundle pathForResource:@"back_icon" ofType:@"png"]; - NSString *forwardIconImagePath = [webBrowserBundle pathForResource:@"forward_icon" ofType:@"png"]; - NSString *reloadIconImagePath = [webBrowserBundle pathForResource:@"reload_icon.png" ofType:@"png"]; - buttonGoBack = [[UIBarButtonItem alloc] initWithImage:[UIImage imageWithContentsOfFile:backIconImagePath] style:UIBarButtonItemStylePlain target:self action:@selector(backButtonTouchUp:)]; + buttonGoBack = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"back_icon.png" inBundle:webBrowserBundle compatibleWithTraitCollection:nil] style:UIBarButtonItemStylePlain target:self action:@selector(backButtonTouchUp:)]; UIBarButtonItem *fixedSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; fixedSpace.width = 30; - buttonGoForward = [[UIBarButtonItem alloc] initWithImage:[UIImage imageWithContentsOfFile:forwardIconImagePath] style:UIBarButtonItemStylePlain target:self action:@selector(forwardButtonTouchUp:)]; + buttonGoForward = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"forward_icon.png" inBundle:webBrowserBundle compatibleWithTraitCollection:nil] style:UIBarButtonItemStylePlain target:self action:@selector(forwardButtonTouchUp:)]; UIBarButtonItem *flexibleSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil]; - UIBarButtonItem *buttonReload = [[UIBarButtonItem alloc] initWithImage:[UIImage imageWithContentsOfFile:reloadIconImagePath] style:UIBarButtonItemStylePlain target:self action:@selector(reloadButtonTouchUp:)]; + UIBarButtonItem *buttonReload = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"reload_icon.png" inBundle:webBrowserBundle compatibleWithTraitCollection:nil] style:UIBarButtonItemStylePlain target:self action:@selector(reloadButtonTouchUp:)]; UIBarButtonItem *fixedSpace2 = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; fixedSpace2.width = 20;