diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj index 1dee694..ef9dddc 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj @@ -21,6 +21,7 @@ 34AAB889189804FF0019860D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AAB880189804FF0019860D /* main.m */; }; 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB881189804FF0019860D /* MainStoryboard.storyboard */; }; 34AAB88D189805300019860D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB88C189805300019860D /* Images.xcassets */; }; + F9127C8B19951B3500040C52 /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F9127C8A19951B3500040C52 /* back_arrow.png */; }; F98356D6192E835F00EA6821 /* InitialViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356D5192E835F00EA6821 /* InitialViewController.m */; }; F98356D8192E906600EA6821 /* bluetooth.png in Resources */ = {isa = PBXBuildFile; fileRef = F98356D7192E906600EA6821 /* bluetooth.png */; }; F98356DB192EAFD400EA6821 /* CommunicationProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356DA192EAFD400EA6821 /* CommunicationProtocol.m */; }; @@ -73,6 +74,7 @@ 34AAB880189804FF0019860D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FirstAppExample/main.m; sourceTree = SOURCE_ROOT; }; 34AAB881189804FF0019860D /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = MainStoryboard.storyboard; path = FirstAppExample/MainStoryboard.storyboard; sourceTree = SOURCE_ROOT; }; 34AAB88C189805300019860D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = FirstAppExample/Images.xcassets; sourceTree = SOURCE_ROOT; }; + F9127C8A19951B3500040C52 /* back_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back_arrow.png; sourceTree = SOURCE_ROOT; }; F98356D4192E835F00EA6821 /* InitialViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitialViewController.h; sourceTree = SOURCE_ROOT; }; F98356D5192E835F00EA6821 /* InitialViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InitialViewController.m; sourceTree = SOURCE_ROOT; }; F98356D7192E906600EA6821 /* bluetooth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bluetooth.png; sourceTree = SOURCE_ROOT; }; @@ -169,6 +171,7 @@ 3471866718070D9300FA0FB2 /* Supporting Files */ = { isa = PBXGroup; children = ( + F9127C8A19951B3500040C52 /* back_arrow.png */, F98356D7192E906600EA6821 /* bluetooth.png */, 34AAB87E189804FF0019860D /* DUREX Vendor Control-Info.plist */, 34AAB87F189804FF0019860D /* DUREX Vendor Control-Prefix.pch */, @@ -307,6 +310,7 @@ 34AAB884189804FF0019860D /* EMConnectingView.xib in Resources */, F9C77F50192CDE30002DBE8A /* durex.json in Resources */, F9C77F4E192CDE18002DBE8A /* InfoPlist.strings in Resources */, + F9127C8B19951B3500040C52 /* back_arrow.png in Resources */, 34AAB88D189805300019860D /* Images.xcassets in Resources */, 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */, ); diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate index 11c668e..61d5113 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/DUREX Vendor Control/MenuTableViewController.m b/DUREX Vendor Control/MenuTableViewController.m index b52d885..bedaadb 100644 --- a/DUREX Vendor Control/MenuTableViewController.m +++ b/DUREX Vendor Control/MenuTableViewController.m @@ -137,8 +137,18 @@ [super viewDidLoad]; [_activityIndicator setHidden:YES]; + UIImage *backImage = [UIImage imageNamed:@"back_arrow.png"]; + UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom]; + backButton.frame = CGRectMake(0, 0, backImage.size.width/2, backImage.size.height/2); + + [backButton setImage:backImage forState:UIControlStateNormal]; + [backButton setTitle:@"Back" forState:UIControlStateNormal]; + [backButton addTarget:self action:@selector(backButtonPressed:) forControlEvents:UIControlEventTouchUpInside]; + + UIBarButtonItem *backBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backButton]; + self.navigationItem.hidesBackButton = YES; - self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Back" style:UIBarButtonItemStylePlain target:self action:@selector(backButtonPressed:)]; + self.navigationItem.leftBarButtonItem = backBarButtonItem; //Emmoco protocol initialization _protocol = [CommunicationProtocol sharedProtocol]; diff --git a/DUREX Vendor Control/back_arrow.png b/DUREX Vendor Control/back_arrow.png new file mode 100644 index 0000000..5cad8bd --- /dev/null +++ b/DUREX Vendor Control/back_arrow.png diff --git a/DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate index de89c23..fa8dbcb 100644 --- a/DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate +++ b/DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/DUREX tests/MenuTableViewController.m b/DUREX tests/MenuTableViewController.m index d4d4c3f..830ee95 100644 --- a/DUREX tests/MenuTableViewController.m +++ b/DUREX tests/MenuTableViewController.m @@ -150,7 +150,6 @@ UIBarButtonItem *backBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backButton]; - self.navigationItem.hidesBackButton = YES; self.navigationItem.leftBarButtonItem = backBarButtonItem;