Browse Source

-- commit

Jason Lee 10 years ago
parent
commit
b6f5c8c72a
28 changed files with 80 additions and 1004 deletions
  1. 78 78
      kneet2.xcodeproj/project.pbxproj
  2. 2 255
      kneet2/Base.lproj/Settings.storyboard
  3. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/DaylightPopupView.h
  4. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/DaylightPopupView.m
  5. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/DaylightPopupView.xib
  6. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/ExternHeatPopupView.h
  7. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/ExternHeatPopupView.m
  8. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/ExternHeatPopupView.xib
  9. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/RulesConditionHomeModePopupView.h
  10. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/RulesConditionHomeModePopupView.m
  11. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/RulesConditionHomeModePopupView.xib
  12. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/RulesConditionHomeModeTableViewCell.xib
  13. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/TemperaturePopupView.h
  14. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/TemperaturePopupView.m
  15. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/TemperaturePopupView.xib
  16. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/TimePickerPopupView.h
  17. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/TimePickerPopupView.m
  18. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/TimePickerPopupView.xib
  19. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/TriggerSelectPopupView.h
  20. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/TriggerSelectPopupView.m
  21. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/TriggerSelectPopupView.xib
  22. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/WeatherLocationPopupTableViewCell.xib
  23. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/WeatherLocationPopupView.h
  24. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/WeatherLocationPopupView.m
  25. 0 0
      kneet2/Classes/ViewControllers/RuelsScreens/WeatherLocationPopupView.xib
  26. 0 39
      kneet2/Classes/ViewControllers/ThingsScreens/DeviceConditionPopupView.h
  27. 0 220
      kneet2/Classes/ViewControllers/ThingsScreens/DeviceConditionPopupView.m
  28. 0 412
      kneet2/Classes/ViewControllers/ThingsScreens/DeviceConditionPopupView.xib

+ 78 - 78
kneet2.xcodeproj/project.pbxproj

@@ -146,29 +146,29 @@
 		A130CDD81BF9C02100126AC5 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A132A59A1BBE70D6004877ED /* Settings.storyboard */; };
 		A130CDD91BF9C02100126AC5 /* Common.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A132A5901BBE70D6004877ED /* Common.storyboard */; };
 		A130CDDA1BF9C02100126AC5 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = A12BBC331BA94FAE00DE1B94 /* LaunchScreen.xib */; };
-		A13671BE1C02B56B005DF6C6 /* TriggerSelectPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13671BC1C02B56A005DF6C6 /* TriggerSelectPopupView.m */; };
-		A13671BF1C02B56B005DF6C6 /* TriggerSelectPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13671BD1C02B56A005DF6C6 /* TriggerSelectPopupView.xib */; };
-		A13671C51C03F5EC005DF6C6 /* TimePickerPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13671C31C03F5EC005DF6C6 /* TimePickerPopupView.m */; };
-		A13671C61C03F5EC005DF6C6 /* TimePickerPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13671C41C03F5EC005DF6C6 /* TimePickerPopupView.xib */; };
-		A13671CB1C0446CB005DF6C6 /* DaylightPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13671C91C0446CB005DF6C6 /* DaylightPopupView.m */; };
-		A13671CC1C0446CB005DF6C6 /* DaylightPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13671CA1C0446CB005DF6C6 /* DaylightPopupView.xib */; };
-		A13671D11C0451A2005DF6C6 /* WeatherLocationPopupTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13671CD1C0451A2005DF6C6 /* WeatherLocationPopupTableViewCell.xib */; };
-		A13671D21C0451A2005DF6C6 /* WeatherLocationPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13671CF1C0451A2005DF6C6 /* WeatherLocationPopupView.m */; };
-		A13671D31C0451A2005DF6C6 /* WeatherLocationPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13671D01C0451A2005DF6C6 /* WeatherLocationPopupView.xib */; };
-		A13671D81C046654005DF6C6 /* ExternHeatPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13671D61C046654005DF6C6 /* ExternHeatPopupView.m */; };
-		A13671D91C046654005DF6C6 /* ExternHeatPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13671D71C046654005DF6C6 /* ExternHeatPopupView.xib */; };
-		A13671DD1C054C49005DF6C6 /* TemperaturePopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13671DB1C054C49005DF6C6 /* TemperaturePopupView.m */; };
-		A13671DE1C054C49005DF6C6 /* TemperaturePopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13671DC1C054C49005DF6C6 /* TemperaturePopupView.xib */; };
 		A13671E21C0585AF005DF6C6 /* RulesConditionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A13671E11C0585AF005DF6C6 /* RulesConditionViewController.m */; };
+		A13BD0A61C3B55C100C76527 /* DaylightPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13BD0941C3B55C100C76527 /* DaylightPopupView.m */; };
+		A13BD0A71C3B55C100C76527 /* DaylightPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13BD0951C3B55C100C76527 /* DaylightPopupView.xib */; };
+		A13BD0A81C3B55C100C76527 /* ExternHeatPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13BD0971C3B55C100C76527 /* ExternHeatPopupView.m */; };
+		A13BD0A91C3B55C100C76527 /* ExternHeatPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13BD0981C3B55C100C76527 /* ExternHeatPopupView.xib */; };
+		A13BD0AA1C3B55C100C76527 /* TemperaturePopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13BD09A1C3B55C100C76527 /* TemperaturePopupView.m */; };
+		A13BD0AB1C3B55C100C76527 /* TemperaturePopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13BD09B1C3B55C100C76527 /* TemperaturePopupView.xib */; };
+		A13BD0AC1C3B55C100C76527 /* TimePickerPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13BD09D1C3B55C100C76527 /* TimePickerPopupView.m */; };
+		A13BD0AD1C3B55C100C76527 /* TimePickerPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13BD09E1C3B55C100C76527 /* TimePickerPopupView.xib */; };
+		A13BD0AE1C3B55C100C76527 /* TriggerSelectPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13BD0A01C3B55C100C76527 /* TriggerSelectPopupView.m */; };
+		A13BD0AF1C3B55C100C76527 /* TriggerSelectPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13BD0A11C3B55C100C76527 /* TriggerSelectPopupView.xib */; };
+		A13BD0B01C3B55C100C76527 /* WeatherLocationPopupTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13BD0A21C3B55C100C76527 /* WeatherLocationPopupTableViewCell.xib */; };
+		A13BD0B11C3B55C100C76527 /* WeatherLocationPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13BD0A41C3B55C100C76527 /* WeatherLocationPopupView.m */; };
+		A13BD0B21C3B55C100C76527 /* WeatherLocationPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13BD0A51C3B55C100C76527 /* WeatherLocationPopupView.xib */; };
+		A13BD0B71C3B55D800C76527 /* RulesConditionHomeModePopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A13BD0B41C3B55D800C76527 /* RulesConditionHomeModePopupView.m */; };
+		A13BD0B81C3B55D800C76527 /* RulesConditionHomeModePopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13BD0B51C3B55D800C76527 /* RulesConditionHomeModePopupView.xib */; };
+		A13BD0B91C3B55D800C76527 /* RulesConditionHomeModeTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A13BD0B61C3B55D800C76527 /* RulesConditionHomeModeTableViewCell.xib */; };
 		A14815621C11752D007B866D /* ReactiveCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A14815601C11752D007B866D /* ReactiveCocoa.framework */; };
 		A14815631C11752D007B866D /* ReactiveCocoa.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A14815601C11752D007B866D /* ReactiveCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A14815641C11752E007B866D /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A14815611C11752D007B866D /* Result.framework */; };
 		A14815651C11752E007B866D /* Result.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A14815611C11752D007B866D /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A17D62221BFEB2530030FE56 /* RulesAddViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A17D62211BFEB2530030FE56 /* RulesAddViewController.m */; };
 		A18C47AA1C0C0C9700E3D02A /* RulesDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A18C47A91C0C0C9700E3D02A /* RulesDetailViewController.m */; };
-		A19076641C05A70D00595146 /* RulesConditionHomeModePopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A19076611C05A70D00595146 /* RulesConditionHomeModePopupView.m */; };
-		A19076651C05A70D00595146 /* RulesConditionHomeModePopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A19076621C05A70D00595146 /* RulesConditionHomeModePopupView.xib */; };
-		A19076661C05A70D00595146 /* RulesConditionHomeModeTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A19076631C05A70D00595146 /* RulesConditionHomeModeTableViewCell.xib */; };
 		A19076701C0709A400595146 /* RulesAddCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A190766F1C0709A400595146 /* RulesAddCompleteViewController.m */; };
 		A1AF89DB1C1024CA00C904A2 /* ModifyDeviceNamePopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A1AF89D91C1024CA00C904A2 /* ModifyDeviceNamePopupView.m */; };
 		A1AF89DC1C1024CA00C904A2 /* ModifyDeviceNamePopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A1AF89DA1C1024CA00C904A2 /* ModifyDeviceNamePopupView.xib */; };
@@ -326,27 +326,31 @@
 		A132A5A91BBE7BF3004877ED /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainViewController.m; path = MainScreens/MainViewController.m; sourceTree = "<group>"; };
 		A132A5B11BBE814A004877ED /* UIView+Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Additions.h"; sourceTree = "<group>"; };
 		A132A5B21BBE814A004877ED /* UIView+Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Additions.m"; sourceTree = "<group>"; };
-		A13671BB1C02B56A005DF6C6 /* TriggerSelectPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TriggerSelectPopupView.h; path = kneet2/Classes/ViewControllers/ThingsScreens/TriggerSelectPopupView.h; sourceTree = SOURCE_ROOT; };
-		A13671BC1C02B56A005DF6C6 /* TriggerSelectPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TriggerSelectPopupView.m; path = kneet2/Classes/ViewControllers/ThingsScreens/TriggerSelectPopupView.m; sourceTree = SOURCE_ROOT; };
-		A13671BD1C02B56A005DF6C6 /* TriggerSelectPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = TriggerSelectPopupView.xib; path = kneet2/Classes/ViewControllers/ThingsScreens/TriggerSelectPopupView.xib; sourceTree = SOURCE_ROOT; };
-		A13671C21C03F5EC005DF6C6 /* TimePickerPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TimePickerPopupView.h; path = kneet2/Classes/ViewControllers/ThingsScreens/TimePickerPopupView.h; sourceTree = SOURCE_ROOT; };
-		A13671C31C03F5EC005DF6C6 /* TimePickerPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TimePickerPopupView.m; path = kneet2/Classes/ViewControllers/ThingsScreens/TimePickerPopupView.m; sourceTree = SOURCE_ROOT; };
-		A13671C41C03F5EC005DF6C6 /* TimePickerPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = TimePickerPopupView.xib; path = kneet2/Classes/ViewControllers/ThingsScreens/TimePickerPopupView.xib; sourceTree = SOURCE_ROOT; };
-		A13671C81C0446CB005DF6C6 /* DaylightPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DaylightPopupView.h; path = kneet2/Classes/ViewControllers/ThingsScreens/DaylightPopupView.h; sourceTree = SOURCE_ROOT; };
-		A13671C91C0446CB005DF6C6 /* DaylightPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DaylightPopupView.m; path = kneet2/Classes/ViewControllers/ThingsScreens/DaylightPopupView.m; sourceTree = SOURCE_ROOT; };
-		A13671CA1C0446CB005DF6C6 /* DaylightPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = DaylightPopupView.xib; path = kneet2/Classes/ViewControllers/ThingsScreens/DaylightPopupView.xib; sourceTree = SOURCE_ROOT; };
-		A13671CD1C0451A2005DF6C6 /* WeatherLocationPopupTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WeatherLocationPopupTableViewCell.xib; path = kneet2/Classes/CommonUI/WeatherLocationPopupTableViewCell.xib; sourceTree = SOURCE_ROOT; };
-		A13671CE1C0451A2005DF6C6 /* WeatherLocationPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WeatherLocationPopupView.h; path = kneet2/Classes/CommonUI/WeatherLocationPopupView.h; sourceTree = SOURCE_ROOT; };
-		A13671CF1C0451A2005DF6C6 /* WeatherLocationPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WeatherLocationPopupView.m; path = kneet2/Classes/CommonUI/WeatherLocationPopupView.m; sourceTree = SOURCE_ROOT; };
-		A13671D01C0451A2005DF6C6 /* WeatherLocationPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WeatherLocationPopupView.xib; path = kneet2/Classes/CommonUI/WeatherLocationPopupView.xib; sourceTree = SOURCE_ROOT; };
-		A13671D51C046654005DF6C6 /* ExternHeatPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExternHeatPopupView.h; path = kneet2/Classes/ViewControllers/ThingsScreens/ExternHeatPopupView.h; sourceTree = SOURCE_ROOT; };
-		A13671D61C046654005DF6C6 /* ExternHeatPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExternHeatPopupView.m; path = kneet2/Classes/ViewControllers/ThingsScreens/ExternHeatPopupView.m; sourceTree = SOURCE_ROOT; };
-		A13671D71C046654005DF6C6 /* ExternHeatPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ExternHeatPopupView.xib; path = kneet2/Classes/ViewControllers/ThingsScreens/ExternHeatPopupView.xib; sourceTree = SOURCE_ROOT; };
-		A13671DA1C054C49005DF6C6 /* TemperaturePopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemperaturePopupView.h; path = kneet2/Classes/ViewControllers/ThingsScreens/TemperaturePopupView.h; sourceTree = SOURCE_ROOT; };
-		A13671DB1C054C49005DF6C6 /* TemperaturePopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TemperaturePopupView.m; path = kneet2/Classes/ViewControllers/ThingsScreens/TemperaturePopupView.m; sourceTree = SOURCE_ROOT; };
-		A13671DC1C054C49005DF6C6 /* TemperaturePopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = TemperaturePopupView.xib; path = kneet2/Classes/ViewControllers/ThingsScreens/TemperaturePopupView.xib; sourceTree = SOURCE_ROOT; };
 		A13671E01C0585AF005DF6C6 /* RulesConditionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RulesConditionViewController.h; sourceTree = "<group>"; };
 		A13671E11C0585AF005DF6C6 /* RulesConditionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RulesConditionViewController.m; sourceTree = "<group>"; };
+		A13BD0931C3B55C100C76527 /* DaylightPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DaylightPopupView.h; sourceTree = "<group>"; };
+		A13BD0941C3B55C100C76527 /* DaylightPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DaylightPopupView.m; sourceTree = "<group>"; };
+		A13BD0951C3B55C100C76527 /* DaylightPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DaylightPopupView.xib; sourceTree = "<group>"; };
+		A13BD0961C3B55C100C76527 /* ExternHeatPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExternHeatPopupView.h; sourceTree = "<group>"; };
+		A13BD0971C3B55C100C76527 /* ExternHeatPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExternHeatPopupView.m; sourceTree = "<group>"; };
+		A13BD0981C3B55C100C76527 /* ExternHeatPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ExternHeatPopupView.xib; sourceTree = "<group>"; };
+		A13BD0991C3B55C100C76527 /* TemperaturePopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemperaturePopupView.h; sourceTree = "<group>"; };
+		A13BD09A1C3B55C100C76527 /* TemperaturePopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TemperaturePopupView.m; sourceTree = "<group>"; };
+		A13BD09B1C3B55C100C76527 /* TemperaturePopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TemperaturePopupView.xib; sourceTree = "<group>"; };
+		A13BD09C1C3B55C100C76527 /* TimePickerPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimePickerPopupView.h; sourceTree = "<group>"; };
+		A13BD09D1C3B55C100C76527 /* TimePickerPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimePickerPopupView.m; sourceTree = "<group>"; };
+		A13BD09E1C3B55C100C76527 /* TimePickerPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TimePickerPopupView.xib; sourceTree = "<group>"; };
+		A13BD09F1C3B55C100C76527 /* TriggerSelectPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerSelectPopupView.h; sourceTree = "<group>"; };
+		A13BD0A01C3B55C100C76527 /* TriggerSelectPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TriggerSelectPopupView.m; sourceTree = "<group>"; };
+		A13BD0A11C3B55C100C76527 /* TriggerSelectPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TriggerSelectPopupView.xib; sourceTree = "<group>"; };
+		A13BD0A21C3B55C100C76527 /* WeatherLocationPopupTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WeatherLocationPopupTableViewCell.xib; sourceTree = "<group>"; };
+		A13BD0A31C3B55C100C76527 /* WeatherLocationPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeatherLocationPopupView.h; sourceTree = "<group>"; };
+		A13BD0A41C3B55C100C76527 /* WeatherLocationPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WeatherLocationPopupView.m; sourceTree = "<group>"; };
+		A13BD0A51C3B55C100C76527 /* WeatherLocationPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WeatherLocationPopupView.xib; sourceTree = "<group>"; };
+		A13BD0B31C3B55D800C76527 /* RulesConditionHomeModePopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RulesConditionHomeModePopupView.h; sourceTree = "<group>"; };
+		A13BD0B41C3B55D800C76527 /* RulesConditionHomeModePopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RulesConditionHomeModePopupView.m; sourceTree = "<group>"; };
+		A13BD0B51C3B55D800C76527 /* RulesConditionHomeModePopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RulesConditionHomeModePopupView.xib; sourceTree = "<group>"; };
+		A13BD0B61C3B55D800C76527 /* RulesConditionHomeModeTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RulesConditionHomeModeTableViewCell.xib; sourceTree = "<group>"; };
 		A14023E81BD8CAE30013756C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/HomeHub.storyboard; sourceTree = "<group>"; };
 		A14023EB1BD8CB7B0013756C /* HomeHubFirstStepViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeHubFirstStepViewController.h; sourceTree = "<group>"; };
 		A14023EC1BD8CB7B0013756C /* HomeHubFirstStepViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeHubFirstStepViewController.m; sourceTree = "<group>"; };
@@ -389,10 +393,6 @@
 		A18085351BC646820076973C /* NoticeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NoticeViewController.m; path = MainScreens/NoticeViewController.m; sourceTree = "<group>"; };
 		A18C47A81C0C0C9700E3D02A /* RulesDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RulesDetailViewController.h; sourceTree = "<group>"; };
 		A18C47A91C0C0C9700E3D02A /* RulesDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RulesDetailViewController.m; sourceTree = "<group>"; };
-		A19076601C05A70D00595146 /* RulesConditionHomeModePopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RulesConditionHomeModePopupView.h; path = kneet2/Classes/CommonUI/RulesConditionHomeModePopupView.h; sourceTree = SOURCE_ROOT; };
-		A19076611C05A70D00595146 /* RulesConditionHomeModePopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RulesConditionHomeModePopupView.m; path = kneet2/Classes/CommonUI/RulesConditionHomeModePopupView.m; sourceTree = SOURCE_ROOT; };
-		A19076621C05A70D00595146 /* RulesConditionHomeModePopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RulesConditionHomeModePopupView.xib; path = kneet2/Classes/CommonUI/RulesConditionHomeModePopupView.xib; sourceTree = SOURCE_ROOT; };
-		A19076631C05A70D00595146 /* RulesConditionHomeModeTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RulesConditionHomeModeTableViewCell.xib; path = kneet2/Classes/CommonUI/RulesConditionHomeModeTableViewCell.xib; sourceTree = SOURCE_ROOT; };
 		A190766E1C0709A400595146 /* RulesAddCompleteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RulesAddCompleteViewController.h; sourceTree = "<group>"; };
 		A190766F1C0709A400595146 /* RulesAddCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RulesAddCompleteViewController.m; sourceTree = "<group>"; };
 		A19E83BE1BD9F00B002B92DB /* HomeHubThirdStepViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeHubThirdStepViewController.h; sourceTree = "<group>"; };
@@ -930,29 +930,29 @@
 				A13671E11C0585AF005DF6C6 /* RulesConditionViewController.m */,
 				A190766E1C0709A400595146 /* RulesAddCompleteViewController.h */,
 				A190766F1C0709A400595146 /* RulesAddCompleteViewController.m */,
-				A13671BB1C02B56A005DF6C6 /* TriggerSelectPopupView.h */,
-				A13671BC1C02B56A005DF6C6 /* TriggerSelectPopupView.m */,
-				A13671BD1C02B56A005DF6C6 /* TriggerSelectPopupView.xib */,
-				A13671C21C03F5EC005DF6C6 /* TimePickerPopupView.h */,
-				A13671C31C03F5EC005DF6C6 /* TimePickerPopupView.m */,
-				A13671C41C03F5EC005DF6C6 /* TimePickerPopupView.xib */,
-				A13671C81C0446CB005DF6C6 /* DaylightPopupView.h */,
-				A13671C91C0446CB005DF6C6 /* DaylightPopupView.m */,
-				A13671CA1C0446CB005DF6C6 /* DaylightPopupView.xib */,
-				A13671D51C046654005DF6C6 /* ExternHeatPopupView.h */,
-				A13671D61C046654005DF6C6 /* ExternHeatPopupView.m */,
-				A13671D71C046654005DF6C6 /* ExternHeatPopupView.xib */,
-				A13671CE1C0451A2005DF6C6 /* WeatherLocationPopupView.h */,
-				A13671CF1C0451A2005DF6C6 /* WeatherLocationPopupView.m */,
-				A13671D01C0451A2005DF6C6 /* WeatherLocationPopupView.xib */,
-				A13671CD1C0451A2005DF6C6 /* WeatherLocationPopupTableViewCell.xib */,
-				A19076601C05A70D00595146 /* RulesConditionHomeModePopupView.h */,
-				A19076611C05A70D00595146 /* RulesConditionHomeModePopupView.m */,
-				A19076621C05A70D00595146 /* RulesConditionHomeModePopupView.xib */,
-				A19076631C05A70D00595146 /* RulesConditionHomeModeTableViewCell.xib */,
-				A13671DA1C054C49005DF6C6 /* TemperaturePopupView.h */,
-				A13671DB1C054C49005DF6C6 /* TemperaturePopupView.m */,
-				A13671DC1C054C49005DF6C6 /* TemperaturePopupView.xib */,
+				A13BD0931C3B55C100C76527 /* DaylightPopupView.h */,
+				A13BD0941C3B55C100C76527 /* DaylightPopupView.m */,
+				A13BD0951C3B55C100C76527 /* DaylightPopupView.xib */,
+				A13BD0961C3B55C100C76527 /* ExternHeatPopupView.h */,
+				A13BD0971C3B55C100C76527 /* ExternHeatPopupView.m */,
+				A13BD0981C3B55C100C76527 /* ExternHeatPopupView.xib */,
+				A13BD0991C3B55C100C76527 /* TemperaturePopupView.h */,
+				A13BD09A1C3B55C100C76527 /* TemperaturePopupView.m */,
+				A13BD09B1C3B55C100C76527 /* TemperaturePopupView.xib */,
+				A13BD09C1C3B55C100C76527 /* TimePickerPopupView.h */,
+				A13BD09D1C3B55C100C76527 /* TimePickerPopupView.m */,
+				A13BD09E1C3B55C100C76527 /* TimePickerPopupView.xib */,
+				A13BD09F1C3B55C100C76527 /* TriggerSelectPopupView.h */,
+				A13BD0A01C3B55C100C76527 /* TriggerSelectPopupView.m */,
+				A13BD0A11C3B55C100C76527 /* TriggerSelectPopupView.xib */,
+				A13BD0A21C3B55C100C76527 /* WeatherLocationPopupTableViewCell.xib */,
+				A13BD0A31C3B55C100C76527 /* WeatherLocationPopupView.h */,
+				A13BD0A41C3B55C100C76527 /* WeatherLocationPopupView.m */,
+				A13BD0A51C3B55C100C76527 /* WeatherLocationPopupView.xib */,
+				A13BD0B31C3B55D800C76527 /* RulesConditionHomeModePopupView.h */,
+				A13BD0B41C3B55D800C76527 /* RulesConditionHomeModePopupView.m */,
+				A13BD0B51C3B55D800C76527 /* RulesConditionHomeModePopupView.xib */,
+				A13BD0B61C3B55D800C76527 /* RulesConditionHomeModeTableViewCell.xib */,
 			);
 			path = RuelsScreens;
 			sourceTree = "<group>";
@@ -1144,27 +1144,27 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A13671D31C0451A2005DF6C6 /* WeatherLocationPopupView.xib in Resources */,
 				A130CDD51BF9C02100126AC5 /* Rules.storyboard in Resources */,
 				A1AF89DC1C1024CA00C904A2 /* ModifyDeviceNamePopupView.xib in Resources */,
-				A13671D91C046654005DF6C6 /* ExternHeatPopupView.xib in Resources */,
 				A130CDD11BF9BF9000126AC5 /* Images.xcassets in Resources */,
-				A13671D11C0451A2005DF6C6 /* WeatherLocationPopupTableViewCell.xib in Resources */,
+				A13BD0B91C3B55D800C76527 /* RulesConditionHomeModeTableViewCell.xib in Resources */,
+				A13BD0A71C3B55C100C76527 /* DaylightPopupView.xib in Resources */,
 				A130CDCF1BF9BE6800126AC5 /* SignUp.storyboard in Resources */,
 				A130CDDA1BF9C02100126AC5 /* LaunchScreen.xib in Resources */,
 				A130CDD31BF9C02100126AC5 /* HomeHub.storyboard in Resources */,
 				A130CDD21BF9BFEF00126AC5 /* Main.storyboard in Resources */,
 				A130CDD71BF9C02100126AC5 /* HomeMember.storyboard in Resources */,
+				A13BD0AF1C3B55C100C76527 /* TriggerSelectPopupView.xib in Resources */,
+				A13BD0B21C3B55C100C76527 /* WeatherLocationPopupView.xib in Resources */,
+				A13BD0B81C3B55D800C76527 /* RulesConditionHomeModePopupView.xib in Resources */,
 				A130CDD41BF9C02100126AC5 /* Things.storyboard in Resources */,
+				A13BD0AD1C3B55C100C76527 /* TimePickerPopupView.xib in Resources */,
+				A13BD0A91C3B55C100C76527 /* ExternHeatPopupView.xib in Resources */,
+				A13BD0AB1C3B55C100C76527 /* TemperaturePopupView.xib in Resources */,
 				A130CDD91BF9C02100126AC5 /* Common.storyboard in Resources */,
-				A13671BF1C02B56B005DF6C6 /* TriggerSelectPopupView.xib in Resources */,
-				A13671DE1C054C49005DF6C6 /* TemperaturePopupView.xib in Resources */,
-				A19076661C05A70D00595146 /* RulesConditionHomeModeTableViewCell.xib in Resources */,
 				A130CDD81BF9C02100126AC5 /* Settings.storyboard in Resources */,
-				A13671C61C03F5EC005DF6C6 /* TimePickerPopupView.xib in Resources */,
+				A13BD0B01C3B55C100C76527 /* WeatherLocationPopupTableViewCell.xib in Resources */,
 				A1FC0D781C157C0C00221127 /* MultiLevelPopupView.xib in Resources */,
-				A13671CC1C0446CB005DF6C6 /* DaylightPopupView.xib in Resources */,
-				A19076651C05A70D00595146 /* RulesConditionHomeModePopupView.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1254,6 +1254,7 @@
 				A130CC961BF9BB4F00126AC5 /* NSDate+Utilities.m in Sources */,
 				A130CC981BF9BB4F00126AC5 /* NSDictionary-Additions.m in Sources */,
 				A130CC9A1BF9BB4F00126AC5 /* NSString-Addtions.m in Sources */,
+				A13BD0AE1C3B55C100C76527 /* TriggerSelectPopupView.m in Sources */,
 				A130CC9C1BF9BB4F00126AC5 /* SortDictionary.m in Sources */,
 				A130CC9E1BF9BB4F00126AC5 /* UIDevice-Reachability.m in Sources */,
 				A130CCA01BF9BB4F00126AC5 /* UIImage+Addtions.m in Sources */,
@@ -1291,6 +1292,7 @@
 				A130CCDD1BF9BB4F00126AC5 /* CommonUtil.m in Sources */,
 				A130CCDF1BF9BB4F00126AC5 /* CypherUtil.m in Sources */,
 				A130CCE11BF9BB4F00126AC5 /* JDUserDefaults.m in Sources */,
+				A13BD0AC1C3B55C100C76527 /* TimePickerPopupView.m in Sources */,
 				A130CCE31BF9BB4F00126AC5 /* UIDeviceUtil.m in Sources */,
 				A130CCE51BF9BB4F00126AC5 /* ValidateUtil.m in Sources */,
 				A130CCE71BF9BB4F00126AC5 /* ImageUtil.m in Sources */,
@@ -1311,7 +1313,6 @@
 				A130CD001BF9BB4F00126AC5 /* AgreementViewController.m in Sources */,
 				A130CD021BF9BB4F00126AC5 /* SignUpViewController.m in Sources */,
 				A130CD041BF9BB4F00126AC5 /* NewMobileViewController.m in Sources */,
-				A19076641C05A70D00595146 /* RulesConditionHomeModePopupView.m in Sources */,
 				A130CD061BF9BB4F00126AC5 /* HomeHubStartViewController.m in Sources */,
 				A130CD081BF9BB4F00126AC5 /* HomeHubFirstStepViewController.m in Sources */,
 				A130CD0A1BF9BB4F00126AC5 /* HomeHubSecondStepViewController.m in Sources */,
@@ -1319,7 +1320,6 @@
 				A130CD0E1BF9BB4F00126AC5 /* QRCodeViewController.m in Sources */,
 				A130CD101BF9BB4F00126AC5 /* QRCodeInputPopupView.m in Sources */,
 				A18C47AA1C0C0C9700E3D02A /* RulesDetailViewController.m in Sources */,
-				A13671DD1C054C49005DF6C6 /* TemperaturePopupView.m in Sources */,
 				A130CD111BF9BB4F00126AC5 /* QRCodeInputPopupView.xib in Sources */,
 				A130CD131BF9BB4F00126AC5 /* HomeHubInitViewController.m in Sources */,
 				A130CD151BF9BB4F00126AC5 /* HomeHubChangeViewController.m in Sources */,
@@ -1327,6 +1327,7 @@
 				A130CD191BF9BB4F00126AC5 /* HomeHubViewController.m in Sources */,
 				A130CD1B1BF9BB4F00126AC5 /* ThingsViewController.m in Sources */,
 				A130CD1D1BF9BB4F00126AC5 /* ThingsDetailViewController.m in Sources */,
+				A13BD0A61C3B55C100C76527 /* DaylightPopupView.m in Sources */,
 				A130CD231BF9BB4F00126AC5 /* ModifySecureKeyPopupView.m in Sources */,
 				A130CD241BF9BB4F00126AC5 /* ModifySecureKeyPopupView.xib in Sources */,
 				A130CD2A1BF9BB4F00126AC5 /* ThingsAddViewController.m in Sources */,
@@ -1334,14 +1335,9 @@
 				A130CD2E1BF9BB4F00126AC5 /* ThingsAddIncludeViewController.m in Sources */,
 				A130CD301BF9BB4F00126AC5 /* ThingsAddCompleteViewController.m in Sources */,
 				A130CD321BF9BB4F00126AC5 /* ThingsAddFailViewController.m in Sources */,
-				A13671D21C0451A2005DF6C6 /* WeatherLocationPopupView.m in Sources */,
 				A130CD3D1BF9BB4F00126AC5 /* HomeMemberViewController.m in Sources */,
 				A130CD3F1BF9BB4F00126AC5 /* HomeMemberAddViewController.m in Sources */,
 				A130CD411BF9BB4F00126AC5 /* RulesViewController.m in Sources */,
-				A13671D81C046654005DF6C6 /* ExternHeatPopupView.m in Sources */,
-				A13671CB1C0446CB005DF6C6 /* DaylightPopupView.m in Sources */,
-				A13671C51C03F5EC005DF6C6 /* TimePickerPopupView.m in Sources */,
-				A13671BE1C02B56B005DF6C6 /* TriggerSelectPopupView.m in Sources */,
 				A130CD6D1BF9BB4F00126AC5 /* SettingsViewController.m in Sources */,
 				A130CD6F1BF9BB4F00126AC5 /* ChangeNamePopupView.m in Sources */,
 				A130CD701BF9BB4F00126AC5 /* ChangeNamePopupView.xib in Sources */,
@@ -1369,12 +1365,16 @@
 				A1FC0D771C157C0C00221127 /* MultiLevelPopupView.m in Sources */,
 				A130CD961BF9BB4F00126AC5 /* DeviceNodePopupTableViewCell.xib in Sources */,
 				A130CD981BF9BB4F00126AC5 /* CommandClassControlView.m in Sources */,
+				A13BD0AA1C3B55C100C76527 /* TemperaturePopupView.m in Sources */,
+				A13BD0A81C3B55C100C76527 /* ExternHeatPopupView.m in Sources */,
 				A130CD9A1BF9BB4F00126AC5 /* CommandClassControlDetailView.m in Sources */,
+				A13BD0B11C3B55C100C76527 /* WeatherLocationPopupView.m in Sources */,
 				A130CD9B1BF9BB4F00126AC5 /* CommandClassControlView.xib in Sources */,
 				A130CD9C1BF9BB4F00126AC5 /* CommandClassControlDetailView.xib in Sources */,
 				A130CD9E1BF9BB4F00126AC5 /* CommandClassControlNodeView.m in Sources */,
 				A130CD9F1BF9BB4F00126AC5 /* CommandClassControlNodeView.xib in Sources */,
 				A130CDAA1BF9BB5000126AC5 /* NoContentView.m in Sources */,
+				A13BD0B71C3B55D800C76527 /* RulesConditionHomeModePopupView.m in Sources */,
 				A130CDAB1BF9BB5000126AC5 /* NoContentView.xib in Sources */,
 				A130CDAD1BF9BB5000126AC5 /* OptionPopOverViewController.m in Sources */,
 				A130CDAF1BF9BB5000126AC5 /* PopTableView.m in Sources */,

File diff suppressed because it is too large
+ 2 - 255
kneet2/Base.lproj/Settings.storyboard


kneet2/Classes/ViewControllers/ThingsScreens/DaylightPopupView.h → kneet2/Classes/ViewControllers/RuelsScreens/DaylightPopupView.h


kneet2/Classes/ViewControllers/ThingsScreens/DaylightPopupView.m → kneet2/Classes/ViewControllers/RuelsScreens/DaylightPopupView.m


kneet2/Classes/ViewControllers/ThingsScreens/DaylightPopupView.xib → kneet2/Classes/ViewControllers/RuelsScreens/DaylightPopupView.xib


kneet2/Classes/ViewControllers/ThingsScreens/ExternHeatPopupView.h → kneet2/Classes/ViewControllers/RuelsScreens/ExternHeatPopupView.h


kneet2/Classes/ViewControllers/ThingsScreens/ExternHeatPopupView.m → kneet2/Classes/ViewControllers/RuelsScreens/ExternHeatPopupView.m


kneet2/Classes/ViewControllers/ThingsScreens/ExternHeatPopupView.xib → kneet2/Classes/ViewControllers/RuelsScreens/ExternHeatPopupView.xib


kneet2/Classes/CommonUI/RulesConditionHomeModePopupView.h → kneet2/Classes/ViewControllers/RuelsScreens/RulesConditionHomeModePopupView.h


kneet2/Classes/CommonUI/RulesConditionHomeModePopupView.m → kneet2/Classes/ViewControllers/RuelsScreens/RulesConditionHomeModePopupView.m


kneet2/Classes/CommonUI/RulesConditionHomeModePopupView.xib → kneet2/Classes/ViewControllers/RuelsScreens/RulesConditionHomeModePopupView.xib


kneet2/Classes/CommonUI/RulesConditionHomeModeTableViewCell.xib → kneet2/Classes/ViewControllers/RuelsScreens/RulesConditionHomeModeTableViewCell.xib


kneet2/Classes/ViewControllers/ThingsScreens/TemperaturePopupView.h → kneet2/Classes/ViewControllers/RuelsScreens/TemperaturePopupView.h


kneet2/Classes/ViewControllers/ThingsScreens/TemperaturePopupView.m → kneet2/Classes/ViewControllers/RuelsScreens/TemperaturePopupView.m


kneet2/Classes/ViewControllers/ThingsScreens/TemperaturePopupView.xib → kneet2/Classes/ViewControllers/RuelsScreens/TemperaturePopupView.xib


kneet2/Classes/ViewControllers/ThingsScreens/TimePickerPopupView.h → kneet2/Classes/ViewControllers/RuelsScreens/TimePickerPopupView.h


kneet2/Classes/ViewControllers/ThingsScreens/TimePickerPopupView.m → kneet2/Classes/ViewControllers/RuelsScreens/TimePickerPopupView.m


kneet2/Classes/ViewControllers/ThingsScreens/TimePickerPopupView.xib → kneet2/Classes/ViewControllers/RuelsScreens/TimePickerPopupView.xib


kneet2/Classes/ViewControllers/ThingsScreens/TriggerSelectPopupView.h → kneet2/Classes/ViewControllers/RuelsScreens/TriggerSelectPopupView.h


kneet2/Classes/ViewControllers/ThingsScreens/TriggerSelectPopupView.m → kneet2/Classes/ViewControllers/RuelsScreens/TriggerSelectPopupView.m


kneet2/Classes/ViewControllers/ThingsScreens/TriggerSelectPopupView.xib → kneet2/Classes/ViewControllers/RuelsScreens/TriggerSelectPopupView.xib


kneet2/Classes/CommonUI/WeatherLocationPopupTableViewCell.xib → kneet2/Classes/ViewControllers/RuelsScreens/WeatherLocationPopupTableViewCell.xib


kneet2/Classes/CommonUI/WeatherLocationPopupView.h → kneet2/Classes/ViewControllers/RuelsScreens/WeatherLocationPopupView.h


kneet2/Classes/CommonUI/WeatherLocationPopupView.m → kneet2/Classes/ViewControllers/RuelsScreens/WeatherLocationPopupView.m


kneet2/Classes/CommonUI/WeatherLocationPopupView.xib → kneet2/Classes/ViewControllers/RuelsScreens/WeatherLocationPopupView.xib


+ 0 - 39
kneet2/Classes/ViewControllers/ThingsScreens/DeviceConditionPopupView.h

@@ -1,39 +0,0 @@
-//
-//  DeviceSelectPopupView.h
-//  kneet2
-//
-//  Created by Jason Lee on 10/12/15.
-//  Copyright (c) 2015 ntels. All rights reserved.
-//
-
-@import UIKit;
-#import "CustomAlertView.h"
-#import "JDViewController.h"
-
-@class CustomImageView;
-@class CustomCheckBox;
-@class CustomRadioButton;
-
-@interface DeviceSelectPopupView : CustomAlertView
-
-@property (weak, nonatomic) NSMutableArray<ItemModel> *refDevices;
-@property (weak, nonatomic, readonly) NSArray<ItemModel> *selectedDevices;
-
-@property (strong, nonatomic) NSString *typeCode;
-
-@property (weak, nonatomic) IBOutlet CustomTableView *tableView;
-
-
-- (id)initFromNib;
-
-@end
-
-
-@interface DeviceSelectPopupTableViewCell : KNTableViewCell
-
-@property (weak, nonatomic) IBOutlet CustomImageView *imgvDevice;
-@property (weak, nonatomic) IBOutlet CustomLabel *lblDeviceName;
-@property (weak, nonatomic) IBOutlet CustomCheckBox *chkSelect;
-@property (weak, nonatomic) IBOutlet CustomRadioButton *rdoSelect;
-
-@end

+ 0 - 220
kneet2/Classes/ViewControllers/ThingsScreens/DeviceConditionPopupView.m

@@ -1,220 +0,0 @@
-//
-//  DeviceConditionPopupView.m
-//  kneet2
-//
-//  Created by Jason Lee on 11/26/15.
-//  Copyright (c) 2015 ntels. All rights reserved.
-//
-#import "JDObject.h"
-
-#import "RequestHandler.h"
-#import "JDJSONModel.h"
-
-#import "CustomLabel.h"
-#import "CustomTextField.h"
-#import "CustomTableView.h"
-#import "CustomImageView.h"
-#import "CustomButton.h"
-#import "CustomCheckBox.h"
-#import "CustomRadioGroup.h"
-
-#import "ValidateUtil.h"
-#import "ImageUtil.h"
-#import "UIImageView+WebCache.h"
-
-#import "DeviceConditionPopupView.h"
-
-@implementation DeviceConditionPopupTableViewCell
-
-@end
-
-@interface DeviceConditionPopupView () <UITableViewDataSource, UITableViewDelegate, CustomCheckBoxDelegate> {
-    
-    CustomRadioReusableGroup *_rgroup;
-    BOOL _isNotFirstLoading;
-    UIImage *_bgCellImage1, *_bgCellImage2;
-    
-    NSMutableArray<ItemModel> *_checkedDevices;
-}
-
-@end
-
-@implementation DeviceSelectPopupView
-
-- (id)initFromNib {
-
-    for (UIView *view in [CommonUtil nibViews:@"DeviceSelectPopupView"]) {
-        if ([view isKindOfClass:[DeviceSelectPopupView class]]) {
-            self = (DeviceSelectPopupView *)view;
-
-            //XIB의 경우, 현재 화면 사이즈로 맞춰줘야 함.
-            self.frame = [UIScreen mainScreen].bounds;
-            self.lblTitle.text = NSLocalizedString(@"장치 선택", @"장치 선택");
-            
-            [self initTableViewAsDefaultStyle:_tableView];
-            
-            UINib *nib = [UINib nibWithNibName:@"DeviceSelectPopupTableViewCell" bundle:nil];
-            [_tableView registerNib:nib forCellReuseIdentifier:@"DeviceCellIdentifier"];
-            
-            //set radio group
-            _rgroup = [[CustomRadioReusableGroup alloc] init];
-            _rgroup.tableView = _tableView;
-            
-            //Localization
-            [self.btnConfirm setTitle:NSLocalizedString(@"확인", @"확인") forState:UIControlStateNormal];
-            [self.btnCancel setTitle:NSLocalizedString(@"취소", @"취소") forState:UIControlStateNormal];
-            
-            UIEdgeInsets insets = UIEdgeInsetsMake(4, 4, 4, 4);
-            _bgCellImage1 = [ImageUtil resizableImageWithCapInsets:insets resizingMode:UIImageResizingModeStretch img:[UIImage imageNamed:@"tp_01_img_list_bg_01"]];
-            _bgCellImage2 = [ImageUtil resizableImageWithCapInsets:insets resizingMode:UIImageResizingModeStretch img:[UIImage imageNamed:@"tp_01_img_list_bg_02"]];
-        }
-    }
-
-    return self;
-}
-
-- (void)initTableViewAsDefaultStyle:(CustomTableView *)tableView {
-    tableView.dataSource = self;
-    tableView.delegate = self;
-    
-    tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-    tableView.backgroundColor = [UIColor clearColor];
-    
-    tableView.tableFooterView = [[UIView alloc] init]; //this call table events;
-}
-
-- (void)didMoveToSuperview {
-
-}
-
-- (void)setRefDevices:(NSMutableArray<ItemModel> *)refDevices {
-    _refDevices = refDevices;
-    
-    for (ItemSubModel *item in _refDevices) {
-        [[JDFacade facade] setRadioButtonStatus:@NO object:item];
-    }
-    
-    [_tableView reloadData];
-}
-
-- (NSArray<ItemModel> *)selectedDevices {
-    NSArray<ItemModel> *devices = nil;
-    
-    if ([_typeCode isEqualToString:ksItemTypeCodeAction]) {
-        devices = _checkedDevices;
-    } else {
-        devices = (NSArray<ItemModel> *)@[_rgroup.valueForChecked];
-    }
-    return devices;
-}
-
-#pragma mark - Main Logic
-
-
-#pragma mark - UITableView DataSource & Delegate
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return 1;
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return _refDevices ? _refDevices.count : 0;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    CGFloat height = 95.0f;
-    
-    return height;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    
-    ItemModel *item = _refDevices[indexPath.row];
-    
-    DeviceSelectPopupTableViewCell *tcell = (DeviceSelectPopupTableViewCell *)[tableView dequeueReusableCellWithIdentifier:@"DeviceCellIdentifier"];
-    tcell.lblDeviceName.text = item.sourceName;
-    [tcell.imgvDevice sd_setImageWithURL:[NSURL URLWithString:item.imageFileName] placeholderImage:nil options:SDWebImageRefreshCached];
-    
-    
-    if ([_typeCode isEqualToString:ksItemTypeCodeTrigger] || [_typeCode isEqualToString:ksItemTypeCodeCondition]) {//트리거 또는 컨디션
-        tcell.chkSelect.hidden = YES;
-        
-        tcell.rdoSelect.value = item;
-        if (indexPath.row == 0 && !_isNotFirstLoading) {
-            _isNotFirstLoading = YES;
-            tcell.rdoSelect.checked = YES;
-        } else {
-            tcell.rdoSelect.checked = [tcell.rdoSelect getRadioStatusFromValue];
-        }
-        
-        [_rgroup addRadioButton:tcell.rdoSelect];
-        
-    } else if ([_typeCode isEqualToString:ksItemTypeCodeAction]) {//액션
-        tcell.rdoSelect.hidden = YES;
-        
-        tcell.chkSelect.delegate = self;
-        tcell.chkSelect.value = item;
-        tcell.chkSelect.checked = [tcell.chkSelect getCheckStatusFromValue];
-    }
-    
-    return tcell;
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    
-    DeviceSelectPopupTableViewCell *tcell = (DeviceSelectPopupTableViewCell *)[self tableView:tableView cellForRowAtIndexPath:indexPath];
-    
-    if ([_typeCode isEqualToString:ksItemTypeCodeTrigger] || [_typeCode isEqualToString:ksItemTypeCodeCondition]) {
-        [_rgroup someRadioButtonTouched:tcell.rdoSelect];
-        
-    } else if ([_typeCode isEqualToString:ksItemTypeCodeAction]) {
-        [tcell.chkSelect checkBoxClicked];
-        
-    }
-    [_tableView reloadData];
-}
-
-
-- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
-    
-    // Remove seperator inset
-    if ([cell respondsToSelector:@selector(setSeparatorInset:)]) {
-        [cell setSeparatorInset:UIEdgeInsetsZero];
-    }
-    
-    // Prevent the cell from inheriting the Table View's margin settings
-    if ([cell respondsToSelector:@selector(setPreservesSuperviewLayoutMargins:)]) {
-        [cell setPreservesSuperviewLayoutMargins:NO];
-    }
-    
-    // Explictly set your cell's layout margins
-    if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
-        [cell setLayoutMargins:UIEdgeInsetsZero];
-    }
-}
-
-#pragma mark - CustomCheckBox Delegate
-- (void)didCheckBoxClicked:(id)sender {
-
-}
-
-
-#pragma mark - UI Events
-- (IBAction)btnConfirmTouched:(id)sender {
-    //validate
-    
-    if ([_typeCode isEqualToString:ksItemTypeCodeAction]) {//디바이스 멀티    BOOL isSelected = NO;
-        
-        _checkedDevices = (NSMutableArray<ItemModel> *)[_refDevices matchedArrayByObjectName:ksCustomCheckBoxStatus condition:YES];
-        if (!_checkedDevices || !_checkedDevices.count) {
-            [[JDFacade facade] alert:NSLocalizedString(@"선택된 항목이 없습니다", @"선택된 항목이 없습니다")];
-            return;
-        }
-    }
-    
-    [super btnConfirmTouched:sender];
-}
-
-
-
-@end

+ 0 - 412
kneet2/Classes/ViewControllers/ThingsScreens/DeviceConditionPopupView.xib

@@ -1,412 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="qLf-va-EAG" customClass="DeviceSelectPopupView">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <view alpha="0.29999999999999999" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4c3-gb-BwR" userLabel="maskView">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                    <animations/>
-                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sqq-aQ-dqD" userLabel="popUpView">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                    <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Np-sH-ysD" userLabel="ContainerView">
-                            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                            <subviews>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7nf-Ia-7Kq" userLabel="View - Title">
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                    <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="장치 선택" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IE2-24-gHl" customClass="CustomLabel">
-                                            <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
-                                            <animations/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="64" id="gmY-Rb-Qao"/>
-                                            </constraints>
-                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
-                                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                            <nil key="highlightedColor"/>
-                                            <variation key="default">
-                                                <mask key="constraints">
-                                                    <exclude reference="gmY-Rb-Qao"/>
-                                                </mask>
-                                            </variation>
-                                            <variation key="heightClass=regular-widthClass=compact">
-                                                <mask key="constraints">
-                                                    <include reference="gmY-Rb-Qao"/>
-                                                </mask>
-                                            </variation>
-                                        </label>
-                                    </subviews>
-                                    <animations/>
-                                    <color key="backgroundColor" red="0.95686274510000002" green="0.30588235289999999" blue="0.3294117647" alpha="1" colorSpace="calibratedRGB"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="44" id="1fj-XN-uH0">
-                                            <variation key="heightClass=regular-widthClass=compact" constant="64"/>
-                                        </constraint>
-                                        <constraint firstItem="IE2-24-gHl" firstAttribute="leading" secondItem="7nf-Ia-7Kq" secondAttribute="leading" id="98Q-bq-Oq7">
-                                            <variation key="heightClass=regular-widthClass=compact" constant="20"/>
-                                        </constraint>
-                                        <constraint firstItem="IE2-24-gHl" firstAttribute="top" secondItem="7nf-Ia-7Kq" secondAttribute="top" id="Ldj-nV-yrM">
-                                            <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                                        </constraint>
-                                        <constraint firstAttribute="trailing" secondItem="IE2-24-gHl" secondAttribute="trailing" id="mUY-4l-GjT">
-                                            <variation key="heightClass=regular-widthClass=compact" constant="-8"/>
-                                        </constraint>
-                                        <constraint firstAttribute="bottom" secondItem="IE2-24-gHl" secondAttribute="bottom" id="yzV-EQ-HeM">
-                                            <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                                        </constraint>
-                                    </constraints>
-                                    <variation key="default">
-                                        <mask key="subviews">
-                                            <exclude reference="IE2-24-gHl"/>
-                                        </mask>
-                                        <mask key="constraints">
-                                            <exclude reference="1fj-XN-uH0"/>
-                                            <exclude reference="98Q-bq-Oq7"/>
-                                            <exclude reference="Ldj-nV-yrM"/>
-                                            <exclude reference="mUY-4l-GjT"/>
-                                            <exclude reference="yzV-EQ-HeM"/>
-                                        </mask>
-                                    </variation>
-                                    <variation key="heightClass=regular-widthClass=compact">
-                                        <mask key="subviews">
-                                            <include reference="IE2-24-gHl"/>
-                                        </mask>
-                                        <mask key="constraints">
-                                            <exclude reference="1fj-XN-uH0"/>
-                                            <include reference="98Q-bq-Oq7"/>
-                                            <include reference="Ldj-nV-yrM"/>
-                                            <include reference="mUY-4l-GjT"/>
-                                            <include reference="yzV-EQ-HeM"/>
-                                        </mask>
-                                    </variation>
-                                </view>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mw5-GF-3oQ" userLabel="View - message">
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                    <subviews>
-                                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="95" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="cee-tl-kl3" customClass="CustomTableView">
-                                            <rect key="frame" x="0.0" y="0.0" width="240" height="128"/>
-                                            <animations/>
-                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="285" id="yne-jW-8qK"/>
-                                            </constraints>
-                                            <variation key="default">
-                                                <mask key="constraints">
-                                                    <exclude reference="yne-jW-8qK"/>
-                                                </mask>
-                                            </variation>
-                                            <variation key="heightClass=regular-widthClass=compact">
-                                                <mask key="constraints">
-                                                    <include reference="yne-jW-8qK"/>
-                                                </mask>
-                                            </variation>
-                                        </tableView>
-                                    </subviews>
-                                    <animations/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                    <constraints>
-                                        <constraint firstAttribute="bottom" secondItem="cee-tl-kl3" secondAttribute="bottom" id="Raf-LN-Jo9"/>
-                                        <constraint firstItem="cee-tl-kl3" firstAttribute="top" secondItem="Mw5-GF-3oQ" secondAttribute="top" id="etS-lK-TEZ"/>
-                                        <constraint firstItem="cee-tl-kl3" firstAttribute="leading" secondItem="Mw5-GF-3oQ" secondAttribute="leading" id="jhl-vp-Sni"/>
-                                        <constraint firstAttribute="trailing" secondItem="cee-tl-kl3" secondAttribute="trailing" id="wlO-DH-OgT"/>
-                                    </constraints>
-                                    <variation key="default">
-                                        <mask key="subviews">
-                                            <exclude reference="cee-tl-kl3"/>
-                                        </mask>
-                                        <mask key="constraints">
-                                            <exclude reference="Raf-LN-Jo9"/>
-                                            <exclude reference="etS-lK-TEZ"/>
-                                            <exclude reference="jhl-vp-Sni"/>
-                                            <exclude reference="wlO-DH-OgT"/>
-                                        </mask>
-                                    </variation>
-                                    <variation key="heightClass=regular-widthClass=compact">
-                                        <mask key="subviews">
-                                            <include reference="cee-tl-kl3"/>
-                                        </mask>
-                                        <mask key="constraints">
-                                            <include reference="Raf-LN-Jo9"/>
-                                            <include reference="etS-lK-TEZ"/>
-                                            <include reference="jhl-vp-Sni"/>
-                                            <include reference="wlO-DH-OgT"/>
-                                        </mask>
-                                    </variation>
-                                </view>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bIs-li-8bz" userLabel="View - Buttons">
-                                    <rect key="frame" x="-20" y="156" width="338" height="90"/>
-                                    <subviews>
-                                        <button opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="145" placeholderIntrinsicHeight="70" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FKG-xS-HlM" customClass="CustomButton">
-                                            <rect key="frame" x="20" y="20" width="149" height="50"/>
-                                            <animations/>
-                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" relation="greaterThanOrEqual" id="BNE-7a-kbD"/>
-                                            </constraints>
-                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                            <state key="normal" title="확인">
-                                                <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                            </state>
-                                            <state key="highlighted">
-                                                <color key="titleColor" red="0.73601246840000001" green="0.3682315451" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                            </state>
-                                            <variation key="default">
-                                                <mask key="constraints">
-                                                    <exclude reference="BNE-7a-kbD"/>
-                                                </mask>
-                                            </variation>
-                                            <variation key="heightClass=regular-widthClass=compact">
-                                                <mask key="constraints">
-                                                    <include reference="BNE-7a-kbD"/>
-                                                </mask>
-                                            </variation>
-                                            <connections>
-                                                <action selector="btnConfirmTouched:" destination="qLf-va-EAG" eventType="touchUpInside" id="JvU-lL-1vP"/>
-                                            </connections>
-                                        </button>
-                                        <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" horizontalCompressionResistancePriority="749" placeholderIntrinsicWidth="144" placeholderIntrinsicHeight="70" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EtP-9O-R3A" customClass="CustomButton">
-                                            <rect key="frame" x="170" y="20" width="148" height="50"/>
-                                            <animations/>
-                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="44" id="L9v-r3-6MJ">
-                                                    <variation key="heightClass=regular-widthClass=compact" constant="50"/>
-                                                </constraint>
-                                            </constraints>
-                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                            <state key="normal" title="취소">
-                                                <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                            </state>
-                                            <variation key="default">
-                                                <mask key="constraints">
-                                                    <exclude reference="L9v-r3-6MJ"/>
-                                                </mask>
-                                            </variation>
-                                            <variation key="heightClass=regular-widthClass=compact">
-                                                <mask key="constraints">
-                                                    <exclude reference="L9v-r3-6MJ"/>
-                                                </mask>
-                                            </variation>
-                                            <connections>
-                                                <action selector="btnCancelTouched:" destination="qLf-va-EAG" eventType="touchUpInside" id="g5k-Tn-E33"/>
-                                            </connections>
-                                        </button>
-                                    </subviews>
-                                    <animations/>
-                                    <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                                    <constraints>
-                                        <constraint firstItem="FKG-xS-HlM" firstAttribute="leading" secondItem="bIs-li-8bz" secondAttribute="leading" id="Fkf-og-ytd"/>
-                                        <constraint firstAttribute="trailing" secondItem="EtP-9O-R3A" secondAttribute="trailing" id="PjC-cB-YfR"/>
-                                        <constraint firstItem="FKG-xS-HlM" firstAttribute="top" secondItem="bIs-li-8bz" secondAttribute="top" constant="1" id="hu2-xM-w64"/>
-                                        <constraint firstAttribute="bottom" secondItem="FKG-xS-HlM" secondAttribute="bottom" id="l9l-jK-cst"/>
-                                        <constraint firstItem="EtP-9O-R3A" firstAttribute="width" secondItem="FKG-xS-HlM" secondAttribute="width" id="qJo-Xg-EhL">
-                                            <variation key="heightClass=regular-widthClass=compact" constant="-1"/>
-                                        </constraint>
-                                        <constraint firstItem="EtP-9O-R3A" firstAttribute="leading" secondItem="FKG-xS-HlM" secondAttribute="trailing" constant="1" id="rpW-dL-KWs"/>
-                                        <constraint firstAttribute="bottom" secondItem="EtP-9O-R3A" secondAttribute="bottom" id="sQC-dK-bJs"/>
-                                        <constraint firstItem="EtP-9O-R3A" firstAttribute="top" secondItem="bIs-li-8bz" secondAttribute="top" constant="1" id="xsM-oo-x8a"/>
-                                    </constraints>
-                                    <variation key="default">
-                                        <mask key="constraints">
-                                            <exclude reference="Fkf-og-ytd"/>
-                                            <exclude reference="hu2-xM-w64"/>
-                                            <exclude reference="l9l-jK-cst"/>
-                                            <exclude reference="PjC-cB-YfR"/>
-                                            <exclude reference="qJo-Xg-EhL"/>
-                                            <exclude reference="rpW-dL-KWs"/>
-                                            <exclude reference="sQC-dK-bJs"/>
-                                            <exclude reference="xsM-oo-x8a"/>
-                                        </mask>
-                                    </variation>
-                                    <variation key="heightClass=regular-widthClass=compact">
-                                        <mask key="constraints">
-                                            <include reference="Fkf-og-ytd"/>
-                                            <include reference="hu2-xM-w64"/>
-                                            <include reference="l9l-jK-cst"/>
-                                            <include reference="PjC-cB-YfR"/>
-                                            <include reference="qJo-Xg-EhL"/>
-                                            <include reference="rpW-dL-KWs"/>
-                                            <include reference="sQC-dK-bJs"/>
-                                            <include reference="xsM-oo-x8a"/>
-                                        </mask>
-                                    </variation>
-                                </view>
-                            </subviews>
-                            <animations/>
-                            <constraints>
-                                <constraint firstAttribute="trailing" secondItem="7nf-Ia-7Kq" secondAttribute="trailing" id="QFZ-sI-FTg"/>
-                                <constraint firstItem="Mw5-GF-3oQ" firstAttribute="leading" secondItem="3Np-sH-ysD" secondAttribute="leading" id="RFN-Kf-txX"/>
-                                <constraint firstItem="7nf-Ia-7Kq" firstAttribute="top" secondItem="3Np-sH-ysD" secondAttribute="top" id="SU0-8W-BVB">
-                                    <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                                </constraint>
-                                <constraint firstItem="Mw5-GF-3oQ" firstAttribute="centerY" secondItem="3Np-sH-ysD" secondAttribute="centerY" id="UWf-rC-hV7">
-                                    <variation key="heightClass=regular-widthClass=compact" constant="-3.5"/>
-                                </constraint>
-                                <constraint firstAttribute="trailing" secondItem="bIs-li-8bz" secondAttribute="trailing" id="UaC-ap-Ulp"/>
-                                <constraint firstItem="7nf-Ia-7Kq" firstAttribute="trailing" secondItem="Mw5-GF-3oQ" secondAttribute="trailing" id="fbA-Cy-O1e"/>
-                                <constraint firstItem="Mw5-GF-3oQ" firstAttribute="top" secondItem="7nf-Ia-7Kq" secondAttribute="bottom" constant="1" id="hfD-i1-Fhe">
-                                    <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                                </constraint>
-                                <constraint firstItem="7nf-Ia-7Kq" firstAttribute="leading" secondItem="3Np-sH-ysD" secondAttribute="leading" id="j4G-mB-NeU"/>
-                                <constraint firstAttribute="bottom" secondItem="bIs-li-8bz" secondAttribute="bottom" id="oNC-iJ-Za7"/>
-                                <constraint firstItem="bIs-li-8bz" firstAttribute="leading" secondItem="3Np-sH-ysD" secondAttribute="leading" id="s6c-op-QFh"/>
-                                <constraint firstItem="bIs-li-8bz" firstAttribute="top" secondItem="Mw5-GF-3oQ" secondAttribute="bottom" id="wPf-du-0AV"/>
-                            </constraints>
-                            <variation key="default">
-                                <mask key="subviews">
-                                    <exclude reference="7nf-Ia-7Kq"/>
-                                    <exclude reference="Mw5-GF-3oQ"/>
-                                </mask>
-                                <mask key="constraints">
-                                    <exclude reference="UaC-ap-Ulp"/>
-                                    <exclude reference="oNC-iJ-Za7"/>
-                                    <exclude reference="s6c-op-QFh"/>
-                                    <exclude reference="wPf-du-0AV"/>
-                                    <exclude reference="QFZ-sI-FTg"/>
-                                    <exclude reference="SU0-8W-BVB"/>
-                                    <exclude reference="fbA-Cy-O1e"/>
-                                    <exclude reference="j4G-mB-NeU"/>
-                                    <exclude reference="RFN-Kf-txX"/>
-                                    <exclude reference="UWf-rC-hV7"/>
-                                    <exclude reference="hfD-i1-Fhe"/>
-                                </mask>
-                            </variation>
-                            <variation key="heightClass=regular-widthClass=compact">
-                                <mask key="subviews">
-                                    <include reference="7nf-Ia-7Kq"/>
-                                    <include reference="Mw5-GF-3oQ"/>
-                                </mask>
-                                <mask key="constraints">
-                                    <include reference="UaC-ap-Ulp"/>
-                                    <include reference="oNC-iJ-Za7"/>
-                                    <include reference="s6c-op-QFh"/>
-                                    <include reference="wPf-du-0AV"/>
-                                    <include reference="QFZ-sI-FTg"/>
-                                    <include reference="SU0-8W-BVB"/>
-                                    <include reference="fbA-Cy-O1e"/>
-                                    <include reference="j4G-mB-NeU"/>
-                                    <include reference="RFN-Kf-txX"/>
-                                    <include reference="UWf-rC-hV7"/>
-                                    <include reference="hfD-i1-Fhe"/>
-                                </mask>
-                            </variation>
-                        </view>
-                    </subviews>
-                    <animations/>
-                    <constraints>
-                        <constraint firstAttribute="bottom" secondItem="3Np-sH-ysD" secondAttribute="bottom" constant="1" id="4tu-Yz-TS5">
-                            <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                        </constraint>
-                        <constraint firstItem="3Np-sH-ysD" firstAttribute="top" secondItem="sqq-aQ-dqD" secondAttribute="top" constant="1" id="CFR-Ui-y7e">
-                            <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                        </constraint>
-                        <constraint firstAttribute="trailing" secondItem="3Np-sH-ysD" secondAttribute="trailing" constant="66" id="SmO-lm-bHQ">
-                            <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                        </constraint>
-                        <constraint firstItem="3Np-sH-ysD" firstAttribute="leading" secondItem="sqq-aQ-dqD" secondAttribute="leading" constant="66" id="feN-Ai-BHU">
-                            <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                        </constraint>
-                    </constraints>
-                    <variation key="default">
-                        <mask key="subviews">
-                            <exclude reference="3Np-sH-ysD"/>
-                        </mask>
-                        <mask key="constraints">
-                            <exclude reference="4tu-Yz-TS5"/>
-                            <exclude reference="CFR-Ui-y7e"/>
-                            <exclude reference="SmO-lm-bHQ"/>
-                            <exclude reference="feN-Ai-BHU"/>
-                        </mask>
-                    </variation>
-                    <variation key="heightClass=regular-widthClass=compact">
-                        <mask key="subviews">
-                            <include reference="3Np-sH-ysD"/>
-                        </mask>
-                        <mask key="constraints">
-                            <include reference="4tu-Yz-TS5"/>
-                            <include reference="CFR-Ui-y7e"/>
-                            <include reference="SmO-lm-bHQ"/>
-                            <include reference="feN-Ai-BHU"/>
-                        </mask>
-                    </variation>
-                </view>
-            </subviews>
-            <animations/>
-            <constraints>
-                <constraint firstAttribute="centerX" secondItem="4c3-gb-BwR" secondAttribute="centerX" id="0tG-Bd-2ic"/>
-                <constraint firstAttribute="trailing" secondItem="4c3-gb-BwR" secondAttribute="trailing" id="F9j-6m-8Sq"/>
-                <constraint firstAttribute="centerY" secondItem="4c3-gb-BwR" secondAttribute="centerY" id="JX5-Sx-hSJ"/>
-                <constraint firstItem="4c3-gb-BwR" firstAttribute="trailing" secondItem="sqq-aQ-dqD" secondAttribute="trailing" constant="26" id="SNd-cf-17Y">
-                    <variation key="heightClass=regular-widthClass=compact" constant="15"/>
-                </constraint>
-                <constraint firstItem="4c3-gb-BwR" firstAttribute="top" secondItem="qLf-va-EAG" secondAttribute="top" id="TOG-yL-xSq"/>
-                <constraint firstItem="sqq-aQ-dqD" firstAttribute="leading" secondItem="4c3-gb-BwR" secondAttribute="leading" constant="25" id="jNe-AH-9q0">
-                    <variation key="heightClass=regular-widthClass=compact" constant="15"/>
-                </constraint>
-                <constraint firstAttribute="centerY" secondItem="sqq-aQ-dqD" secondAttribute="centerY" constant="12" id="rPN-2q-9iB">
-                    <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
-                </constraint>
-                <constraint firstAttribute="bottom" secondItem="4c3-gb-BwR" secondAttribute="bottom" id="uc7-M6-ZYJ"/>
-                <constraint firstItem="4c3-gb-BwR" firstAttribute="leading" secondItem="qLf-va-EAG" secondAttribute="leading" id="wPB-Gl-TgQ"/>
-            </constraints>
-            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
-            <variation key="default">
-                <mask key="subviews">
-                    <exclude reference="4c3-gb-BwR"/>
-                    <exclude reference="sqq-aQ-dqD"/>
-                </mask>
-                <mask key="constraints">
-                    <exclude reference="0tG-Bd-2ic"/>
-                    <exclude reference="F9j-6m-8Sq"/>
-                    <exclude reference="JX5-Sx-hSJ"/>
-                    <exclude reference="SNd-cf-17Y"/>
-                    <exclude reference="TOG-yL-xSq"/>
-                    <exclude reference="uc7-M6-ZYJ"/>
-                    <exclude reference="wPB-Gl-TgQ"/>
-                    <exclude reference="jNe-AH-9q0"/>
-                    <exclude reference="rPN-2q-9iB"/>
-                </mask>
-            </variation>
-            <variation key="heightClass=regular-widthClass=compact">
-                <mask key="subviews">
-                    <include reference="4c3-gb-BwR"/>
-                    <include reference="sqq-aQ-dqD"/>
-                </mask>
-                <mask key="constraints">
-                    <include reference="0tG-Bd-2ic"/>
-                    <include reference="F9j-6m-8Sq"/>
-                    <include reference="JX5-Sx-hSJ"/>
-                    <include reference="SNd-cf-17Y"/>
-                    <include reference="TOG-yL-xSq"/>
-                    <include reference="uc7-M6-ZYJ"/>
-                    <include reference="wPB-Gl-TgQ"/>
-                    <include reference="jNe-AH-9q0"/>
-                    <include reference="rPN-2q-9iB"/>
-                </mask>
-            </variation>
-            <connections>
-                <outlet property="btnCancel" destination="EtP-9O-R3A" id="mr5-zY-bQM"/>
-                <outlet property="btnConfirm" destination="FKG-xS-HlM" id="zTF-29-eYq"/>
-                <outlet property="constraintBtnConfirmWidth" destination="BNE-7a-kbD" id="C9m-XW-2MO"/>
-                <outlet property="containerView" destination="3Np-sH-ysD" id="uJs-dG-r2k"/>
-                <outlet property="lblTitle" destination="IE2-24-gHl" id="DFB-ut-ky2"/>
-                <outlet property="maskingView" destination="4c3-gb-BwR" id="9bJ-5l-qJq"/>
-                <outlet property="popUpView" destination="sqq-aQ-dqD" id="BCO-MT-Cf2"/>
-                <outlet property="tableView" destination="cee-tl-kl3" id="aBa-eb-ReK"/>
-            </connections>
-            <point key="canvasLocation" x="87" y="297"/>
-        </view>
-    </objects>
-</document>