Imanol-Mikel Barba Sabariego / btvendor · Commits

Commit c2691027dab16974e9894368797213ac5ef9a533

Authored by Imanol-Mikel Barba Sabariego
1 parent b43e7309

--no commit message

Inline Side-by-side
Showing 6 changed files with 15 additions and 2 deletions
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj
  View file @c269102
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
21 34AAB889189804FF0019860D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AAB880189804FF0019860D /* main.m */; }; 21 34AAB889189804FF0019860D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AAB880189804FF0019860D /* main.m */; };
22 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB881189804FF0019860D /* MainStoryboard.storyboard */; }; 22 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB881189804FF0019860D /* MainStoryboard.storyboard */; };
23 34AAB88D189805300019860D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB88C189805300019860D /* Images.xcassets */; }; 23 34AAB88D189805300019860D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB88C189805300019860D /* Images.xcassets */; };
  24 + F9127C8B19951B3500040C52 /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F9127C8A19951B3500040C52 /* back_arrow.png */; };
24 F98356D6192E835F00EA6821 /* InitialViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356D5192E835F00EA6821 /* InitialViewController.m */; }; 25 F98356D6192E835F00EA6821 /* InitialViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356D5192E835F00EA6821 /* InitialViewController.m */; };
25 F98356D8192E906600EA6821 /* bluetooth.png in Resources */ = {isa = PBXBuildFile; fileRef = F98356D7192E906600EA6821 /* bluetooth.png */; }; 26 F98356D8192E906600EA6821 /* bluetooth.png in Resources */ = {isa = PBXBuildFile; fileRef = F98356D7192E906600EA6821 /* bluetooth.png */; };
26 F98356DB192EAFD400EA6821 /* CommunicationProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356DA192EAFD400EA6821 /* CommunicationProtocol.m */; }; 27 F98356DB192EAFD400EA6821 /* CommunicationProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356DA192EAFD400EA6821 /* CommunicationProtocol.m */; };
@@ -73,6 +74,7 @@ @@ -73,6 +74,7 @@
73 34AAB880189804FF0019860D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FirstAppExample/main.m; sourceTree = SOURCE_ROOT; }; 74 34AAB880189804FF0019860D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FirstAppExample/main.m; sourceTree = SOURCE_ROOT; };
74 34AAB881189804FF0019860D /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = MainStoryboard.storyboard; path = FirstAppExample/MainStoryboard.storyboard; sourceTree = SOURCE_ROOT; }; 75 34AAB881189804FF0019860D /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = MainStoryboard.storyboard; path = FirstAppExample/MainStoryboard.storyboard; sourceTree = SOURCE_ROOT; };
75 34AAB88C189805300019860D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = FirstAppExample/Images.xcassets; sourceTree = SOURCE_ROOT; }; 76 34AAB88C189805300019860D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = FirstAppExample/Images.xcassets; sourceTree = SOURCE_ROOT; };
  77 + F9127C8A19951B3500040C52 /* back_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back_arrow.png; sourceTree = SOURCE_ROOT; };
76 F98356D4192E835F00EA6821 /* InitialViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitialViewController.h; sourceTree = SOURCE_ROOT; }; 78 F98356D4192E835F00EA6821 /* InitialViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitialViewController.h; sourceTree = SOURCE_ROOT; };
77 F98356D5192E835F00EA6821 /* InitialViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InitialViewController.m; sourceTree = SOURCE_ROOT; }; 79 F98356D5192E835F00EA6821 /* InitialViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InitialViewController.m; sourceTree = SOURCE_ROOT; };
78 F98356D7192E906600EA6821 /* bluetooth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bluetooth.png; sourceTree = SOURCE_ROOT; }; 80 F98356D7192E906600EA6821 /* bluetooth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bluetooth.png; sourceTree = SOURCE_ROOT; };
@@ -169,6 +171,7 @@ @@ -169,6 +171,7 @@
169 3471866718070D9300FA0FB2 /* Supporting Files */ = { 171 3471866718070D9300FA0FB2 /* Supporting Files */ = {
170 isa = PBXGroup; 172 isa = PBXGroup;
171 children = ( 173 children = (
  174 + F9127C8A19951B3500040C52 /* back_arrow.png */,
172 F98356D7192E906600EA6821 /* bluetooth.png */, 175 F98356D7192E906600EA6821 /* bluetooth.png */,
173 34AAB87E189804FF0019860D /* DUREX Vendor Control-Info.plist */, 176 34AAB87E189804FF0019860D /* DUREX Vendor Control-Info.plist */,
174 34AAB87F189804FF0019860D /* DUREX Vendor Control-Prefix.pch */, 177 34AAB87F189804FF0019860D /* DUREX Vendor Control-Prefix.pch */,
@@ -307,6 +310,7 @@ @@ -307,6 +310,7 @@
307 34AAB884189804FF0019860D /* EMConnectingView.xib in Resources */, 310 34AAB884189804FF0019860D /* EMConnectingView.xib in Resources */,
308 F9C77F50192CDE30002DBE8A /* durex.json in Resources */, 311 F9C77F50192CDE30002DBE8A /* durex.json in Resources */,
309 F9C77F4E192CDE18002DBE8A /* InfoPlist.strings in Resources */, 312 F9C77F4E192CDE18002DBE8A /* InfoPlist.strings in Resources */,
  313 + F9127C8B19951B3500040C52 /* back_arrow.png in Resources */,
310 34AAB88D189805300019860D /* Images.xcassets in Resources */, 314 34AAB88D189805300019860D /* Images.xcassets in Resources */,
311 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */, 315 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */,
312 ); 316 );
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
View file @c269102
No preview for this file type
DUREX Vendor Control/MenuTableViewController.m
  View file @c269102
@@ -137,8 +137,18 @@ @@ -137,8 +137,18 @@
137 [super viewDidLoad]; 137 [super viewDidLoad];
138 [_activityIndicator setHidden:YES]; 138 [_activityIndicator setHidden:YES];
139 139
  140 + UIImage *backImage = [UIImage imageNamed:@"back_arrow.png"];
  141 + UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
  142 + backButton.frame = CGRectMake(0, 0, backImage.size.width/2, backImage.size.height/2);
  143 +
  144 + [backButton setImage:backImage forState:UIControlStateNormal];
  145 + [backButton setTitle:@"Back" forState:UIControlStateNormal];
  146 + [backButton addTarget:self action:@selector(backButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
  147 +
  148 + UIBarButtonItem *backBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backButton];
  149 +
140 self.navigationItem.hidesBackButton = YES; 150 self.navigationItem.hidesBackButton = YES;
141 - self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Back" style:UIBarButtonItemStylePlain target:self action:@selector(backButtonPressed:)]; 151 + self.navigationItem.leftBarButtonItem = backBarButtonItem;
142 152
143 //Emmoco protocol initialization 153 //Emmoco protocol initialization
144 _protocol = [CommunicationProtocol sharedProtocol]; 154 _protocol = [CommunicationProtocol sharedProtocol];
DUREX Vendor Control/back_arrow.png 0 → 100644
View file @c269102

3.06 KB
DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
View file @c269102
No preview for this file type
DUREX tests/MenuTableViewController.m
  View file @c269102
@@ -150,7 +150,6 @@ @@ -150,7 +150,6 @@
150 150
151 UIBarButtonItem *backBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backButton]; 151 UIBarButtonItem *backBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backButton];
152 152
153 -  
154 self.navigationItem.hidesBackButton = YES; 153 self.navigationItem.hidesBackButton = YES;
155 self.navigationItem.leftBarButtonItem = backBarButtonItem; 154 self.navigationItem.leftBarButtonItem = backBarButtonItem;
156 155