diff --git a/Ring/Ring.xcodeproj/project.pbxproj b/Ring/Ring.xcodeproj/project.pbxproj index 37b85625c8efe9ef519a4ea13389c976bbf560fa..148e9ef6232bf7ffc35690afa8d8bc1eeefa309e 100644 --- a/Ring/Ring.xcodeproj/project.pbxproj +++ b/Ring/Ring.xcodeproj/project.pbxproj @@ -115,6 +115,9 @@ 564C44601E943C37000F92B1 /* NameRegistrationAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 564C445F1E943C37000F92B1 /* NameRegistrationAdapter.mm */; }; 564C44621E943DE6000F92B1 /* NameService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 564C44611E943DE6000F92B1 /* NameService.swift */; }; 564C44641E943E1E000F92B1 /* NameRegistrationAdapterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 564C44631E943E1E000F92B1 /* NameRegistrationAdapterDelegate.swift */; }; + 5669A7FA1EA904AF003C7B93 /* SwitchCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5669A7F91EA904AF003C7B93 /* SwitchCell.xib */; }; + 5669A7FC1EA904D2003C7B93 /* TextFieldCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5669A7FB1EA904D2003C7B93 /* TextFieldCell.xib */; }; + 5669A7FE1EA904E4003C7B93 /* TextCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5669A7FD1EA904E4003C7B93 /* TextCell.xib */; }; 568F56751EA7E5DE00132D7D /* PKHUD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 568F56721EA7E38F00132D7D /* PKHUD.framework */; }; 56AC64D51E7C7F4000EA1AA9 /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AC64D41E7C7F4000EA1AA9 /* WelcomeViewController.swift */; }; 56AC64D91E8012CA00EA1AA9 /* Walkthrough.strings in Resources */ = {isa = PBXBuildFile; fileRef = 56AC64DB1E8012CA00EA1AA9 /* Walkthrough.strings */; }; @@ -265,6 +268,9 @@ 564C445F1E943C37000F92B1 /* NameRegistrationAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NameRegistrationAdapter.mm; sourceTree = "<group>"; }; 564C44611E943DE6000F92B1 /* NameService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NameService.swift; sourceTree = "<group>"; }; 564C44631E943E1E000F92B1 /* NameRegistrationAdapterDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NameRegistrationAdapterDelegate.swift; sourceTree = "<group>"; }; + 5669A7F91EA904AF003C7B93 /* SwitchCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SwitchCell.xib; sourceTree = "<group>"; }; + 5669A7FB1EA904D2003C7B93 /* TextFieldCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TextFieldCell.xib; sourceTree = "<group>"; }; + 5669A7FD1EA904E4003C7B93 /* TextCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TextCell.xib; sourceTree = "<group>"; }; 568F56721EA7E38F00132D7D /* PKHUD.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PKHUD.framework; path = Carthage/Build/iOS/PKHUD.framework; sourceTree = "<group>"; }; 56AC64D41E7C7F4000EA1AA9 /* WelcomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = "<group>"; }; 56AC64DA1E8012CA00EA1AA9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Walkthrough.strings; sourceTree = "<group>"; }; @@ -678,8 +684,11 @@ isa = PBXGroup; children = ( 56AC64DE1E804ECC00EA1AA9 /* SwitchCell.swift */, + 5669A7F91EA904AF003C7B93 /* SwitchCell.xib */, 56AC64E01E80542300EA1AA9 /* TextFieldCell.swift */, + 5669A7FB1EA904D2003C7B93 /* TextFieldCell.xib */, 56AC64E21E805F0200EA1AA9 /* TextCell.swift */, + 5669A7FD1EA904E4003C7B93 /* TextCell.xib */, ); name = Cells; sourceTree = "<group>"; @@ -795,9 +804,12 @@ files = ( 56AC64D91E8012CA00EA1AA9 /* Walkthrough.strings in Resources */, 02B22E031DF755F7000358C9 /* WalkthroughStoryboard.storyboard in Resources */, + 5669A7FE1EA904E4003C7B93 /* TextCell.xib in Resources */, 04399A061D1C2D9D00E99CD9 /* LaunchScreen.storyboard in Resources */, 04399A031D1C2D9D00E99CD9 /* Assets.xcassets in Resources */, 04399A011D1C2D9D00E99CD9 /* Main.storyboard in Resources */, + 5669A7FA1EA904AF003C7B93 /* SwitchCell.xib in Resources */, + 5669A7FC1EA904D2003C7B93 /* TextFieldCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Ring/Ring/SwitchCell.xib b/Ring/Ring/SwitchCell.xib new file mode 100644 index 0000000000000000000000000000000000000000..a6daceef9c905019dd2ef8c54e2ca1f287ffdf1b --- /dev/null +++ b/Ring/Ring/SwitchCell.xib @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> + <dependencies> + <deployment identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> + </dependencies> + <objects> + <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> + <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="SwitchCellId" rowHeight="69" id="Yif-IF-81k" customClass="SwitchCell" customModule="Ring" customModuleProvider="target"> + <rect key="frame" x="0.0" y="0.0" width="320" height="69"/> + <autoresizingMask key="autoresizingMask"/> + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Yif-IF-81k" id="EOF-e2-nje"> + <rect key="frame" x="0.0" y="0.0" width="320" height="68"/> + <autoresizingMask key="autoresizingMask"/> + <subviews> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Register public username (experimental)" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tA2-KH-hQH"> + <rect key="frame" x="16" y="8" width="231" height="53"/> + <fontDescription key="fontDescription" type="system" pointSize="17"/> + <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <nil key="highlightedColor"/> + </label> + <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mew-RY-xpg"> + <rect key="frame" x="255" y="19" width="51" height="31"/> + </switch> + </subviews> + <constraints> + <constraint firstItem="mew-RY-xpg" firstAttribute="centerY" secondItem="EOF-e2-nje" secondAttribute="centerY" id="IPn-AW-SF6"/> + <constraint firstAttribute="bottom" secondItem="tA2-KH-hQH" secondAttribute="bottom" constant="8" id="OTV-UN-GEE"/> + <constraint firstItem="mew-RY-xpg" firstAttribute="leading" secondItem="tA2-KH-hQH" secondAttribute="trailing" constant="8" id="We4-Xh-xDG"/> + <constraint firstAttribute="trailing" secondItem="mew-RY-xpg" secondAttribute="trailing" constant="16" id="Xlc-0g-krk"/> + <constraint firstItem="tA2-KH-hQH" firstAttribute="top" secondItem="EOF-e2-nje" secondAttribute="top" constant="8" id="gL7-Zb-Jzg"/> + <constraint firstItem="tA2-KH-hQH" firstAttribute="leading" secondItem="EOF-e2-nje" secondAttribute="leading" constant="16" id="qE8-OH-OlE"/> + </constraints> + </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <connections> + <outlet property="registerSwitch" destination="mew-RY-xpg" id="FEC-Ep-LTP"/> + <outlet property="titleLabel" destination="tA2-KH-hQH" id="eJz-g7-ECA"/> + </connections> + </tableViewCell> + </objects> +</document> diff --git a/Ring/Ring/TextCell.xib b/Ring/Ring/TextCell.xib new file mode 100644 index 0000000000000000000000000000000000000000..2501045472de5ab875a2190bf064d5165297d878 --- /dev/null +++ b/Ring/Ring/TextCell.xib @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> + <dependencies> + <deployment identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> + </dependencies> + <objects> + <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> + <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TextCellId" rowHeight="69" id="6fR-7o-uTx" customClass="TextCell" customModule="Ring" customModuleProvider="target"> + <rect key="frame" x="0.0" y="0.0" width="320" height="69"/> + <autoresizingMask key="autoresizingMask"/> + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6fR-7o-uTx" id="dja-bC-isJ"> + <rect key="frame" x="0.0" y="0.0" width="320" height="68"/> + <autoresizingMask key="autoresizingMask"/> + <subviews> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jFA-AW-xcV"> + <rect key="frame" x="16" y="8" width="288" height="53"/> + <fontDescription key="fontDescription" type="system" pointSize="17"/> + <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <nil key="highlightedColor"/> + </label> + </subviews> + <constraints> + <constraint firstAttribute="bottom" secondItem="jFA-AW-xcV" secondAttribute="bottom" constant="8" id="1gA-Tq-G8N"/> + <constraint firstItem="jFA-AW-xcV" firstAttribute="leading" secondItem="dja-bC-isJ" secondAttribute="leading" constant="16" id="5uH-dG-rpe"/> + <constraint firstAttribute="trailing" secondItem="jFA-AW-xcV" secondAttribute="trailing" constant="16" id="DcD-Zr-TSr"/> + <constraint firstItem="jFA-AW-xcV" firstAttribute="top" secondItem="dja-bC-isJ" secondAttribute="top" constant="8" id="RM5-V7-gpN"/> + </constraints> + </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <connections> + <outlet property="label" destination="jFA-AW-xcV" id="2kT-f6-q4f"/> + </connections> + </tableViewCell> + </objects> +</document> diff --git a/Ring/Ring/TextFieldCell.xib b/Ring/Ring/TextFieldCell.xib new file mode 100644 index 0000000000000000000000000000000000000000..51abaeaefe5bb454d2ec4847467caf62d3396912 --- /dev/null +++ b/Ring/Ring/TextFieldCell.xib @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> + <dependencies> + <deployment identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> + </dependencies> + <objects> + <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> + <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TextFieldCellId" rowHeight="80" id="U14-3B-dOe" customClass="TextFieldCell" customModule="Ring" customModuleProvider="target"> + <rect key="frame" x="0.0" y="0.0" width="320" height="80"/> + <autoresizingMask key="autoresizingMask"/> + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="U14-3B-dOe" id="4gJ-Ji-yr3"> + <rect key="frame" x="0.0" y="0.0" width="320" height="79"/> + <autoresizingMask key="autoresizingMask"/> + <subviews> + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="let-RU-Vya" customClass="RoundedTextField" customModule="Ring" customModuleProvider="target"> + <rect key="frame" x="16" y="8" width="288" height="42"/> + <nil key="textColor"/> + <fontDescription key="fontDescription" type="system" pointSize="14"/> + <textInputTraits key="textInputTraits" secureTextEntry="YES"/> + </textField> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JXp-TT-tN0"> + <rect key="frame" x="16" y="54" width="288" height="17"/> + <constraints> + <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="17" id="EVv-1r-8dZ"/> + </constraints> + <fontDescription key="fontDescription" type="system" pointSize="14"/> + <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <nil key="highlightedColor"/> + </label> + </subviews> + <constraints> + <constraint firstAttribute="trailing" secondItem="let-RU-Vya" secondAttribute="trailing" constant="16" id="8tN-FD-abO"/> + <constraint firstItem="let-RU-Vya" firstAttribute="top" secondItem="4gJ-Ji-yr3" secondAttribute="top" constant="8" id="CA5-jm-57y"/> + <constraint firstItem="JXp-TT-tN0" firstAttribute="leading" secondItem="4gJ-Ji-yr3" secondAttribute="leading" constant="16" id="NpS-VI-iDF"/> + <constraint firstAttribute="bottom" secondItem="JXp-TT-tN0" secondAttribute="bottom" constant="8" id="lWN-0g-Bd1"/> + <constraint firstItem="let-RU-Vya" firstAttribute="leading" secondItem="4gJ-Ji-yr3" secondAttribute="leading" constant="16" id="rYs-8Q-y71"/> + <constraint firstItem="JXp-TT-tN0" firstAttribute="top" secondItem="let-RU-Vya" secondAttribute="bottom" constant="4" id="wWh-Vn-WVa"/> + <constraint firstAttribute="trailing" secondItem="JXp-TT-tN0" secondAttribute="trailing" constant="16" id="xfk-Qg-XAg"/> + </constraints> + </tableViewCellContentView> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <connections> + <outlet property="errorMessageLabel" destination="JXp-TT-tN0" id="6ar-LE-Hd5"/> + <outlet property="textField" destination="let-RU-Vya" id="mSE-wJ-u6p"/> + </connections> + </tableViewCell> + </objects> +</document> diff --git a/Ring/Ring/Walkthrough/CreateRingAccountViewController.swift b/Ring/Ring/Walkthrough/CreateRingAccountViewController.swift index bb5cc3c9f0f8ccced7336ad52e593d9bc1768399..e3ac205636148d5cbdb34137d5dbdd238f402ba9 100644 --- a/Ring/Ring/Walkthrough/CreateRingAccountViewController.swift +++ b/Ring/Ring/Walkthrough/CreateRingAccountViewController.swift @@ -46,18 +46,32 @@ class CreateRingAccountViewController: UITableViewController { let mSwitchCellId = "SwitchCellId" let mTextFieldCellId = "TextFieldCellId" - let mTableViewCellId = "TableViewCellId" + let mTextCellId = "TextCellId" var mDisposeBag = DisposeBag() override func viewDidLoad() { super.viewDidLoad() + self.registerCells() + self.bindViews() self.setupUI() } + func registerCells() { + self.tableView.register(UINib.init(nibName: "SwitchCell", bundle: nil), + forCellReuseIdentifier: mSwitchCellId) + + self.tableView.register(UINib.init(nibName: "TextFieldCell", bundle: nil), + forCellReuseIdentifier: mTextFieldCellId) + + self.tableView.register(UINib.init(nibName: "TextCell", bundle: nil), + forCellReuseIdentifier: mTextCellId) + + } + /** Bind all the necessary of this View to its ViewModel. That allows to build the binding part of the MVVM pattern. @@ -228,7 +242,7 @@ class CreateRingAccountViewController: UITableViewController { return cell } else if currentCellType == .passwordNotice { - let cell = tableView.dequeueReusableCell(withIdentifier: mTableViewCellId, + let cell = tableView.dequeueReusableCell(withIdentifier: mTextCellId, for: indexPath) as! TextCell cell.label.text = NSLocalizedString("ChooseStrongPassword", tableName: LocalizedStringTableNames.walkthrough, diff --git a/Ring/Ring/Walkthrough/WalkthroughStoryboard.storyboard b/Ring/Ring/Walkthrough/WalkthroughStoryboard.storyboard index 5f70a14bcb8b66a0fb8689a183ce37a3cb312caf..1e037f427fd88d6e947dcdbd794eb9e925020f9b 100644 --- a/Ring/Ring/Walkthrough/WalkthroughStoryboard.storyboard +++ b/Ring/Ring/Walkthrough/WalkthroughStoryboard.storyboard @@ -168,7 +168,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="480"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" red="0.039215686270000001" green="0.4549019608" blue="0.53725490200000003" alpha="1" colorSpace="calibratedRGB"/> - <view key="tableHeaderView" contentMode="scaleToFill" id="gnd-b0-Ncm"> + <view key="tableHeaderView" contentMode="scaleToFill" id="gnd-b0-Ncm" userLabel="Header"> <rect key="frame" x="0.0" y="0.0" width="320" height="130"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> @@ -187,8 +187,8 @@ <constraint firstItem="AIX-eC-baN" firstAttribute="top" secondItem="gnd-b0-Ncm" secondAttribute="top" constant="8" id="peB-GQ-GOz"/> </constraints> </view> - <view key="tableFooterView" contentMode="scaleToFill" id="MnN-De-arJ"> - <rect key="frame" x="0.0" y="365" width="320" height="54"/> + <view key="tableFooterView" contentMode="scaleToFill" id="MnN-De-arJ" userLabel="Footer"> + <rect key="frame" x="0.0" y="130" width="320" height="54"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gsT-SB-0AP" customClass="RoundedButton" customModule="Ring" customModuleProvider="target"> @@ -209,105 +209,6 @@ <constraint firstItem="gsT-SB-0AP" firstAttribute="centerX" secondItem="MnN-De-arJ" secondAttribute="centerX" id="tMA-Qg-oxa"/> </constraints> </view> - <prototypes> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="SwitchCellId" rowHeight="69" id="xv3-kL-wNV" customClass="SwitchCell" customModule="Ring" customModuleProvider="target"> - <rect key="frame" x="0.0" y="158" width="320" height="69"/> - <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xv3-kL-wNV" id="u8d-10-5fQ"> - <rect key="frame" x="0.0" y="0.0" width="320" height="69"/> - <autoresizingMask key="autoresizingMask"/> - <subviews> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Register public username (experimental)" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l6E-2a-51c"> - <rect key="frame" x="16" y="8" width="231" height="52.5"/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <nil key="highlightedColor"/> - </label> - <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eXQ-lo-PPY"> - <rect key="frame" x="255" y="19" width="51" height="31"/> - </switch> - </subviews> - <constraints> - <constraint firstAttribute="bottom" secondItem="l6E-2a-51c" secondAttribute="bottom" constant="8" id="3mf-5d-kOd"/> - <constraint firstItem="eXQ-lo-PPY" firstAttribute="centerY" secondItem="u8d-10-5fQ" secondAttribute="centerY" id="UJ8-RD-ddQ"/> - <constraint firstItem="l6E-2a-51c" firstAttribute="leading" secondItem="u8d-10-5fQ" secondAttribute="leading" constant="16" id="UsX-gS-0TN"/> - <constraint firstAttribute="trailing" secondItem="eXQ-lo-PPY" secondAttribute="trailing" constant="16" id="cE9-Xf-bT3"/> - <constraint firstItem="eXQ-lo-PPY" firstAttribute="leading" secondItem="l6E-2a-51c" secondAttribute="trailing" constant="8" id="cyW-Kw-ea3"/> - <constraint firstItem="l6E-2a-51c" firstAttribute="top" secondItem="u8d-10-5fQ" secondAttribute="top" constant="8" id="oun-Kt-auw"/> - </constraints> - </tableViewCellContentView> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <connections> - <outlet property="registerSwitch" destination="eXQ-lo-PPY" id="SlD-P6-SiF"/> - <outlet property="titleLabel" destination="l6E-2a-51c" id="28k-pL-Ri6"/> - </connections> - </tableViewCell> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TextFieldCellId" rowHeight="141" id="hll-q9-QzR" customClass="TextFieldCell" customModule="Ring" customModuleProvider="target"> - <rect key="frame" x="0.0" y="227" width="320" height="141"/> - <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hll-q9-QzR" id="b0d-cJ-IJT"> - <rect key="frame" x="0.0" y="0.0" width="320" height="141"/> - <autoresizingMask key="autoresizingMask"/> - <subviews> - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dWn-2T-XDN" customClass="RoundedTextField" customModule="Ring" customModuleProvider="target"> - <rect key="frame" x="16" y="8" width="288" height="104"/> - <nil key="textColor"/> - <fontDescription key="fontDescription" type="system" pointSize="14"/> - <textInputTraits key="textInputTraits" secureTextEntry="YES"/> - </textField> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E0m-7s-XEz"> - <rect key="frame" x="16" y="116" width="288" height="17"/> - <constraints> - <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="17" id="5fo-tK-QhJ"/> - </constraints> - <fontDescription key="fontDescription" type="system" pointSize="14"/> - <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> - <nil key="highlightedColor"/> - </label> - </subviews> - <constraints> - <constraint firstItem="E0m-7s-XEz" firstAttribute="top" secondItem="dWn-2T-XDN" secondAttribute="bottom" constant="4" id="PcG-Ss-0z5"/> - <constraint firstAttribute="trailing" secondItem="dWn-2T-XDN" secondAttribute="trailing" constant="16" id="TZI-tk-XCc"/> - <constraint firstItem="E0m-7s-XEz" firstAttribute="leading" secondItem="b0d-cJ-IJT" secondAttribute="leading" constant="16" id="VZb-a1-THP"/> - <constraint firstAttribute="trailing" secondItem="E0m-7s-XEz" secondAttribute="trailing" constant="16" id="bxv-dZ-6fV"/> - <constraint firstItem="dWn-2T-XDN" firstAttribute="top" secondItem="b0d-cJ-IJT" secondAttribute="top" constant="8" id="gXN-EW-HYY"/> - <constraint firstAttribute="bottom" secondItem="E0m-7s-XEz" secondAttribute="bottom" constant="8" id="vhj-er-C2E"/> - <constraint firstItem="dWn-2T-XDN" firstAttribute="leading" secondItem="b0d-cJ-IJT" secondAttribute="leading" constant="16" id="zAm-rb-vhR"/> - </constraints> - </tableViewCellContentView> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <connections> - <outlet property="errorMessageLabel" destination="E0m-7s-XEz" id="Xng-uT-cAm"/> - <outlet property="textField" destination="dWn-2T-XDN" id="xz6-aa-Izw"/> - </connections> - </tableViewCell> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TableViewCellId" rowHeight="69" id="ExW-Pf-YtL" customClass="TextCell" customModule="Ring" customModuleProvider="target"> - <rect key="frame" x="0.0" y="368" width="320" height="69"/> - <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ExW-Pf-YtL" id="D4j-0H-Fhi"> - <rect key="frame" x="0.0" y="0.0" width="320" height="69"/> - <autoresizingMask key="autoresizingMask"/> - <subviews> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tqa-H7-iG3"> - <rect key="frame" x="16" y="8" width="288" height="52.5"/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <nil key="highlightedColor"/> - </label> - </subviews> - <constraints> - <constraint firstAttribute="trailing" secondItem="tqa-H7-iG3" secondAttribute="trailing" constant="16" id="VN7-fC-5Av"/> - <constraint firstItem="tqa-H7-iG3" firstAttribute="leading" secondItem="D4j-0H-Fhi" secondAttribute="leading" constant="16" id="ghI-k7-j7e"/> - <constraint firstAttribute="bottom" secondItem="tqa-H7-iG3" secondAttribute="bottom" constant="8" id="r6B-sj-b0Z"/> - <constraint firstItem="tqa-H7-iG3" firstAttribute="top" secondItem="D4j-0H-Fhi" secondAttribute="top" constant="8" id="vYA-FB-IGa"/> - </constraints> - </tableViewCellContentView> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <connections> - <outlet property="label" destination="tqa-H7-iG3" id="LDf-uD-qqo"/> - </connections> - </tableViewCell> - </prototypes> <connections> <outlet property="dataSource" destination="kzh-87-Ao9" id="fWb-k5-HBL"/> <outlet property="delegate" destination="kzh-87-Ao9" id="DE2-dv-wl2"/> @@ -321,7 +222,7 @@ </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="W0G-TV-Z9c" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="1965" y="366.25"/> + <point key="canvasLocation" x="1913" y="291"/> </scene> <!--View Controller--> <scene sceneID="c8H-6M-3dO">