Skip to content

Commit 579e008

Browse files
nicklockwoodnicklockwood
committed
Improve Swiftformat for Xcode app styling
1 parent 472cf58 commit 579e008

2 files changed

Lines changed: 40 additions & 54 deletions

File tree

‎EditorExtension/Application/Base.lproj/Main.storyboard‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.2"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.3"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<scenes>
@@ -385,10 +385,10 @@
385385
<!--Tab View Controller-->
386386
<scene sceneID="y9y-mK-zv0">
387387
<objects>
388-
<tabViewController storyboardIdentifier="MainWindowTabViewController" showSeguePresentationStyle="single" selectedTabViewItemIndex="0" id="5TS-Xa-esv" sceneMemberID="viewController">
388+
<tabViewController storyboardIdentifier="MainWindowTabViewController" showSeguePresentationStyle="single" selectedTabViewItemIndex="0" tabStyle="toolbar" id="5TS-Xa-esv" sceneMemberID="viewController">
389389
<tabViewItems>
390-
<tabViewItem id="a30-N6-piJ"/>
391-
<tabViewItem identifier="" id="zOv-w8-921"/>
390+
<tabViewItem image="NSTouchBarGetInfoTemplate" id="a30-N6-piJ"/>
391+
<tabViewItem identifier="" image="NSTouchBarTextListTemplate" id="zOv-w8-921"/>
392392
</tabViewItems>
393393
<viewControllerTransitionOptions key="transitionOptions" allowUserInteraction="YES"/>
394394
<tabView key="tabView" type="noTabsNoBorder" id="EJQ-wo-I9k">
@@ -407,37 +407,37 @@
407407
</tabViewController>
408408
<customObject id="gwc-tk-N4m" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
409409
</objects>
410-
<point key="canvasLocation" x="75" y="670"/>
410+
<point key="canvasLocation" x="74" y="863"/>
411411
</scene>
412412
<!--Rules-->
413413
<scene sceneID="v8f-un-92m">
414414
<objects>
415415
<viewController title="Rules" storyboardIdentifier="RulesViewController" showSeguePresentationStyle="single" id="9ZR-Qg-hHT" customClass="RulesViewController" customModule="SwiftFormat_for_Xcode" customModuleProvider="target" sceneMemberID="viewController">
416-
<view key="view" id="iDF-FY-6tf">
417-
<rect key="frame" x="0.0" y="0.0" width="476" height="614"/>
416+
<view key="view" misplaced="YES" id="iDF-FY-6tf">
417+
<rect key="frame" x="0.0" y="0.0" width="498" height="615"/>
418418
<autoresizingMask key="autoresizingMask"/>
419419
<subviews>
420420
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="RZx-Ps-pFP">
421-
<rect key="frame" x="0.0" y="571" width="476" height="5"/>
421+
<rect key="frame" x="0.0" y="587" width="505" height="5"/>
422422
<constraints>
423423
<constraint firstAttribute="height" constant="1" id="cK6-hE-hqz"/>
424424
</constraints>
425425
</box>
426426
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="33" horizontalPageScroll="10" verticalLineScroll="33" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="vVz-rA-tRS">
427-
<rect key="frame" x="0.0" y="0.0" width="476" height="535"/>
427+
<rect key="frame" x="0.0" y="0.0" width="505" height="551"/>
428428
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="1nY-Z5-cvR">
429-
<rect key="frame" x="0.0" y="0.0" width="476" height="535"/>
429+
<rect key="frame" x="0.0" y="0.0" width="505" height="551"/>
430430
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
431431
<subviews>
432432
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" selectionHighlightStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="30" rowSizeStyle="automatic" usesAutomaticRowHeights="YES" viewBased="YES" id="JTc-wy-tJT">
433-
<rect key="frame" x="0.0" y="0.0" width="476" height="535"/>
433+
<rect key="frame" x="0.0" y="0.0" width="505" height="551"/>
434434
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
435435
<size key="intercellSpacing" width="3" height="3"/>
436436
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
437437
<tableViewGridLines key="gridStyleMask" dashed="YES"/>
438438
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
439439
<tableColumns>
440-
<tableColumn editable="NO" width="473" minWidth="40" maxWidth="1000" id="jXL-aR-Mks">
440+
<tableColumn editable="NO" width="466" minWidth="40" maxWidth="1000" id="jXL-aR-Mks">
441441
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
442442
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
443443
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -449,11 +449,11 @@
449449
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
450450
<prototypeCellViews>
451451
<tableCellView identifier="BinarySelectionTableCellView" id="CZN-za-xvO" customClass="BinarySelectionTableCellView" customModule="SwiftFormat_for_Xcode" customModuleProvider="target">
452-
<rect key="frame" x="1" y="1" width="473" height="26"/>
452+
<rect key="frame" x="1" y="1" width="466" height="26"/>
453453
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
454454
<subviews>
455455
<button verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Mfi-uR-j8t">
456-
<rect key="frame" x="2" y="4" width="469" height="18"/>
456+
<rect key="frame" x="2" y="4" width="462" height="18"/>
457457
<buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="aQA-fV-2dz">
458458
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
459459
<font key="font" metaFont="system"/>
@@ -474,7 +474,7 @@
474474
</connections>
475475
</tableCellView>
476476
<tableCellView identifier="FreeTextTableCellView" id="ISi-9v-fr9" customClass="FreeTextTableCellView" customModule="SwiftFormat_for_Xcode" customModuleProvider="target">
477-
<rect key="frame" x="1" y="30" width="473" height="30"/>
477+
<rect key="frame" x="1" y="30" width="466" height="30"/>
478478
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
479479
<subviews>
480480
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hfs-ko-uob">
@@ -486,7 +486,7 @@
486486
</textFieldCell>
487487
</textField>
488488
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3FH-Sx-Hfs">
489-
<rect key="frame" x="106" y="4" width="359" height="21"/>
489+
<rect key="frame" x="106" y="4" width="352" height="21"/>
490490
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="Mkg-Qi-aiV">
491491
<font key="font" metaFont="system"/>
492492
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -511,14 +511,14 @@
511511
</connections>
512512
</tableCellView>
513513
<tableCellView identifier="ListSelectionTableCellView" id="gu5-aI-ODU" customClass="ListSelectionTableCellView" customModule="SwiftFormat_for_Xcode" customModuleProvider="target">
514-
<rect key="frame" x="1" y="63" width="473" height="29"/>
514+
<rect key="frame" x="1" y="63" width="466" height="29"/>
515515
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
516516
<subviews>
517517
<popUpButton horizontalHuggingPriority="500" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uIw-Th-pkZ">
518-
<rect key="frame" x="391" y="1" width="77" height="25"/>
518+
<rect key="frame" x="384" y="1" width="77" height="25"/>
519519
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="oEo-Ud-RHl" id="99Z-zT-syJ">
520520
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
521-
<font key="font" metaFont="system"/>
521+
<font key="font" metaFont="menu"/>
522522
<menu key="menu" id="jQM-YH-P6z">
523523
<items>
524524
<menuItem title="Item 1" state="on" id="oEo-Ud-RHl"/>
@@ -532,7 +532,7 @@
532532
</connections>
533533
</popUpButton>
534534
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8Sj-pm-88d">
535-
<rect key="frame" x="32" y="7" width="355" height="16"/>
535+
<rect key="frame" x="32" y="7" width="348" height="16"/>
536536
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Option name" id="72m-8i-Mg3">
537537
<font key="font" metaFont="system"/>
538538
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -574,7 +574,7 @@
574574
</scroller>
575575
</scrollView>
576576
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pHb-Fu-MRN">
577-
<rect key="frame" x="6" y="572" width="186" height="44"/>
577+
<rect key="frame" x="6" y="588" width="186" height="44"/>
578578
<constraints>
579579
<constraint firstAttribute="height" constant="40" id="qEB-fw-FrU"/>
580580
</constraints>
@@ -587,10 +587,10 @@
587587
</connections>
588588
</button>
589589
<popUpButton horizontalHuggingPriority="500" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YId-jI-Kpd">
590-
<rect key="frame" x="394" y="580" width="77" height="25"/>
590+
<rect key="frame" x="423" y="596" width="77" height="25"/>
591591
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="nhQ-Kk-Ta3" id="JGl-KG-s99">
592592
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
593-
<font key="font" metaFont="system"/>
593+
<font key="font" metaFont="menu"/>
594594
<menu key="menu" id="gu2-yX-6cs">
595595
<items>
596596
<menuItem title="Item 1" state="on" id="nhQ-Kk-Ta3"/>
@@ -604,15 +604,15 @@
604604
</connections>
605605
</popUpButton>
606606
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8vB-lt-Jpe">
607-
<rect key="frame" x="312" y="586" width="82" height="16"/>
607+
<rect key="frame" x="341" y="602" width="82" height="16"/>
608608
<textFieldCell key="cell" lineBreakMode="clipping" title="Swift version" id="pwb-qe-8jm">
609609
<font key="font" metaFont="system"/>
610610
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
611611
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
612612
</textFieldCell>
613613
</textField>
614614
<searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g0F-OD-16q">
615-
<rect key="frame" x="8" y="543" width="460" height="22"/>
615+
<rect key="frame" x="8" y="559" width="489" height="22"/>
616616
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="7UJ-JQ-nkl">
617617
<font key="font" metaFont="system"/>
618618
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -652,7 +652,7 @@
652652
</viewController>
653653
<customObject id="i1Z-CA-hdr" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
654654
</objects>
655-
<point key="canvasLocation" x="-408" y="1334.5"/>
655+
<point key="canvasLocation" x="-462" y="1642"/>
656656
</scene>
657657
<!--About-->
658658
<scene sceneID="hIz-AP-VOD">
@@ -808,7 +808,11 @@
808808
</viewController>
809809
<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
810810
</objects>
811-
<point key="canvasLocation" x="524.5" y="1269"/>
811+
<point key="canvasLocation" x="536" y="1521"/>
812812
</scene>
813813
</scenes>
814+
<resources>
815+
<image name="NSTouchBarGetInfoTemplate" width="18" height="30"/>
816+
<image name="NSTouchBarTextListTemplate" width="18" height="30"/>
817+
</resources>
814818
</document>

0 commit comments

Comments
 (0)