Merge branch 'develop'

Author: Paolo Ardia

ResourceObjC/Sources/SeguesGenerator.m

@@ -16,7 +16,8 @@
 #import <XMLDictionary/XMLDictionary.h>
 
 @interface SegueResource : NSObject
-@property (nonatomic, strong) NSMutableArray* segues;
+@property (nonatomic, strong) NSMutableOrderedSet* segues;
+@property (nonatomic, strong) NSString* sourceOriginalClass;
 @property (nonatomic, strong) NSString* sourceClassName;
 @property (nonatomic, readonly) NSString* sourceClassType;
 @property (nonatomic, readonly) NSString* methodName;
@@ -28,7 +29,7 @@ - (instancetype)init
     self = [super init];
     if (self)
     {
-        self.segues = [NSMutableArray new];
+        self.segues = [NSMutableOrderedSet new];
     }
     return self;
 }
@@ -83,7 +84,7 @@ - (NSString *)propertyName
 - (SegueResource*)resourceForViewController:(NSString*)className
 {
     NSUInteger index = [self.resources indexOfObjectPassingTest:^BOOL(SegueResource * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        if ([obj.className isEqualToString:className])
+        if ([obj.sourceOriginalClass isEqualToString:className])
         {
             *stop = YES;
             return YES;
@@ -98,6 +99,7 @@ - (SegueResource*)resourceForViewController:(NSString*)className
 
     SegueResource* res = [SegueResource new];
     res.sourceClassName = className;
+    res.sourceOriginalClass = className;
     [self.resources addObject:res];
     return res;
 }
@@ -214,7 +216,7 @@ - (BOOL)writeInResourceFileWithError:(NSError *__autoreleasing *)error
             [self.clazz.implementation.lazyGetters addObject:lazy];
 
             // sort segues in alphabetic order
-            NSArray* segues = [res.segues sortedArrayUsingSelector:@selector(compare:)];
+            NSArray* segues = [res.segues.array sortedArrayUsingSelector:@selector(compare:)];
             for (NSString* segue in segues)
             {
                 codableKey = [CommonUtils codableNameFromString:segue];

ResourceObjCTest/ResourceObjCTest/Base.lproj/Main.storyboard

@@ -38,7 +38,8 @@
                     <connections>
                         <outlet property="imageView" destination="tvn-B6-FrS" id="3ee-G7-Oeq"/>
                         <outlet property="label" destination="8kX-NH-AiF" id="gTg-0Q-uxn"/>
-                        <segue destination="asI-WZ-88X" kind="show" identifier="openNext" id="vlu-Jy-XGR"/>
+                        <segue destination="asI-WZ-88X" kind="show" identifier="open" id="vlu-Jy-XGR"/>
+                        <segue destination="jMu-cY-bEk" kind="show" identifier="openNext" id="EDt-YO-Ju8"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
@@ -56,7 +57,7 @@
                     <view key="view" contentMode="scaleToFill" id="NGl-Yy-Zsw">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.80000000000000004" green="0.1215686275" blue="0.12549019610000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                     <connections>
                         <segue destination="62T-p0-jzj" kind="show" identifier="openSome" customClass="SomeSegue" id="Zhd-wg-C38"/>
@@ -66,6 +67,27 @@
             </objects>
             <point key="canvasLocation" x="729" y="37"/>
         </scene>
+        <!--View Controller-->
+        <scene sceneID="Oe7-1V-6Eg">
+            <objects>
+                <viewController id="jMu-cY-bEk" customClass="ViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="XOR-ji-SxE"/>
+                        <viewControllerLayoutGuide type="bottom" id="etg-G2-z7w"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="HZO-tC-2U8">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="1" green="1" blue="0.12967722039999999" alpha="1" colorSpace="calibratedRGB"/>
+                    </view>
+                    <connections>
+                        <segue destination="asI-WZ-88X" kind="show" identifier="openNext" id="T2e-bA-Z3u"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="LlM-nU-fxE" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="729" y="790"/>
+        </scene>
         <!--Some-->
         <scene sceneID="Af8-Na-j93">
             <objects>
@@ -75,4 +97,7 @@
             <point key="canvasLocation" x="1354" y="36"/>
         </scene>
     </scenes>
+    <inferredMetricsTieBreakers>
+        <segue reference="T2e-bA-Z3u"/>
+    </inferredMetricsTieBreakers>
 </document>

ResourceObjCTest/ResourceObjCTest/ViewController.m

@@ -23,6 +23,11 @@ - (void)viewDidLoad
     self.imageView.image = R.image.testImage;
     self.label.text = R.string.localizable._34563456KeyB;
     NSLog(@"%@", R.segue.viewController.openNext.identifier);
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
     [R.segue.viewController.openNext performWithSource:self sender:@"trySender"];
 }