diff --git a/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib b/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib index 47a1085..7a6eeed 100644 --- a/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib +++ b/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib @@ -55,7 +55,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj index 32ecda6..5d83cdd 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj @@ -32,6 +32,8 @@ F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F961D80E199A5F2D00E9282C /* back_arrow.png */; }; F961D816199A5FA000E9282C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F961D814199A5FA000E9282C /* Localizable.strings */; }; F961D819199A711300E9282C /* EMConnectingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F961D81B199A711300E9282C /* EMConnectingView.xib */; }; + F97B90CB19B859F500DDA9EF /* icon_checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = F97B90C919B859F500DDA9EF /* icon_checkmark.png */; }; + F97B90CC19B859F500DDA9EF /* icon_delete.png in Resources */ = {isa = PBXBuildFile; fileRef = F97B90CA19B859F500DDA9EF /* icon_delete.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 */; }; @@ -117,6 +119,8 @@ F961D81A199A711300E9282C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView.xib; sourceTree = ""; }; F961D81D199A711600E9282C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView.strings; sourceTree = ""; }; F961D81F199A711700E9282C /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView.strings; sourceTree = ""; }; + F97B90C919B859F500DDA9EF /* icon_checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_checkmark.png; sourceTree = SOURCE_ROOT; }; + F97B90CA19B859F500DDA9EF /* icon_delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_delete.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; }; @@ -225,6 +229,8 @@ 3471866718070D9300FA0FB2 /* Supporting Files */ = { isa = PBXGroup; children = ( + F97B90C919B859F500DDA9EF /* icon_checkmark.png */, + F97B90CA19B859F500DDA9EF /* icon_delete.png */, F961D80E199A5F2D00E9282C /* back_arrow.png */, F98356D7192E906600EA6821 /* bluetooth.png */, 34AAB87E189804FF0019860D /* DUREX Vendor Control-Info.plist */, @@ -361,6 +367,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + F97B90CC19B859F500DDA9EF /* icon_delete.png in Resources */, F9015D9019B73052006C7882 /* DatePickerViewController.xib in Resources */, F98356D8192E906600EA6821 /* bluetooth.png in Resources */, F9015D9719B7305E006C7882 /* DatePickerViewController_iPad.xib in Resources */, @@ -371,6 +378,7 @@ F92F569219B7665F00A1EACA /* NameChangerViewController.xib in Resources */, F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */, F961D816199A5FA000E9282C /* Localizable.strings in Resources */, + F97B90CB19B859F500DDA9EF /* icon_checkmark.png in Resources */, 34AAB88D189805300019860D /* Images.xcassets in Resources */, F92F568419B760A800A1EACA /* PriceChangerViewController_iPad.xib in Resources */, F961D804199A5F1000E9282C /* 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 6e8ad07..ff80eca 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/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 163caa2..7fb0acc 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -58,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "DatePickerViewController.m" - timestampString = "431435820.039883" + timestampString = "431511161.110287" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "66" - endingLineNumber = "66" + startingLineNumber = "71" + endingLineNumber = "71" landmarkName = "-closePopup:" landmarkType = "5"> diff --git a/DUREX Vendor Control/DatePickerViewController.m b/DUREX Vendor Control/DatePickerViewController.m index 929acb6..2fcc189 100644 --- a/DUREX Vendor Control/DatePickerViewController.m +++ b/DUREX Vendor Control/DatePickerViewController.m @@ -29,6 +29,11 @@ self.datePickerView.layer.cornerRadius = 5; self.datePickerView.layer.shadowOpacity = 0.8; self.datePickerView.layer.shadowOffset = CGSizeMake(0.0f, 0.0f); + + //Fix transparency glitch on iPad + [self.datePicker setDate:[NSDate dateWithTimeIntervalSince1970:NSTimeIntervalSince1970]]; + [self.datePicker setDate:[NSDate date]]; + [super viewDidLoad]; // Do any additional setup after loading the view from its nib. } diff --git a/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard index 373c413..118268e 100644 --- a/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard +++ b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard @@ -1,5 +1,5 @@ - + @@ -156,24 +156,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/DUREX Vendor Control/icon_checkmark.png b/DUREX Vendor Control/icon_checkmark.png new file mode 100755 index 0000000..05f9c40 --- /dev/null +++ b/DUREX Vendor Control/icon_checkmark.png diff --git a/DUREX Vendor Control/icon_delete.png b/DUREX Vendor Control/icon_delete.png new file mode 100755 index 0000000..3ea51f4 --- /dev/null +++ b/DUREX Vendor Control/icon_delete.png diff --git a/DUREX tests/Base.lproj/DatePickerViewController_iPad.xib b/DUREX tests/Base.lproj/DatePickerViewController_iPad.xib index b72f739..37f5d2a 100644 --- a/DUREX tests/Base.lproj/DatePickerViewController_iPad.xib +++ b/DUREX tests/Base.lproj/DatePickerViewController_iPad.xib @@ -23,6 +23,7 @@ + @@ -59,7 +60,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + diff --git a/DUREX tests/CommunicationProtocol.m b/DUREX tests/CommunicationProtocol.m index b432c3f..68e1333 100644 --- a/DUREX tests/CommunicationProtocol.m +++ b/DUREX tests/CommunicationProtocol.m @@ -42,7 +42,7 @@ -(Boolean) establishConnection { - return FALSE; + return TRUE; } @end 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 549c2ed..707ea67 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/DatePickerViewController.m b/DUREX tests/DatePickerViewController.m index 6de1190..d7eb9d7 100644 --- a/DUREX tests/DatePickerViewController.m +++ b/DUREX tests/DatePickerViewController.m @@ -28,6 +28,11 @@ self.datePickerView.layer.cornerRadius = 5; self.datePickerView.layer.shadowOpacity = 0.8; self.datePickerView.layer.shadowOffset = CGSizeMake(0.0f, 0.0f); + + //Fix transparency glitch on iPad + [self.datePicker setDate:[NSDate dateWithTimeIntervalSince1970:NSTimeIntervalSince1970]]; + [self.datePicker setDate:[NSDate date]]; + [super viewDidLoad]; // Do any additional setup after loading the view from its nib. }