Bump version

Also move a bunch of globals related to FLEXShortcutsFactory into ivars of a FLEXShortcutsFactory singleton so that it is easier to trace the origin of the global storage of FLEX[Property|Ivar|Method] objects in a memory graph

Classes/Core/Views/Carousel/FLEXScopeCarousel.m

@@ -76,11 +76,11 @@ NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
         _dynamicTypeObserver = [NSNotificationCenter.defaultCenter
             addObserverForName:UIContentSizeCategoryDidChangeNotification
             object:nil queue:nil usingBlock:^(NSNotification *note) {
+                __typeof(self) self = weakSelf;
                 [self.collectionView setNeedsLayout];
                 [self setNeedsUpdateConstraints];
 
                 // Notify observers
-                __typeof(self) self = weakSelf;
                 for (void (^block)(FLEXScopeCarousel *) in self.dynamicTypeHandlers) {
                     block(self);
                 }

Classes/ExplorerInterface/FLEXExplorerViewController.m

@@ -45,6 +45,9 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 /// Only valid while a toolbar drag pan gesture is in progress.
 @property (nonatomic) CGRect toolbarFrameBeforeDragging;
 
+/// Only valid while a selected view pan gesture is in progress.
+@property (nonatomic) CGFloat selectedViewLastPanX;
+
 /// Borders of all the visible views in the hierarchy at the selection point.
 /// The keys are NSValues with the corresponding view (nonretained).
 @property (nonatomic) NSDictionary<NSValue *, UIView *> *outlineViewsForVisibleViews;
@@ -58,6 +61,9 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 /// A colored transparent overlay to indicate that the view is selected.
 @property (nonatomic) UIView *selectedViewOverlay;
 
+/// Used to actuate changes in view selection on iOS 10+
+@property (nonatomic, readonly) UISelectionFeedbackGenerator *selectionFBG API_AVAILABLE(ios(10.0));
+
 /// self.view.window as a \c FLEXWindow
 @property (nonatomic, readonly) FLEXWindow *window;
 
@@ -118,6 +124,11 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     self.movePanGR = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handleMovePan:)];
     self.movePanGR.enabled = self.currentMode == FLEXExplorerModeMove;
     [self.view addGestureRecognizer:self.movePanGR];
+    
+    // Feedback
+    if (@available(iOS 10.0, *)) {
+        _selectionFBG = [UISelectionFeedbackGenerator new];
+    }
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -450,16 +461,16 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     ];
     [toolbar.selectedViewDescriptionContainer addGestureRecognizer:self.detailsTapGR];
     // Swipe gestures for selecting deeper / higher views at a point
-    UISwipeGestureRecognizer *leftSwipe = [[UISwipeGestureRecognizer alloc]
+    UIPanGestureRecognizer *leftSwipe = [[UIPanGestureRecognizer alloc]
         initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
     ];
-    UISwipeGestureRecognizer *rightSwipe = [[UISwipeGestureRecognizer alloc]
-        initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
-    ];
-    leftSwipe.direction = UISwipeGestureRecognizerDirectionLeft;
-    rightSwipe.direction = UISwipeGestureRecognizerDirectionRight;
+//    UIPanGestureRecognizer *rightSwipe = [[UIPanGestureRecognizer alloc]
+//        initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
+//    ];
+//    leftSwipe.direction = UISwipeGestureRecognizerDirectionLeft;
+//    rightSwipe.direction = UISwipeGestureRecognizerDirectionRight;
     [toolbar.selectedViewDescriptionContainer addGestureRecognizer:leftSwipe];
-    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:rightSwipe];
+//    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:rightSwipe];
     
     // Long press gesture to present tabs manager
     [toolbar.globalsItem addGestureRecognizer:[[UILongPressGestureRecognizer alloc]
@@ -598,19 +609,54 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     }
 }
 
-- (void)handleChangeViewAtPointGesture:(UISwipeGestureRecognizer *)sender {
+- (void)handleChangeViewAtPointGesture:(UIPanGestureRecognizer *)sender {
     NSInteger max = self.viewsAtTapPoint.count - 1;
     NSInteger currentIdx = [self.viewsAtTapPoint indexOfObject:self.selectedView];
-    switch (sender.direction) {
-        case UISwipeGestureRecognizerDirectionLeft:
-            self.selectedView = self.viewsAtTapPoint[MIN(max, currentIdx + 1)];
-            break;
-        case UISwipeGestureRecognizerDirectionRight:
-            self.selectedView = self.viewsAtTapPoint[MAX(0, currentIdx - 1)];
+    CGFloat locationX = [sender locationInView:self.view].x;
+    
+    // Track the pan gesture: every N points we move along the X axis,
+    // actuate some haptic feedback and move up or down the hierarchy.
+    // We only store the "last" location when we've met the threshold.
+    // We only change the view and actuate feedback if the view selection
+    // changes; that is, as long as we don't go outside or under the array.
+    switch (sender.state) {
+        case UIGestureRecognizerStateBegan: {
+            self.selectedViewLastPanX = locationX;
             break;
+        }
+        case UIGestureRecognizerStateChanged: {
+            static CGFloat kNextLevelThreshold = 20.f;
+            CGFloat lastX = self.selectedViewLastPanX;
+            NSInteger newSelection = currentIdx;
+            
+            // Left, go down the hierarchy
+            if (locationX < lastX && (lastX - locationX) >= kNextLevelThreshold) {
+                // Choose a new view index up to the max index
+                newSelection = MIN(max, currentIdx + 1);
+                self.selectedViewLastPanX = locationX;
+            }
+            // Right, go up the hierarchy
+            else if (lastX < locationX && (locationX - lastX) >= kNextLevelThreshold) {
+                // Choose a new view index down to the min index
+                newSelection = MAX(0, currentIdx - 1);
+                self.selectedViewLastPanX = locationX;
+            }
+            
+            if (currentIdx != newSelection) {
+                self.selectedView = self.viewsAtTapPoint[newSelection];
+                [self actuateSelectionChangedFeedback];
+            }
             
-        default:
             break;
+        }
+            
+        default: break;
+    }
+}
+
+- (void)actuateSelectionChangedFeedback {
+    if (@available(iOS 10.0, *)) {
+        [self.selectionFBG selectionChanged];
     }
 }
 

Classes/GlobalStateExplorers/FLEXLiveObjectsController.m

@@ -45,6 +45,15 @@ static const NSInteger kFLEXLiveObjectsSortBySizeIndex = 2;
     [self reloadTableData];
 }
 
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        // This doesn't work unless it's wrapped in this dispatch_async call
+        [self.searchController.searchBar becomeFirstResponder];
+    });
+}
+
 - (NSArray<NSString *> *)allClassNames {
     return self.instanceCountsForClassNames.allKeys;
 }

Classes/GlobalStateExplorers/Keychain/FLEXKeychainQuery.m

@@ -170,7 +170,7 @@
 
 - (NSString *)password {
     if (self.passwordData.length) {
-        return [NSString stringWithCString:self.passwordData.bytes encoding:NSUTF8StringEncoding];
+        return [[NSString alloc] initWithData:self.passwordData encoding:NSUTF8StringEncoding];
     }
     
     return nil;

Classes/GlobalStateExplorers/Keychain/FLEXKeychainViewController.m

@@ -30,10 +30,10 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    self.navigationItem.rightBarButtonItems = @[
-        [UIBarButtonItem flex_systemItem:UIBarButtonSystemItemTrash target:self action:@selector(trashPressed:)],
-        [UIBarButtonItem flex_systemItem:UIBarButtonSystemItemAdd target:self action:@selector(addPressed)],
-    ];
+    [self addToolbarItems:@[
+        FLEXBarButtonItemSystem(Add, self, @selector(addPressed)),
+        [FLEXBarButtonItemSystem(Trash, self, @selector(trashPressed:)) flex_withTintColor:UIColor.redColor],
+    ]];
 
     [self reloadData];
 }
@@ -43,14 +43,15 @@
         cellConfiguration:^(__kindof FLEXTableViewCell *cell, NSDictionary *item, NSInteger row) {
             cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
         
-            id account = item[kFLEXKeychainAccountKey];
-            if ([account isKindOfClass:[NSString class]]) {
-                cell.textLabel.text = account;
+            id service = item[kFLEXKeychainWhereKey];
+            if ([service isKindOfClass:[NSString class]]) {
+                cell.textLabel.text = service;
+                cell.detailTextLabel.text = item[kFLEXKeychainAccountKey];
             } else {
                 cell.textLabel.text = [NSString stringWithFormat:
                     @"[%@]\n\n%@",
-                    NSStringFromClass([account class]),
-                    [account description]
+                    NSStringFromClass([service class]),
+                    [service description]
                 ];
             }
         } filterMatcher:^BOOL(NSString *filterText, NSDictionary *item) {
@@ -129,6 +130,18 @@
         make.title(@"Clear Keychain");
         make.message(@"This will remove all keychain items for this app.\n");
         make.message(@"This action cannot be undone. Are you sure?");
+        make.button(@"Yes, clear the keychain").destructiveStyle().handler(^(NSArray *strings) {
+            [self confirmClearKeychain];
+        });
+        make.button(@"Cancel").cancelStyle();
+    } showFrom:self source:sender];
+}
+
+- (void)confirmClearKeychain {
+    [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        make.title(@"ARE YOU SURE?");
+        make.message(@"This action CANNOT BE UNDONE.\nAre you sure you want to continue?\n");
+        make.message(@"If you're sure, scroll to confirm.");
         make.button(@"Yes, clear the keychain").destructiveStyle().handler(^(NSArray *strings) {
             for (id account in self.section.list) {
                 [self deleteItem:account];
@@ -136,8 +149,12 @@
 
             [self reloadData];
         });
+        make.button(@"Cancel"); make.button(@"Cancel"); make.button(@"Cancel"); make.button(@"Cancel");
+        make.button(@"Cancel"); make.button(@"Cancel"); make.button(@"Cancel"); make.button(@"Cancel");
+        make.button(@"Cancel"); make.button(@"Cancel"); make.button(@"Cancel"); make.button(@"Cancel");
+        make.button(@"Cancel"); make.button(@"Cancel"); make.button(@"Cancel"); make.button(@"Cancel");
         make.button(@"Cancel").cancelStyle();
-    } showFrom:self source:sender];
+    } showFrom:self];
 }
 
 - (void)addPressed {

Classes/GlobalStateExplorers/RuntimeBrowser/FLEXObjcRuntimeViewController.m

@@ -13,6 +13,7 @@
 #import "FLEXTableView.h"
 #import "FLEXObjectExplorerFactory.h"
 #import "FLEXAlert.h"
+#import "FLEXRuntimeClient.h"
 
 @interface FLEXObjcRuntimeViewController () <FLEXKeyPathSearchControllerDelegate>
 
@@ -28,6 +29,20 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    // Long press on navigation bar to initialize webkit legacy
+    //
+    // We call initializeWebKitLegacy automatically before you search
+    // all bundles just to be safe (since touching some classes before
+    // WebKit is initialized will initialize it on a thread other than
+    // the main thread), but sometimes you can encounter this crash
+    // without searching through all bundles, of course.
+    [self.navigationController.navigationBar addGestureRecognizer:[
+        [UILongPressGestureRecognizer alloc]
+            initWithTarget:[FLEXRuntimeClient class]
+            action:@selector(initializeWebKitLegacy)
+        ]
+    ];
+    
     // Search bar stuff, must be first because this creates self.searchController
     self.showsSearchBar = YES;
     self.showSearchBarInitially = YES;

Classes/Network/FLEXNetworkCurlLogger.m

@@ -28,7 +28,8 @@
     }
 
     if (request.HTTPBody) {
-            [curlCommandString appendFormat:@"-d \'%@\'", [NSString stringWithCString:request.HTTPBody.bytes encoding:NSUTF8StringEncoding]];
+        NSString *body = [[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding];
+        [curlCommandString appendFormat:@"-d \'%@\'", body];
     }
 
     return curlCommandString;

Classes/Network/FLEXNetworkTransactionDetailController.m

@@ -426,7 +426,8 @@ typedef UIViewController *(^FLEXNetworkDetailRowSelectionFuture)(void);
     if (transaction.cachedRequestBody.length > 0) {
         NSString *contentType = [transaction.request valueForHTTPHeaderField:@"Content-Type"];
         if ([contentType hasPrefix:@"application/x-www-form-urlencoded"]) {
-            NSString *bodyString = [NSString stringWithCString:[self postBodyDataForTransaction:transaction].bytes encoding:NSUTF8StringEncoding];
+            NSData *body = [self postBodyDataForTransaction:transaction];
+            NSString *bodyString = [[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding];
             postBodySection.rows = [self networkDetailRowsFromQueryItems:[FLEXUtility itemsFromQueryString:bodyString]];
         }
     }

Classes/ObjectExplorers/FLEXObjectExplorerFactory.m

@@ -21,7 +21,7 @@
 #import "FLEXUtility.h"
 
 @implementation FLEXObjectExplorerFactory
-static NSMutableDictionary<Class, Class> *classesToRegisteredSections = nil;
+static NSMutableDictionary<id<NSCopying>, Class> *classesToRegisteredSections = nil;
 
 + (void)initialize {
     if (self == [FLEXObjectExplorerFactory class]) {
@@ -33,9 +33,9 @@ static NSMutableDictionary<Class, Class> *classesToRegisteredSections = nil;
         // For example, if we used class names, this would result in
         // the object explorer trying to render a color preview for
         // the UIColor class object, which is not a color itself.
-        #define ClassKey(name) (Class<NSCopying>)[name class]
-        #define ClassKeyByName(str) (Class<NSCopying>)NSClassFromString(@ #str)
-        #define MetaclassKey(meta) (Class<NSCopying>)object_getClass([meta class])
+        #define ClassKey(name) (id<NSCopying>)[name class]
+        #define ClassKeyByName(str) (id<NSCopying>)NSClassFromString(@ #str)
+        #define MetaclassKey(meta) (id<NSCopying>)object_getClass([meta class])
         classesToRegisteredSections = [NSMutableDictionary dictionaryWithDictionary:@{
             MetaclassKey(NSObject)     : [FLEXClassShortcuts class],
             ClassKey(NSArray)          : [FLEXCollectionContentSection class],
@@ -75,7 +75,7 @@ static NSMutableDictionary<Class, Class> *classesToRegisteredSections = nil;
     Class sectionClass = nil;
     Class cls = object_getClass(object);
     do {
-        sectionClass = classesToRegisteredSections[(Class<NSCopying>)cls];
+        sectionClass = classesToRegisteredSections[(id<NSCopying>)cls];
     } while (!sectionClass && (cls = [cls superclass]));
 
     if (!sectionClass) {
@@ -89,7 +89,7 @@ static NSMutableDictionary<Class, Class> *classesToRegisteredSections = nil;
 }
 
 + (void)registerExplorerSection:(Class)explorerClass forClass:(Class)objectClass {
-    classesToRegisteredSections[(Class<NSCopying>)objectClass] = explorerClass;
+    classesToRegisteredSections[(id<NSCopying>)objectClass] = explorerClass;
 }
 
 #pragma mark - FLEXGlobalsEntry
@@ -184,7 +184,7 @@ static NSMutableDictionary<Class, Class> *classesToRegisteredSections = nil;
             return [self explorerViewControllerForObject:NSThread.mainThread];
         case FLEXGlobalsRowOperationQueue:
             return [self explorerViewControllerForObject:NSOperationQueue.mainQueue];
-            
+
         case FLEXGlobalsRowKeyWindow:
             return [FLEXObjectExplorerFactory
                 explorerViewControllerForObject:FLEXUtility.appKeyWindow

Classes/ObjectExplorers/Sections/Shortcuts/FLEXLayerShortcuts.m

@@ -15,11 +15,11 @@
 + (instancetype)forObject:(CALayer *)layer {
     return [self forObject:layer additionalRows:@[
         [FLEXActionShortcut title:@"Preview Image" subtitle:nil
-            viewer:^UIViewController *(id layer) {
+            viewer:^UIViewController *(CALayer *layer) {
                 return [FLEXImagePreviewViewController previewForLayer:layer];
             }
-            accessoryType:^UITableViewCellAccessoryType(id layer) {
-                return UITableViewCellAccessoryDisclosureIndicator;
+            accessoryType:^UITableViewCellAccessoryType(CALayer *layer) {
+                return CGRectIsEmpty(layer.bounds) ? UITableViewCellAccessoryNone : UITableViewCellAccessoryDisclosureIndicator;
             }
         ]
     ]];

Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsSection.m

@@ -255,31 +255,52 @@
 }
 @end
 
-#define NewAndSet(ivar) ({ FLEXShortcutsFactory *r = [self new]; r->ivar = YES; r; })
+#define NewAndSet(ivar) ({ FLEXShortcutsFactory *r = [self sharedFactory]; r->ivar = YES; r; })
 #define SetIvar(ivar) ({ self->ivar = YES; self; })
 #define SetParamBlock(ivar) ^(NSArray *p) { self->ivar = p; return self; }
 
-@implementation FLEXShortcutsFactory
-
 typedef NSMutableDictionary<Class, NSMutableArray<id<FLEXRuntimeMetadata>> *> RegistrationBuckets;
-// Class buckets
-static RegistrationBuckets *cProperties = nil;
-static RegistrationBuckets *cIvars = nil;
-static RegistrationBuckets *cMethods = nil;
-// Metaclass buckets
-static RegistrationBuckets *mProperties = nil;
-static RegistrationBuckets *mMethods = nil;
 
-+ (void)load {
-    cProperties = [NSMutableDictionary new];
-    cIvars = [NSMutableDictionary new];
-    cMethods = [NSMutableDictionary new];
+@implementation FLEXShortcutsFactory {
+    // Class buckets
+    RegistrationBuckets *cProperties;
+    RegistrationBuckets *cIvars;
+    RegistrationBuckets *cMethods;
+    // Metaclass buckets
+    RegistrationBuckets *mProperties;
+    RegistrationBuckets *mMethods;
+}
 
-    mProperties = [NSMutableDictionary new];
-    mMethods = [NSMutableDictionary new];
++ (instancetype)sharedFactory {
+    static FLEXShortcutsFactory *shared = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        shared = [self new];
+    });
+    
+    return shared;
+}
+
+- (id)init {
+    self = [super init];
+    if (self) {
+        cProperties = [NSMutableDictionary new];
+        cIvars = [NSMutableDictionary new];
+        cMethods = [NSMutableDictionary new];
+
+        mProperties = [NSMutableDictionary new];
+        mMethods = [NSMutableDictionary new];
+    }
+    
+    return self;
 }
 
 + (NSArray<id<FLEXRuntimeMetadata>> *)shortcutsForObjectOrClass:(id)objectOrClass {
+    return [[self sharedFactory] shortcutsForObjectOrClass:objectOrClass];
+}
+
+- (NSArray<id<FLEXRuntimeMetadata>> *)shortcutsForObjectOrClass:(id)objectOrClass {
+
     NSMutableArray<id<FLEXRuntimeMetadata>> *shortcuts = [NSMutableArray new];
     BOOL isClass = object_isClass(objectOrClass);
     // The -class does not give you a metaclass, and we want a metaclass
@@ -325,30 +346,45 @@ static RegistrationBuckets *mMethods = nil;
 }
 
 - (void)_register:(NSArray<id<FLEXRuntimeMetadata>> *)items to:(RegistrationBuckets *)global class:(Class)key {
-    // Get (or initialize) the bucket for this class
-    NSMutableArray *bucket = ({
-        id bucket = global[key];
-        if (!bucket) {
-            bucket = [NSMutableArray new];
-            global[(id)key] = bucket;
-        }
-        bucket;
-    });
+    @synchronized (self) {
+        // Get (or initialize) the bucket for this class
+        NSMutableArray *bucket = ({
+            id bucket = global[key];
+            if (!bucket) {
+                bucket = [NSMutableArray new];
+                global[(id)key] = bucket;
+            }
+            bucket;
+        });
 
-    if (self->_append)  { [bucket addObjectsFromArray:items]; }
-    if (self->_replace) { [bucket setArray:items]; }
-    if (self->_prepend) {
-        if (bucket.count) {
-            // Set new items as array, add old items behind them
-            id copy = bucket.copy;
-            [bucket setArray:items];
-            [bucket addObjectsFromArray:copy];
-        } else {
-            [bucket addObjectsFromArray:items];
+        if (self->_append)  { [bucket addObjectsFromArray:items]; }
+        if (self->_replace) { [bucket setArray:items]; }
+        if (self->_prepend) {
+            if (bucket.count) {
+                // Set new items as array, add old items behind them
+                id copy = bucket.copy;
+                [bucket setArray:items];
+                [bucket addObjectsFromArray:copy];
+            } else {
+                [bucket addObjectsFromArray:items];
+            }
         }
+        
+        [self reset];
     }
 }
 
+- (void)reset {
+    _append = NO;
+    _prepend = NO;
+    _replace = NO;
+    _notInstance = NO;
+    
+    _properties = nil;
+    _ivars = nil;
+    _methods = nil;
+}
+
 - (FLEXShortcutsFactory *)class {
     return SetIvar(_notInstance);
 }
@@ -405,9 +441,15 @@ static RegistrationBuckets *mMethods = nil;
         Class metaclass = isMeta ? cls : object_getClass(cls);
         Class clsForMetadata = instanceMetadata ? cls : metaclass;
         
+        // The factory is a singleton so we don't need to worry about "leaking" it
+        #pragma clang diagnostic push
+        #pragma clang diagnostic ignored "-Wimplicit-retain-self"
+        
         RegistrationBuckets *propertyBucket = instanceShortcut ? cProperties : mProperties;
         RegistrationBuckets *methodBucket = instanceShortcut ? cMethods : mMethods;
         RegistrationBuckets *ivarBucket = instanceShortcut ? cIvars : nil;
+        
+        #pragma clang diagnostic pop
 
         if (self->_properties) {
             NSArray *items = [self->_properties flex_mapped:^id(NSString *name, NSUInteger idx) {

Classes/ObjectExplorers/Sections/Shortcuts/FLEXViewShortcuts.m

@@ -70,15 +70,18 @@
                 return [FLEXObjectExplorerFactory explorerViewControllerForObject:controller];
             }
             accessoryType:^UITableViewCellAccessoryType(id view) {
-                return controller ? UITableViewCellAccessoryDisclosureIndicator : 0;
+                return controller ? UITableViewCellAccessoryDisclosureIndicator : UITableViewCellAccessoryNone;
             }
         ],
-        [FLEXActionShortcut title:@"Preview Image" subtitle:nil
-            viewer:^UIViewController *(id view) {
+        [FLEXActionShortcut title:@"Preview Image" subtitle:^NSString *(UIView *view) {
+                return !CGRectIsEmpty(view.bounds) ? @"" : @"Unavailable with empty bounds";
+            }
+            viewer:^UIViewController *(UIView *view) {
                 return [FLEXImagePreviewViewController previewForView:view];
             }
-            accessoryType:^UITableViewCellAccessoryType(id view) {
-                return UITableViewCellAccessoryDisclosureIndicator;
+            accessoryType:^UITableViewCellAccessoryType(UIView *view) {
+                // Disable preview if bounds are CGRectZero
+                return !CGRectIsEmpty(view.bounds) ? UITableViewCellAccessoryDisclosureIndicator : UITableViewCellAccessoryNone;
             }
         ]
     ]];

Classes/Utility/Categories/NSObject+FLEX_Reflection.m

@@ -95,6 +95,7 @@ NSArray<FLEXProtocol *> *FLEXGetConformedProtocols(Class cls) {
     unsigned int count = 0;
     Protocol *__unsafe_unretained *list = class_copyProtocolList(cls, &count);
     NSArray<Protocol *> *protocols = [NSArray arrayWithObjects:list count:count];
+    free(list);
     
     return [protocols flex_mapped:^id(Protocol *pro, NSUInteger idx) {
         return [FLEXProtocol protocol:pro];

Classes/Utility/Categories/UIPasteboard+FLEX.m

@@ -11,16 +11,21 @@
 @implementation UIPasteboard (FLEX)
 
 - (void)flex_copy:(id)object {
+    if (!object) {
+        return;
+    }
+    
     if ([object isKindOfClass:[NSString class]]) {
         UIPasteboard.generalPasteboard.string = object;
     } else if([object isKindOfClass:[NSData class]]) {
         [UIPasteboard.generalPasteboard setData:object forPasteboardType:@"public.data"];
     } else if ([object isKindOfClass:[NSNumber class]]) {
         UIPasteboard.generalPasteboard.string = [object stringValue];
+    } else {
+        // TODO: make this an alert instead of an exception
+        [NSException raise:NSInternalInconsistencyException
+                    format:@"Tried to copy unsupported type: %@", [object class]];
     }
-
-    [NSException raise:NSInternalInconsistencyException
-                format:@"Tried to copy unsupported type: %@", [object class]];
 }
 
 @end

Classes/Utility/FLEXResources.h

@@ -52,7 +52,8 @@
 
 #pragma mark - Misc Icons
 
-@property(readonly, class) UIImage *checkerPattern;
-@property(readonly, class) UIImage *hierarchyIndentPattern;
+@property (readonly, class) UIImage *checkerPattern;
+@property (readonly, class) UIColor *checkerPatternColor;
+@property (readonly, class) UIImage *hierarchyIndentPattern;
 
 @end

Classes/Utility/FLEXResources.m

@@ -8838,6 +8838,10 @@ static const u_int8_t FLEXHierarchyIndentPattern3x[] = {
     return FLEXImage(FLEXCheckerPattern);
 }
 
++ (UIColor *)checkerPatternColor {
+    return [UIColor colorWithPatternImage:FLEXResources.checkerPattern];
+}
+
 + (UIImage *)hierarchyIndentPattern {
     return FLEXImageTemplate(FLEXHierarchyIndentPattern);
 }

Classes/Utility/FLEXUtility.m

@@ -135,7 +135,7 @@ BOOL FLEXConstructorsShouldRun() {
 
 + (UIImage *)previewImageForView:(UIView *)view {
     if (CGRectIsEmpty(view.bounds)) {
-        return nil;
+        return [UIImage new];
     }
     
     CGSize viewSize = view.bounds.size;
@@ -359,14 +359,18 @@ BOOL FLEXConstructorsShouldRun() {
     
     id jsonObject = [NSJSONSerialization JSONObjectWithData:data options:0 error:NULL];
     if ([NSJSONSerialization isValidJSONObject:jsonObject]) {
-        prettyString = [NSString stringWithCString:[NSJSONSerialization
-            dataWithJSONObject:jsonObject options:NSJSONWritingPrettyPrinted error:NULL
-        ].bytes encoding:NSUTF8StringEncoding];
+        // Thanks RaziPour1993
+        prettyString = [[NSString alloc]
+            initWithData:[NSJSONSerialization
+                dataWithJSONObject:jsonObject options:NSJSONWritingPrettyPrinted error:NULL
+            ]
+            encoding:NSUTF8StringEncoding
+        ];
         // NSJSONSerialization escapes forward slashes.
         // We want pretty json, so run through and unescape the slashes.
         prettyString = [prettyString stringByReplacingOccurrencesOfString:@"\\/" withString:@"/"];
     } else {
-        prettyString = [NSString stringWithCString:data.bytes encoding:NSUTF8StringEncoding];
+        prettyString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
     }
     
     return prettyString;

Classes/ViewHierarchy/FLEXImagePreviewViewController.m

@@ -15,6 +15,9 @@
 @property (nonatomic) UIImage *image;
 @property (nonatomic) UIScrollView *scrollView;
 @property (nonatomic) UIImageView *imageView;
+@property (nonatomic) UITapGestureRecognizer *bgColorTapGesture;
+@property (nonatomic) NSInteger backgroundColorIndex;
+@property (nonatomic, readonly) NSArray<UIColor *> *backgroundColors;
 @end
 
 #pragma mark -
@@ -31,19 +34,19 @@
 }
 
 + (instancetype)forImage:(UIImage *)image {
-    if (!image) {
-        return nil;
-    }
-    
     return [[self alloc] initWithImage:image];
 }
 
 - (id)initWithImage:(UIImage *)image {
+    NSParameterAssert(image);
+    
     self = [super init];
     if (self) {
         self.title = @"Preview";
         self.image = image;
+        _backgroundColors = @[FLEXResources.checkerPatternColor, UIColor.whiteColor, UIColor.blackColor];
     }
+    
     return self;
 }
 
@@ -53,12 +56,10 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    self.view.backgroundColor = [UIColor colorWithPatternImage:FLEXResources.checkerPattern];
-    
     self.imageView = [[UIImageView alloc] initWithImage:self.image];
     self.scrollView = [[UIScrollView alloc] initWithFrame:self.view.bounds];
     self.scrollView.delegate = self;
-    self.scrollView.backgroundColor = self.view.backgroundColor;
+    self.scrollView.backgroundColor = self.backgroundColors.firstObject;
     self.scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     [self.scrollView addSubview:self.imageView];
     self.scrollView.contentSize = self.imageView.frame.size;
@@ -66,7 +67,14 @@
     self.scrollView.maximumZoomScale = 2.0;
     [self.view addSubview:self.scrollView];
     
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(actionButtonPressed:)];
+    self.bgColorTapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(changeBackground)];
+    [self.scrollView addGestureRecognizer:self.bgColorTapGesture];
+    
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]
+        initWithBarButtonSystemItem:UIBarButtonSystemItemAction
+        target:self
+        action:@selector(actionButtonPressed:)
+    ];
 }
 
 - (void)viewDidLayoutSubviews {
@@ -99,6 +107,12 @@
     self.scrollView.contentInset = UIEdgeInsetsMake(verticalInset, horizontalInset, verticalInset, horizontalInset);
 }
 
+- (void)changeBackground {
+    self.backgroundColorIndex++;
+    self.backgroundColorIndex %= self.backgroundColors.count;
+    self.scrollView.backgroundColor = self.backgroundColors[self.backgroundColorIndex];
+}
+
 - (void)actionButtonPressed:(id)sender {
     static BOOL canSaveToCameraRoll = NO, didShowWarning = NO;
     static dispatch_once_t onceToken;

FLEX.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name             = "FLEX"
-  spec.version          = "4.2.2"
+  spec.version          = "4.3.0"
   spec.summary          = "A set of in-app debugging and exploration tools for iOS"
   spec.description      = <<-DESC
                         - Inspect and modify views in the hierarchy.