diff --git a/DUREX tests/DUREX test.xcodeproj/project.pbxproj b/DUREX tests/DUREX test.xcodeproj/project.pbxproj index eb09695..6ffdbed 100644 --- a/DUREX tests/DUREX test.xcodeproj/project.pbxproj +++ b/DUREX tests/DUREX test.xcodeproj/project.pbxproj @@ -19,6 +19,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 */; }; + F9127C891995144E00040C52 /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F9127C881995144E00040C52 /* back_arrow.png */; }; F9469169193015EE006DACD3 /* icon_checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = F9469167193015EE006DACD3 /* icon_checkmark.png */; }; F946916A193015EE006DACD3 /* icon_delete.png in Resources */ = {isa = PBXBuildFile; fileRef = F9469168193015EE006DACD3 /* icon_delete.png */; }; F962A233192FCA8A00E4324A /* Stack.m in Sources */ = {isa = PBXBuildFile; fileRef = F962A232192FCA8A00E4324A /* Stack.m */; }; @@ -57,6 +58,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; }; + F9127C881995144E00040C52 /* back_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back_arrow.png; sourceTree = SOURCE_ROOT; }; F9469167193015EE006DACD3 /* icon_checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_checkmark.png; sourceTree = SOURCE_ROOT; }; F9469168193015EE006DACD3 /* icon_delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_delete.png; sourceTree = SOURCE_ROOT; }; F962A231192FCA8A00E4324A /* Stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stack.h; sourceTree = SOURCE_ROOT; }; @@ -154,6 +156,7 @@ 3471866718070D9300FA0FB2 /* Supporting Files */ = { isa = PBXGroup; children = ( + F9127C881995144E00040C52 /* back_arrow.png */, F9469167193015EE006DACD3 /* icon_checkmark.png */, F9469168193015EE006DACD3 /* icon_delete.png */, F98356D7192E906600EA6821 /* bluetooth.png */, @@ -269,6 +272,7 @@ F9C77F50192CDE30002DBE8A /* durex.json in Resources */, F9C77F4E192CDE18002DBE8A /* InfoPlist.strings in Resources */, 34AAB88D189805300019860D /* Images.xcassets in Resources */, + F9127C891995144E00040C52 /* back_arrow.png in Resources */, F9469169193015EE006DACD3 /* icon_checkmark.png in Resources */, F946916A193015EE006DACD3 /* icon_delete.png in Resources */, 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */, 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 1ea41bd..de89c23 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/DUREX test.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DUREX tests/DUREX test.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 205e857..fe2b454 100644 --- a/DUREX tests/DUREX test.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/DUREX tests/DUREX test.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,22 +2,4 @@ - - - - - - diff --git a/DUREX tests/MenuTableViewController.m b/DUREX tests/MenuTableViewController.m index b33f016..d4d4c3f 100644 --- a/DUREX tests/MenuTableViewController.m +++ b/DUREX tests/MenuTableViewController.m @@ -140,8 +140,19 @@ [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 tests/back_arrow.png b/DUREX tests/back_arrow.png new file mode 100644 index 0000000..5cad8bd --- /dev/null +++ b/DUREX tests/back_arrow.png