Skip to content

Commit 68223df

Browse files
insanoidinsanoid
committed
#1 added checkbox for SwiftyJSON include
1 parent 5011607 commit 68223df

File tree

5 files changed

+69
-32
lines changed

5 files changed

+69
-32
lines changed

‎SwiftyJSONAccelerator.xcodeproj/project.pbxproj

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
9341A14A1BD6E5FE0048CE2C /* SJModelGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A1491BD6E5FE0048CE2C /* SJModelGenerator.swift */; settings = {ASSET_TAGS = (); }; };
11-
9341A14C1BD6E6300048CE2C /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A14B1BD6E6300048CE2C /* SwiftyJSON.swift */; settings = {ASSET_TAGS = (); }; };
12-
9341A14F1BD6E7290048CE2C /* BaseTemplate.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9341A14E1BD6E7290048CE2C /* BaseTemplate.txt */; settings = {ASSET_TAGS = (); }; };
13-
9341A1521BD6E9EC0048CE2C /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A14B1BD6E6300048CE2C /* SwiftyJSON.swift */; settings = {ASSET_TAGS = (); }; };
14-
9361FD141BD18558001ED533 /* LineNumberRulerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9361FD131BD18558001ED533 /* LineNumberRulerView.swift */; settings = {ASSET_TAGS = (); }; };
15-
9362F8661BD07DBA0001372E /* JSONHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9362F8651BD07DBA0001372E /* JSONHelperTests.swift */; settings = {ASSET_TAGS = (); }; };
16-
93CDE7721BD1A00B00B5B234 /* SJTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93CDE7711BD1A00B00B5B234 /* SJTextView.swift */; settings = {ASSET_TAGS = (); }; };
10+
9341A14A1BD6E5FE0048CE2C /* SJModelGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A1491BD6E5FE0048CE2C /* SJModelGenerator.swift */; };
11+
9341A14C1BD6E6300048CE2C /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A14B1BD6E6300048CE2C /* SwiftyJSON.swift */; };
12+
9341A14F1BD6E7290048CE2C /* BaseTemplate.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9341A14E1BD6E7290048CE2C /* BaseTemplate.txt */; };
13+
9341A1521BD6E9EC0048CE2C /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A14B1BD6E6300048CE2C /* SwiftyJSON.swift */; };
14+
9361FD141BD18558001ED533 /* LineNumberRulerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9361FD131BD18558001ED533 /* LineNumberRulerView.swift */; };
15+
9362F8661BD07DBA0001372E /* JSONHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9362F8651BD07DBA0001372E /* JSONHelperTests.swift */; };
16+
93CDE7721BD1A00B00B5B234 /* SJTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93CDE7711BD1A00B00B5B234 /* SJTextView.swift */; };
1717
93F174431BD0707D007E7DFC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F174421BD0707D007E7DFC /* AppDelegate.swift */; };
1818
93F174451BD0707D007E7DFC /* SJEditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F174441BD0707D007E7DFC /* SJEditorViewController.swift */; };
1919
93F174471BD0707D007E7DFC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 93F174461BD0707D007E7DFC /* Assets.xcassets */; };
2020
93F1744A1BD0707D007E7DFC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 93F174481BD0707D007E7DFC /* Main.storyboard */; };
2121
93F174551BD0707D007E7DFC /* SwiftyJSONAcceleratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F174541BD0707D007E7DFC /* SwiftyJSONAcceleratorTests.swift */; };
22-
93F174601BD070AA007E7DFC /* JSONHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F1745F1BD070AA007E7DFC /* JSONHelper.swift */; settings = {ASSET_TAGS = (); }; };
22+
93F174601BD070AA007E7DFC /* JSONHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F1745F1BD070AA007E7DFC /* JSONHelper.swift */; };
2323
/* End PBXBuildFile section */
2424

2525
/* Begin PBXContainerItemProxy section */
@@ -86,6 +86,25 @@
8686
name = "External Libraries";
8787
sourceTree = "<group>";
8888
};
89+
93A1264E1BDB8B04002A3B11 /* Model Generation */ = {
90+
isa = PBXGroup;
91+
children = (
92+
93F1745F1BD070AA007E7DFC /* JSONHelper.swift */,
93+
9341A1491BD6E5FE0048CE2C /* SJModelGenerator.swift */,
94+
);
95+
name = "Model Generation";
96+
sourceTree = "<group>";
97+
};
98+
93A1264F1BDB8B14002A3B11 /* Application Interface */ = {
99+
isa = PBXGroup;
100+
children = (
101+
93F174421BD0707D007E7DFC /* AppDelegate.swift */,
102+
93F174441BD0707D007E7DFC /* SJEditorViewController.swift */,
103+
93CDE7711BD1A00B00B5B234 /* SJTextView.swift */,
104+
);
105+
name = "Application Interface";
106+
sourceTree = "<group>";
107+
};
89108
93F174361BD0707D007E7DFC = {
90109
isa = PBXGroup;
91110
children = (
@@ -108,12 +127,9 @@
108127
isa = PBXGroup;
109128
children = (
110129
9362D3BC1BD8398A00B927D6 /* External Libraries */,
130+
93A1264E1BDB8B04002A3B11 /* Model Generation */,
111131
9341A14D1BD6E6EF0048CE2C /* Base Files */,
112-
93F174421BD0707D007E7DFC /* AppDelegate.swift */,
113-
93F174441BD0707D007E7DFC /* SJEditorViewController.swift */,
114-
93F1745F1BD070AA007E7DFC /* JSONHelper.swift */,
115-
93CDE7711BD1A00B00B5B234 /* SJTextView.swift */,
116-
9341A1491BD6E5FE0048CE2C /* SJModelGenerator.swift */,
132+
93A1264F1BDB8B14002A3B11 /* Application Interface */,
117133
93F174461BD0707D007E7DFC /* Assets.xcassets */,
118134
93F174481BD0707D007E7DFC /* Main.storyboard */,
119135
93F1744B1BD0707D007E7DFC /* Info.plist */,

‎SwiftyJSONAccelerator/Base Files/BaseTemplate.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
// Copyright (c) __MyCompanyName__. All rights reserved.
66
//
77

8-
import Foundation
9-
import SwiftyJSON
8+
import Foundation{INCLUDE_SWIFTY}
109

1110
public {OBJECT_KIND} {OBJECT_NAME}: NSObject, NSCoding {
1211

‎SwiftyJSONAccelerator/Base.lproj/Main.storyboard

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15A284" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15A284" 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="8191"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
66
</dependencies>
77
<scenes>
88
<!--Application-->
@@ -670,11 +670,11 @@
670670
<objects>
671671
<viewController title="SwiftyJSONAccelerator" id="XfG-lQ-9wD" customClass="SJEditorViewController" customModule="SwiftyJSONAccelerator" customModuleProvider="target" sceneMemberID="viewController">
672672
<view key="view" id="m2S-Jp-Qdl">
673-
<rect key="frame" x="0.0" y="0.0" width="717" height="599"/>
673+
<rect key="frame" x="0.0" y="0.0" width="717" height="628"/>
674674
<autoresizingMask key="autoresizingMask"/>
675675
<subviews>
676676
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AwX-MF-DMD">
677-
<rect key="frame" x="501" y="97" width="212" height="36"/>
677+
<rect key="frame" x="501" y="126" width="212" height="36"/>
678678
<constraints>
679679
<constraint firstAttribute="width" constant="200" id="Fsx-eV-1MY"/>
680680
</constraints>
@@ -688,7 +688,7 @@
688688
</connections>
689689
</button>
690690
<scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gmg-Tp-PPn">
691-
<rect key="frame" x="0.0" y="136" width="717" height="463"/>
691+
<rect key="frame" x="0.0" y="165" width="717" height="463"/>
692692
<clipView key="contentView" id="V7d-R1-cDN">
693693
<rect key="frame" x="1" y="1" width="715" height="461"/>
694694
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -700,10 +700,10 @@
700700
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
701701
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
702702
<size key="minSize" width="715" height="461"/>
703-
<size key="maxSize" width="715" height="10000000"/>
703+
<size key="maxSize" width="717" height="10000000"/>
704704
<color key="insertionPointColor" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
705705
<size key="minSize" width="715" height="461"/>
706-
<size key="maxSize" width="715" height="10000000"/>
706+
<size key="maxSize" width="717" height="10000000"/>
707707
</textView>
708708
</subviews>
709709
<animations/>
@@ -722,7 +722,7 @@
722722
</scroller>
723723
</scrollView>
724724
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="PJA-AP-s5I">
725-
<rect key="frame" x="15" y="109" width="20" height="20"/>
725+
<rect key="frame" x="15" y="138" width="20" height="20"/>
726726
<constraints>
727727
<constraint firstAttribute="height" constant="20" id="48s-vB-xta"/>
728728
<constraint firstAttribute="width" constant="20" id="t6S-fb-bjE"/>
@@ -731,7 +731,7 @@
731731
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyDown" image="failure" id="CKF-pW-DBY"/>
732732
</imageView>
733733
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GbJ-FJ-Uuc">
734-
<rect key="frame" x="41" y="103" width="460" height="26"/>
734+
<rect key="frame" x="41" y="132" width="460" height="26"/>
735735
<constraints>
736736
<constraint firstAttribute="height" constant="26" id="WGF-kR-SB9"/>
737737
</constraints>
@@ -743,7 +743,7 @@
743743
</textFieldCell>
744744
</textField>
745745
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aJ1-yn-Pl7">
746-
<rect key="frame" x="13" y="77" width="692" height="22"/>
746+
<rect key="frame" x="13" y="106" width="692" height="22"/>
747747
<animations/>
748748
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="BaseClass" placeholderString="Base Class Name" bezelStyle="round" id="vuP-t4-ep6">
749749
<font key="font" metaFont="system"/>
@@ -752,7 +752,7 @@
752752
</textFieldCell>
753753
</textField>
754754
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b3c-Wz-v36">
755-
<rect key="frame" x="13" y="53" width="692" height="22"/>
755+
<rect key="frame" x="13" y="82" width="692" height="22"/>
756756
<animations/>
757757
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Class Prefix (For example, NS)" bezelStyle="round" id="N8s-m9-cf7">
758758
<font key="font" metaFont="system"/>
@@ -761,7 +761,7 @@
761761
</textFieldCell>
762762
</textField>
763763
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sNu-7Z-F06">
764-
<rect key="frame" x="13" y="29" width="692" height="22"/>
764+
<rect key="frame" x="13" y="58" width="692" height="22"/>
765765
<animations/>
766766
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Company name" bezelStyle="round" id="76e-Gm-0jI">
767767
<font key="font" metaFont="system"/>
@@ -770,17 +770,26 @@
770770
</textFieldCell>
771771
</textField>
772772
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mJg-3P-2Aw">
773-
<rect key="frame" x="13" y="5" width="692" height="22"/>
773+
<rect key="frame" x="13" y="34" width="692" height="22"/>
774774
<animations/>
775775
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Author name" bezelStyle="round" id="jUe-0u-QLL">
776776
<font key="font" metaFont="system"/>
777777
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
778778
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
779779
</textFieldCell>
780780
</textField>
781+
<button translatesAutoresizingMaskIntoConstraints="NO" id="uZa-9r-6Xo">
782+
<rect key="frame" x="13" y="10" width="265" height="18"/>
783+
<animations/>
784+
<buttonCell key="cell" type="check" title="Add &quot;import SwiftyJSON&quot; in the models." bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="tJK-cs-wrm">
785+
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
786+
<font key="font" metaFont="system"/>
787+
</buttonCell>
788+
</button>
781789
</subviews>
782790
<constraints>
783791
<constraint firstAttribute="trailing" secondItem="AwX-MF-DMD" secondAttribute="trailing" constant="10" id="1wF-Ly-8ue"/>
792+
<constraint firstAttribute="bottom" secondItem="uZa-9r-6Xo" secondAttribute="bottom" constant="12" id="33g-aa-kCl"/>
784793
<constraint firstItem="aJ1-yn-Pl7" firstAttribute="leading" secondItem="mJg-3P-2Aw" secondAttribute="leading" id="35V-f8-AGH"/>
785794
<constraint firstItem="b3c-Wz-v36" firstAttribute="width" secondItem="mJg-3P-2Aw" secondAttribute="width" id="8wA-lO-d5e"/>
786795
<constraint firstItem="aJ1-yn-Pl7" firstAttribute="width" secondItem="mJg-3P-2Aw" secondAttribute="width" id="9m4-gy-MnL"/>
@@ -794,7 +803,9 @@
794803
<constraint firstItem="b3c-Wz-v36" firstAttribute="leading" secondItem="mJg-3P-2Aw" secondAttribute="leading" id="Q9g-6W-fq3"/>
795804
<constraint firstItem="sNu-7Z-F06" firstAttribute="top" secondItem="b3c-Wz-v36" secondAttribute="bottom" constant="2" id="Svz-9v-6zt"/>
796805
<constraint firstItem="PJA-AP-s5I" firstAttribute="leading" secondItem="m2S-Jp-Qdl" secondAttribute="leading" constant="15" id="ZKf-XD-X3C"/>
806+
<constraint firstItem="uZa-9r-6Xo" firstAttribute="leading" secondItem="m2S-Jp-Qdl" secondAttribute="leading" constant="15" id="ZT5-69-AWH"/>
797807
<constraint firstItem="AwX-MF-DMD" firstAttribute="top" secondItem="Gmg-Tp-PPn" secondAttribute="bottom" constant="7" id="cHK-Sj-6ps"/>
808+
<constraint firstItem="uZa-9r-6Xo" firstAttribute="top" secondItem="mJg-3P-2Aw" secondAttribute="bottom" constant="8" id="dno-LM-r3L"/>
798809
<constraint firstItem="AwX-MF-DMD" firstAttribute="top" secondItem="PJA-AP-s5I" secondAttribute="top" id="ds3-Tk-TKg"/>
799810
<constraint firstItem="aJ1-yn-Pl7" firstAttribute="top" secondItem="PJA-AP-s5I" secondAttribute="bottom" constant="10" id="gHI-A7-SyE"/>
800811
<constraint firstItem="mJg-3P-2Aw" firstAttribute="top" secondItem="sNu-7Z-F06" secondAttribute="bottom" constant="2" id="h24-Ox-KU7"/>
@@ -803,7 +814,6 @@
803814
<constraint firstItem="AwX-MF-DMD" firstAttribute="leading" secondItem="GbJ-FJ-Uuc" secondAttribute="trailing" constant="8" id="i7q-la-dYw"/>
804815
<constraint firstItem="aJ1-yn-Pl7" firstAttribute="top" secondItem="GbJ-FJ-Uuc" secondAttribute="bottom" constant="4" id="iwL-1w-9za"/>
805816
<constraint firstItem="b3c-Wz-v36" firstAttribute="top" secondItem="aJ1-yn-Pl7" secondAttribute="bottom" constant="2" id="jIg-Xp-GaU"/>
806-
<constraint firstAttribute="bottom" secondItem="mJg-3P-2Aw" secondAttribute="bottom" constant="5" id="mwR-zK-YI2"/>
807817
<constraint firstItem="mJg-3P-2Aw" firstAttribute="leading" secondItem="m2S-Jp-Qdl" secondAttribute="leading" constant="13" id="n4f-7b-FZR"/>
808818
</constraints>
809819
<animations/>
@@ -813,14 +823,15 @@
813823
<outlet property="baseClassTextField" destination="aJ1-yn-Pl7" id="22H-xr-iCp"/>
814824
<outlet property="companyNameTextField" destination="sNu-7Z-F06" id="1lU-Ld-bFb"/>
815825
<outlet property="errorImageView" destination="PJA-AP-s5I" id="0nv-qV-54d"/>
826+
<outlet property="includeSwiftyCheckbox" destination="uZa-9r-6Xo" id="r84-Fc-xwG"/>
816827
<outlet property="messageLabel" destination="GbJ-FJ-Uuc" id="19Z-0L-YwW"/>
817828
<outlet property="prefixClassTextField" destination="b3c-Wz-v36" id="3wr-bV-AAf"/>
818829
<outlet property="textView" destination="fWl-7Q-Cq6" id="1lh-CW-y1Y"/>
819830
</connections>
820831
</viewController>
821832
<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
822833
</objects>
823-
<point key="canvasLocation" x="151.5" y="636.5"/>
834+
<point key="canvasLocation" x="151.5" y="651"/>
824835
</scene>
825836
</scenes>
826837
<resources>

0 commit comments

Comments
 (0)