Fixed Keyboard settings and alignments

leepro · Sep 26, 2017 · 8795d18 · 8795d18
1 parent b5a81a9
commit 8795d18
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/Settings/Base.lproj/Settings.storyboard b/Settings/Base.lproj/Settings.storyboard
@@ -1385,23 +1385,30 @@
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Auto repeat" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JeQ-Lh-fTJ">
-                                            <rect key="frame" x="15" y="12" width="104" height="21"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                        <switch opaque="NO" tag="1003" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" preservesSuperviewLayoutMargins="YES" contentHorizontalAlignment="right" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cii-El-Jjy">
-                                            <rect key="frame" x="306" y="6" width="52" height="31"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                        <switch opaque="NO" tag="1003" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" preservesSuperviewLayoutMargins="YES" contentHorizontalAlignment="right" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cii-El-Jjy">
+                                            <rect key="frame" x="310" y="6.5" width="51" height="31"/>
                                             <edgeInsets key="layoutMargins" top="8" left="8" bottom="8" right="10"/>
                                             <connections>
                                                 <action selector="autoRepeatChanged:" destination="Man-FB-xZk" eventType="valueChanged" id="8vc-bU-907"/>
                                                 <action selector="cursorBlinkSwitchChanged:" destination="wNx-Mq-Q3D" eventType="valueChanged" id="Mkt-ed-QZD"/>
                                             </connections>
                                         </switch>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Auto Repeat" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3l2-Pw-5NA">
+                                            <rect key="frame" x="16" y="12" width="89" height="20"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
                                     </subviews>
+                                    <constraints>
+                                        <constraint firstItem="cii-El-Jjy" firstAttribute="centerY" secondItem="3l2-Pw-5NA" secondAttribute="centerY" id="7YK-zd-ARa"/>
+                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="3l2-Pw-5NA" secondAttribute="trailingMargin" id="FMW-X2-U7h"/>
+                                        <constraint firstItem="3l2-Pw-5NA" firstAttribute="leading" secondItem="1X5-Hn-Zyc" secondAttribute="leadingMargin" id="KJ3-FB-FXl"/>
+                                        <constraint firstItem="3l2-Pw-5NA" firstAttribute="leading" secondItem="1X5-Hn-Zyc" secondAttribute="leadingMargin" id="WU2-fQ-sTe"/>
+                                        <constraint firstAttribute="trailingMargin" secondItem="cii-El-Jjy" secondAttribute="trailing" id="jHm-wV-gBa"/>
+                                        <constraint firstItem="cii-El-Jjy" firstAttribute="trailing" secondItem="1X5-Hn-Zyc" secondAttribute="trailingMargin" id="jhM-SC-L9w"/>
+                                        <constraint firstItem="3l2-Pw-5NA" firstAttribute="centerY" secondItem="1X5-Hn-Zyc" secondAttribute="centerY" id="mp2-pW-0aS"/>
+                                    </constraints>
                                 </tableViewCellContentView>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="multipleModifierCell" textLabel="XE5-AE-x0L" detailTextLabel="gYW-Y1-qzY" style="IBUITableViewCellStyleValue1" id="RfM-9g-AlL">
@@ -2390,8 +2397,8 @@
         <image name="user" width="22" height="22"/>
     </resources>
     <inferredMetricsTieBreakers>
+        <segue reference="dlZ-04-Kay"/>
         <segue reference="y9I-rB-ZKT"/>
         <segue reference="dMC-e1-GtW"/>
-        <segue reference="dlZ-04-Kay"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/Settings/ViewControllers/BKKeyboard/BKKeyboardViewController.m b/Settings/ViewControllers/BKKeyboard/BKKeyboardViewController.m
@@ -152,6 +152,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
           cell = [tableView dequeueReusableCellWithIdentifier:@"autoRepeatCell" forIndexPath:indexPath];
           _autoRepeatSwitch = [cell viewWithTag:AUTOREPEAT_TAG];
           [_autoRepeatSwitch setOn:[BKDefaults autoRepeatKeys]];
+          break;
         case 3:
           cell = [tableView dequeueReusableCellWithIdentifier:@"multipleModifierCell" forIndexPath:indexPath];
           cell.textLabel.text = (NSString*)BKKeyboardFuncFTriggers;