Commit b43e7309afa06cc0d125d02b083d3f0706bcf248
1 parent
8643d47c
--no commit message
Showing
5 changed files
with
16 additions
and
19 deletions
DUREX tests/DUREX test.xcodeproj/project.pbxproj
@@ -19,6 +19,7 @@ | @@ -19,6 +19,7 @@ | ||
19 | 34AAB889189804FF0019860D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AAB880189804FF0019860D /* main.m */; }; | 19 | 34AAB889189804FF0019860D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AAB880189804FF0019860D /* main.m */; }; |
20 | 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB881189804FF0019860D /* MainStoryboard.storyboard */; }; | 20 | 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB881189804FF0019860D /* MainStoryboard.storyboard */; }; |
21 | 34AAB88D189805300019860D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB88C189805300019860D /* Images.xcassets */; }; | 21 | 34AAB88D189805300019860D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB88C189805300019860D /* Images.xcassets */; }; |
22 | + F9127C891995144E00040C52 /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F9127C881995144E00040C52 /* back_arrow.png */; }; | ||
22 | F9469169193015EE006DACD3 /* icon_checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = F9469167193015EE006DACD3 /* icon_checkmark.png */; }; | 23 | F9469169193015EE006DACD3 /* icon_checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = F9469167193015EE006DACD3 /* icon_checkmark.png */; }; |
23 | F946916A193015EE006DACD3 /* icon_delete.png in Resources */ = {isa = PBXBuildFile; fileRef = F9469168193015EE006DACD3 /* icon_delete.png */; }; | 24 | F946916A193015EE006DACD3 /* icon_delete.png in Resources */ = {isa = PBXBuildFile; fileRef = F9469168193015EE006DACD3 /* icon_delete.png */; }; |
24 | F962A233192FCA8A00E4324A /* Stack.m in Sources */ = {isa = PBXBuildFile; fileRef = F962A232192FCA8A00E4324A /* Stack.m */; }; | 25 | F962A233192FCA8A00E4324A /* Stack.m in Sources */ = {isa = PBXBuildFile; fileRef = F962A232192FCA8A00E4324A /* Stack.m */; }; |
@@ -57,6 +58,7 @@ | @@ -57,6 +58,7 @@ | ||
57 | 34AAB880189804FF0019860D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FirstAppExample/main.m; sourceTree = SOURCE_ROOT; }; | 58 | 34AAB880189804FF0019860D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FirstAppExample/main.m; sourceTree = SOURCE_ROOT; }; |
58 | 34AAB881189804FF0019860D /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = MainStoryboard.storyboard; path = FirstAppExample/MainStoryboard.storyboard; sourceTree = SOURCE_ROOT; }; | 59 | 34AAB881189804FF0019860D /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = MainStoryboard.storyboard; path = FirstAppExample/MainStoryboard.storyboard; sourceTree = SOURCE_ROOT; }; |
59 | 34AAB88C189805300019860D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = FirstAppExample/Images.xcassets; sourceTree = SOURCE_ROOT; }; | 60 | 34AAB88C189805300019860D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = FirstAppExample/Images.xcassets; sourceTree = SOURCE_ROOT; }; |
61 | + F9127C881995144E00040C52 /* back_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back_arrow.png; sourceTree = SOURCE_ROOT; }; | ||
60 | F9469167193015EE006DACD3 /* icon_checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_checkmark.png; sourceTree = SOURCE_ROOT; }; | 62 | F9469167193015EE006DACD3 /* icon_checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_checkmark.png; sourceTree = SOURCE_ROOT; }; |
61 | F9469168193015EE006DACD3 /* icon_delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_delete.png; sourceTree = SOURCE_ROOT; }; | 63 | F9469168193015EE006DACD3 /* icon_delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_delete.png; sourceTree = SOURCE_ROOT; }; |
62 | F962A231192FCA8A00E4324A /* Stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stack.h; sourceTree = SOURCE_ROOT; }; | 64 | F962A231192FCA8A00E4324A /* Stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stack.h; sourceTree = SOURCE_ROOT; }; |
@@ -154,6 +156,7 @@ | @@ -154,6 +156,7 @@ | ||
154 | 3471866718070D9300FA0FB2 /* Supporting Files */ = { | 156 | 3471866718070D9300FA0FB2 /* Supporting Files */ = { |
155 | isa = PBXGroup; | 157 | isa = PBXGroup; |
156 | children = ( | 158 | children = ( |
159 | + F9127C881995144E00040C52 /* back_arrow.png */, | ||
157 | F9469167193015EE006DACD3 /* icon_checkmark.png */, | 160 | F9469167193015EE006DACD3 /* icon_checkmark.png */, |
158 | F9469168193015EE006DACD3 /* icon_delete.png */, | 161 | F9469168193015EE006DACD3 /* icon_delete.png */, |
159 | F98356D7192E906600EA6821 /* bluetooth.png */, | 162 | F98356D7192E906600EA6821 /* bluetooth.png */, |
@@ -269,6 +272,7 @@ | @@ -269,6 +272,7 @@ | ||
269 | F9C77F50192CDE30002DBE8A /* durex.json in Resources */, | 272 | F9C77F50192CDE30002DBE8A /* durex.json in Resources */, |
270 | F9C77F4E192CDE18002DBE8A /* InfoPlist.strings in Resources */, | 273 | F9C77F4E192CDE18002DBE8A /* InfoPlist.strings in Resources */, |
271 | 34AAB88D189805300019860D /* Images.xcassets in Resources */, | 274 | 34AAB88D189805300019860D /* Images.xcassets in Resources */, |
275 | + F9127C891995144E00040C52 /* back_arrow.png in Resources */, | ||
272 | F9469169193015EE006DACD3 /* icon_checkmark.png in Resources */, | 276 | F9469169193015EE006DACD3 /* icon_checkmark.png in Resources */, |
273 | F946916A193015EE006DACD3 /* icon_delete.png in Resources */, | 277 | F946916A193015EE006DACD3 /* icon_delete.png in Resources */, |
274 | 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */, | 278 | 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */, |
DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
DUREX tests/DUREX test.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,22 +2,4 @@ | @@ -2,22 +2,4 @@ | ||
2 | <Bucket | 2 | <Bucket |
3 | type = "1" | 3 | type = "1" |
4 | version = "2.0"> | 4 | version = "2.0"> |
5 | - <Breakpoints> | ||
6 | - <BreakpointProxy | ||
7 | - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | ||
8 | - <BreakpointContent | ||
9 | - shouldBeEnabled = "No" | ||
10 | - ignoreCount = "0" | ||
11 | - continueAfterRunningActions = "No" | ||
12 | - filePath = "MenuTableViewController.m" | ||
13 | - timestampString = "429132434.984264" | ||
14 | - startingColumnNumber = "9223372036854775807" | ||
15 | - endingColumnNumber = "9223372036854775807" | ||
16 | - startingLineNumber = "165" | ||
17 | - endingLineNumber = "165" | ||
18 | - landmarkName = "-viewDidLoad" | ||
19 | - landmarkType = "5"> | ||
20 | - </BreakpointContent> | ||
21 | - </BreakpointProxy> | ||
22 | - </Breakpoints> | ||
23 | </Bucket> | 5 | </Bucket> |
DUREX tests/MenuTableViewController.m
@@ -140,8 +140,19 @@ | @@ -140,8 +140,19 @@ | ||
140 | [super viewDidLoad]; | 140 | [super viewDidLoad]; |
141 | [_activityIndicator setHidden:YES]; | 141 | [_activityIndicator setHidden:YES]; |
142 | 142 | ||
143 | + UIImage *backImage = [UIImage imageNamed:@"back_arrow.png"]; | ||
144 | + UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom]; | ||
145 | + backButton.frame = CGRectMake(0, 0, backImage.size.width/2, backImage.size.height/2); | ||
146 | + | ||
147 | + [backButton setImage:backImage forState:UIControlStateNormal]; | ||
148 | + [backButton setTitle:@"Back" forState:UIControlStateNormal]; | ||
149 | + [backButton addTarget:self action:@selector(backButtonPressed:) forControlEvents:UIControlEventTouchUpInside]; | ||
150 | + | ||
151 | + UIBarButtonItem *backBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backButton]; | ||
152 | + | ||
153 | + | ||
143 | self.navigationItem.hidesBackButton = YES; | 154 | self.navigationItem.hidesBackButton = YES; |
144 | - self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Back" style:UIBarButtonItemStylePlain target:self action:@selector(backButtonPressed:)]; | 155 | + self.navigationItem.leftBarButtonItem = backBarButtonItem; |
145 | 156 | ||
146 | //Emmoco protocol initialization | 157 | //Emmoco protocol initialization |
147 | _protocol = [CommunicationProtocol sharedProtocol]; | 158 | _protocol = [CommunicationProtocol sharedProtocol]; |
DUREX tests/back_arrow.png
0 → 100644
3.06 KB