From a605b34b0106482bf7dfe2a21ad91bb9e35bf2a4 Mon Sep 17 00:00:00 2001
From: Adam Demasi <adam@hbang.com.au>
Date: Sat, 8 May 2021 20:19:37 +0930
Subject: [PATCH] Clean up the settings layout

---
 iOS/OCRuntime/Base.lproj/Main.storyboard | 114 ++++++++++++-----------
 iOS/OCRuntime/RTBInfoVC.m                |   2 +-
 2 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/iOS/OCRuntime/Base.lproj/Main.storyboard b/iOS/OCRuntime/Base.lproj/Main.storyboard
index 5e0203ed8..c94558797 100755
--- a/iOS/OCRuntime/Base.lproj/Main.storyboard
+++ b/iOS/OCRuntime/Base.lproj/Main.storyboard
@@ -235,34 +235,6 @@ We have found this to be a useful development tool. Please note, however, that e
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </textView>
-                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="dN9-UO-ZoB">
-                                <rect key="frame" x="246" y="690" width="51" height="31"/>
-                                <connections>
-                                    <action selector="showOCRuntimeClassesAction:" destination="z37-Zv-0FS" eventType="valueChanged" id="qy6-jU-dEh"/>
-                                </connections>
-                            </switch>
-                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WZJ-DL-319">
-                                <rect key="frame" x="246" y="729" width="51" height="31"/>
-                                <connections>
-                                    <action selector="toggleWebServerAction:" destination="z37-Zv-0FS" eventType="valueChanged" id="2e5-PG-5Ug"/>
-                                </connections>
-                            </switch>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Show OCRuntime Classes" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tkK-cB-p3M">
-                                <rect key="frame" x="25" y="697" width="213" height="17"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="213" id="4Sp-tO-3WE"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable Web Server" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Fd-kN-Sty">
-                                <rect key="frame" x="25" y="736" width="213" height="17"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="213" id="HGa-TY-YBn"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Dk9-Xb-psz">
                                 <rect key="frame" x="25" y="286" width="374" height="44"/>
                                 <constraints>
@@ -279,51 +251,85 @@ We have found this to be a useful development tool. Please note, however, that e
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="cgc-YJ-XbT">
-                                <rect key="frame" x="246" y="651" width="51" height="31"/>
-                                <connections>
-                                    <action selector="addBlockCommentsAction:" destination="z37-Zv-0FS" eventType="valueChanged" id="OI6-yr-FwR"/>
-                                    <action selector="showOCRuntimeClassesAction:" destination="z37-Zv-0FS" eventType="valueChanged" id="y91-0Z-dUg"/>
-                                </connections>
-                            </switch>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Add Comments for Blocks" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6AX-AQ-Dp7">
-                                <rect key="frame" x="25" y="658" width="213" height="17"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aME-D2-DAS">
+                                <rect key="frame" x="90.5" y="651" width="233" height="109"/>
+                                <subviews>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Add Comments for Blocks" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6AX-AQ-Dp7">
+                                        <rect key="frame" x="8" y="7" width="168" height="17"/>
+                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="cgc-YJ-XbT">
+                                        <rect key="frame" x="184" y="0.0" width="51" height="31"/>
+                                        <connections>
+                                            <action selector="addBlockCommentsAction:" destination="z37-Zv-0FS" eventType="valueChanged" id="OI6-yr-FwR"/>
+                                            <action selector="showOCRuntimeClassesAction:" destination="z37-Zv-0FS" eventType="valueChanged" id="y91-0Z-dUg"/>
+                                        </connections>
+                                    </switch>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="dN9-UO-ZoB">
+                                        <rect key="frame" x="184" y="39" width="51" height="31"/>
+                                        <connections>
+                                            <action selector="showOCRuntimeClassesAction:" destination="z37-Zv-0FS" eventType="valueChanged" id="qy6-jU-dEh"/>
+                                        </connections>
+                                    </switch>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Show OCRuntime Classes" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tkK-cB-p3M">
+                                        <rect key="frame" x="8" y="46" width="168" height="17"/>
+                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable Web Server" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Fd-kN-Sty">
+                                        <rect key="frame" x="8" y="85" width="168" height="17"/>
+                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WZJ-DL-319">
+                                        <rect key="frame" x="184" y="78" width="51" height="31"/>
+                                        <connections>
+                                            <action selector="toggleWebServerAction:" destination="z37-Zv-0FS" eventType="valueChanged" id="2e5-PG-5Ug"/>
+                                        </connections>
+                                    </switch>
+                                </subviews>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="213" id="8NR-ur-A55"/>
+                                    <constraint firstItem="WZJ-DL-319" firstAttribute="centerY" secondItem="9Fd-kN-Sty" secondAttribute="centerY" id="8QU-Zl-8Ji"/>
+                                    <constraint firstItem="cgc-YJ-XbT" firstAttribute="top" secondItem="aME-D2-DAS" secondAttribute="top" id="GHr-LE-Qg2"/>
+                                    <constraint firstItem="9Fd-kN-Sty" firstAttribute="width" secondItem="tkK-cB-p3M" secondAttribute="width" id="GZm-tM-jn3"/>
+                                    <constraint firstItem="tkK-cB-p3M" firstAttribute="leading" secondItem="aME-D2-DAS" secondAttribute="leadingMargin" id="HsQ-QC-hQZ"/>
+                                    <constraint firstItem="dN9-UO-ZoB" firstAttribute="centerY" secondItem="tkK-cB-p3M" secondAttribute="centerY" id="Obq-6O-imt"/>
+                                    <constraint firstItem="WZJ-DL-319" firstAttribute="top" secondItem="dN9-UO-ZoB" secondAttribute="bottom" constant="8" symbolic="YES" id="Tct-Ah-P2l"/>
+                                    <constraint firstItem="WZJ-DL-319" firstAttribute="leading" secondItem="9Fd-kN-Sty" secondAttribute="trailing" constant="8" symbolic="YES" id="Wgp-Z2-2Mr"/>
+                                    <constraint firstItem="dN9-UO-ZoB" firstAttribute="top" secondItem="cgc-YJ-XbT" secondAttribute="bottom" constant="8" symbolic="YES" id="YNX-Bi-5IF"/>
+                                    <constraint firstItem="6AX-AQ-Dp7" firstAttribute="leading" secondItem="aME-D2-DAS" secondAttribute="leadingMargin" id="YQD-rO-hTc"/>
+                                    <constraint firstAttribute="bottom" secondItem="WZJ-DL-319" secondAttribute="bottom" id="cmh-UR-Oa0"/>
+                                    <constraint firstAttribute="trailing" secondItem="WZJ-DL-319" secondAttribute="trailing" id="eQV-nH-NV3"/>
+                                    <constraint firstItem="9Fd-kN-Sty" firstAttribute="leading" secondItem="aME-D2-DAS" secondAttribute="leadingMargin" id="imQ-zk-fjC"/>
+                                    <constraint firstItem="cgc-YJ-XbT" firstAttribute="leading" secondItem="6AX-AQ-Dp7" secondAttribute="trailing" constant="8" symbolic="YES" id="jCx-lD-FSV"/>
+                                    <constraint firstItem="cgc-YJ-XbT" firstAttribute="centerY" secondItem="6AX-AQ-Dp7" secondAttribute="centerY" id="kd7-15-AdZ"/>
+                                    <constraint firstItem="dN9-UO-ZoB" firstAttribute="leading" secondItem="tkK-cB-p3M" secondAttribute="trailing" constant="8" symbolic="YES" id="pg3-HS-hju"/>
+                                    <constraint firstAttribute="trailing" secondItem="cgc-YJ-XbT" secondAttribute="trailing" id="pw0-Kx-IfV"/>
+                                    <constraint firstItem="tkK-cB-p3M" firstAttribute="width" secondItem="6AX-AQ-Dp7" secondAttribute="width" id="qtg-g3-FOV"/>
+                                    <constraint firstAttribute="trailing" secondItem="dN9-UO-ZoB" secondAttribute="trailing" id="vgv-nq-HNK"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                <nil key="highlightedColor"/>
-                            </label>
+                            </view>
                             <view contentMode="scaleToFill" verticalHuggingPriority="249" verticalCompressionResistancePriority="749" translatesAutoresizingMaskIntoConstraints="NO" id="i9b-in-MBf">
                                 <rect key="frame" x="20" y="350" width="374" height="281"/>
                             </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="secondarySystemBackgroundColor"/>
                         <constraints>
+                            <constraint firstItem="Vr7-hh-3aa" firstAttribute="top" secondItem="aME-D2-DAS" secondAttribute="bottom" constant="15" id="0Rm-PJ-hjM"/>
                             <constraint firstItem="Vr7-hh-3aa" firstAttribute="leading" secondItem="e0G-4p-y2g" secondAttribute="leadingMargin" constant="5" id="31l-kf-3yc"/>
                             <constraint firstItem="j7q-Et-3km" firstAttribute="trailing" secondItem="e0G-4p-y2g" secondAttribute="trailingMargin" id="3jC-Ti-8cZ"/>
-                            <constraint firstItem="6AX-AQ-Dp7" firstAttribute="leading" secondItem="e0G-4p-y2g" secondAttribute="leadingMargin" constant="5" id="4aj-YZ-6X7"/>
-                            <constraint firstItem="dN9-UO-ZoB" firstAttribute="top" secondItem="cgc-YJ-XbT" secondAttribute="bottom" constant="8" symbolic="YES" id="4rU-Ji-Rgi"/>
                             <constraint firstAttribute="trailingMargin" secondItem="i9b-in-MBf" secondAttribute="trailing" id="5fb-4H-vnP"/>
                             <constraint firstItem="Dk9-Xb-psz" firstAttribute="top" secondItem="j7q-Et-3km" secondAttribute="bottom" id="A0p-ez-2rV"/>
-                            <constraint firstItem="cgc-YJ-XbT" firstAttribute="top" secondItem="i9b-in-MBf" secondAttribute="bottom" constant="20" id="DIZ-BL-c8k"/>
-                            <constraint firstItem="Vr7-hh-3aa" firstAttribute="top" secondItem="WZJ-DL-319" secondAttribute="bottom" constant="15" id="IRu-kn-Imz"/>
-                            <constraint firstItem="dN9-UO-ZoB" firstAttribute="leading" secondItem="tkK-cB-p3M" secondAttribute="trailing" constant="8" symbolic="YES" id="OD1-ha-3LZ"/>
                             <constraint firstItem="NIF-tN-RRy" firstAttribute="top" secondItem="Vr7-hh-3aa" secondAttribute="bottom" constant="20" id="PM9-1B-QXM"/>
                             <constraint firstItem="i9b-in-MBf" firstAttribute="leading" secondItem="e0G-4p-y2g" secondAttribute="leadingMargin" id="PoM-Hy-a07"/>
                             <constraint firstItem="Dk9-Xb-psz" firstAttribute="trailing" secondItem="e0G-4p-y2g" secondAttribute="trailingMargin" constant="5" id="RCd-Ra-b2J"/>
                             <constraint firstItem="Vr7-hh-3aa" firstAttribute="trailing" secondItem="e0G-4p-y2g" secondAttribute="trailingMargin" constant="5" id="WL7-8W-V5Q"/>
-                            <constraint firstItem="dN9-UO-ZoB" firstAttribute="centerY" secondItem="tkK-cB-p3M" secondAttribute="centerY" id="YTB-6O-77I"/>
-                            <constraint firstItem="WZJ-DL-319" firstAttribute="leading" secondItem="9Fd-kN-Sty" secondAttribute="trailing" constant="8" symbolic="YES" id="dvn-Oc-jJk"/>
-                            <constraint firstItem="cgc-YJ-XbT" firstAttribute="centerY" secondItem="6AX-AQ-Dp7" secondAttribute="centerY" id="nuc-RT-jYG"/>
+                            <constraint firstItem="aME-D2-DAS" firstAttribute="centerX" secondItem="e0G-4p-y2g" secondAttribute="centerX" id="lI7-rw-Xlx"/>
                             <constraint firstItem="j7q-Et-3km" firstAttribute="leading" secondItem="e0G-4p-y2g" secondAttribute="leadingMargin" id="pIb-2M-hkt"/>
                             <constraint firstItem="i9b-in-MBf" firstAttribute="top" secondItem="Dk9-Xb-psz" secondAttribute="bottom" constant="20" id="qd2-7h-sgs"/>
-                            <constraint firstItem="cgc-YJ-XbT" firstAttribute="leading" secondItem="6AX-AQ-Dp7" secondAttribute="trailing" constant="8" symbolic="YES" id="rml-3D-Eh4"/>
+                            <constraint firstItem="aME-D2-DAS" firstAttribute="top" secondItem="i9b-in-MBf" secondAttribute="bottom" constant="20" id="qkD-Y4-vBy"/>
                             <constraint firstItem="j7q-Et-3km" firstAttribute="top" secondItem="igw-S1-sZv" secondAttribute="bottom" constant="20" id="tgL-ND-QaL"/>
-                            <constraint firstItem="9Fd-kN-Sty" firstAttribute="leading" secondItem="e0G-4p-y2g" secondAttribute="leadingMargin" constant="5" id="v3Y-g1-zxX"/>
-                            <constraint firstItem="WZJ-DL-319" firstAttribute="top" secondItem="dN9-UO-ZoB" secondAttribute="bottom" constant="8" symbolic="YES" id="vky-QO-OmI"/>
-                            <constraint firstItem="tkK-cB-p3M" firstAttribute="leading" secondItem="e0G-4p-y2g" secondAttribute="leadingMargin" constant="5" id="wSg-0p-JAg"/>
-                            <constraint firstItem="WZJ-DL-319" firstAttribute="centerY" secondItem="9Fd-kN-Sty" secondAttribute="centerY" id="wkX-Ib-phb"/>
                             <constraint firstItem="Dk9-Xb-psz" firstAttribute="leading" secondItem="e0G-4p-y2g" secondAttribute="leadingMargin" constant="5" id="zCh-QI-gR7"/>
                         </constraints>
                     </view>
diff --git a/iOS/OCRuntime/RTBInfoVC.m b/iOS/OCRuntime/RTBInfoVC.m
index aa206575e..679681685 100755
--- a/iOS/OCRuntime/RTBInfoVC.m
+++ b/iOS/OCRuntime/RTBInfoVC.m
@@ -29,7 +29,7 @@ @implementation RTBInfoVC
 - (void)updateWebServerStatus {
 	RTBAppDelegate *appDelegate = (RTBAppDelegate *)[[UIApplication sharedApplication] delegate];
 	NSString *serverURL = [NSString stringWithFormat:@"http://%@:%d/", [appDelegate myIPAddress], [appDelegate serverPort]];
-	_webServerStatusLabel.text = [[appDelegate webServer] isRunning] ? serverURL : @"";
+	_webServerStatusLabel.text = [[appDelegate webServer] isRunning] ? serverURL : @"Web Server Disabled";
 }
 
 - (void)viewWillAppear:(BOOL)animated {