Imanol-Mikel Barba Sabariego / btvendor · Commits

Commit 27e675a3309289ec83796ae0b7df097406c18776

Authored by Imanol-Mikel Barba Sabariego
1 parent eb096bad

--no commit message

Inline Side-by-side
Showing 12 changed files with 26 additions and 25 deletions
DUREX Vendor Control/Base.lproj/DatePickerViewController.xib
  View file @27e675a
@@ -55,7 +55,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -55,7 +55,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
55 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> 55 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
56 </state> 56 </state>
57 <connections> 57 <connections>
58 - <action selector="closePopup:" destination="-1" eventType="touchDragInside" id="Hml-qE-msj"/> 58 + <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="bgh-B7-4fN"/>
59 </connections> 59 </connections>
60 </button> 60 </button>
61 </subviews> 61 </subviews>
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj
  View file @27e675a
@@ -32,6 +32,8 @@ @@ -32,6 +32,8 @@
32 F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F961D80E199A5F2D00E9282C /* back_arrow.png */; }; 32 F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F961D80E199A5F2D00E9282C /* back_arrow.png */; };
33 F961D816199A5FA000E9282C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F961D814199A5FA000E9282C /* Localizable.strings */; }; 33 F961D816199A5FA000E9282C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F961D814199A5FA000E9282C /* Localizable.strings */; };
34 F961D819199A711300E9282C /* EMConnectingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F961D81B199A711300E9282C /* EMConnectingView.xib */; }; 34 F961D819199A711300E9282C /* EMConnectingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F961D81B199A711300E9282C /* EMConnectingView.xib */; };
  35 + F97B90CB19B859F500DDA9EF /* icon_checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = F97B90C919B859F500DDA9EF /* icon_checkmark.png */; };
  36 + F97B90CC19B859F500DDA9EF /* icon_delete.png in Resources */ = {isa = PBXBuildFile; fileRef = F97B90CA19B859F500DDA9EF /* icon_delete.png */; };
35 F98356D6192E835F00EA6821 /* InitialViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356D5192E835F00EA6821 /* InitialViewController.m */; }; 37 F98356D6192E835F00EA6821 /* InitialViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356D5192E835F00EA6821 /* InitialViewController.m */; };
36 F98356D8192E906600EA6821 /* bluetooth.png in Resources */ = {isa = PBXBuildFile; fileRef = F98356D7192E906600EA6821 /* bluetooth.png */; }; 38 F98356D8192E906600EA6821 /* bluetooth.png in Resources */ = {isa = PBXBuildFile; fileRef = F98356D7192E906600EA6821 /* bluetooth.png */; };
37 F98356DB192EAFD400EA6821 /* CommunicationProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356DA192EAFD400EA6821 /* CommunicationProtocol.m */; }; 39 F98356DB192EAFD400EA6821 /* CommunicationProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356DA192EAFD400EA6821 /* CommunicationProtocol.m */; };
@@ -117,6 +119,8 @@ @@ -117,6 +119,8 @@
117 F961D81A199A711300E9282C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView.xib; sourceTree = "<group>"; }; 119 F961D81A199A711300E9282C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView.xib; sourceTree = "<group>"; };
118 F961D81D199A711600E9282C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView.strings; sourceTree = "<group>"; }; 120 F961D81D199A711600E9282C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView.strings; sourceTree = "<group>"; };
119 F961D81F199A711700E9282C /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView.strings; sourceTree = "<group>"; }; 121 F961D81F199A711700E9282C /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView.strings; sourceTree = "<group>"; };
  122 + F97B90C919B859F500DDA9EF /* icon_checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_checkmark.png; sourceTree = SOURCE_ROOT; };
  123 + F97B90CA19B859F500DDA9EF /* icon_delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_delete.png; sourceTree = SOURCE_ROOT; };
120 F98356D4192E835F00EA6821 /* InitialViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitialViewController.h; sourceTree = SOURCE_ROOT; }; 124 F98356D4192E835F00EA6821 /* InitialViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitialViewController.h; sourceTree = SOURCE_ROOT; };
121 F98356D5192E835F00EA6821 /* InitialViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InitialViewController.m; sourceTree = SOURCE_ROOT; }; 125 F98356D5192E835F00EA6821 /* InitialViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InitialViewController.m; sourceTree = SOURCE_ROOT; };
122 F98356D7192E906600EA6821 /* bluetooth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bluetooth.png; sourceTree = SOURCE_ROOT; }; 126 F98356D7192E906600EA6821 /* bluetooth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bluetooth.png; sourceTree = SOURCE_ROOT; };
@@ -225,6 +229,8 @@ @@ -225,6 +229,8 @@
225 3471866718070D9300FA0FB2 /* Supporting Files */ = { 229 3471866718070D9300FA0FB2 /* Supporting Files */ = {
226 isa = PBXGroup; 230 isa = PBXGroup;
227 children = ( 231 children = (
  232 + F97B90C919B859F500DDA9EF /* icon_checkmark.png */,
  233 + F97B90CA19B859F500DDA9EF /* icon_delete.png */,
228 F961D80E199A5F2D00E9282C /* back_arrow.png */, 234 F961D80E199A5F2D00E9282C /* back_arrow.png */,
229 F98356D7192E906600EA6821 /* bluetooth.png */, 235 F98356D7192E906600EA6821 /* bluetooth.png */,
230 34AAB87E189804FF0019860D /* DUREX Vendor Control-Info.plist */, 236 34AAB87E189804FF0019860D /* DUREX Vendor Control-Info.plist */,
@@ -361,6 +367,7 @@ @@ -361,6 +367,7 @@
361 isa = PBXResourcesBuildPhase; 367 isa = PBXResourcesBuildPhase;
362 buildActionMask = 2147483647; 368 buildActionMask = 2147483647;
363 files = ( 369 files = (
  370 + F97B90CC19B859F500DDA9EF /* icon_delete.png in Resources */,
364 F9015D9019B73052006C7882 /* DatePickerViewController.xib in Resources */, 371 F9015D9019B73052006C7882 /* DatePickerViewController.xib in Resources */,
365 F98356D8192E906600EA6821 /* bluetooth.png in Resources */, 372 F98356D8192E906600EA6821 /* bluetooth.png in Resources */,
366 F9015D9719B7305E006C7882 /* DatePickerViewController_iPad.xib in Resources */, 373 F9015D9719B7305E006C7882 /* DatePickerViewController_iPad.xib in Resources */,
@@ -371,6 +378,7 @@ @@ -371,6 +378,7 @@
371 F92F569219B7665F00A1EACA /* NameChangerViewController.xib in Resources */, 378 F92F569219B7665F00A1EACA /* NameChangerViewController.xib in Resources */,
372 F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */, 379 F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */,
373 F961D816199A5FA000E9282C /* Localizable.strings in Resources */, 380 F961D816199A5FA000E9282C /* Localizable.strings in Resources */,
  381 + F97B90CB19B859F500DDA9EF /* icon_checkmark.png in Resources */,
374 34AAB88D189805300019860D /* Images.xcassets in Resources */, 382 34AAB88D189805300019860D /* Images.xcassets in Resources */,
375 F92F568419B760A800A1EACA /* PriceChangerViewController_iPad.xib in Resources */, 383 F92F568419B760A800A1EACA /* PriceChangerViewController_iPad.xib in Resources */,
376 F961D804199A5F1000E9282C /* MainStoryboard.storyboard in Resources */, 384 F961D804199A5F1000E9282C /* MainStoryboard.storyboard in Resources */,
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
View file @27e675a
No preview for this file type
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  View file @27e675a
@@ -58,11 +58,11 @@ @@ -58,11 +58,11 @@
58 ignoreCount = "0" 58 ignoreCount = "0"
59 continueAfterRunningActions = "No" 59 continueAfterRunningActions = "No"
60 filePath = "DatePickerViewController.m" 60 filePath = "DatePickerViewController.m"
61 - timestampString = "431435820.039883" 61 + timestampString = "431511161.110287"
62 startingColumnNumber = "9223372036854775807" 62 startingColumnNumber = "9223372036854775807"
63 endingColumnNumber = "9223372036854775807" 63 endingColumnNumber = "9223372036854775807"
64 - startingLineNumber = "66"  
65 - endingLineNumber = "66" 64 + startingLineNumber = "71"
  65 + endingLineNumber = "71"
66 landmarkName = "-closePopup:" 66 landmarkName = "-closePopup:"
67 landmarkType = "5"> 67 landmarkType = "5">
68 </BreakpointContent> 68 </BreakpointContent>
DUREX Vendor Control/DatePickerViewController.m
  View file @27e675a
@@ -29,6 +29,11 @@ @@ -29,6 +29,11 @@
29 self.datePickerView.layer.cornerRadius = 5; 29 self.datePickerView.layer.cornerRadius = 5;
30 self.datePickerView.layer.shadowOpacity = 0.8; 30 self.datePickerView.layer.shadowOpacity = 0.8;
31 self.datePickerView.layer.shadowOffset = CGSizeMake(0.0f, 0.0f); 31 self.datePickerView.layer.shadowOffset = CGSizeMake(0.0f, 0.0f);
  32 +
  33 + //Fix transparency glitch on iPad
  34 + [self.datePicker setDate:[NSDate dateWithTimeIntervalSince1970:NSTimeIntervalSince1970]];
  35 + [self.datePicker setDate:[NSDate date]];
  36 +
32 [super viewDidLoad]; 37 [super viewDidLoad];
33 // Do any additional setup after loading the view from its nib. 38 // Do any additional setup after loading the view from its nib.
34 } 39 }
DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard
  View file @27e675a
1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="kWw-Rk-wD6"> 2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="kWw-Rk-wD6">
3 <dependencies> 3 <dependencies>
4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/> 4 <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
5 </dependencies> 5 </dependencies>
@@ -156,24 +156,6 @@ @@ -156,24 +156,6 @@
156 </objects> 156 </objects>
157 <point key="canvasLocation" x="834" y="-9"/> 157 <point key="canvasLocation" x="834" y="-9"/>
158 </scene> 158 </scene>
159 - <!--View Controller-->  
160 - <scene sceneID="agw-j4-kfO">  
161 - <objects>  
162 - <viewController id="ant-Nj-pgA" sceneMemberID="viewController">  
163 - <layoutGuides>  
164 - <viewControllerLayoutGuide type="top" id="SN7-Hq-ZIL"/>  
165 - <viewControllerLayoutGuide type="bottom" id="Bb0-g7-RIh"/>  
166 - </layoutGuides>  
167 - <view key="view" contentMode="scaleToFill" id="m88-0L-ecz">  
168 - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>  
169 - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>  
170 - <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>  
171 - </view>  
172 - </viewController>  
173 - <placeholder placeholderIdentifier="IBFirstResponder" id="5RD-WX-vrv" userLabel="First Responder" sceneMemberID="firstResponder"/>  
174 - </objects>  
175 - <point key="canvasLocation" x="1469" y="-383"/>  
176 - </scene>  
177 <!--Navigation Controller--> 159 <!--Navigation Controller-->
178 <scene sceneID="Ker-Z3-hzQ"> 160 <scene sceneID="Ker-Z3-hzQ">
179 <objects> 161 <objects>
DUREX Vendor Control/icon_checkmark.png 0 → 100755
View file @27e675a

2.92 KB
DUREX Vendor Control/icon_delete.png 0 → 100755
View file @27e675a

2.93 KB
DUREX tests/Base.lproj/DatePickerViewController_iPad.xib
  View file @27e675a
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 <datePicker contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="Ye8-NM-1gf"> 23 <datePicker contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="Ye8-NM-1gf">
24 <rect key="frame" x="-192" y="47" width="768" height="216"/> 24 <rect key="frame" x="-192" y="47" width="768" height="216"/>
25 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> 25 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
  26 + <color key="backgroundColor" red="0.9960784912109375" green="0.99215692281723022" blue="0.99215692281723022" alpha="0.95000000000000007" colorSpace="deviceRGB"/>
26 <date key="date" timeIntervalSinceReferenceDate="431372189.40412599"> 27 <date key="date" timeIntervalSinceReferenceDate="431372189.40412599">
27 <!--2014-09-02 17:36:29 +0000--> 28 <!--2014-09-02 17:36:29 +0000-->
28 </date> 29 </date>
@@ -59,7 +60,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA @@ -59,7 +60,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
59 </connections> 60 </connections>
60 </button> 61 </button>
61 </subviews> 62 </subviews>
62 - <color key="backgroundColor" white="1" alpha="0.95000000000000007" colorSpace="custom" customColorSpace="calibratedWhite"/> 63 + <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
63 <constraints> 64 <constraints>
64 <constraint firstItem="b32-QI-eSJ" firstAttribute="top" secondItem="Ye8-NM-1gf" secondAttribute="bottom" constant="8" id="kLC-bc-bhQ"/> 65 <constraint firstItem="b32-QI-eSJ" firstAttribute="top" secondItem="Ye8-NM-1gf" secondAttribute="bottom" constant="8" id="kLC-bc-bhQ"/>
65 <constraint firstItem="Ye8-NM-1gf" firstAttribute="centerX" secondItem="b32-QI-eSJ" secondAttribute="centerX" id="uy2-qe-Oz3"/> 66 <constraint firstItem="Ye8-NM-1gf" firstAttribute="centerX" secondItem="b32-QI-eSJ" secondAttribute="centerX" id="uy2-qe-Oz3"/>
DUREX tests/CommunicationProtocol.m
  View file @27e675a
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 42
43 -(Boolean) establishConnection 43 -(Boolean) establishConnection
44 { 44 {
45 - return FALSE; 45 + return TRUE;
46 } 46 }
47 47
48 @end 48 @end
DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
View file @27e675a
No preview for this file type
DUREX tests/DatePickerViewController.m
  View file @27e675a
@@ -28,6 +28,11 @@ @@ -28,6 +28,11 @@
28 self.datePickerView.layer.cornerRadius = 5; 28 self.datePickerView.layer.cornerRadius = 5;
29 self.datePickerView.layer.shadowOpacity = 0.8; 29 self.datePickerView.layer.shadowOpacity = 0.8;
30 self.datePickerView.layer.shadowOffset = CGSizeMake(0.0f, 0.0f); 30 self.datePickerView.layer.shadowOffset = CGSizeMake(0.0f, 0.0f);
  31 +
  32 + //Fix transparency glitch on iPad
  33 + [self.datePicker setDate:[NSDate dateWithTimeIntervalSince1970:NSTimeIntervalSince1970]];
  34 + [self.datePicker setDate:[NSDate date]];
  35 +
31 [super viewDidLoad]; 36 [super viewDidLoad];
32 // Do any additional setup after loading the view from its nib. 37 // Do any additional setup after loading the view from its nib.
33 } 38 }