Merge pull request #47 from willowtreeapps/develop

Merge develop into master.
willowtreeapps · Jan 22, 2018 · dd88fc2 · dd88fc2
2 parents 28bad72 + 49f5920
commit dd88fc2
Show file tree

Hide file tree

Showing 57 changed files with 280 additions and 87 deletions.
diff --git a/...butesInspector/AttributesViewer/AttributeProviders/HYPAttributedStringAttributeProvider.m b/...butesInspector/AttributesViewer/AttributeProviders/HYPAttributedStringAttributeProvider.m
@@ -28,7 +28,7 @@ @implementation HYPAttributedStringAttributeProvider
 {
     NSMutableArray<id<HYPInspectorAttribute>> *viewAttributes = [[NSMutableArray alloc] init];
 
-    [attributedString enumerateAttributesInRange:NSMakeRange(0, attributedString.length) options:0 usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
+    [attributedString enumerateAttributesInRange:NSMakeRange(0, attributedString.length) options:0 usingBlock:^(NSDictionary<NSString *,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
         HYPAttributedStringInspectorAttribute *attribute = [[HYPAttributedStringInspectorAttribute alloc] initWithAttributedString:[attributedString attributedSubstringFromRange:range] range:range];
         [viewAttributes addObject:attribute];
     }];

diff --git a/AttributesInspector/AttributesViewer/AttributeProviders/HYPAttributesProvider.m b/AttributesInspector/AttributesViewer/AttributeProviders/HYPAttributesProvider.m
@@ -65,6 +65,9 @@ -(Class)providerClass
 
     HYPKeyValueInspectorAttribute *accessibilityHintAttribute = [[HYPKeyValueInspectorAttribute alloc] initWithKey:@"Accessibility Hint" value:view.accessibilityHint ? view.accessibilityHint : @"--" ];
     [viewAttributes addObject:accessibilityHintAttribute];
+
+    HYPKeyValueInspectorAttribute *accessibilityIDAttribute = [[HYPKeyValueInspectorAttribute alloc] initWithKey:@"Accessibility ID" value:view.accessibilityIdentifier ? view.accessibilityIdentifier : @"--" ];
+        [viewAttributes addObject:accessibilityIDAttribute];
 
 
     return viewAttributes;

diff --git a/AttributesInspector/AttributesViewer/PreviewViews/HYPTextPreview.m b/AttributesInspector/AttributesViewer/PreviewViews/HYPTextPreview.m
@@ -53,12 +53,12 @@ -(instancetype)initWithAttributedString:(NSAttributedString *)string
 {
     self = [[NSBundle bundleForClass:[self class]] loadNibNamed:@"HYPTextPreview" owner:self options:nil].firstObject;
 
-    __block NSDictionary<NSAttributedStringKey,id> *attributes;
+    __block NSDictionary<NSString *,id> *attributes;
     __block BOOL viewTooComplicated = false;
 
     NSRange range = NSMakeRange(0, string.length);
 
-    [string enumerateAttributesInRange:range options:0 usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
+    [string enumerateAttributesInRange:range options:0 usingBlock:^(NSDictionary<NSString *,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
 
         if (attributes)
         {

diff --git a/Core/Public/HyperionManager.m b/Core/Public/HyperionManager.m
@@ -197,6 +197,10 @@ -(void)setActivationGesture:(HYPActivationGestureOptions)gesture {
     NSMutableArray<id<HYPPluginModule>> *mutablePluginModules = [[NSMutableArray alloc] init];
     NSArray<Class<HYPPlugin>> *pluginClasses = [self retrievePluginClasses];
 
+    pluginClasses = [pluginClasses sortedArrayUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
+        return [[[obj1 class] description] compare:[[obj2 class] description]];
+    }];
+
     for (Class<HYPPlugin> pluginClass in pluginClasses)
     {
         if ([pluginClass conformsToProtocol:@protocol(HYPPlugin)])

diff --git a/Core/Public/Plugin/HYPPluginHelper.m b/Core/Public/Plugin/HYPPluginHelper.m
@@ -27,14 +27,15 @@ @implementation HYPPluginHelper
 {
     NSMutableArray<UIView *> *potentialSelectionViews = [[NSMutableArray alloc] init];
     NSArray *subviews = [view subviews];
+    NSSet *blackList = [self blacklistedViews];
 
     for (UIView *subView in [subviews reverseObjectEnumerator])
     {
         if (subView.alpha > 0 && !subView.hidden)
         {
             [potentialSelectionViews addObjectsFromArray:[self findSubviewsInView:subView intersectingPoint:point]];
 
-            if ([self view:subView surrondsPoint:point])
+            if ([self view:subView surrondsPoint:point] && ![blackList containsObject:NSStringFromClass([subView class])])
             {
                 [potentialSelectionViews addObject:subView];
             }
@@ -52,4 +53,15 @@ +(BOOL)view:(UIView *)view surrondsPoint:(CGPoint)point
     viewRect.origin.y <= point.y && (viewRect.size.height + viewRect.origin.y) >= point.y;
 }
 
+/**
+ *  This returns a list of views that we do not want to show up as selectable views.
+ *  Reference: https://github.com/willowtreeapps/Hyperion-iOS/issues/31
+ */
++(NSSet *)blacklistedViews
+{
+    NSMutableSet *blackListedViews = [[NSMutableSet alloc] initWithArray:@[@"_UINavigationControllerPaletteClippingView"]];
+
+    return blackListedViews;
+}
+
 @end
diff --git a/Core/Public/Plugin/HYPPluginMenuItem.h b/Core/Public/Plugin/HYPPluginMenuItem.h
@@ -90,4 +90,9 @@
  */
 @property (nonatomic) UIImageView *pluginImageView;
 
+/**
+ * The height of the plugin menu item. This value defaults to 130.
+ */
+@property (nonatomic) CGFloat height;
+
 @end
diff --git a/Core/Public/Plugin/HYPPluginMenuItem.m b/Core/Public/Plugin/HYPPluginMenuItem.m
@@ -20,6 +20,11 @@
 //
 
 #import "HYPPluginMenuItem.h"
+@interface HYPPluginMenuItem()
+
+@property (nonatomic) NSLayoutConstraint *heightConstraint;
+
+@end
 @implementation HYPPluginMenuItem
 @synthesize delegate = _delegate;
 @synthesize selected = _selected;
@@ -34,19 +39,23 @@ -(instancetype)init
     self.titleLabel.translatesAutoresizingMaskIntoConstraints = false;
     self.pluginImageView.translatesAutoresizingMaskIntoConstraints = false;
 
+    _height = 130;
+
+    self.heightConstraint = [self.heightAnchor constraintEqualToConstant:_height];
+    self.heightConstraint.active = true;
+
     [self addSubview:self.titleLabel];
     [self addSubview:self.pluginImageView];
 
     [self.pluginImageView.topAnchor constraintEqualToAnchor:self.topAnchor constant:50].active = true;
-    [self.pluginImageView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor constant:-50].active = true;
     [self.pluginImageView.heightAnchor constraintEqualToConstant:30].active = true;
     [self.pluginImageView.widthAnchor constraintEqualToConstant:30].active = true;
 
     [self.pluginImageView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor constant:45].active = true;
 
     self.titleLabel.numberOfLines = 2;
     [self.titleLabel.leadingAnchor constraintEqualToAnchor:self.pluginImageView.trailingAnchor constant:28].active = true;
-    [self.titleLabel.centerYAnchor constraintEqualToAnchor:self.centerYAnchor].active = true;
+    [self.titleLabel.centerYAnchor constraintEqualToAnchor:self.pluginImageView.centerYAnchor].active = true;
     [self.titleLabel.widthAnchor constraintEqualToConstant:114].active = true;
 
     [self setSelected:NO animated:NO];
@@ -87,4 +96,10 @@ -(void)setSelected:(BOOL)selected animated:(BOOL)animated;
     self.pluginImageView.tintColor = self.titleLabel.textColor;
 }
 
+-(void)setHeight:(CGFloat)height
+{
+    _height = height;
+    self.heightConstraint.constant = _height;
+}
+
 @end
diff --git a/HyperioniOS.podspec b/HyperioniOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'HyperioniOS'
-  s.version          = '1.0.1'
+  s.version          = '1.0.2'
   s.summary          = 'Hyperion is an app design review tool that allows you to inspect views and perform measurements live within your app.'
 
 # This description is used to generate tags and improve search results.
@@ -31,26 +31,30 @@ Hyperion is an app design review tool that allows you to inspect views and perfo
   s.frameworks = ["UIKit"]
 
   s.subspec 'Core' do |core|
-    core.source_files = 'Core/**/*'
+    core.source_files = 'Core/**/*.{h,m}'
     core.exclude_files = 'Core/**/*.md'
+    core.resources = ['Core/**/*.png', 'Core/**/*.xib', 'Core/**/*.plist']
   end
 
   s.subspec 'AttributesInspector' do |attributes|
     attributes.dependency 'HyperioniOS/Core'
-    attributes.source_files = 'AttributesInspector/**/*'
+    attributes.source_files = 'AttributesInspector/**/*.{h,m}'
     attributes.exclude_files = 'AttributesInspector/**/*.md'
+    attributes.resources = ['AttributesInspector/**/*.png', 'AttributesInspector/**/*.xib', 'AttributesInspector/**/*.plist']
   end
 
   s.subspec 'SlowAnimations' do |slowanimations|
     slowanimations.dependency 'HyperioniOS/Core'
-    slowanimations.source_files = 'SlowAnimations/**/*'
+    slowanimations.source_files = 'SlowAnimations/**/*.{h,m}'
     slowanimations.exclude_files = 'SlowAnimations/**/*.md'
+    slowanimations.resources = ['SlowAnimations/**/*.png', 'SlowAnimations/**/*.xib', 'SlowAnimations/**/*.plist']
   end
 
   s.subspec 'Measurements' do |measurements|
     measurements.dependency 'HyperioniOS/Core'
-    measurements.source_files = 'Measurements/**/*'
+    measurements.source_files = 'Measurements/**/*.{h,m}'
     measurements.exclude_files = 'Measurements/**/*.md'
+    measurements.resources = ['Measurements/**/*.png', 'Measurements/**/*.xib', 'Measurements/**/*.plist']
   end
 
 end
diff --git a/SlowAnimations/HYPSlowAnimationsPluginMenuItem.m b/SlowAnimations/HYPSlowAnimationsPluginMenuItem.m
@@ -33,6 +33,8 @@ -(instancetype)init
 {
     self = [super init];
 
+    self.height = 160;
+
     _quarterSpeed = [UIButton buttonWithType:UIButtonTypeCustom];
 
     [_quarterSpeed setImage:[UIImage imageWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:@"25x-Unselected" ofType:@"png"]] forState:UIControlStateNormal];

diff --git a/docs/Classes.html b/docs/Classes.html
@@ -232,7 +232,7 @@ <h4>Declaration</h4>
                         </div>
                       </div>
                       <div class="slightly-smaller">
-                        <a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/Plugin/HYPPluginMenuItem.h#L66-L93">Show on GitHub</a>
+                        <a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/Plugin/HYPPluginMenuItem.h#L66-L98">Show on GitHub</a>
                       </div>
                     </section>
                   </div>
@@ -363,7 +363,7 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Classes/HYPPluginHelper.html b/docs/Classes/HYPPluginHelper.html
@@ -198,7 +198,7 @@ <h4>Parameters</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Classes/HYPPluginMenuItem.html b/docs/Classes/HYPPluginMenuItem.html
@@ -300,12 +300,47 @@ <h4>Declaration</h4>
                     </section>
                   </div>
                 </li>
+                <li class="item">
+                  <div>
+                    <code>
+                    <a name="/c:objc(cs)HYPPluginMenuItem(py)height"></a>
+                    <a name="//apple_ref/objc/Property/height" class="dashAnchor"></a>
+                    <a class="token" href="#/c:objc(cs)HYPPluginMenuItem(py)height">height</a>
+                    </code>
+                  </div>
+                  <div class="height-container">
+                    <div class="pointer-container"></div>
+                    <section class="section">
+                      <div class="pointer"></div>
+                      <div class="abstract">
+                        <p>The height of the plugin menu item. This value defaults to 130.</p>
+
+                      </div>
+                      <div class="declaration">
+                        <h4>Declaration</h4>
+                        <div class="language">
+                          <p class="aside-title">Objective-C</p>
+                          <pre class="highlight"><code><span class="k">@property</span> <span class="p">(</span><span class="n">assign</span><span class="p">,</span> <span class="n">readwrite</span><span class="p">,</span> <span class="n">nonatomic</span><span class="p">)</span> <span class="n">CGFloat</span> <span class="n">height</span><span class="p">;</span></code></pre>
+
+                        </div>
+                        <div class="language">
+                          <p class="aside-title">Swift</p>
+                          <pre class="highlight"><code><span class="k">var</span> <span class="nv">height</span><span class="p">:</span> <span class="kt">Int32</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+
+                        </div>
+                      </div>
+                      <div class="slightly-smaller">
+                        <a href="https://github.com/willowtreeapps/Hyperion-iOS/tree/master//Core/Public/Plugin/HYPPluginMenuItem.h#L96">Show on GitHub</a>
+                      </div>
+                    </section>
+                  </div>
+                </li>
               </ul>
             </div>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Classes/HYPSnapShotInteractionView.html b/docs/Classes/HYPSnapShotInteractionView.html
@@ -333,7 +333,7 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Classes/HYPSnapshotPluginModule.html b/docs/Classes/HYPSnapshotPluginModule.html
@@ -288,7 +288,7 @@ <h4>Return Value</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Classes/HyperionManager.html b/docs/Classes/HyperionManager.html
@@ -411,7 +411,7 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Constants.html b/docs/Constants.html
@@ -228,7 +228,7 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Enums.html b/docs/Enums.html
@@ -155,7 +155,7 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Enums/HYPActivationGestureOptions.html b/docs/Enums/HYPActivationGestureOptions.html
@@ -251,7 +251,7 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Protocols.html b/docs/Protocols.html
@@ -513,7 +513,7 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Protocols/HYPOverlayContainer.html b/docs/Protocols/HYPOverlayContainer.html
@@ -165,7 +165,7 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>

diff --git a/docs/Protocols/HYPOverlayPluginViewProvider.html b/docs/Protocols/HYPOverlayPluginViewProvider.html
@@ -224,7 +224,7 @@ <h4>Declaration</h4>
           </section>
         </section>
         <section id="footer">
-          <p>&copy; 2017 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2017-12-07)</p>
+          <p>&copy; 2018 <a class="link" href="http://willowtreeapps.com" target="_blank" rel="external">WillowTree</a>. All rights reserved. (Last updated: 2018-01-22)</p>
           <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.0</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
         </section>
       </article>