ios: use system's backbutton image and fix navbar background/size

Change-Id: Iba51a595757c54ed14ed0383e3eae2daa5d9c69c

12 files changed, 10 insertions, 26 deletions

diff --git a/ios/iosremote/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m b/ios/iosremote/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
index 0c072aa..8205191 100755
--- a/ios/iosremote/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
+++ b/ios/iosremote/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
@@ -148,8 +148,7 @@ CGRect IASKCGRectSwap(CGRect rect);
   }
 
     UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", nil) style:UIBarButtonItemStylePlain target:self action:@selector(handleBack)];
-    [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    self.navigationItem.leftBarButtonItem = backButton;
+    self.navigationController.navigationBar.topItem.backBarButtonItem = backButton;
     
     self.tableView.backgroundView.backgroundColor = [UIColor colorWithRed:.968627451 green:.968627451 blue:.968627451 alpha:1.0];
 }
diff --git a/ios/iosremote/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m b/ios/iosremote/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m
index d9e554f..a39f1a6 100755
--- a/ios/iosremote/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m
+++ b/ios/iosremote/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m
@@ -56,8 +56,7 @@
 {
     [super viewDidLoad];
     UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", nil) style:UIBarButtonItemStylePlain target:self action:@selector(handleBack)];
-    [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    self.navigationItem.leftBarButtonItem = backButton;
+    self.navigationController.navigationBar.topItem.backBarButtonItem = backButton;
     
     self.view.backgroundColor = [UIColor colorWithRed:.968627451 green:.968627451 blue:.968627451 alpha:1.0];
 }
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index 0c0646b..076eadc 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -63,8 +63,6 @@
 		8C19F42F17B05089005BDB61 /* LibONavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C19F42E17B05089005BDB61 /* LibONavigationController.m */; };
 		8C19F43317B056B3005BDB61 /* navBarButtonNormal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C19F43217B056B3005BDB61 /* navBarButtonNormal@2x.png */; };
 		8C19F43617B10D49005BDB61 /* UIViewController+LibOStyling.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C19F43517B10D49005BDB61 /* UIViewController+LibOStyling.m */; };
-		8C19F43917B145AD005BDB61 /* backButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C19F43717B145AD005BDB61 /* backButton.png */; };
-		8C19F43A17B145AD005BDB61 /* backButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C19F43817B145AD005BDB61 /* backButton@2x.png */; };
 		8C19F43E17B1D935005BDB61 /* add.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C19F43C17B1D935005BDB61 /* add.png */; };
 		8C19F44A17B1FEFE005BDB61 /* gear_transparent_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C19F44817B1FEFD005BDB61 /* gear_transparent_bg.png */; };
 		8C19F44B17B1FEFE005BDB61 /* gear_transparent_bg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C19F44917B1FEFE005BDB61 /* gear_transparent_bg@2x.png */; };
@@ -230,8 +228,6 @@
 		8C19F43217B056B3005BDB61 /* navBarButtonNormal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "navBarButtonNormal@2x.png"; sourceTree = "<group>"; };
 		8C19F43417B10D48005BDB61 /* UIViewController+LibOStyling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+LibOStyling.h"; path = "iosremote/Categories/UIViewController+LibOStyling.h"; sourceTree = "<group>"; };
 		8C19F43517B10D49005BDB61 /* UIViewController+LibOStyling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+LibOStyling.m"; path = "iosremote/Categories/UIViewController+LibOStyling.m"; sourceTree = "<group>"; };
-		8C19F43717B145AD005BDB61 /* backButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = backButton.png; sourceTree = "<group>"; };
-		8C19F43817B145AD005BDB61 /* backButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backButton@2x.png"; sourceTree = "<group>"; };
 		8C19F43C17B1D935005BDB61 /* add.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = add.png; sourceTree = "<group>"; };
 		8C19F44817B1FEFD005BDB61 /* gear_transparent_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gear_transparent_bg.png; sourceTree = "<group>"; };
 		8C19F44917B1FEFE005BDB61 /* gear_transparent_bg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gear_transparent_bg@2x.png"; sourceTree = "<group>"; };
@@ -545,8 +541,6 @@
 				8C19F44817B1FEFD005BDB61 /* gear_transparent_bg.png */,
 				8C19F44917B1FEFE005BDB61 /* gear_transparent_bg@2x.png */,
 				8C19F43C17B1D935005BDB61 /* add.png */,
-				8C19F43717B145AD005BDB61 /* backButton.png */,
-				8C19F43817B145AD005BDB61 /* backButton@2x.png */,
 				8C19F43217B056B3005BDB61 /* navBarButtonNormal@2x.png */,
 				8C19F42517B04E7C005BDB61 /* navBarBackground@2x.png */,
 				8C19F42617B04E7C005BDB61 /* navBarBackground.png */,
@@ -956,8 +950,6 @@
 				8C19F42717B04E7C005BDB61 /* navBarBackground@2x.png in Resources */,
 				8C19F42817B04E7C005BDB61 /* navBarBackground.png in Resources */,
 				8C19F43317B056B3005BDB61 /* navBarButtonNormal@2x.png in Resources */,
-				8C19F43917B145AD005BDB61 /* backButton.png in Resources */,
-				8C19F43A17B145AD005BDB61 /* backButton@2x.png in Resources */,
 				8C19F43E17B1D935005BDB61 /* add.png in Resources */,
 				8C19F44A17B1FEFE005BDB61 /* gear_transparent_bg.png in Resources */,
 				8C19F44B17B1FEFE005BDB61 /* gear_transparent_bg@2x.png in Resources */,
diff --git a/ios/iosremote/iosremote/Categories/UINavigationController+Theme.m b/ios/iosremote/iosremote/Categories/UINavigationController+Theme.m
index bb387b8..220aa1e 100644
--- a/ios/iosremote/iosremote/Categories/UINavigationController+Theme.m
+++ b/ios/iosremote/iosremote/Categories/UINavigationController+Theme.m
@@ -12,11 +12,11 @@
 @implementation UINavigationController (Theme)
 - (void)loadTheme
 {
-    UINavigationBar *navBar = self.navigationBar;
+    UINavigationBar *navBar = self.navigationController.navigationBar;
     [navBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"]
                  forBarMetrics:UIBarMetricsDefault];
     [navBar setBackgroundImage:[UIImage imageNamed:@"navBarBackgroundPhoneLandscape"]
-                 forBarMetrics:UIBarMetricsLandscapePhone];
+                 forBarMetrics:UIBarMetricsCompact];
     navBar.barStyle = UIBarStyleBlack;
 }
 @end
diff --git a/ios/iosremote/iosremote/Classes/AboutViewController.m b/ios/iosremote/iosremote/Classes/AboutViewController.m
index 0e9b9d9..4e4681f 100644
--- a/ios/iosremote/iosremote/Classes/AboutViewController.m
+++ b/ios/iosremote/iosremote/Classes/AboutViewController.m
@@ -28,8 +28,7 @@
     [super viewDidLoad];
     
     UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Back", nil) style:UIBarButtonItemStylePlain target:self action:@selector(handleBack)];
-    [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    self.navigationItem.leftBarButtonItem = backButton;
+    self.navigationController.navigationBar.topItem.backBarButtonItem = backButton;
  
     NSURL *url = [NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"licenses" ofType:@"html" inDirectory:nil]];
     [self.aboutWebView loadRequest:[NSURLRequest requestWithURL:url]];
diff --git a/ios/iosremote/iosremote/Classes/NewServerViewController.m b/ios/iosremote/iosremote/Classes/NewServerViewController.m
index 1afd94a..a90bc37 100644
--- a/ios/iosremote/iosremote/Classes/NewServerViewController.m
+++ b/ios/iosremote/iosremote/Classes/NewServerViewController.m
@@ -77,8 +77,7 @@
         [self setTitle:NSLocalizedString(@"New Server", nil)];
     
     UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Cancel", nil) style:UIBarButtonItemStylePlain target:self action:@selector(handleBack)];
-    [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    self.navigationItem.leftBarButtonItem = backButton;
+    self.navigationController.navigationBar.topItem.backBarButtonItem = backButton;
     [super viewDidLoad];
 }
 
diff --git a/ios/iosremote/iosremote/Classes/PinValidationViewController.m b/ios/iosremote/iosremote/Classes/PinValidationViewController.m
index ae94415..999278a 100644
--- a/ios/iosremote/iosremote/Classes/PinValidationViewController.m
+++ b/ios/iosremote/iosremote/Classes/PinValidationViewController.m
@@ -42,8 +42,7 @@
     [self.pinLabel setText:[NSString stringWithFormat:@"%@", [self.comManager getPairingPin]]];
     
     UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Connect", @"Back button to the connect page on navbar") style:UIBarButtonItemStylePlain target:self action:@selector(handleBack)];
-    [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    self.navigationItem.leftBarButtonItem = backButton;
+    self.navigationController.navigationBar.topItem.backBarButtonItem = backButton;
 }
 
 - (void) viewDidAppear:(BOOL)animated
diff --git a/ios/iosremote/iosremote/Classes/SlideShowPreviewViewController~ipad.m b/ios/iosremote/iosremote/Classes/SlideShowPreviewViewController~ipad.m
index 2d40142..09b6c38 100644
--- a/ios/iosremote/iosremote/Classes/SlideShowPreviewViewController~ipad.m
+++ b/ios/iosremote/iosremote/Classes/SlideShowPreviewViewController~ipad.m
@@ -54,8 +54,7 @@
     }];
     
     UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Connect", nil) style:UIBarButtonItemStylePlain target:self action:@selector(handleBack)];
-    [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    self.navigationItem.leftBarButtonItem = backButton;
+    self.navigationController.navigationBar.topItem.backBarButtonItem = backButton;
 }
 
 - (void) viewDidAppear:(BOOL)animated
diff --git a/ios/iosremote/iosremote/Classes/SlideShowPreviewViewController~iphone.m b/ios/iosremote/iosremote/Classes/SlideShowPreviewViewController~iphone.m
index 067c993..bc91297 100644
--- a/ios/iosremote/iosremote/Classes/SlideShowPreviewViewController~iphone.m
+++ b/ios/iosremote/iosremote/Classes/SlideShowPreviewViewController~iphone.m
@@ -31,8 +31,7 @@
     }];
     
     UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Connect", nil) style:UIBarButtonItemStylePlain target:self action:@selector(handleBack)];
-    [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    self.navigationItem.leftBarButtonItem = backButton;
+    self.navigationController.navigationBar.topItem.backBarButtonItem = backButton;
 }
 
 - (void) viewDidAppear:(BOOL)animated
diff --git a/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m b/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m
index 655e560..7d91078 100644
--- a/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m
+++ b/ios/iosremote/iosremote/Classes/WalkThroughContainerViewController.m
@@ -41,8 +41,7 @@
     [self.pageController didMoveToParentViewController:self];
     
     UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Ok, thanks", @"backButton for Tutorial") style:UIBarButtonItemStylePlain target:self action:@selector(handleBack)];
-    [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
-    self.navigationItem.leftBarButtonItem = backButton;
+    self.navigationController.navigationBar.topItem.backBarButtonItem = backButton;
     
     [self setTitle:NSLocalizedString(@"How-to", @"In app How-to title")];
     
diff --git a/ios/iosremote/iosremote/Ressources/backButton.png b/ios/iosremote/iosremote/Ressources/backButton.png
deleted file mode 100644
index 84b8d66..0000000
--- a/ios/iosremote/iosremote/Ressources/backButton.png
+++ /dev/null
diff --git a/ios/iosremote/iosremote/Ressources/backButton@2x.png b/ios/iosremote/iosremote/Ressources/backButton@2x.png
deleted file mode 100644
index 27e6632..0000000
--- a/ios/iosremote/iosremote/Ressources/backButton@2x.png
+++ /dev/null