Bump version, close #465 #466

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,27 +0,0 @@
----
-name: Bug report
-about: Report a bug in FLEX
-title: ''
-labels: bug
-assignees: ''
-
----
-
-### Environment
-- Platform+version: **iOS 14** <!--- Change to match your platform and version -->
-- FLEX version: **9.9.9** <!--- Change to the version of FLEX you're using -->
-<!--- FLEXing / libFLEX users: please include FLEXing and libFLEX versions separately -->
-
-### Bug Report
-
-Here, you can provide a description of the bug. Some tips:
-
-- Please do not paste an entire crash log. Upload the crash log to something like [ghostbin.co](https://ghostbin.co/) or another paste service. Alternatively, you can cut out the relevant stack trace and paste that inside a ` ```code block``` `
-- If the bug is more complex than "this button is broken" or a crash, consider including a sample project. For example, if your app's requests aren't showing up in the network history page.
-- Providing steps to reproduce is always helpful!
-- If you want to include a screenshot or GIF, consider modifying the default markdown for uploaded images to use this code to make the image smaller on desktop:
-  ```
-  <img width="50%" src=your-image-url >
-  ```
-
-This template is a suggestion. You may format your issue however you want, but generally you should at least include your iOS version and FLEX version.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,10 +0,0 @@
----
-name: Feature request
-about: Suggest a new feature for FLEX
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-

Classes/Core/Controllers/FLEXNavigationController.m

@@ -20,7 +20,6 @@
 @interface FLEXNavigationController ()
 @property (nonatomic, readonly) BOOL toolbarWasHidden;
 @property (nonatomic) BOOL waitingToAddTab;
-@property (nonatomic, readonly) BOOL canShowToolbar;
 @property (nonatomic) BOOL didSetupPendingDismissButtons;
 @property (nonatomic) UISwipeGestureRecognizer *navigationBarSwipeGesture;
 @end
@@ -37,13 +36,10 @@
     self.waitingToAddTab = YES;
     
     // Add gesture to reveal toolbar if hidden
-    UITapGestureRecognizer *navbarTapGesture = [[UITapGestureRecognizer alloc]
+    self.navigationBar.userInteractionEnabled = YES;
+    [self.navigationBar addGestureRecognizer:[[UITapGestureRecognizer alloc]
         initWithTarget:self action:@selector(handleNavigationBarTap:)
-    ];
-    
-    // Don't cancel touches to work around bug on versions of iOS prior to 13
-    navbarTapGesture.cancelsTouchesInView = NO;
-    [self.navigationBar addGestureRecognizer:navbarTapGesture];
+    ]];
     
     // Add gesture to dismiss if not presented with a sheet style
     if (@available(iOS 13, *)) {
@@ -100,10 +96,6 @@
     [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
 }
 
-- (BOOL)canShowToolbar {
-    return self.topViewController.toolbarItems.count;
-}
-
 - (void)addNavigationBarItemsToViewController:(UINavigationItem *)navigationItem {
     if (!self.presentingViewController) {
         return;
@@ -153,15 +145,8 @@
 }
      
 - (void)handleNavigationBarTap:(UIGestureRecognizer *)sender {
-    // Don't reveal the toolbar if we were just tapping a button
-    CGPoint location = [sender locationInView:self.navigationBar];
-    UIView *hitView = [self.navigationBar hitTest:location withEvent:nil];
-    if ([hitView isKindOfClass:[UIControl class]]) {
-        return;
-    }
-
     if (sender.state == UIGestureRecognizerStateRecognized) {
-        if (self.toolbarHidden && self.canShowToolbar) {
+        if (self.toolbarHidden) {
             [self setToolbarHidden:NO animated:YES];
         }
     }
@@ -177,7 +162,7 @@
 
 - (void)_gestureRecognizedInteractiveHide:(UIPanGestureRecognizer *)sender {
     if (sender.state == UIGestureRecognizerStateRecognized) {
-        BOOL show = self.canShowToolbar;
+        BOOL show = self.topViewController.toolbarItems.count;
         CGFloat yTranslation = [sender translationInView:self.view].y;
         CGFloat yVelocity = [sender velocityInView:self.view].y;
         if (yVelocity > 2000) {

Classes/Core/Controllers/FLEXTableViewController.h

@@ -67,10 +67,6 @@ extern CGFloat const kFLEXDebounceForExpensiveIO;
 /// Setting this to YES will make the search bar appear whenever the view appears.
 /// Otherwise, iOS will only show the search bar when you scroll up.
 @property (nonatomic) BOOL showSearchBarInitially;
-/// Defaults to NO.
-///
-/// Setting this to YES will make the search bar activate whenever the view appears.
-@property (nonatomic) BOOL activatesSearchBarAutomatically;
 
 /// nil unless showsSearchBar is set to YES.
 ///

Classes/Core/Controllers/FLEXTableViewController.m

@@ -124,15 +124,18 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
     _showsCarousel = showsCarousel;
     
     if (showsCarousel) {
-        _carousel = ({ weakify(self)
-            
+        _carousel = ({
+            __weak __typeof(self) weakSelf = self;
+
             FLEXScopeCarousel *carousel = [FLEXScopeCarousel new];
-            carousel.selectedIndexChangedAction = ^(NSInteger idx) { strongify(self);
+            carousel.selectedIndexChangedAction = ^(NSInteger idx) {
+                __typeof(self) self = weakSelf;
                 [self.searchDelegate updateSearchResults:self.searchText];
             };
 
             // UITableView won't update the header size unless you reset the header view
-            [carousel registerBlockForDynamicTypeChanges:^(FLEXScopeCarousel *_) { strongify(self);
+            [carousel registerBlockForDynamicTypeChanges:^(FLEXScopeCarousel *carousel) {
+                __typeof(self) self = weakSelf;
                 [self layoutTableHeaderIfNeeded];
             }];
 
@@ -238,7 +241,7 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
     self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeOnDrag;
     
     // Toolbar
-    self.navigationController.toolbarHidden = self.toolbarItems.count > 0;
+    self.navigationController.toolbarHidden = NO;
     self.navigationController.hidesBarsOnSwipe = YES;
 
     // On iOS 13, the root view controller shows it's search bar no matter what.
@@ -256,17 +259,12 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     
+    // When going back, make the search bar reappear instead of hiding
     if (@available(iOS 11.0, *)) {
-        // When going back, make the search bar reappear instead of hiding
         if ((self.pinSearchBar || self.showSearchBarInitially) && !self.didInitiallyRevealSearchBar) {
             self.navigationItem.hidesSearchBarWhenScrolling = NO;
         }
     }
-    
-    // Make the keyboard seem to appear faster
-    if (self.activatesSearchBarAutomatically) {
-        [self makeKeyboardAppearNow];
-    }
 
     [self setupToolbarItems];
 }
@@ -288,17 +286,6 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
             }];
         }
     }
-    
-    if (self.activatesSearchBarAutomatically) {
-        // Keyboard has appeared, now we call this as we soon present our search bar
-        [self removeDummyTextField];
-        
-        // Activate the search bar
-        dispatch_async(dispatch_get_main_queue(), ^{
-            // This doesn't work unless it's wrapped in this dispatch_async call
-            [self.searchController.searchBar becomeFirstResponder];
-        });
-    }
 
     // We only want to reveal the search bar when the view controller first appears.
     self.didInitiallyRevealSearchBar = YES;
@@ -538,30 +525,6 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
 
 #pragma mark - Search Bar
 
-#pragma mark Faster keyboard
-
-static UITextField *kDummyTextField = nil;
-
-/// Make the keyboard appear instantly. We use this to make the
-/// keyboard appear faster when the search bar is set to appear initially.
-/// You must call \c -removeDummyTextField before your search bar is to appear.
-- (void)makeKeyboardAppearNow {
-    if (!kDummyTextField) {
-        kDummyTextField = [UITextField new];
-        kDummyTextField.autocorrectionType = UITextAutocorrectionTypeNo;
-    }
-    
-    kDummyTextField.inputAccessoryView = self.searchController.searchBar.inputAccessoryView;
-    [UIApplication.sharedApplication.keyWindow addSubview:kDummyTextField];
-    [kDummyTextField becomeFirstResponder];
-}
-
-- (void)removeDummyTextField {
-    if (kDummyTextField.superview) {
-        [kDummyTextField removeFromSuperview];
-    }
-}
-
 #pragma mark UISearchResultsUpdating
 
 - (void)updateSearchResultsForSearchController:(UISearchController *)searchController {

Classes/Core/FLEXTableViewSection.h

@@ -7,6 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "FLEXMacros.h"
 #import "NSArray+FLEX.h"
 @class FLEXTableView;
 

Classes/Core/Views/Carousel/FLEXCarouselCell.m

@@ -77,7 +77,7 @@
     self.selectionIndicatorStripe.translatesAutoresizingMaskIntoConstraints = NO;
 
     UIView *superview = self.contentView;
-    [self.titleLabel flex_pinEdgesToSuperviewWithInsets:UIEdgeInsetsMake(10, 15, 8 + stripeHeight, 15)];
+    [self.titleLabel pinEdgesToSuperviewWithInsets:UIEdgeInsetsMake(10, 15, 8 + stripeHeight, 15)];
 
     [self.selectionIndicatorStripe.leadingAnchor constraintEqualToAnchor:superview.leadingAnchor].active = YES;
     [self.selectionIndicatorStripe.bottomAnchor constraintEqualToAnchor:superview.bottomAnchor].active = YES;

Classes/Core/Views/Carousel/FLEXScopeCarousel.m

@@ -9,7 +9,6 @@
 #import "FLEXScopeCarousel.h"
 #import "FLEXCarouselCell.h"
 #import "FLEXColor.h"
-#import "FLEXMacros.h"
 #import "UIView+FLEX_Layout.h"
 
 const CGFloat kCarouselItemSpacing = 0;
@@ -73,14 +72,15 @@ NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
         self.sizingCell.title = @"NSObject";
 
         // Dynamic type
-        weakify(self);
+        __weak __typeof(self) weakSelf = self;
         _dynamicTypeObserver = [NSNotificationCenter.defaultCenter
             addObserverForName:UIContentSizeCategoryDidChangeNotification
-            object:nil queue:nil usingBlock:^(NSNotification *note) { strongify(self)
+            object:nil queue:nil usingBlock:^(NSNotification *note) {
                 [self.collectionView setNeedsLayout];
                 [self setNeedsUpdateConstraints];
 
                 // Notify observers
+                __typeof(self) self = weakSelf;
                 for (void (^block)(FLEXScopeCarousel *) in self.dynamicTypeHandlers) {
                     block(self);
                 }
@@ -118,7 +118,7 @@ NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
 - (void)updateConstraints {
     if (!self.constraintsInstalled) {
         self.collectionView.translatesAutoresizingMaskIntoConstraints = NO;
-        [self.collectionView flex_pinEdgesToSuperview];
+        [self.collectionView pinEdgesToSuperview];
         
         self.constraintsInstalled = YES;
     }

Classes/ExplorerInterface/FLEXExplorerViewController.h

@@ -25,8 +25,7 @@
 ///
 /// If a tool is already presented, this method simply dismisses it and calls the completion block.
 /// If no tool is presented, @code future() @endcode is presented and the completion block is called.
-- (void)toggleToolWithViewControllerProvider:(UINavigationController *(^)(void))future
-                                  completion:(void (^)(void))completion;
+- (void)toggleToolWithViewControllerProvider:(UINavigationController *(^)(void))future completion:(void(^)(void))completion;
 
 // Keyboard shortcut helpers
 

Classes/ExplorerInterface/FLEXExplorerViewController.m

@@ -45,9 +45,6 @@ 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;
@@ -61,9 +58,6 @@ 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;
 
@@ -124,11 +118,6 @@ 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 {
@@ -461,16 +450,16 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     ];
     [toolbar.selectedViewDescriptionContainer addGestureRecognizer:self.detailsTapGR];
     // Swipe gestures for selecting deeper / higher views at a point
-    UIPanGestureRecognizer *leftSwipe = [[UIPanGestureRecognizer alloc]
+    UISwipeGestureRecognizer *leftSwipe = [[UISwipeGestureRecognizer alloc]
         initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
     ];
-//    UIPanGestureRecognizer *rightSwipe = [[UIPanGestureRecognizer alloc]
-//        initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
-//    ];
-//    leftSwipe.direction = UISwipeGestureRecognizerDirectionLeft;
-//    rightSwipe.direction = UISwipeGestureRecognizerDirectionRight;
+    UISwipeGestureRecognizer *rightSwipe = [[UISwipeGestureRecognizer 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]
@@ -609,54 +598,19 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     }
 }
 
-- (void)handleChangeViewAtPointGesture:(UIPanGestureRecognizer *)sender {
+- (void)handleChangeViewAtPointGesture:(UISwipeGestureRecognizer *)sender {
     NSInteger max = self.viewsAtTapPoint.count - 1;
     NSInteger currentIdx = [self.viewsAtTapPoint indexOfObject:self.selectedView];
-    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;
+    switch (sender.direction) {
+        case UISwipeGestureRecognizerDirectionLeft:
+            self.selectedView = self.viewsAtTapPoint[MIN(max, currentIdx + 1)];
             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];
-            }
-            
+        case UISwipeGestureRecognizerDirectionRight:
+            self.selectedView = self.viewsAtTapPoint[MAX(0, currentIdx - 1)];
             break;
-        }
             
-        default: break;
-    }
-}
-
-- (void)actuateSelectionChangedFeedback {
-    if (@available(iOS 10.0, *)) {
-        [self.selectionFBG selectionChanged];
+        default:
+            break;
     }
 }
 
@@ -918,12 +872,13 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     [super dismissViewControllerAnimated:animated completion:completion];
 }
 
-- (BOOL)wantsWindowToBecomeKey {
+- (BOOL)wantsWindowToBecomeKey
+{
     return self.window.previousKeyWindow != nil;
 }
 
 - (void)toggleToolWithViewControllerProvider:(UINavigationController *(^)(void))future
-                                  completion:(void (^)(void))completion {
+                                  completion:(void(^)(void))completion {
     if (self.presentedViewController) {
         [self dismissViewControllerAnimated:YES completion:completion];
     } else if (future) {
@@ -969,7 +924,11 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
         } else {
             return [FLEXHierarchyViewController delegate:self];
         }
-    } completion:completion];
+    } completion:^{
+        if (completion) {
+            completion();
+        }
+    }];
 }
 
 - (void)toggleMenuTool {

Classes/FLEX-Categories.h

@@ -12,11 +12,16 @@
 #import <FLEX/CALayer+FLEX.h>
 #import <FLEX/UIFont+FLEX.h>
 #import <FLEX/UIGestureRecognizer+Blocks.h>
+#import <FLEX/UIView+FLEX_Layout.h>
 #import <FLEX/UIPasteboard+FLEX.h>
 #import <FLEX/UIMenu+FLEX.h>
 #import <FLEX/UITextField+Range.h>
 
 #import <FLEX/NSObject+FLEX_Reflection.h>
 #import <FLEX/NSArray+FLEX.h>
+#import <FLEX/NSDictionary+ObjcRuntime.h>
+#import <FLEX/NSString+ObjcRuntime.h>
+#import <FLEX/NSString+FLEX.h>
 #import <FLEX/NSUserDefaults+FLEX.h>
+#import <FLEX/NSMapTable+FLEX_Subscripting.h>
 #import <FLEX/NSTimer+FLEX.h>

Classes/FLEX.h

@@ -20,5 +20,6 @@
 #import <FLEX/FLEX-Categories.h>
 #import <FLEX/FLEX-ObjectExploring.h>
 
+#import <FLEX/FLEXMacros.h>
 #import <FLEX/FLEXAlert.h>
 #import <FLEX/FLEXResources.h>

Classes/GlobalStateExplorers/FLEXLiveObjectsController.m

@@ -35,7 +35,6 @@ static const NSInteger kFLEXLiveObjectsSortBySizeIndex = 2;
 
     self.showsSearchBar = YES;
     self.showSearchBarInitially = YES;
-    self.activatesSearchBarAutomatically = YES;
     self.searchBarDebounceInterval = kFLEXDebounceInstant;
     self.showsCarousel = YES;
     self.carousel.items = @[@"A→Z", @"Count", @"Size"];

Classes/GlobalStateExplorers/FLEXObjectListViewController.m

@@ -20,25 +20,11 @@
 #import <malloc/malloc.h>
 
 
-typedef NS_ENUM(NSUInteger, FLEXObjectReferenceSection) {
-    FLEXObjectReferenceSectionMain,
-    FLEXObjectReferenceSectionAutoLayout,
-    FLEXObjectReferenceSectionKVO,
-    FLEXObjectReferenceSectionFLEX,
-    
-    FLEXObjectReferenceSectionCount
-};
-
 @interface FLEXObjectListViewController ()
-
-@property (nonatomic, readonly, class) NSArray<NSPredicate *> *defaultPredicates;
-@property (nonatomic, readonly, class) NSArray<NSString *> *defaultSectionTitles;
-
-
 @property (nonatomic, copy) NSArray<FLEXMutableListSection *> *sections;
 @property (nonatomic, copy) NSArray<FLEXMutableListSection *> *allSections;
 
-@property (nonatomic, readonly, nullable) NSArray<FLEXObjectRef *> *references;
+@property (nonatomic, readonly) NSArray<FLEXObjectRef *> *references;
 @property (nonatomic, readonly) NSArray<NSPredicate *> *predicates;
 @property (nonatomic, readonly) NSArray<NSString *> *sectionTitles;
 
@@ -52,7 +38,7 @@ typedef NS_ENUM(NSUInteger, FLEXObjectReferenceSection) {
 + (NSPredicate *)defaultPredicateForSection:(NSInteger)section {
     // These are the types of references that we typically don't care about.
     // We want this list of "object-ivar pairs" split into two sections.
-    BOOL(^isKVORelated)(FLEXObjectRef *, NSDictionary *) = ^BOOL(FLEXObjectRef *ref, NSDictionary *bindings) {
+    BOOL(^isObserver)(FLEXObjectRef *, NSDictionary *) = ^BOOL(FLEXObjectRef *ref, NSDictionary *bindings) {
         NSString *row = ref.reference;
         return [row isEqualToString:@"__NSObserver object"] ||
                [row isEqualToString:@"_CFXNotificationObjcObserverRegistration _object"];
@@ -79,50 +65,34 @@ typedef NS_ENUM(NSUInteger, FLEXObjectReferenceSection) {
                ([row hasPrefix:@"_NSAutoresizingMask"] && [row hasSuffix:@" _referenceItem"]) ||
                [ignored containsObject:row];
     };
-    
-    /// These are FLEX classes and usually you aren't looking for FLEX references inside FLEX itself
-    BOOL(^isFLEXClass)(FLEXObjectRef *, NSDictionary *) = ^BOOL(FLEXObjectRef *ref, NSDictionary *bindings) {
-        return [ref.reference hasPrefix:@"FLEX"];
-    };
 
     BOOL(^isEssential)(FLEXObjectRef *, NSDictionary *) = ^BOOL(FLEXObjectRef *ref, NSDictionary *bindings) {
-        return !(
-            isKVORelated(ref, bindings) ||
-            isConstraintRelated(ref, bindings) ||
-            isFLEXClass(ref, bindings)
-        );
+        return !(isObserver(ref, bindings) || isConstraintRelated(ref, bindings));
     };
 
     switch (section) {
-        case FLEXObjectReferenceSectionMain:
-            return [NSPredicate predicateWithBlock:isEssential];
-        case FLEXObjectReferenceSectionAutoLayout:
-            return [NSPredicate predicateWithBlock:isConstraintRelated];
-        case FLEXObjectReferenceSectionKVO:
-            return [NSPredicate predicateWithBlock:isKVORelated];
-        case FLEXObjectReferenceSectionFLEX:
-            return [NSPredicate predicateWithBlock:isFLEXClass];
+        case 0: return [NSPredicate predicateWithBlock:isEssential];
+        case 1: return [NSPredicate predicateWithBlock:isConstraintRelated];
+        case 2: return [NSPredicate predicateWithBlock:isObserver];
 
         default: return nil;
     }
 }
 
 + (NSArray<NSPredicate *> *)defaultPredicates {
-    return [NSArray flex_forEachUpTo:FLEXObjectReferenceSectionCount map:^id(NSUInteger i) {
-        return [self defaultPredicateForSection:i];
-    }];
+    return @[[self defaultPredicateForSection:0],
+             [self defaultPredicateForSection:1],
+             [self defaultPredicateForSection:2]];
 }
 
 + (NSArray<NSString *> *)defaultSectionTitles {
-    return @[
-        @"", @"AutoLayout", @"Key-Value Observing", @"FLEX"
-    ];
+    return @[@"", @"AutoLayout", @"Trivial"];
 }
 
 
 #pragma mark - Initialization
 
-- (id)initWithReferences:(nullable NSArray<FLEXObjectRef *> *)references {
+- (id)initWithReferences:(NSArray<FLEXObjectRef *> *)references {
     return [self initWithReferences:references predicates:nil sectionTitles:nil];
 }
 
@@ -214,18 +184,19 @@ typedef NS_ENUM(NSUInteger, FLEXObjectReferenceSection) {
                 }
             }
 
-            free(ivars);
             tryClass = class_getSuperclass(tryClass);
         }
     }];
 
+    NSArray<NSPredicate *> *predicates = [self defaultPredicates];
+    NSArray<NSString *> *sectionTitles = [self defaultSectionTitles];
     FLEXObjectListViewController *viewController = [[self alloc]
         initWithReferences:instances
-        predicates:self.defaultPredicates
-        sectionTitles:self.defaultSectionTitles
+        predicates:predicates
+        sectionTitles:sectionTitles
     ];
     viewController.title = [NSString stringWithFormat:@"Referencing %@ %p",
-        [FLEXRuntimeUtility safeClassNameForObject:object], object
+        NSStringFromClass(object_getClass(object)), object
     ];
     return viewController;
 }
@@ -260,7 +231,7 @@ typedef NS_ENUM(NSUInteger, FLEXObjectReferenceSection) {
     }];
 }
 
-- (FLEXMutableListSection *)makeSection:(NSArray *)rows title:(NSString *)title { weakify(self)
+- (FLEXMutableListSection *)makeSection:(NSArray *)rows title:(NSString *)title {
     FLEXMutableListSection *section = [FLEXMutableListSection list:rows
         cellConfiguration:^(FLEXTableViewCell *cell, FLEXObjectRef *ref, NSInteger row) {
             cell.textLabel.text = ref.reference;
@@ -275,10 +246,14 @@ typedef NS_ENUM(NSUInteger, FLEXObjectReferenceSection) {
         }
     ];
 
-    section.selectionHandler = ^(UIViewController *host, FLEXObjectRef *ref) { strongify(self)
-        [self.navigationController pushViewController:[
-            FLEXObjectExplorerFactory explorerViewControllerForObject:ref.object
-        ] animated:YES];
+    __weak __typeof(self) weakSelf = self;
+    section.selectionHandler = ^(__kindof UIViewController *host, FLEXObjectRef *ref) {
+        __strong __typeof(self) strongSelf = weakSelf;
+        if (strongSelf) {
+            [strongSelf.navigationController pushViewController:[
+                FLEXObjectExplorerFactory explorerViewControllerForObject:ref.object
+            ] animated:YES];
+        }
     };
 
     section.customTitle = title;

Classes/GlobalStateExplorers/FLEXObjectRef.m

@@ -47,7 +47,7 @@
         _object = object;
         _wantsSummary = showSummary;
 
-        NSString *class = [FLEXRuntimeUtility safeClassNameForObject:object];
+        NSString *class = NSStringFromClass(object_getClass(object));
         if (ivar) {
             _reference = [NSString stringWithFormat:@"%@ %@", class, ivar];
         } else if (showSummary) {

Classes/GlobalStateExplorers/FLEXWebViewController.m

@@ -25,7 +25,7 @@
         WKWebViewConfiguration *configuration = [WKWebViewConfiguration new];
 
         if (@available(iOS 10.0, *)) {
-            configuration.dataDetectorTypes = WKDataDetectorTypeLink;
+            configuration.dataDetectorTypes = UIDataDetectorTypeLink;
         }
 
         self.webView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration];

Classes/GlobalStateExplorers/FileBrowser/FLEXFileBrowserController.m

@@ -54,8 +54,9 @@ typedef NS_ENUM(NSUInteger, FLEXFileBrowserSortAttribute) {
         self.title = [path lastPathComponent];
         self.operationQueue = [NSOperationQueue new];
         
-        // Compute path size
-        weakify(self)
+        
+        //computing path size
+        FLEXFileBrowserController *__weak weakSelf = self;
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             NSFileManager *fileManager = NSFileManager.defaultManager;
             NSDictionary<NSString *, id> *attributes = [fileManager attributesOfItemAtPath:path error:NULL];
@@ -65,15 +66,16 @@ typedef NS_ENUM(NSUInteger, FLEXFileBrowserSortAttribute) {
                 attributes = [fileManager attributesOfItemAtPath:[path stringByAppendingPathComponent:fileName] error:NULL];
                 totalSize += [attributes fileSize];
 
-                // Bail if the interested view controller has gone away
-                if (!self) {
+                // Bail if the interested view controller has gone away.
+                if (!weakSelf) {
                     return;
                 }
             }
 
-            dispatch_async(dispatch_get_main_queue(), ^{ strongify(self)
-                self.recursiveSize = @(totalSize);
-                [self.tableView reloadData];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                FLEXFileBrowserController *__strong strongSelf = weakSelf;
+                strongSelf.recursiveSize = @(totalSize);
+                [strongSelf.tableView reloadData];
             });
         });
 
@@ -358,41 +360,38 @@ typedef NS_ENUM(NSUInteger, FLEXFileBrowserSortAttribute) {
 
 #if FLEX_AT_LEAST_IOS13_SDK
 
-- (UIContextMenuConfiguration *)tableView:(UITableView *)tableView
-contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath
-                                    point:(CGPoint)point __IOS_AVAILABLE(13.0) {
-    weakify(self)
-    return [UIContextMenuConfiguration configurationWithIdentifier:nil previewProvider:nil
-        actionProvider:^UIMenu *(NSArray<UIMenuElement *> *suggestedActions) {
-            UITableViewCell * const cell = [tableView cellForRowAtIndexPath:indexPath];
-            UIAction *rename = [UIAction actionWithTitle:@"Rename" image:nil identifier:@"Rename"
-                handler:^(UIAction *action) { strongify(self)
-                    [self fileBrowserRename:cell];
-                }
-            ];
-            UIAction *delete = [UIAction actionWithTitle:@"Delete" image:nil identifier:@"Delete"
-                handler:^(UIAction *action) { strongify(self)
-                    [self fileBrowserDelete:cell];
-                }
-            ];
-            UIAction *copyPath = [UIAction actionWithTitle:@"Copy Path" image:nil identifier:@"Copy Path"
-                handler:^(UIAction *action) { strongify(self)
-                    [self fileBrowserCopyPath:cell];
-                }
-            ];
-            UIAction *share = [UIAction actionWithTitle:@"Share" image:nil identifier:@"Share"
-                handler:^(UIAction *action) { strongify(self)
-                    [self fileBrowserShare:cell];
-                }
-            ];
-            
-            return [UIMenu menuWithTitle:@"Manage File" image:nil
-                identifier:@"Manage File"
-                options:UIMenuOptionsDisplayInline
-                children:@[rename, delete, copyPath, share]
-            ];
-        }
-    ];
+- (UIContextMenuConfiguration *)tableView:(UITableView *)tableView contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath point:(CGPoint)point __IOS_AVAILABLE(13.0) {
+    __weak __typeof__(self) weakSelf = self;
+    return [UIContextMenuConfiguration configurationWithIdentifier:nil
+                                                   previewProvider:nil
+                                                    actionProvider:^UIMenu * _Nullable(NSArray<UIMenuElement *> * _Nonnull suggestedActions) {
+        UITableViewCell * const cell = [tableView cellForRowAtIndexPath:indexPath];
+        UIAction *rename = [UIAction actionWithTitle:@"Rename"
+                                               image:nil
+                                          identifier:@"Rename"
+                                             handler:^(__kindof UIAction * _Nonnull action) {
+            [weakSelf fileBrowserRename:cell];
+        }];
+        UIAction *delete = [UIAction actionWithTitle:@"Delete"
+                                               image:nil
+                                          identifier:@"Delete"
+                                             handler:^(__kindof UIAction * _Nonnull action) {
+            [weakSelf fileBrowserDelete:cell];
+        }];
+        UIAction *copyPath = [UIAction actionWithTitle:@"Copy Path"
+                                                 image:nil
+                                            identifier:@"Copy Path"
+                                               handler:^(__kindof UIAction * _Nonnull action) {
+            [weakSelf fileBrowserCopyPath:cell];
+        }];
+        UIAction *share = [UIAction actionWithTitle:@"Share"
+                                              image:nil
+                                         identifier:@"Share"
+                                            handler:^(__kindof UIAction * _Nonnull action) {
+            [weakSelf fileBrowserShare:cell];
+        }];
+        return [UIMenu menuWithTitle:@"Manage File" image:nil identifier:@"Manage File" options:UIMenuOptionsDisplayInline children:@[rename, delete, copyPath, share]];
+    }];
 }
 
 #endif

Classes/GlobalStateExplorers/Keychain/FLEXKeychainQuery.m

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

Classes/GlobalStateExplorers/Keychain/FLEXKeychainViewController.m

@@ -30,10 +30,10 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    [self addToolbarItems:@[
-        FLEXBarButtonItemSystem(Add, self, @selector(addPressed)),
-        [FLEXBarButtonItemSystem(Trash, self, @selector(trashPressed:)) flex_withTintColor:UIColor.redColor],
-    ]];
+    self.navigationItem.rightBarButtonItems = @[
+        [UIBarButtonItem flex_systemItem:UIBarButtonSystemItemTrash target:self action:@selector(trashPressed:)],
+        [UIBarButtonItem flex_systemItem:UIBarButtonSystemItemAdd target:self action:@selector(addPressed)],
+    ];
 
     [self reloadData];
 }
@@ -43,15 +43,14 @@
         cellConfiguration:^(__kindof FLEXTableViewCell *cell, NSDictionary *item, NSInteger row) {
             cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
         
-            id service = item[kFLEXKeychainWhereKey];
-            if ([service isKindOfClass:[NSString class]]) {
-                cell.textLabel.text = service;
-                cell.detailTextLabel.text = [item[kFLEXKeychainAccountKey] description];
+            id account = item[kFLEXKeychainAccountKey];
+            if ([account isKindOfClass:[NSString class]]) {
+                cell.textLabel.text = account;
             } else {
                 cell.textLabel.text = [NSString stringWithFormat:
                     @"[%@]\n\n%@",
-                    NSStringFromClass([service class]),
-                    [service description]
+                    NSStringFromClass([account class]),
+                    [account description]
                 ];
             }
         } filterMatcher:^BOOL(NSString *filterText, NSDictionary *item) {
@@ -130,18 +129,6 @@
         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];
@@ -149,12 +136,8 @@
 
             [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];
+    } showFrom:self source:sender];
 }
 
 - (void)addPressed {

Classes/GlobalStateExplorers/RuntimeBrowser/DataSources/FLEXRuntimeClient.m

@@ -303,14 +303,14 @@ static inline NSString * TBWildcardMap(NSString *token, NSString *candidate, TBW
         if (options == TBWildcardOptionsAny) {
             return [[bundles flex_flatmapped:^NSArray *(NSString *bundlePath, NSUInteger idx) {
                 return [self classNamesInImageAtPath:bundlePath];
-            }] flex_sortedUsingSelector:@selector(caseInsensitiveCompare:)];
+            }] sortedUsingSelector:@selector(caseInsensitiveCompare:)];
         }
 
         return [[bundles flex_flatmapped:^NSArray *(NSString *bundlePath, NSUInteger idx) {
             return [[self classNamesInImageAtPath:bundlePath] flex_mapped:^id(NSString *className, NSUInteger idx) {
                 return TBWildcardMap(query, className, options);
             }];
-        }] flex_sortedUsingSelector:@selector(caseInsensitiveCompare:)];
+        }] sortedUsingSelector:@selector(caseInsensitiveCompare:)];
     }
 }
 

Classes/GlobalStateExplorers/RuntimeBrowser/FLEXKBToolbarButton.m

@@ -51,7 +51,7 @@
         [self sizeToFit];
         
         if (@available(iOS 13, *)) {
-            self.appearance = UIKeyboardAppearanceDefault;
+            self.appearance = UIKeyboardTypeDefault;
         } else {
             self.appearance = UIKeyboardAppearanceLight;
         }

Classes/GlobalStateExplorers/RuntimeBrowser/FLEXKeyPathSearchController.m

@@ -101,7 +101,7 @@
 
     // Change "Bundle.fooba" to "Bundle.foobar."
     NSString *orig = self.delegate.searchController.searchBar.text;
-    NSString *keyPath = [orig flex_stringByReplacingLastKeyPathComponent:text];
+    NSString *keyPath = [orig stringByReplacingLastKeyPathComponent:text];
     self.delegate.searchController.searchBar.text = keyPath;
 
     self.keyPath = [FLEXRuntimeKeyPathTokenizer tokenizeString:keyPath];
@@ -130,7 +130,7 @@
     // Available since at least iOS 9, still present in iOS 13
     UITextField *field = [searchBar valueForKey:@"_searchBarTextField"];
 
-    if ([self searchBar:searchBar shouldChangeTextInRange:field.flex_selectedRange replacementText:text]) {
+    if ([self searchBar:searchBar shouldChangeTextInRange:field.selectedRange replacementText:text]) {
         [field replaceRange:field.selectedTextRange withText:text];
     }
 }
@@ -266,7 +266,7 @@
             self.filteredClasses = nil;
         }
 
-        self.timer = [NSTimer flex_fireSecondsFromNow:0.15 block:^{
+        self.timer = [NSTimer fireSecondsFromNow:0.15 block:^{
             [self updateTable];
         }];
     }

Classes/GlobalStateExplorers/RuntimeBrowser/FLEXKeyboardToolbar.m

@@ -40,7 +40,7 @@
         self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
         
         if (@available(iOS 13, *)) {
-            self.appearance = UIKeyboardAppearanceDefault;
+            self.appearance = UIKeyboardTypeDefault;
         } else {
             self.appearance = UIKeyboardAppearanceLight;
         }

Classes/GlobalStateExplorers/RuntimeBrowser/FLEXObjcRuntimeViewController.m

@@ -13,7 +13,6 @@
 #import "FLEXTableView.h"
 #import "FLEXObjectExplorerFactory.h"
 #import "FLEXAlert.h"
-#import "FLEXRuntimeClient.h"
 
 @interface FLEXObjcRuntimeViewController () <FLEXKeyPathSearchControllerDelegate>
 
@@ -29,24 +28,9 @@
 - (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;
-    self.activatesSearchBarAutomatically = YES;
     // Using pinSearchBar on this screen causes a weird visual
     // thing on the next view controller that gets pushed.
     //
@@ -73,6 +57,15 @@
     [self.tableView deselectRowAtIndexPath:self.tableView.indexPathForSelectedRow animated:YES];
 }
 
+- (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];
+    });
+}
+
 
 #pragma mark Delegate stuff
 

Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogViewController.m

@@ -100,9 +100,10 @@ static BOOL my_os_log_shim_enabled(void *addr) {
     self.showsSearchBar = YES;
     self.showSearchBarInitially = NO;
 
-    weakify(self)
-    id logHandler = ^(NSArray<FLEXSystemLogMessage *> *newMessages) { strongify(self)
-        [self handleUpdateWithNewMessages:newMessages];
+    __weak __typeof(self) weakSelf = self;
+    id logHandler = ^(NSArray<FLEXSystemLogMessage *> *newMessages) {
+        __strong __typeof(weakSelf) strongSelf = weakSelf;
+        [strongSelf handleUpdateWithNewMessages:newMessages];
     };
 
     if (FLEXOSLogAvailable() && !FLEXNSLogHookWorks) {
@@ -136,18 +137,20 @@ static BOOL my_os_log_shim_enabled(void *addr) {
     [self.logController startMonitoring];
 }
 
-- (NSArray<FLEXTableViewSection *> *)makeSections { weakify(self)
+- (NSArray<FLEXTableViewSection *> *)makeSections {
+    __weak __typeof(self) weakSelf = self;
     _logMessages = [FLEXMutableListSection list:@[]
         cellConfiguration:^(FLEXSystemLogCell *cell, FLEXSystemLogMessage *message, NSInteger row) {
-            strongify(self)
-        
-            cell.logMessage = message;
-            cell.highlightedText = self.filterText;
+            __strong __typeof(self) strongSelf = weakSelf;
+            if (strongSelf) {
+                cell.logMessage = message;
+                cell.highlightedText = strongSelf.filterText;
 
-            if (row % 2 == 0) {
-                cell.backgroundColor = FLEXColor.primaryBackgroundColor;
-            } else {
-                cell.backgroundColor = FLEXColor.secondaryBackgroundColor;
+                if (row % 2 == 0) {
+                    cell.backgroundColor = FLEXColor.primaryBackgroundColor;
+                } else {
+                    cell.backgroundColor = FLEXColor.secondaryBackgroundColor;
+                }
             }
         } filterMatcher:^BOOL(NSString *filterText, FLEXSystemLogMessage *message) {
             NSString *displayedText = [FLEXSystemLogCell displayedTextForLogMessage:message];
@@ -262,30 +265,8 @@ static BOOL my_os_log_shim_enabled(void *addr) {
 - (void)tableView:(UITableView *)tableView performAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(id)sender {
     if (action == @selector(copy:)) {
         // We usually only want to copy the log message itself, not any metadata associated with it.
-        UIPasteboard.generalPasteboard.string = self.logMessages.filteredList[indexPath.row].messageText ?: @"";
+        UIPasteboard.generalPasteboard.string = self.logMessages.filteredList[indexPath.row].messageText;
     }
 }
 
-#if FLEX_AT_LEAST_IOS13_SDK
-
-- (UIContextMenuConfiguration *)tableView:(UITableView *)tableView
-contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath
-                                    point:(CGPoint)point __IOS_AVAILABLE(13.0) {
-    weakify(self)
-    return [UIContextMenuConfiguration configurationWithIdentifier:nil previewProvider:nil
-        actionProvider:^UIMenu *(NSArray<UIMenuElement *> *suggestedActions) {
-            UIAction *copy = [UIAction actionWithTitle:@"Copy"
-                                                 image:nil
-                                            identifier:@"Copy"
-                                               handler:^(UIAction *action) { strongify(self)
-                // We usually only want to copy the log message itself, not any metadata associated with it.
-                UIPasteboard.generalPasteboard.string = self.logMessages.filteredList[indexPath.row].messageText ?: @"";
-            }];
-            return [UIMenu menuWithTitle:@"" image:nil identifier:nil options:UIMenuOptionsDisplayInline children:@[copy]];
-        }
-    ];
-}
-
-#endif
-
 @end

Classes/Manager/FLEXManager+Extensibility.h

@@ -7,7 +7,6 @@
 //
 
 #import "FLEXManager.h"
-#import "FLEXGlobalsEntry.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -15,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - Globals Screen Entries
 
-/// Adds an entry at the top of the list of Global State items.
+/// Adds an entry at the bottom of the list of Global State items.
 /// Call this method before this view controller is displayed.
 /// @param entryName The string to be displayed in the cell.
 /// @param objectFutureBlock When you tap on the row, information about the object returned
@@ -27,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// you may want to use __weak references.
 - (void)registerGlobalEntryWithName:(NSString *)entryName objectFutureBlock:(id (^)(void))objectFutureBlock;
 
-/// Adds an entry at the top of the list of Global State items.
+/// Adds an entry at the bottom of the list of Global State items.
 /// Call this method before this view controller is displayed.
 /// @param entryName The string to be displayed in the cell.
 /// @param viewControllerFutureBlock When you tap on the row, view controller returned
@@ -35,23 +34,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// @note This method must be called from the main thread.
 /// The viewControllerFutureBlock will be invoked from the main thread and may not return nil.
 /// @note The passed block will be copied and retain for the duration of the application,
-/// you may want to use __weak references as needed.
+/// you may want to use __weak references.
 - (void)registerGlobalEntryWithName:(NSString *)entryName
           viewControllerFutureBlock:(UIViewController * (^)(void))viewControllerFutureBlock;
 
-/// Adds an entry at the top of the list of Global State items.
-/// @param entryName The string to be displayed in the cell.
-/// @param rowSelectedAction When you tap on the row, this block will be invoked
-/// with the host table view view controller. Use it to deselect the row or present an alert.
-/// @note This method must be called from the main thread.
-/// The rowSelectedAction will be invoked from the main thread.
-/// @note The passed block will be copied and retain for the duration of the application,
-/// you may want to use __weak references as needed.
-- (void)registerGlobalEntryWithName:(NSString *)entryName action:(FLEXGlobalsEntryRowAction)rowSelectedAction;
-
-/// Removes all registered global entries.
-- (void)clearGlobalEntries;
-
 #pragma mark - Simulator Shortcuts
 
 /// Simulator keyboard shortcuts are enabled by default.

Classes/Manager/FLEXManager+Extensibility.m

@@ -9,6 +9,7 @@
 #import "FLEXManager+Extensibility.h"
 #import "FLEXManager+Private.h"
 #import "FLEXNavigationController.h"
+#import "FLEXGlobalsEntry.h"
 #import "FLEXObjectExplorerFactory.h"
 #import "FLEXKeyboardShortcutManager.h"
 #import "FLEXExplorerViewController.h"
@@ -57,23 +58,6 @@
     [self.userGlobalEntries addObject:entry];
 }
 
-- (void)registerGlobalEntryWithName:(NSString *)entryName action:(FLEXGlobalsEntryRowAction)rowSelectedAction {
-    NSParameterAssert(entryName);
-    NSParameterAssert(rowSelectedAction);
-    NSAssert(NSThread.isMainThread, @"This method must be called from the main thread.");
-    
-    entryName = entryName.copy;
-    FLEXGlobalsEntry *entry = [FLEXGlobalsEntry entryWithNameFuture:^NSString * _Nonnull{
-        return entryName;
-    } action:rowSelectedAction];
-    
-    [self.userGlobalEntries addObject:entry];
-}
-
-- (void)clearGlobalEntries {
-    [self.userGlobalEntries removeAllObjects];
-}
-
 
 #pragma mark - Simulator Shortcuts
 
@@ -111,49 +95,60 @@
     [self registerDefaultSimulatorShortcutWithKey:@"f" modifiers:0 action:^{
         [self toggleExplorer];
     } description:@"Toggle FLEX toolbar"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:@"g" modifiers:0 action:^{
         [self showExplorerIfNeeded];
         [self.explorerViewController toggleMenuTool];
     } description:@"Toggle FLEX globals menu"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:@"v" modifiers:0 action:^{
         [self showExplorerIfNeeded];
         [self.explorerViewController toggleViewsTool];
     } description:@"Toggle view hierarchy menu"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:@"s" modifiers:0 action:^{
         [self showExplorerIfNeeded];
         [self.explorerViewController toggleSelectTool];
     } description:@"Toggle select tool"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:@"m" modifiers:0 action:^{
         [self showExplorerIfNeeded];
         [self.explorerViewController toggleMoveTool];
     } description:@"Toggle move tool"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:@"n" modifiers:0 action:^{
         [self toggleTopViewControllerOfClass:[FLEXNetworkMITMViewController class]];
     } description:@"Toggle network history view"];
-
+    
+    // 't' is for testing: quickly present an object explorer for debugging
+    [self registerDefaultSimulatorShortcutWithKey:@"t" modifiers:0 action:^{
+        [self showExplorerIfNeeded];
+        
+        [self.explorerViewController toggleToolWithViewControllerProvider:^UINavigationController *{
+            return [FLEXNavigationController withRootViewController:[FLEXObjectExplorerFactory
+                explorerViewControllerForObject:NSBundle.mainBundle
+            ]];
+        } completion:nil];
+    } description:@"Present an object explorer for debugging"];
+    
     [self registerDefaultSimulatorShortcutWithKey:UIKeyInputDownArrow modifiers:0 action:^{
         if (self.isHidden || ![self.explorerViewController handleDownArrowKeyPressed]) {
             [self tryScrollDown];
         }
     } description:@"Cycle view selection\n\t\tMove view down\n\t\tScroll down"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:UIKeyInputUpArrow modifiers:0 action:^{
         if (self.isHidden || ![self.explorerViewController handleUpArrowKeyPressed]) {
             [self tryScrollUp];
         }
     } description:@"Cycle view selection\n\t\tMove view up\n\t\tScroll up"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:UIKeyInputRightArrow modifiers:0 action:^{
         if (!self.isHidden) {
             [self.explorerViewController handleRightArrowKeyPressed];
         }
     } description:@"Move selected view right"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:UIKeyInputLeftArrow modifiers:0 action:^{
         if (self.isHidden) {
             [self tryGoBack];
@@ -161,15 +156,15 @@
             [self.explorerViewController handleLeftArrowKeyPressed];
         }
     } description:@"Move selected view left"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:@"?" modifiers:0 action:^{
         [self toggleTopViewControllerOfClass:[FLEXKeyboardHelpViewController class]];
     } description:@"Toggle (this) help menu"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:UIKeyInputEscape modifiers:0 action:^{
         [[self.topViewController presentingViewController] dismissViewControllerAnimated:YES completion:nil];
     } description:@"End editing text\n\t\tDismiss top view controller"];
-
+    
     [self registerDefaultSimulatorShortcutWithKey:@"o" modifiers:UIKeyModifierCommand|UIKeyModifierShift action:^{
         [self toggleTopViewControllerOfClass:[FLEXFileBrowserController class]];
     } description:@"Toggle file browser menu"];
@@ -188,7 +183,7 @@
     if (@available(iOS 11, *)) {
         return scrollView.adjustedContentInset;
     }
-
+    
     return scrollView.contentInset;
 }
 

Classes/Manager/FLEXManager+Networking.h

@@ -21,10 +21,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// The response cache uses an NSCache, so it may purge prior to hitting the limit when the app is under memory pressure.
 @property (nonatomic) NSUInteger networkResponseCacheByteLimit;
 
-/// Requests whose host ends with one of the excluded entries in this array will be not be recorded (eg. google.com).
+/// Requests whose host ends with one of the blacklisted entries in this array will be not be recorded (eg. google.com).
 /// Wildcard or subdomain entries are not required (eg. google.com will match any subdomain under google.com).
 /// Useful to remove requests that are typically noisy, such as analytics requests that you aren't interested in tracking.
-@property (nonatomic) NSMutableArray<NSString *> *networkRequestHostDenylist;
+@property (nonatomic) NSMutableArray<NSString *> *networkRequestHostBlacklist;
 
 /// Sets custom viewer for specific content type.
 /// @param contentType Mime type like application/json

Classes/Manager/FLEXManager+Networking.m

@@ -48,12 +48,12 @@
     FLEXNetworkRecorder.defaultRecorder.responseCacheByteLimit = networkResponseCacheByteLimit;
 }
 
-- (NSMutableArray<NSString *> *)networkRequestHostDenylist {
-    return FLEXNetworkRecorder.defaultRecorder.hostDenylist;
+- (NSMutableArray<NSString *> *)networkRequestHostBlacklist {
+    return FLEXNetworkRecorder.defaultRecorder.hostBlacklist;
 }
 
-- (void)setNetworkRequestHostDenylist:(NSMutableArray<NSString *> *)networkRequestHostDenylist {
-    FLEXNetworkRecorder.defaultRecorder.hostDenylist = networkRequestHostDenylist;
+- (void)setNetworkRequestHostBlacklist:(NSMutableArray<NSString *> *)networkRequestHostBlacklist {
+    FLEXNetworkRecorder.defaultRecorder.hostBlacklist = networkRequestHostBlacklist;
 }
 
 - (void)setCustomViewerForContentType:(NSString *)contentType

Classes/Manager/FLEXManager.h

@@ -25,14 +25,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)hideExplorer;
 - (void)toggleExplorer;
 
-/// Programmatically dismiss anything presented by FLEX, leaving only the toolbar visible.
-- (void)dismissAnyPresentedTools:(void (^_Nullable)(void))completion;
-/// Programmatically present something on top of the FLEX toolbar.
-/// This method will automatically dismiss any currently presented tool,
-/// so you do not need to call \c dismissAnyPresentedTools: yourself.
-- (void)presentTool:(UINavigationController *(^)(void))viewControllerFuture
-         completion:(void (^_Nullable)(void))completion;
-
 /// Use this to present the explorer in a specific scene when the one
 /// it chooses by default is not the one you wish to display it in.
 - (void)showExplorerFromScene:(UIWindowScene *)scene API_AVAILABLE(ios(13.0));

Classes/Manager/FLEXManager.m

@@ -91,18 +91,6 @@
     }
 }
 
-- (void)dismissAnyPresentedTools:(void (^)(void))completion {
-    if (self.explorerViewController.presentedViewController) {
-        [self.explorerViewController dismissViewControllerAnimated:YES completion:completion];
-    } else if (completion) {
-        completion();
-    }
-}
-
-- (void)presentTool:(UINavigationController * _Nonnull (^)(void))future completion:(void (^)(void))completion {
-    [self.explorerViewController toggleToolWithViewControllerProvider:future completion:completion];
-}
-
 - (void)showExplorerFromScene:(UIWindowScene *)scene {
     #if FLEX_AT_LEAST_IOS13_SDK
     if (@available(iOS 13.0, *)) {

Classes/Network/FLEXNetworkCurlLogger.m

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

Classes/Network/FLEXNetworkMITMViewController.m

@@ -406,22 +406,22 @@
                     UIPasteboard.generalPasteboard.string = request.URL.absoluteString ?: @"";
                 }
             ];
-            UIAction *denylist = [UIAction
-                actionWithTitle:[NSString stringWithFormat:@"Exclude '%@'", request.URL.host]
+            UIAction *blacklist = [UIAction
+                actionWithTitle:[NSString stringWithFormat:@"Blacklist '%@'", request.URL.host]
                 image:nil
                 identifier:nil
                 handler:^(__kindof UIAction *action) {
-                    NSMutableArray *denylist =  FLEXNetworkRecorder.defaultRecorder.hostDenylist;
-                    [denylist addObject:request.URL.host];
-                    [FLEXNetworkRecorder.defaultRecorder clearExcludedTransactions];
-                    [FLEXNetworkRecorder.defaultRecorder synchronizeDenylist];
+                    NSMutableArray *blacklist =  FLEXNetworkRecorder.defaultRecorder.hostBlacklist;
+                    [blacklist addObject:request.URL.host];
+                    [FLEXNetworkRecorder.defaultRecorder clearBlacklistedTransactions];
+                    [FLEXNetworkRecorder.defaultRecorder synchronizeBlacklist];
                     [self tryUpdateTransactions];
                 }
             ];
             return [UIMenu
                 menuWithTitle:@"" image:nil identifier:nil
                 options:UIMenuOptionsDisplayInline
-                children:@[copy, denylist]
+                children:@[copy, blacklist]
             ];
         }
     ];

Classes/Network/FLEXNetworkRecorder.h

@@ -28,13 +28,13 @@ extern NSString *const kFLEXNetworkRecorderTransactionsClearedNotification;
 /// with an "image", "video", or "audio" prefix.
 @property (nonatomic) BOOL shouldCacheMediaResponses;
 
-@property (nonatomic) NSMutableArray<NSString *> *hostDenylist;
+@property (nonatomic) NSMutableArray<NSString *> *hostBlacklist;
 
-/// Call this after adding to or setting the \c hostDenylist to remove excluded transactions
-- (void)clearExcludedTransactions;
+/// Call this after adding to or setting the \c hostBlacklist to remove blacklisted transactions
+- (void)clearBlacklistedTransactions;
 
-/// Call this to save the denylist to the disk to be loaded next time
-- (void)synchronizeDenylist;
+/// Call this to save the blacklist to the disk to be loaded next time
+- (void)synchronizeBlacklist;
 
 
 // Accessing recorded network activity

Classes/Network/FLEXNetworkRecorder.m

@@ -45,7 +45,7 @@ NSString *const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = @"com.flex.r
         
         self.orderedTransactions = [NSMutableArray new];
         self.requestIDsToTransactions = [NSMutableDictionary new];
-        self.hostDenylist = NSUserDefaults.standardUserDefaults.flex_networkHostDenylist.mutableCopy;
+        self.hostBlacklist = NSUserDefaults.standardUserDefaults.flex_networkHostBlacklist.mutableCopy;
 
         // Serial queue used because we use mutable objects that are not thread safe
         self.queue = dispatch_queue_create("com.flex.FLEXNetworkRecorder", DISPATCH_QUEUE_SERIAL);
@@ -100,13 +100,13 @@ NSString *const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = @"com.flex.r
     });
 }
 
-- (void)clearExcludedTransactions {
+- (void)clearBlacklistedTransactions {
     dispatch_sync(self.queue, ^{
         self.orderedTransactions = ({
             [self.orderedTransactions flex_filtered:^BOOL(FLEXNetworkTransaction *ta, NSUInteger idx) {
                 NSString *host = ta.request.URL.host;
-                for (NSString *excluded in self.hostDenylist) {
-                    if ([host hasSuffix:excluded]) {
+                for (NSString *blacklisted in self.hostBlacklist) {
+                    if ([host hasSuffix:blacklisted]) {
                         return NO;
                     }
                 }
@@ -117,8 +117,8 @@ NSString *const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = @"com.flex.r
     });
 }
 
-- (void)synchronizeDenylist {
-    NSUserDefaults.standardUserDefaults.flex_networkHostDenylist = self.hostDenylist;
+- (void)synchronizeBlacklist {
+    NSUserDefaults.standardUserDefaults.flex_networkHostBlacklist = self.hostBlacklist;
 }
 
 #pragma mark - Network Events
@@ -126,7 +126,7 @@ NSString *const kFLEXNetworkRecorderResponseCacheLimitDefaultsKey = @"com.flex.r
 - (void)recordRequestWillBeSentWithRequestID:(NSString *)requestID
                                      request:(NSURLRequest *)request
                             redirectResponse:(NSURLResponse *)redirectResponse {
-    for (NSString *host in self.hostDenylist) {
+    for (NSString *host in self.hostBlacklist) {
         if ([request.URL.host hasSuffix:host]) {
             return;
         }

Classes/Network/FLEXNetworkSettingsController.m

@@ -23,7 +23,7 @@
 @property (nonatomic, readonly) UISlider *cacheLimitSlider;
 @property (nonatomic) UILabel *cacheLimitLabel;
 
-@property (nonatomic) NSMutableArray<NSString *> *hostDenylist;
+@property (nonatomic) NSMutableArray<NSString *> *hostBlacklist;
 @end
 
 @implementation FLEXNetworkSettingsController
@@ -32,7 +32,7 @@
     [super viewDidLoad];
     
     [self disableToolbar];
-    self.hostDenylist = FLEXNetworkRecorder.defaultRecorder.hostDenylist.mutableCopy;
+    self.hostBlacklist = FLEXNetworkRecorder.defaultRecorder.hostBlacklist.mutableCopy;
     
     NSUserDefaults *defaults = NSUserDefaults.standardUserDefaults;
     
@@ -107,13 +107,13 @@
 #pragma mark - Table View Data Source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return self.hostDenylist.count ? 2 : 1;
+    return self.hostBlacklist.count ? 2 : 1;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     switch (section) {
         case 0: return 5;
-        case 1: return self.hostDenylist.count;
+        case 1: return self.hostBlacklist.count;
         default: return 0;
     }
 }
@@ -121,7 +121,7 @@
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
     switch (section) {
         case 0: return @"General";
-        case 1: return @"Host Denylist";
+        case 1: return @"Host Blacklist";
         default: return nil;
     }
 }
@@ -162,7 +162,7 @@
                     cell.accessoryView = self.jsonViewerSwitch;
                     break;
                 case 3:
-                    cell.textLabel.text = @"Reset Host Denylist";
+                    cell.textLabel.text = @"Reset Host Blacklist";
                     cell.textLabel.textColor = tableView.tintColor;
                     break;
                 case 4:
@@ -195,9 +195,9 @@
             break;
         }
         
-        // Denylist entries
+        // Blacklist entries
         case 1: {
-            cell.textLabel.text = self.hostDenylist[indexPath.row];
+            cell.textLabel.text = self.hostBlacklist[indexPath.row];
             break;
         }
         
@@ -212,7 +212,7 @@
 #pragma mark - Table View Delegate
 
 - (BOOL)tableView:(UITableView *)tableView shouldHighlightRowAtIndexPath:(NSIndexPath *)ip {
-    // Can only select the "Reset Host Denylist" row
+    // Can only select the "Reset Host Blacklist" row
     return ip.section == 0 && ip.row == 2;
 }
 
@@ -220,12 +220,12 @@
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     
     [FLEXAlert makeAlert:^(FLEXAlert *make) {
-        make.title(@"Reset Host Denylist");
+        make.title(@"Reset Host Blacklist");
         make.message(@"You cannot undo this action. Are you sure?");
         make.button(@"Reset").destructiveStyle().handler(^(NSArray<NSString *> *strings) {
-            self.hostDenylist = nil;
-            [FLEXNetworkRecorder.defaultRecorder.hostDenylist removeAllObjects];
-            [FLEXNetworkRecorder.defaultRecorder synchronizeDenylist];
+            self.hostBlacklist = nil;
+            [FLEXNetworkRecorder.defaultRecorder.hostBlacklist removeAllObjects];
+            [FLEXNetworkRecorder.defaultRecorder synchronizeBlacklist];
             [self.tableView deleteSections:
                 [NSIndexSet indexSetWithIndex:1]
             withRowAnimation:UITableViewRowAnimationAutomatic];
@@ -242,10 +242,10 @@
 forRowAtIndexPath:(NSIndexPath *)indexPath {
     NSParameterAssert(style == UITableViewCellEditingStyleDelete);
     
-    NSString *host = self.hostDenylist[indexPath.row];
-    [self.hostDenylist removeObjectAtIndex:indexPath.row];
-    [FLEXNetworkRecorder.defaultRecorder.hostDenylist removeObject:host];
-    [FLEXNetworkRecorder.defaultRecorder synchronizeDenylist];
+    NSString *host = self.hostBlacklist[indexPath.row];
+    [self.hostBlacklist removeObjectAtIndex:indexPath.row];
+    [FLEXNetworkRecorder.defaultRecorder.hostBlacklist removeObject:host];
+    [FLEXNetworkRecorder.defaultRecorder synchronizeBlacklist];
     
     [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic];
 }

Classes/Network/FLEXNetworkTransactionDetailController.m

@@ -328,23 +328,24 @@ typedef UIViewController *(^FLEXNetworkDetailRowSelectionFuture)(void);
         responseBodyRow.detailText = @"tap to view";
 
         // Avoid a long lived strong reference to the response data in case we need to purge it from the cache.
-        weakify(responseData)
-        responseBodyRow.selectionFuture = ^UIViewController *() { strongify(responseData)
+        __weak NSData *weakResponseData = responseData;
+        responseBodyRow.selectionFuture = ^UIViewController * () {
 
             // Show the response if we can
             NSString *contentType = transaction.response.MIMEType;
-            if (responseData) {
-                UIViewController *bodyDetails = [self detailViewControllerForMIMEType:contentType data:responseData];
-                if (bodyDetails) {
-                    bodyDetails.title = @"Response";
-                    return bodyDetails;
+            NSData *strongResponseData = weakResponseData;
+            if (strongResponseData) {
+                UIViewController *bodyDetailController = [self detailViewControllerForMIMEType:contentType data:strongResponseData];
+                if (bodyDetailController) {
+                    bodyDetailController.title = @"Response";
+                    return bodyDetailController;
                 }
             }
 
             // We can't show the response, alert user
             return [FLEXAlert makeAlert:^(FLEXAlert *make) {
                 make.title(@"Unable to View Response");
-                if (responseData) {
+                if (strongResponseData) {
                     make.message(@"No viewer content type: ").message(contentType);
                 } else {
                     make.message(@"The response has been purged from the cache");
@@ -425,8 +426,7 @@ typedef UIViewController *(^FLEXNetworkDetailRowSelectionFuture)(void);
     if (transaction.cachedRequestBody.length > 0) {
         NSString *contentType = [transaction.request valueForHTTPHeaderField:@"Content-Type"];
         if ([contentType hasPrefix:@"application/x-www-form-urlencoded"]) {
-            NSData *body = [self postBodyDataForTransaction:transaction];
-            NSString *bodyString = [[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding];
+            NSString *bodyString = [NSString stringWithCString:[self postBodyDataForTransaction:transaction].bytes encoding:NSUTF8StringEncoding];
             postBodySection.rows = [self networkDetailRowsFromQueryItems:[FLEXUtility itemsFromQueryString:bodyString]];
         }
     }

Classes/ObjectExplorers/FLEXObjectExplorer.m

@@ -136,13 +136,7 @@
     NSUserDefaults *defaults = NSUserDefaults.standardUserDefaults;
     BOOL hideBackingIvars = defaults.flex_explorerHidesPropertyIvars;
     BOOL hidePropertyMethods = defaults.flex_explorerHidesPropertyMethods;
-    BOOL hidePrivateMethods = defaults.flex_explorerHidesPrivateMethods;
     BOOL showMethodOverrides = defaults.flex_explorerShowsMethodOverrides;
-    
-    NSMutableArray<NSArray<FLEXProperty *> *> *allProperties = [NSMutableArray new];
-    NSMutableArray<NSArray<FLEXProperty *> *> *allClassProps = [NSMutableArray new];
-    NSMutableArray<NSArray<FLEXMethod *> *> *allMethods = [NSMutableArray new];
-    NSMutableArray<NSArray<FLEXMethod *> *> *allClassMethods = [NSMutableArray new];
 
     // Loop over each class and each superclass, collect
     // the fresh and unique metadata in each category
@@ -153,13 +147,13 @@
         Class cls = self.classHierarchyClasses[i];
         superclass = (i < rootIdx) ? self.classHierarchyClasses[i+1] : nil;
 
-        [allProperties addObject:[self
+        [_allProperties addObject:[self
             metadataUniquedByName:[cls flex_allInstanceProperties]
             superclass:superclass
             kind:FLEXMetadataKindProperties
             skip:showMethodOverrides
         ]];
-        [allClassProps addObject:[self
+        [_allClassProperties addObject:[self
             metadataUniquedByName:[cls flex_allClassProperties]
             superclass:superclass
             kind:FLEXMetadataKindClassProperties
@@ -171,13 +165,13 @@
             kind:FLEXMetadataKindIvars
             skip:NO
         ]];
-        [allMethods addObject:[self
+        [_allMethods addObject:[self
             metadataUniquedByName:[cls flex_allInstanceMethods]
             superclass:superclass
             kind:FLEXMetadataKindMethods
             skip:showMethodOverrides
         ]];
-        [allClassMethods addObject:[self
+        [_allClassMethods addObject:[self
             metadataUniquedByName:[cls flex_allClassMethods]
             superclass:superclass
             kind:FLEXMetadataKindClassMethods
@@ -204,7 +198,7 @@
     
     _classHierarchy = [FLEXStaticMetadata classHierarchy:self.classHierarchyClasses];
     
-    NSArray<NSArray<FLEXProperty *> *> *properties = allProperties;
+    NSArray<NSArray<FLEXProperty *> *> *properties = _allProperties;
     
     // Potentially filter property-backing ivars
     if (hideBackingIvars) {
@@ -214,7 +208,7 @@
             NSSet *ivarNames = [NSSet setWithArray:({
                 [properties[idx] flex_mapped:^id(FLEXProperty *p, NSUInteger idx) {
                     // Nil if no ivar, and array is flatted
-                    return p.likelyIvarName;
+                    return p.attributes.backingIvar;
                 }];
             })];
             
@@ -227,7 +221,8 @@
     
     // Potentially filter property-backing methods
     if (hidePropertyMethods) {
-        allMethods = [allMethods flex_mapped:^id(NSArray<FLEXMethod *> *list, NSUInteger idx) {
+        NSArray<NSArray<FLEXMethod *> *> *methods = _allMethods.copy;
+        _allMethods = [methods flex_mapped:^id(NSArray<FLEXMethod *> *list, NSUInteger idx) {
             // Get a set of all property method names for the current class in the hierarchy
             NSSet *methodNames = [NSSet setWithArray:({
                 [properties[idx] flex_flatmapped:^NSArray *(FLEXProperty *p, NSUInteger idx) {
@@ -245,37 +240,12 @@
                 }];
             })];
             
-            // Remove methods whose name is in the property method names list
+            // Remove ivars whose name is in the ivar names list
             return [list flex_filtered:^BOOL(FLEXMethod *method, NSUInteger idx) {
                 return ![methodNames containsObject:method.selectorString];
             }];
         }];
     }
-    
-    if (hidePrivateMethods) {
-        id methodMapBlock = ^id(NSArray<FLEXMethod *> *list, NSUInteger idx) {
-            // Remove methods which contain an underscore
-            return [list flex_filtered:^BOOL(FLEXMethod *method, NSUInteger idx) {
-                return ![method.selectorString containsString:@"_"];
-            }];
-        };
-        id propertyMapBlock = ^id(NSArray<FLEXProperty *> *list, NSUInteger idx) {
-            // Remove methods which contain an underscore
-            return [list flex_filtered:^BOOL(FLEXProperty *prop, NSUInteger idx) {
-                return ![prop.name containsString:@"_"];
-            }];
-        };
-        
-        allMethods = [allMethods flex_mapped:methodMapBlock];
-        allClassMethods = [allClassMethods flex_mapped:methodMapBlock];
-        allProperties = [allProperties flex_mapped:propertyMapBlock];
-        allClassProps = [allClassProps flex_mapped:propertyMapBlock];
-    }
-    
-    _allProperties = allProperties;
-    _allClassProperties = allClassProps;
-    _allMethods = allMethods;
-    _allClassMethods = allClassMethods;
 
     // Set up UIKit helper data
     // Really, we only need to call this on properties and ivars
@@ -313,8 +283,8 @@
 - (NSArray *)metadataUniquedByName:(NSArray *)list
                         superclass:(Class)superclass
                               kind:(FLEXMetadataKind)kind
-                              skip:(BOOL)skipUniquing {
-    if (skipUniquing) {
+                              skip:(BOOL)skip {
+    if (skip) {
         return list;
     }
     

Classes/ObjectExplorers/FLEXObjectExplorerFactory.m

@@ -17,27 +17,17 @@
 #import "FLEXColorPreviewSection.h"
 #import "FLEXDefaultsContentSection.h"
 #import "FLEXBundleShortcuts.h"
-#import "FLEXNSStringShortcuts.h"
-#import "FLEXNSDataShortcuts.h"
 #import "FLEXBlockShortcuts.h"
 #import "FLEXUtility.h"
 
 @implementation FLEXObjectExplorerFactory
-static NSMutableDictionary<id<NSCopying>, Class> *classesToRegisteredSections = nil;
+static NSMutableDictionary<Class, Class> *classesToRegisteredSections = nil;
 
 + (void)initialize {
     if (self == [FLEXObjectExplorerFactory class]) {
-        // DO NOT USE STRING KEYS HERE
-        // We NEED to use the class as a key, because we CANNOT
-        // differentiate a class's name from the metaclass's name.
-        // These mappings are per-class-object, not per-class-name.
-        //
-        // 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) (id<NSCopying>)[name class]
-        #define ClassKeyByName(str) (id<NSCopying>)NSClassFromString(@ #str)
-        #define MetaclassKey(meta) (id<NSCopying>)object_getClass([meta class])
+        #define ClassKey(name) (Class<NSCopying>)[name class]
+        #define ClassKeyByName(str) (Class<NSCopying>)NSClassFromString(@ #str)
+        #define MetaclassKey(meta) (Class<NSCopying>)object_getClass([meta class])
         classesToRegisteredSections = [NSMutableDictionary dictionaryWithDictionary:@{
             MetaclassKey(NSObject)     : [FLEXClassShortcuts class],
             ClassKey(NSArray)          : [FLEXCollectionContentSection class],
@@ -52,8 +42,6 @@ static NSMutableDictionary<id<NSCopying>, Class> *classesToRegisteredSections =
             ClassKey(CALayer)          : [FLEXLayerShortcuts class],
             ClassKey(UIColor)          : [FLEXColorPreviewSection class],
             ClassKey(NSBundle)         : [FLEXBundleShortcuts class],
-            ClassKey(NSString)         : [FLEXNSStringShortcuts class],
-            ClassKey(NSData)           : [FLEXNSDataShortcuts class],
             ClassKeyByName(NSBlock)    : [FLEXBlockShortcuts class],
         }];
         #undef ClassKey
@@ -79,7 +67,7 @@ static NSMutableDictionary<id<NSCopying>, Class> *classesToRegisteredSections =
     Class sectionClass = nil;
     Class cls = object_getClass(object);
     do {
-        sectionClass = classesToRegisteredSections[(id<NSCopying>)cls];
+        sectionClass = classesToRegisteredSections[(Class<NSCopying>)cls];
     } while (!sectionClass && (cls = [cls superclass]));
 
     if (!sectionClass) {
@@ -93,7 +81,7 @@ static NSMutableDictionary<id<NSCopying>, Class> *classesToRegisteredSections =
 }
 
 + (void)registerExplorerSection:(Class)explorerClass forClass:(Class)objectClass {
-    classesToRegisteredSections[(id<NSCopying>)objectClass] = explorerClass;
+    classesToRegisteredSections[(Class<NSCopying>)objectClass] = explorerClass;
 }
 
 #pragma mark - FLEXGlobalsEntry
@@ -188,7 +176,7 @@ static NSMutableDictionary<id<NSCopying>, Class> *classesToRegisteredSections =
             return [self explorerViewControllerForObject:NSThread.mainThread];
         case FLEXGlobalsRowOperationQueue:
             return [self explorerViewControllerForObject:NSOperationQueue.mainQueue];
-
+            
         case FLEXGlobalsRowKeyWindow:
             return [FLEXObjectExplorerFactory
                 explorerViewControllerForObject:FLEXUtility.appKeyWindow

Classes/ObjectExplorers/FLEXObjectExplorerViewController.m

@@ -72,8 +72,7 @@
     return @[
         kFLEXDefaultsHidePropertyIvarsKey,
         kFLEXDefaultsHidePropertyMethodsKey,
-        kFLEXDefaultsHidePrivateMethodsKey,
-        kFLEXDefaultsShowMethodOverridesKey,
+        kFLEXDefaultsHideMethodOverridesKey,
         kFLEXDefaultsHideVariablePreviewsKey,
     ];
 }
@@ -88,7 +87,7 @@
 
     // Use [object class] here rather than object_getClass
     // to avoid the KVO prefix for observed objects
-    self.title = [FLEXRuntimeUtility safeClassNameForObject:self.object];
+    self.title = [[self.object class] description];
 
     // Search
     self.showsSearchBar = YES;
@@ -266,11 +265,9 @@
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)g1 shouldBeRequiredToFailByGestureRecognizer:(UIGestureRecognizer *)g2 {
     // Prioritize important pan gestures over our swipe gesture
     if ([g2 isKindOfClass:[UIPanGestureRecognizer class]]) {
-        if (g2 == self.navigationController.interactivePopGestureRecognizer) {
-            return NO;
-        }
-        
-        if (g2 == self.tableView.panGestureRecognizer) {
+        if (g2 == self.navigationController.interactivePopGestureRecognizer ||
+            g2 == self.navigationController.barHideOnSwipeGestureRecognizer ||
+            g2 == self.tableView.panGestureRecognizer) {
             return NO;
         }
     }
@@ -294,8 +291,7 @@
     NSDictionary<NSString *, NSString *> *explorerToggles = @{
         kFLEXDefaultsHidePropertyIvarsKey:    @"Property-Backing Ivars",
         kFLEXDefaultsHidePropertyMethodsKey:  @"Property-Backing Methods",
-        kFLEXDefaultsHidePrivateMethodsKey:   @"Likely Private Methods",
-        kFLEXDefaultsShowMethodOverridesKey:  @"Method Overrides",
+        kFLEXDefaultsHideMethodOverridesKey:  @"Method Overrides",
         kFLEXDefaultsHideVariablePreviewsKey: @"Variable Previews"
     };
     
@@ -306,8 +302,7 @@
     NSDictionary<NSString *, NSDictionary *> *nextStateDescriptions = @{
         kFLEXDefaultsHidePropertyIvarsKey:    @{ @NO: @"Hide ", @YES: @"Show " },
         kFLEXDefaultsHidePropertyMethodsKey:  @{ @NO: @"Hide ", @YES: @"Show " },
-        kFLEXDefaultsHidePrivateMethodsKey:   @{ @NO: @"Hide ", @YES: @"Show " },
-        kFLEXDefaultsShowMethodOverridesKey:  @{ @NO: @"Show ", @YES: @"Hide " },
+        kFLEXDefaultsHideMethodOverridesKey:  @{ @NO: @"Show ", @YES: @"Hide " },
         kFLEXDefaultsHideVariablePreviewsKey: @{ @NO: @"Hide ", @YES: @"Show " },
     };
     

Classes/ObjectExplorers/Sections/FLEXDefaultsContentSection.m

@@ -13,7 +13,7 @@
 @interface FLEXDefaultsContentSection ()
 @property (nonatomic) NSUserDefaults *defaults;
 @property (nonatomic) NSArray *keys;
-@property (nonatomic, readonly) NSDictionary *unexcludedDefaults;
+@property (nonatomic, readonly) NSDictionary *whitelistedDefaults;
 @end
 
 @implementation FLEXDefaultsContentSection
@@ -33,7 +33,7 @@
     FLEXDefaultsContentSection *section = [self forReusableFuture:^id(FLEXDefaultsContentSection *section) {
         section.defaults = userDefaults;
         section.onlyShowKeysForAppPrefs = YES;
-        return section.unexcludedDefaults;
+        return section.whitelistedDefaults;
     }];
     return section;
 }
@@ -87,16 +87,16 @@
     _keys = [keys sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
 }
 
-- (NSDictionary *)unexcludedDefaults {
-    // Case: no excluding
+- (NSDictionary *)whitelistedDefaults {
+    // Case: no whitelisting
     if (!self.onlyShowKeysForAppPrefs) {
         return self.defaults.dictionaryRepresentation;
     }
 
-    // Always regenerate key allowlist when this method is called
+    // Always regenerate key whitelist when this method is called
     _keys = nil;
 
-    // Generate new dictionary from unexcluded keys
+    // Generate new dictionary from whitelisted keys
     NSArray *values = [self.defaults.dictionaryRepresentation
         objectsForKeys:self.keys notFoundMarker:NSNull.null
     ];

Classes/ObjectExplorers/Sections/FLEXMutableListSection.m

@@ -7,7 +7,6 @@
 //
 
 #import "FLEXMutableListSection.h"
-#import "FLEXMacros.h"
 
 @interface FLEXMutableListSection ()
 @property (nonatomic, readonly) FLEXMutableListCellForElement configureCell;
@@ -79,10 +78,12 @@ configurationBlock:(FLEXMutableListCellForElement)cellConfig
 }
 
 - (void (^)(__kindof UIViewController *))didSelectRowAction:(NSInteger)row {
-    if (self.selectionHandler) { weakify(self)
-        return ^(UIViewController *host) { strongify(self)
-            if (self) {
-                self.selectionHandler(host, self.filteredList[row]);
+    if (self.selectionHandler) {
+        __weak __typeof(self) weakSelf = self;
+        return ^(UIViewController *host) {
+            __strong __typeof(self) strongSelf = weakSelf;
+            if (strongSelf) {
+                strongSelf.selectionHandler(host, strongSelf.filteredList[row]);
             }
         };
     }

Classes/ObjectExplorers/Sections/Shortcuts/FLEXBundleShortcuts.m

@@ -9,7 +9,6 @@
 #import "FLEXBundleShortcuts.h"
 #import "FLEXShortcut.h"
 #import "FLEXAlert.h"
-#import "FLEXMacros.h"
 #import "FLEXRuntimeExporter.h"
 #import "FLEXTableListViewController.h"
 #import "FLEXFileBrowserController.h"
@@ -18,7 +17,8 @@
 @implementation FLEXBundleShortcuts
 #pragma mark Overrides
 
-+ (instancetype)forObject:(NSBundle *)bundle { weakify(self)
++ (instancetype)forObject:(NSBundle *)bundle {
+    __weak __typeof(self) weakSelf = self;
     return [self forObject:bundle additionalRows:@[
         [FLEXActionShortcut
             title:@"Browse Bundle Directory" subtitle:nil
@@ -30,8 +30,11 @@
             }
         ],
         [FLEXActionShortcut title:@"Browse Bundle as Database…" subtitle:nil
-            selectionHandler:^(UIViewController *host, NSBundle *bundle) { strongify(self)
-                [self promptToExportBundleAsDatabase:bundle host:host];
+            selectionHandler:^(UIViewController *host, NSBundle *bundle) {
+                __strong __typeof(self) strongSelf = weakSelf;
+                if (strongSelf) {
+                    [strongSelf promptToExportBundleAsDatabase:bundle host:host];
+                }
             }
             accessoryType:^UITableViewCellAccessoryType(NSBundle *bundle) {
                 return UITableViewCellAccessoryDisclosureIndicator;

Classes/ObjectExplorers/Sections/Shortcuts/FLEXImageShortcuts.m

@@ -10,7 +10,6 @@
 #import "FLEXImagePreviewViewController.h"
 #import "FLEXShortcut.h"
 #import "FLEXAlert.h"
-#import "FLEXMacros.h"
 
 @interface UIAlertController (FLEXImageShortcuts)
 - (void)flex_image:(UIImage *)image disSaveWithError:(NSError *)error :(void *)context;

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 *(CALayer *layer) {
+            viewer:^UIViewController *(id layer) {
                 return [FLEXImagePreviewViewController previewForLayer:layer];
             }
-            accessoryType:^UITableViewCellAccessoryType(CALayer *layer) {
-                return CGRectIsEmpty(layer.bounds) ? UITableViewCellAccessoryNone : UITableViewCellAccessoryDisclosureIndicator;
+            accessoryType:^UITableViewCellAccessoryType(id layer) {
+                return UITableViewCellAccessoryDisclosureIndicator;
             }
         ]
     ]];

Classes/ObjectExplorers/Sections/Shortcuts/FLEXNSDataShortcuts.h

@@ -1,13 +0,0 @@
-//
-//  FLEXNSDataShortcuts.h
-//  FLEX
-//
-//  Created by Tanner on 3/29/21.
-//
-
-#import "FLEXShortcutsSection.h"
-
-/// Adds a "UTF-8 String" shortcut
-@interface FLEXNSDataShortcuts : FLEXShortcutsSection
-
-@end

Classes/ObjectExplorers/Sections/Shortcuts/FLEXNSDataShortcuts.m

@@ -1,48 +0,0 @@
-//
-//  FLEXNSDataShortcuts.m
-//  FLEX
-//
-//  Created by Tanner on 3/29/21.
-//
-
-#import "FLEXNSDataShortcuts.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXShortcut.h"
-
-@implementation FLEXNSDataShortcuts
-
-+ (instancetype)forObject:(NSData *)data {
-    NSString *string = [self stringForData:data];
-    
-    return [self forObject:data additionalRows:@[
-        [FLEXActionShortcut title:@"UTF-8 String" subtitle:^(NSData *object) {
-            return string.length ? string : (string ?
-                @"Data is not a UTF8 String" : @"Empty string"
-            );
-        } viewer:^UIViewController *(id object) {
-            return [FLEXObjectExplorerFactory explorerViewControllerForObject:string];
-        } accessoryType:^UITableViewCellAccessoryType(NSData *object) {
-            if (string.length) {
-                return UITableViewCellAccessoryDisclosureIndicator;
-            }
-            
-            return UITableViewCellAccessoryNone;
-        }]
-    ]];
-}
-
-+ (NSString *)stringForData:(NSData *)data {
-    return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-}
-
-@end
-
-@interface NSData (Overrides) @end
-@implementation NSData (Overrides)
-
-// This normally crashes
-- (NSUInteger)length {
-    return 0;
-}
-
-@end

Classes/ObjectExplorers/Sections/Shortcuts/FLEXNSStringShortcuts.h

@@ -1,13 +0,0 @@
-//
-//  FLEXNSStringShortcuts.h
-//  FLEX
-//
-//  Created by Tanner on 3/29/21.
-//
-
-#import "FLEXShortcutsSection.h"
-
-/// Adds a "UTF-8 Data" shortcut
-@interface FLEXNSStringShortcuts : FLEXShortcutsSection
-
-@end

Classes/ObjectExplorers/Sections/Shortcuts/FLEXNSStringShortcuts.m

@@ -1,29 +0,0 @@
-//
-//  FLEXNSStringShortcuts.m
-//  FLEX
-//
-//  Created by Tanner on 3/29/21.
-//
-
-#import "FLEXNSStringShortcuts.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXShortcut.h"
-
-@implementation FLEXNSStringShortcuts
-
-+ (instancetype)forObject:(NSString *)string {
-    NSUInteger length = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-    NSData *data = [NSData dataWithBytesNoCopy:(void *)string.UTF8String length:length freeWhenDone:NO];
-    
-    return [self forObject:string additionalRows:@[
-        [FLEXActionShortcut title:@"UTF-8 Data" subtitle:^NSString *(id _) {
-            return data.description;
-        } viewer:^UIViewController *(id _) {
-            return [FLEXObjectExplorerFactory explorerViewControllerForObject:data];
-        } accessoryType:^UITableViewCellAccessoryType(id _) {
-            return UITableViewCellAccessoryDisclosureIndicator;
-        }]
-    ]];
-}
-
-@end

Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcut.h

@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @optional
 /// Called when the (i) button is pressed if the accessory type includes it
-- (UIViewController *)editorWith:(id)object forSection:(FLEXTableViewSection *)section;
+- (UIViewController *)editorWith:(id)object;
 
 @end
 

Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsFactory+Defaults.m

@@ -8,10 +8,8 @@
 
 #import "FLEXShortcutsFactory+Defaults.h"
 #import "FLEXShortcut.h"
-#import "FLEXMacros.h"
 #import "FLEXRuntimeUtility.h"
 #import "NSObject+FLEX_Reflection.h"
-#import "Cocoa+FLEXShortcuts.h"
 
 #pragma mark - UIApplication
 
@@ -61,7 +59,6 @@
     FLEXRuntimeUtilityTryAddObjectProperty(6, constraints, UIView_, NSArray, PropertyKey(ReadOnly));
     FLEXRuntimeUtilityTryAddObjectProperty(2, subviews, UIView_, NSArray, PropertyKey(ReadOnly));
     FLEXRuntimeUtilityTryAddObjectProperty(2, superview, UIView_, UIView, PropertyKey(ReadOnly));
-    FLEXRuntimeUtilityTryAddObjectProperty(7, tintColor, UIView_, UIView);
 
     // UIButton, private
     FLEXRuntimeUtilityTryAddObjectProperty(2, font, UIButton.class, UIFont, PropertyKey(ReadOnly));
@@ -144,26 +141,7 @@
             @"viewIfLoaded", @"title", @"navigationItem", @"toolbarItems", @"tabBarItem",
             @"childViewControllers", @"navigationController", @"tabBarController", @"splitViewController",
             @"parentViewController", @"presentedViewController", @"presentingViewController",
-        ])
-        .methods(@[@"view"])
-        .forClass(UIViewController.class);
-    
-    // UIAlertController
-    NSMutableArray *alertControllerProps = @[
-        @"title", @"message", @"actions", @"textFields",
-        @"preferredAction", @"presentingViewController", @"viewIfLoaded",
-    ].mutableCopy;
-    if (@available(iOS 14.0, *)) {
-        [alertControllerProps insertObject:@"image" atIndex:4];
-    }
-    self.append
-        .properties(alertControllerProps)
-        .methods(@[@"addAction:"])
-        .forClass(UIAlertController.class);
-    self.append.properties(@[
-        @"title", @"style", @"enabled", @"flex_styleName",
-        @"image", @"keyCommandInput", @"_isPreferred", @"_alertController",
-    ]).forClass(UIAlertAction.class);
+        ]).methods(@[@"view"]).forClass(UIViewController.class);
 }
 
 @end
@@ -278,18 +256,12 @@
     FLEXRuntimeUtilityTryAddObjectProperty(2, abbreviationDictionary, NSTimeZone.flex_metaclass, NSDictionary);
     
     self.append.classMethods(@[
-        @"timeZoneWithName:", @"timeZoneWithAbbreviation:", @"timeZoneForSecondsFromGMT:",
+        @"timeZoneWithName:", @"timeZoneWithAbbreviation:", @"timeZoneForSecondsFromGMT:", @"", @"", @"", 
     ]).forClass(NSTimeZone.flex_metaclass);
     
     self.append.classProperties(@[
         @"defaultTimeZone", @"systemTimeZone", @"localTimeZone"
     ]).forClass(NSTimeZone.class);
-    
-    // UTF8String is not a real property under the hood
-    FLEXRuntimeUtilityTryAddNonatomicProperty(2, UTF8String, NSString.class, const char *, PropertyKey(ReadOnly));
-    
-    self.append.properties(@[@"length"]).methods(@[@"characterAtIndex:"]).forClass(NSString.class);
-    self.append.properties(@[@"length", @"bytes"]).forClass(NSData.class);
 }
 
 @end

Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsSection.m

@@ -201,10 +201,10 @@
 
 - (void (^)(__kindof UIViewController *))didPressInfoButtonAction:(NSInteger)row {
     id<FLEXShortcut> shortcut = self.shortcuts[row];
-    if ([shortcut respondsToSelector:@selector(editorWith:forSection:)]) {
+    if ([shortcut respondsToSelector:@selector(editorWith:)]) {
         id object = self.object;
         return ^(UIViewController *host) {
-            UIViewController *editor = [shortcut editorWith:object forSection:self];
+            UIViewController *editor = [shortcut editorWith:object];
             [host.navigationController pushViewController:editor animated:YES];
         };
     }
@@ -255,52 +255,31 @@
 }
 @end
 
-#define NewAndSet(ivar) ({ FLEXShortcutsFactory *r = [self sharedFactory]; r->ivar = YES; r; })
+#define NewAndSet(ivar) ({ FLEXShortcutsFactory *r = [self new]; 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;
 
-@implementation FLEXShortcutsFactory {
-    // Class buckets
-    RegistrationBuckets *cProperties;
-    RegistrationBuckets *cIvars;
-    RegistrationBuckets *cMethods;
-    // Metaclass buckets
-    RegistrationBuckets *mProperties;
-    RegistrationBuckets *mMethods;
-}
++ (void)load {
+    cProperties = [NSMutableDictionary new];
+    cIvars = [NSMutableDictionary new];
+    cMethods = [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;
+    mProperties = [NSMutableDictionary new];
+    mMethods = [NSMutableDictionary new];
 }
 
 + (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
@@ -346,43 +325,30 @@ typedef NSMutableDictionary<Class, NSMutableArray<id<FLEXRuntimeMetadata>> *> Re
 }
 
 - (void)_register:(NSArray<id<FLEXRuntimeMetadata>> *)items to:(RegistrationBuckets *)global class:(Class)key {
-    @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;
-        });
+    // 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];
         }
     }
 }
 
-- (void)reset {
-    _append = NO;
-    _prepend = NO;
-    _replace = NO;
-    _notInstance = NO;
-    
-    _properties = nil;
-    _ivars = nil;
-    _methods = nil;
-}
-
 - (FLEXShortcutsFactory *)class {
     return SetIvar(_notInstance);
 }
@@ -439,15 +405,9 @@ typedef NSMutableDictionary<Class, NSMutableArray<id<FLEXRuntimeMetadata>> *> Re
         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) {
@@ -470,8 +430,6 @@ typedef NSMutableDictionary<Class, NSMutableArray<id<FLEXRuntimeMetadata>> *> Re
             }];
             [self _register:items to:ivarBucket class:cls];
         }
-        
-        [self reset];
     };
 }
 

Classes/ObjectExplorers/Sections/Shortcuts/FLEXViewShortcuts.m

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

Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.m

@@ -13,7 +13,6 @@
 #import "FLEXObjectExplorerFactory.h"
 #import "FLEXFieldEditorViewController.h"
 #import "FLEXMethodCallingViewController.h"
-#import "FLEXObjectListViewController.h"
 #import "FLEXTableView.h"
 #import "FLEXUtility.h"
 #import "NSArray+FLEX.h"
@@ -132,37 +131,15 @@ FLEXObjectExplorerDefaultsImpl
 #if FLEX_AT_LEAST_IOS13_SDK
 
 - (NSArray<UIAction *> *)additionalActionsWithTarget:(id)object sender:(UIViewController *)sender __IOS_AVAILABLE(13.0) {
-    BOOL returnsObject = self.attributes.typeEncoding.flex_typeIsObjectOrClass;
-    BOOL targetNotNil = [self appropriateTargetForPropertyType:object] != nil;
+    Class propertyClass = self.attributes.typeEncoding.flex_typeClass;
     
     // "Explore PropertyClass" for properties with a concrete class name
-    if (returnsObject) {
-        NSMutableArray<UIAction *> *actions = [NSMutableArray new];
-        
-        // Action for exploring class of this property
-        Class propertyClass = self.attributes.typeEncoding.flex_typeClass;
-        if (propertyClass) {
-            NSString *title = [NSString stringWithFormat:@"Explore %@", NSStringFromClass(propertyClass)];
-            [actions addObject:[UIAction actionWithTitle:title image:nil identifier:nil handler:^(UIAction *action) {
-                UIViewController *explorer = [FLEXObjectExplorerFactory explorerViewControllerForObject:propertyClass];
-                [sender.navigationController pushViewController:explorer animated:YES];
-            }]];
-        }
-        
-        // Action for exploring references to this object
-        if (targetNotNil) {
-            // Since the property holder is not nil, check if the property value is nil
-            id value = [self currentValueBeforeUnboxingWithTarget:object];
-            if (value) {
-                NSString *title = @"List all references";
-                [actions addObject:[UIAction actionWithTitle:title image:nil identifier:nil handler:^(UIAction *action) {
-                    UIViewController *list = [FLEXObjectListViewController objectsWithReferencesToObject:value];
-                    [sender.navigationController pushViewController:list animated:YES];
-                }]];
-            }
-        }
-        
-        return actions;
+    if (propertyClass) {
+        NSString *title = [NSString stringWithFormat:@"Explore %@", NSStringFromClass(propertyClass)];
+        return @[[UIAction actionWithTitle:title image:nil identifier:nil handler:^(UIAction *action) {
+            UIViewController *explorer = [FLEXObjectExplorerFactory explorerViewControllerForObject:propertyClass];
+            [sender.navigationController pushViewController:explorer animated:YES];
+        }]];
     }
     
     return nil;

Classes/Utility/Categories/NSArray+FLEX.h

@@ -27,12 +27,6 @@
 + (instancetype)flex_forEachUpTo:(NSUInteger)bound map:(T(^)(NSUInteger i))block;
 + (instancetype)flex_mapped:(id<NSFastEnumeration>)collection block:(id(^)(T obj, NSUInteger idx))mapFunc;
 
-- (instancetype)flex_sortedUsingSelector:(SEL)selector;
-
-@end
-
-@interface NSMutableArray<T> (Functional)
-
-- (void)flex_filter:(BOOL(^)(T obj, NSUInteger idx))filterFunc;
+- (instancetype)sortedUsingSelector:(SEL)selector;
 
 @end

Classes/Utility/Categories/NSArray+FLEX.m

@@ -85,6 +85,7 @@
     return array;
 }
 
+
 + (instancetype)flex_mapped:(id<NSFastEnumeration>)collection block:(id(^)(id obj, NSUInteger idx))mapFunc {
     NSMutableArray *array = [NSMutableArray new];
     NSInteger idx = 0;
@@ -103,7 +104,7 @@
     return array;
 }
 
-- (instancetype)flex_sortedUsingSelector:(SEL)selector {
+- (instancetype)sortedUsingSelector:(SEL)selector {
     if (FLEXArrayClassIsMutable(self)) {
         NSMutableArray *me = (id)self;
         [me sortUsingSelector:selector];
@@ -114,20 +115,3 @@
 }
 
 @end
-
-
-@implementation NSMutableArray (Functional)
-
-- (void)flex_filter:(BOOL (^)(id, NSUInteger))keepObject {
-    NSMutableIndexSet *toRemove = [NSMutableIndexSet new];
-    
-    [self enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        if (!keepObject(obj, idx)) {
-            [toRemove addIndex:idx];
-        }
-    }];
-    
-    [self removeObjectsAtIndexes:toRemove];
-}
-
-@end

Classes/Utility/Categories/NSObject+FLEX_Reflection.h

@@ -21,21 +21,21 @@ NS_ASSUME_NONNULL_BEGIN
 /// @return The type encoding string, or \c nil if \e returnType is \c NULL.
 NSString * FLEXTypeEncodingString(const char *returnType, NSUInteger count, ...);
 
-NSArray<Class> * _Nullable FLEXGetAllSubclasses(_Nullable Class cls, BOOL includeSelf);
-NSArray<Class> * _Nullable FLEXGetClassHierarchy(_Nullable Class cls, BOOL includeSelf);
-NSArray<FLEXProtocol *> * _Nullable FLEXGetConformedProtocols(_Nullable Class cls);
+NSArray<Class> *FLEXGetAllSubclasses(_Nullable Class cls, BOOL includeSelf);
+NSArray<Class> *FLEXGetClassHierarchy(_Nullable Class cls, BOOL includeSelf);
+NSArray<FLEXProtocol *> *FLEXGetConformedProtocols(_Nullable Class cls);
 
-NSArray<FLEXIvar *> * _Nullable FLEXGetAllIvars(_Nullable Class cls);
+NSArray<FLEXIvar *> *FLEXGetAllIvars(_Nullable Class cls);
 /// @param cls a class object to get instance properties,
 /// or a metaclass object to get class properties
-NSArray<FLEXProperty *> * _Nullable FLEXGetAllProperties(_Nullable Class cls);
+NSArray<FLEXProperty *> *FLEXGetAllProperties(_Nullable Class cls);
 /// @param cls a class object to get instance methods,
 /// or a metaclass object to get class methods
 /// @param instance used to mark methods as instance methods or not.
 /// Not used to determine whether to get instance or class methods. 
-NSArray<FLEXMethod *> * _Nullable FLEXGetAllMethods(_Nullable Class cls, BOOL instance);
+NSArray<FLEXMethod *> *FLEXGetAllMethods(_Nullable Class cls, BOOL instance);
 /// @param cls a class object to get all instance and class methods.
-NSArray<FLEXMethod *> * _Nullable FLEXGetAllInstanceAndClassMethods(_Nullable Class cls);
+NSArray<FLEXMethod *> *FLEXGetAllInstanceAndClassMethods(_Nullable Class cls);
 
 
 

Classes/Utility/Categories/NSObject+FLEX_Reflection.m

@@ -20,7 +20,7 @@
 
 
 NSString * FLEXTypeEncodingString(const char *returnType, NSUInteger count, ...) {
-    if (!returnType) return nil;
+    if (returnType == NULL) return nil;
     
     NSMutableString *encoding = [NSMutableString new];
     [encoding appendFormat:@"%s%s%s", returnType, @encode(id), @encode(SEL)];
@@ -37,7 +37,9 @@ NSString * FLEXTypeEncodingString(const char *returnType, NSUInteger count, ...)
 }
 
 NSArray<Class> *FLEXGetAllSubclasses(Class cls, BOOL includeSelf) {
-    if (!cls) return nil;
+    if (!cls) {
+        return nil;
+    }
     
     Class *buffer = NULL;
     
@@ -69,7 +71,9 @@ NSArray<Class> *FLEXGetAllSubclasses(Class cls, BOOL includeSelf) {
 }
 
 NSArray<Class> *FLEXGetClassHierarchy(Class cls, BOOL includeSelf) {
-    if (!cls) return nil;
+    if (!cls) {
+        return nil;
+    }
     
     NSMutableArray *classes = [NSMutableArray new];
     if (includeSelf) {
@@ -84,12 +88,13 @@ NSArray<Class> *FLEXGetClassHierarchy(Class cls, BOOL includeSelf) {
 }
 
 NSArray<FLEXProtocol *> *FLEXGetConformedProtocols(Class cls) {
-    if (!cls) return nil;
+    if (!cls) {
+        return nil;
+    }
     
     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];
@@ -241,7 +246,7 @@ NSArray<FLEXMethod *> *FLEXGetAllMethods(_Nullable Class cls, BOOL instance) {
 }
 
 + (NSArray<FLEXMethod *> *)flex_allClassMethods {
-    return FLEXGetAllMethods(self.flex_metaclass, NO) ?: @[];
+    return FLEXGetAllMethods(self.flex_metaclass, NO);
 }
 
 + (FLEXMethod *)flex_methodNamed:(NSString *)name {
@@ -389,7 +394,7 @@ NSArray<FLEXMethod *> *FLEXGetAllMethods(_Nullable Class cls, BOOL instance) {
 }
 
 + (NSArray<FLEXProperty *> *)flex_allClassProperties {
-    return FLEXGetAllProperties(self.flex_metaclass) ?: @[];
+    return FLEXGetAllProperties(self.flex_metaclass);
 }
 
 + (FLEXProperty *)flex_propertyNamed:(NSString *)name {

Classes/Utility/Categories/NSString+FLEX.h

@@ -27,7 +27,7 @@
 
 @interface NSString (KeyPaths)
 
-- (NSString *)flex_stringByRemovingLastKeyPathComponent;
-- (NSString *)flex_stringByReplacingLastKeyPathComponent:(NSString *)replacement;
+- (NSString *)stringByRemovingLastKeyPathComponent;
+- (NSString *)stringByReplacingLastKeyPathComponent:(NSString *)replacement;
 
 @end

Classes/Utility/Categories/NSString+FLEX.m

@@ -128,7 +128,7 @@
 
 @implementation NSString (KeyPaths)
 
-- (NSString *)flex_stringByRemovingLastKeyPathComponent {
+- (NSString *)stringByRemovingLastKeyPathComponent {
     if (![self containsString:@"."]) {
         return @"";
     }
@@ -138,7 +138,7 @@
     return mself;
 }
 
-- (NSString *)flex_stringByReplacingLastKeyPathComponent:(NSString *)replacement {
+- (NSString *)stringByReplacingLastKeyPathComponent:(NSString *)replacement {
     // replacement should not have any escaped '.' in it,
     // so we escape all '.'
     if ([replacement containsString:@"."]) {

Classes/Utility/Categories/NSTimer+FLEX.h

@@ -11,7 +11,7 @@ typedef void (^VoidBlock)(void);
 
 @interface NSTimer (Blocks)
 
-+ (instancetype)flex_fireSecondsFromNow:(NSTimeInterval)delay block:(VoidBlock)block;
++ (instancetype)fireSecondsFromNow:(NSTimeInterval)delay block:(VoidBlock)block;
 
 // Forward declaration
 //+ (NSTimer *)scheduledTimerWithTimeInterval:(NSTimeInterval)interval repeats:(BOOL)repeats block:(void (^)(NSTimer *timer))block;

Classes/Utility/Categories/NSTimer+FLEX.m

@@ -14,7 +14,7 @@
 #pragma clang diagnostic ignored "-Wincomplete-implementation"
 @implementation NSTimer (Blocks)
 
-+ (instancetype)flex_fireSecondsFromNow:(NSTimeInterval)delay block:(VoidBlock)block {
++ (instancetype)fireSecondsFromNow:(NSTimeInterval)delay block:(VoidBlock)block {
     if (@available(iOS 10, *)) {
         return [self scheduledTimerWithTimeInterval:delay repeats:NO block:(id)block];
     } else {

Classes/Utility/Categories/NSUserDefaults+FLEX.h

@@ -13,10 +13,9 @@ extern NSString * const kFLEXDefaultsToolbarTopMarginKey;
 extern NSString * const kFLEXDefaultsiOSPersistentOSLogKey;
 extern NSString * const kFLEXDefaultsHidePropertyIvarsKey;
 extern NSString * const kFLEXDefaultsHidePropertyMethodsKey;
-extern NSString * const kFLEXDefaultsHidePrivateMethodsKey;
-extern NSString * const kFLEXDefaultsShowMethodOverridesKey;
+extern NSString * const kFLEXDefaultsHideMethodOverridesKey;
 extern NSString * const kFLEXDefaultsHideVariablePreviewsKey;
-extern NSString * const kFLEXDefaultsNetworkHostDenylistKey;
+extern NSString * const kFLEXDefaultsNetworkHostBlacklistKey;
 extern NSString * const kFLEXDefaultsDisableOSLogForceASLKey;
 extern NSString * const kFLEXDefaultsRegisterJSONExplorerKey;
 
@@ -28,7 +27,7 @@ extern NSString * const kFLEXDefaultsRegisterJSONExplorerKey;
 @property (nonatomic) double flex_toolbarTopMargin;
 
 // Not actually stored in defaults, but written to a file
-@property (nonatomic) NSArray<NSString *> *flex_networkHostDenylist;
+@property (nonatomic) NSArray<NSString *> *flex_networkHostBlacklist;
 
 /// Whether or not to register the object explorer as a JSON viewer on launch
 @property (nonatomic) BOOL flex_registerDictionaryJSONViewerOnLaunch;
@@ -39,7 +38,6 @@ extern NSString * const kFLEXDefaultsRegisterJSONExplorerKey;
 
 @property (nonatomic) BOOL flex_explorerHidesPropertyIvars;
 @property (nonatomic) BOOL flex_explorerHidesPropertyMethods;
-@property (nonatomic) BOOL flex_explorerHidesPrivateMethods;
 @property (nonatomic) BOOL flex_explorerShowsMethodOverrides;
 @property (nonatomic) BOOL flex_explorerHidesVariablePreviews;
 

Classes/Utility/Categories/NSUserDefaults+FLEX.m

@@ -12,10 +12,9 @@ NSString * const kFLEXDefaultsToolbarTopMarginKey = @"com.flex.FLEXToolbar.topMa
 NSString * const kFLEXDefaultsiOSPersistentOSLogKey = @"com.flipborad.flex.enable_persistent_os_log";
 NSString * const kFLEXDefaultsHidePropertyIvarsKey = @"com.flipboard.FLEX.hide_property_ivars";
 NSString * const kFLEXDefaultsHidePropertyMethodsKey = @"com.flipboard.FLEX.hide_property_methods";
-NSString * const kFLEXDefaultsHidePrivateMethodsKey = @"com.flipboard.FLEX.hide_private_or_namespaced_methods";
-NSString * const kFLEXDefaultsShowMethodOverridesKey = @"com.flipboard.FLEX.show_method_overrides";
+NSString * const kFLEXDefaultsHideMethodOverridesKey = @"com.flipboard.FLEX.hide_method_overrides";
 NSString * const kFLEXDefaultsHideVariablePreviewsKey = @"com.flipboard.FLEX.hide_variable_previews";
-NSString * const kFLEXDefaultsNetworkHostDenylistKey = @"com.flipboard.FLEX.network_host_denylist";
+NSString * const kFLEXDefaultsNetworkHostBlacklistKey = @"com.flipboard.FLEX.network_host_blacklist";
 NSString * const kFLEXDefaultsDisableOSLogForceASLKey = @"com.flipboard.FLEX.try_disable_os_log";
 NSString * const kFLEXDefaultsRegisterJSONExplorerKey = @"com.flipboard.FLEX.view_json_as_object";
 
@@ -62,16 +61,16 @@ NSString * const kFLEXDefaultsRegisterJSONExplorerKey = @"com.flipboard.FLEX.vie
     [self setDouble:margin forKey:kFLEXDefaultsToolbarTopMarginKey];
 }
 
-- (NSArray<NSString *> *)flex_networkHostDenylist {
+- (NSArray<NSString *> *)flex_networkHostBlacklist {
     return [NSArray arrayWithContentsOfFile:[
-        self flex_defaultsPathForFile:kFLEXDefaultsNetworkHostDenylistKey
+        self flex_defaultsPathForFile:kFLEXDefaultsNetworkHostBlacklistKey
     ]] ?: @[];
 }
 
-- (void)setFlex_networkHostDenylist:(NSArray<NSString *> *)denylist {
-    NSParameterAssert(denylist);
-    [denylist writeToFile:[
-        self flex_defaultsPathForFile:kFLEXDefaultsNetworkHostDenylistKey
+- (void)setFlex_networkHostBlacklist:(NSArray<NSString *> *)blacklist {
+    NSParameterAssert(blacklist);
+    [blacklist writeToFile:[
+        self flex_defaultsPathForFile:kFLEXDefaultsNetworkHostBlacklistKey
     ] atomically:YES];
 }
 
@@ -131,26 +130,14 @@ NSString * const kFLEXDefaultsRegisterJSONExplorerKey = @"com.flipboard.FLEX.vie
     ];
 }
 
-- (BOOL)flex_explorerHidesPrivateMethods {
-    return [self boolForKey:kFLEXDefaultsHidePrivateMethodsKey];
-}
-
-- (void)setFlex_explorerHidesPrivateMethods:(BOOL)show {
-    [self setBool:show forKey:kFLEXDefaultsHidePrivateMethodsKey];
-    [NSNotificationCenter.defaultCenter
-     postNotificationName:kFLEXDefaultsHidePrivateMethodsKey
-        object:nil
-    ];
-}
-
 - (BOOL)flex_explorerShowsMethodOverrides {
-    return [self boolForKey:kFLEXDefaultsShowMethodOverridesKey];
+    return [self boolForKey:kFLEXDefaultsHideMethodOverridesKey];
 }
 
 - (void)setFlex_explorerShowsMethodOverrides:(BOOL)show {
-    [self setBool:show forKey:kFLEXDefaultsShowMethodOverridesKey];
+    [self setBool:show forKey:kFLEXDefaultsHideMethodOverridesKey];
     [NSNotificationCenter.defaultCenter
-     postNotificationName:kFLEXDefaultsShowMethodOverridesKey
+        postNotificationName:kFLEXDefaultsHideMethodOverridesKey
         object:nil
     ];
 }

Classes/Utility/Categories/Private/Cocoa+FLEXShortcuts.h

@@ -1,13 +0,0 @@
-//
-//  Cocoa+FLEXShortcuts.h
-//  Pods
-//
-//  Created by Tanner on 2/24/21.
-//  
-//
-
-#import <UIKit/UIKit.h>
-
-@interface UIAlertAction (FLEXShortcuts)
-@property (nonatomic, readonly) NSString *flex_styleName;
-@end

Classes/Utility/Categories/Private/Cocoa+FLEXShortcuts.m

@@ -1,25 +0,0 @@
-//
-//  Cocoa+FLEXShortcuts.m
-//  Pods
-//
-//  Created by Tanner on 2/24/21.
-//  
-//
-
-#import "Cocoa+FLEXShortcuts.h"
-
-@implementation UIAlertAction (FLEXShortcuts)
-- (NSString *)flex_styleName {
-    switch (self.style) {
-        case UIAlertActionStyleDefault:
-            return @"Default style";
-        case UIAlertActionStyleCancel:
-            return @"Cancel style";
-        case UIAlertActionStyleDestructive:
-            return @"Destructive style";
-            
-        default:
-            return [NSString stringWithFormat:@"Unknown (%@)", @(self.style)];
-    }
-}
-@end

Classes/Utility/Categories/Private/UIView+FLEX_Layout.h

@@ -1,23 +0,0 @@
-//
-//  UIView+FLEX_Layout.h
-//  FLEX
-//
-//  Created by Tanner Bennett on 7/18/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#define Padding(p) UIEdgeInsetsMake(p, p, p, p)
-
-@interface UIView (FLEX_Layout)
-
-- (void)flex_centerInView:(UIView *)view;
-- (void)flex_pinEdgesTo:(UIView *)view;
-- (void)flex_pinEdgesTo:(UIView *)view withInsets:(UIEdgeInsets)insets;
-- (void)flex_pinEdgesToSuperview;
-- (void)flex_pinEdgesToSuperviewWithInsets:(UIEdgeInsets)insets;
-- (void)flex_pinEdgesToSuperviewWithInsets:(UIEdgeInsets)insets aboveView:(UIView *)sibling;
-- (void)flex_pinEdgesToSuperviewWithInsets:(UIEdgeInsets)insets belowView:(UIView *)sibling;
-
-@end

Classes/Utility/Categories/UIBarButtonItem+FLEX.m

@@ -64,7 +64,7 @@
     return item;
 }
 
-- (UIBarButtonItem *)flex_withTintColor:(UIColor *)tint {
+- (UIBarButtonItem *)withTintColor:(UIColor *)tint {
     self.tintColor = tint;
     return self;
 }

Classes/Utility/Categories/UIGestureRecognizer+Blocks.h

@@ -13,9 +13,9 @@ typedef void (^GestureBlock)(UIGestureRecognizer *gesture);
 
 @interface UIGestureRecognizer (Blocks)
 
-+ (instancetype)flex_action:(GestureBlock)action;
++ (instancetype)action:(GestureBlock)action;
 
-@property (nonatomic, setter=flex_setAction:) GestureBlock flex_action;
+@property (nonatomic) GestureBlock action;
 
 @end
 

Classes/Utility/Categories/UIGestureRecognizer+Blocks.m

@@ -14,22 +14,22 @@
 
 static void * actionKey;
 
-+ (instancetype)flex_action:(GestureBlock)action {
++ (instancetype)action:(GestureBlock)action {
     UIGestureRecognizer *gesture = [[self alloc] initWithTarget:nil action:nil];
     [gesture addTarget:gesture action:@selector(flex_invoke)];
-    gesture.flex_action = action;
+    gesture.action = action;
     return gesture;
 }
 
 - (void)flex_invoke {
-    self.flex_action(self);
+    self.action(self);
 }
 
-- (GestureBlock)flex_action {
+- (GestureBlock)action {
     return objc_getAssociatedObject(self, &actionKey);
 }
 
-- (void)flex_setAction:(GestureBlock)action {
+- (void)setAction:(GestureBlock)action {
     objc_setAssociatedObject(self, &actionKey, action, OBJC_ASSOCIATION_COPY);
 }
 

Classes/Utility/Categories/UIPasteboard+FLEX.m

@@ -11,21 +11,16 @@
 @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/Categories/UITextField+Range.h

@@ -9,6 +9,6 @@
 
 @interface UITextField (Range)
 
-@property (nonatomic, readonly) NSRange flex_selectedRange;
+@property (nonatomic, readonly) NSRange selectedRange;
 
 @end

Classes/Utility/Categories/UITextField+Range.m

@@ -9,7 +9,7 @@
 
 @implementation UITextField (Range)
 
-- (NSRange)flex_selectedRange {
+- (NSRange)selectedRange {
     UITextRange *r = self.selectedTextRange;
     if (r) {
         NSInteger loc = [self offsetFromPosition:self.beginningOfDocument toPosition:r.start];

Classes/Utility/Categories/UIView+FLEX_Layout.h

@@ -0,0 +1,23 @@
+//
+//  UIView+FLEX_Layout.h
+//  FLEX
+//
+//  Created by Tanner Bennett on 7/18/19.
+//  Copyright © 2020 FLEX Team. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#define Padding(p) UIEdgeInsetsMake(p, p, p, p)
+
+@interface UIView (FLEX_Layout)
+
+- (void)centerInView:(UIView *)view;
+- (void)pinEdgesTo:(UIView *)view;
+- (void)pinEdgesTo:(UIView *)view withInsets:(UIEdgeInsets)insets;
+- (void)pinEdgesToSuperview;
+- (void)pinEdgesToSuperviewWithInsets:(UIEdgeInsets)insets;
+- (void)pinEdgesToSuperviewWithInsets:(UIEdgeInsets)insets aboveView:(UIView *)sibling;
+- (void)pinEdgesToSuperviewWithInsets:(UIEdgeInsets)insets belowView:(UIView *)sibling;
+
+@end

Classes/Utility/Categories/UIView+FLEX_Layout.m

@@ -10,14 +10,14 @@
 
 @implementation UIView (FLEX_Layout)
 
-- (void)flex_centerInView:(UIView *)view {
+- (void)centerInView:(UIView *)view {
     [NSLayoutConstraint activateConstraints:@[
         [self.centerXAnchor constraintEqualToAnchor:view.centerXAnchor],
         [self.centerYAnchor constraintEqualToAnchor:view.centerYAnchor],
     ]];
 }
 
-- (void)flex_pinEdgesTo:(UIView *)view {
+- (void)pinEdgesTo:(UIView *)view {
    [NSLayoutConstraint activateConstraints:@[
        [self.topAnchor constraintEqualToAnchor:view.topAnchor],
        [self.leftAnchor constraintEqualToAnchor:view.leftAnchor],
@@ -26,7 +26,7 @@
    ]]; 
 }
 
-- (void)flex_pinEdgesTo:(UIView *)view withInsets:(UIEdgeInsets)i {
+- (void)pinEdgesTo:(UIView *)view withInsets:(UIEdgeInsets)i {
     [NSLayoutConstraint activateConstraints:@[
         [self.topAnchor constraintEqualToAnchor:view.topAnchor constant:i.top],
         [self.leftAnchor constraintEqualToAnchor:view.leftAnchor constant:i.left],
@@ -35,15 +35,15 @@
     ]];
 }
 
-- (void)flex_pinEdgesToSuperview {
-    [self flex_pinEdgesTo:self.superview];
+- (void)pinEdgesToSuperview {
+    [self pinEdgesTo:self.superview];
 }
 
-- (void)flex_pinEdgesToSuperviewWithInsets:(UIEdgeInsets)insets {
-    [self flex_pinEdgesTo:self.superview withInsets:insets];
+- (void)pinEdgesToSuperviewWithInsets:(UIEdgeInsets)insets {
+    [self pinEdgesTo:self.superview withInsets:insets];
 }
 
-- (void)flex_pinEdgesToSuperviewWithInsets:(UIEdgeInsets)i aboveView:(UIView *)sibling {
+- (void)pinEdgesToSuperviewWithInsets:(UIEdgeInsets)i aboveView:(UIView *)sibling {
     UIView *view = self.superview;
     [NSLayoutConstraint activateConstraints:@[
         [self.topAnchor constraintEqualToAnchor:view.topAnchor constant:i.top],
@@ -53,7 +53,7 @@
     ]];
 }
 
-- (void)flex_pinEdgesToSuperviewWithInsets:(UIEdgeInsets)i belowView:(UIView *)sibling {
+- (void)pinEdgesToSuperviewWithInsets:(UIEdgeInsets)i belowView:(UIView *)sibling {
     UIView *view = self.superview;
     [NSLayoutConstraint activateConstraints:@[
         [self.topAnchor constraintEqualToAnchor:sibling.bottomAnchor constant:i.top],

Classes/Utility/FLEXAlert.m

@@ -7,7 +7,6 @@
 //
 
 #import "FLEXAlert.h"
-#import "FLEXMacros.h"
 
 @interface FLEXAlert ()
 @property (nonatomic, readonly) UIAlertController *_controller;
@@ -204,9 +203,10 @@ NSAssert(!self._action, @"Cannot mutate action after retreiving underlying UIAle
         FLEXAlertActionMutationAssertion();
 
         // Get weak reference to the alert to avoid block <--> alert retain cycle
-        UIAlertController *controller = self._controller; weakify(controller)
-        self._handler = ^(UIAlertAction *action) { strongify(controller)
+        __weak __typeof(self._controller) weakController = self._controller;
+        self._handler = ^(UIAlertAction *action) {
             // Strongify that reference and pass the text field strings to the handler
+            __strong __typeof(weakController) controller = weakController;
             NSArray *strings = [controller.textFields valueForKeyPath:@"text"];
             handler(strings);
         };

Classes/Utility/FLEXMacros.h

@@ -13,19 +13,11 @@
 #define ctor flex_keywordify __attribute__((constructor)) void __flex_ctor_##__LINE__()
 #define dtor flex_keywordify __attribute__((destructor)) void __flex_dtor_##__LINE__()
 
-#define weakify(var) __weak __typeof(var) __weak__##var = var;
-
-#define strongify(var) \
-_Pragma("clang diagnostic push") \
-_Pragma("clang diagnostic ignored \"-Wshadow\"") \
-__strong typeof(var) var = __weak__##var; \
-_Pragma("clang diagnostic pop")
-
 // A macro to check if we are running in a test environment
 #define FLEX_IS_TESTING() (NSClassFromString(@"XCTest") != nil)
 
 /// Whether we want the majority of constructors to run upon load or not.
-extern BOOL FLEXConstructorsShouldRun(void);
+extern BOOL FLEXConstructorsShouldRun();
 
 /// A macro to return from the current procedure if we don't want to run constructors
 #define FLEX_EXIT_IF_NO_CTORS() if (!FLEXConstructorsShouldRun()) return;

Classes/Utility/FLEXResources.h

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

Classes/Utility/FLEXResources.m

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

Classes/Utility/FLEXUtility.h

@@ -15,6 +15,7 @@
 #import "FLEXAlert.h"
 #import "NSArray+FLEX.h"
 #import "UIFont+FLEX.h"
+#import "NSMapTable+FLEX_Subscripting.h"
 #import "FLEXMacros.h"
 
 #if !FLEX_AT_LEAST_IOS13_SDK

Classes/Utility/FLEXUtility.m

@@ -15,21 +15,17 @@
 #import <zlib.h>
 
 BOOL FLEXConstructorsShouldRun() {
-    #if FLEX_DISABLE_CTORS
-        return NO;
-    #else
-        static BOOL _FLEXConstructorsShouldRun_storage = YES;
-        
-        static dispatch_once_t onceToken;
-        dispatch_once(&onceToken, ^{
-            NSString *key = @"FLEX_SKIP_INIT";
-            if (getenv(key.UTF8String) || [NSUserDefaults.standardUserDefaults boolForKey:key]) {
-                _FLEXConstructorsShouldRun_storage = NO;
-            }
-        });
-        
-        return _FLEXConstructorsShouldRun_storage;
-    #endif
+    static BOOL _FLEXConstructorsShouldRun_storage = YES;
+    
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        NSString *key = @"FLEX_SKIP_INIT";
+        if (getenv(key.UTF8String) || [NSUserDefaults.standardUserDefaults boolForKey:key]) {
+            _FLEXConstructorsShouldRun_storage = NO;
+        }
+    });
+    
+    return _FLEXConstructorsShouldRun_storage;
 }
 
 @implementation FLEXUtility
@@ -135,7 +131,7 @@ BOOL FLEXConstructorsShouldRun() {
 
 + (UIImage *)previewImageForView:(UIView *)view {
     if (CGRectIsEmpty(view.bounds)) {
-        return [UIImage new];
+        return nil;
     }
     
     CGSize viewSize = view.bounds.size;
@@ -359,18 +355,14 @@ BOOL FLEXConstructorsShouldRun() {
     
     id jsonObject = [NSJSONSerialization JSONObjectWithData:data options:0 error:NULL];
     if ([NSJSONSerialization isValidJSONObject:jsonObject]) {
-        // Thanks RaziPour1993
-        prettyString = [[NSString alloc]
-            initWithData:[NSJSONSerialization
-                dataWithJSONObject:jsonObject options:NSJSONWritingPrettyPrinted error:NULL
-            ]
-            encoding:NSUTF8StringEncoding
-        ];
+        prettyString = [NSString stringWithCString:[NSJSONSerialization
+            dataWithJSONObject:jsonObject options:NSJSONWritingPrettyPrinted error:NULL
+        ].bytes encoding:NSUTF8StringEncoding];
         // NSJSONSerialization escapes forward slashes.
         // We want pretty json, so run through and unescape the slashes.
         prettyString = [prettyString stringByReplacingOccurrencesOfString:@"\\/" withString:@"/"];
     } else {
-        prettyString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+        prettyString = [NSString stringWithCString:data.bytes encoding:NSUTF8StringEncoding];
     }
     
     return prettyString;

Classes/Utility/Runtime/FLEXRuntimeUtility.h

@@ -34,15 +34,6 @@
 #define FLEXRuntimeUtilityTryAddObjectProperty(iOS_atLeast, name, cls, type, ...) \
     FLEXRuntimeUtilityTryAddProperty(iOS_atLeast, name, cls, FLEXEncodeClass(type), PropertyKey(NonAtomic), __VA_ARGS__);
 
-extern NSString * const FLEXRuntimeUtilityErrorDomain;
-
-typedef NS_ENUM(NSInteger, FLEXRuntimeUtilityErrorCode) {
-    // Start at a random value instead of 0 to avoid confusion with an absent code
-    FLEXRuntimeUtilityErrorCodeDoesNotRecognizeSelector = 0xbabe,
-    FLEXRuntimeUtilityErrorCodeInvocationFailed,
-    FLEXRuntimeUtilityErrorCodeArgumentTypeMismatch
-};
-
 @interface FLEXRuntimeUtility : NSObject
 
 // General Helpers
@@ -62,7 +53,6 @@ typedef NS_ENUM(NSInteger, FLEXRuntimeUtilityErrorCode) {
 
 /// Used to describe an object in brief within an explorer row
 + (NSString *)summaryForObject:(id)value;
-+ (NSString *)safeClassNameForObject:(id)object;
 + (NSString *)safeDescriptionForObject:(id)object;
 + (NSString *)safeDebugDescriptionForObject:(id)object;
 
@@ -84,12 +74,6 @@ typedef NS_ENUM(NSInteger, FLEXRuntimeUtilityErrorCode) {
              onObject:(id)object
         withArguments:(NSArray *)arguments
                 error:(NSError * __autoreleasing *)error;
-+ (id)performSelector:(SEL)selector
-             onObject:(id)object
-        withArguments:(NSArray *)arguments
-      allowForwarding:(BOOL)mightForwardMsgSend
-                error:(NSError * __autoreleasing *)error;
-
 + (NSString *)editableJSONStringForObject:(id)object;
 + (id)objectValueFromEditableJSONString:(NSString *)string;
 + (NSValue *)valueForNumberWithObjCType:(const char *)typeEncoding fromInputString:(NSString *)inputString;

Classes/Utility/Runtime/FLEXRuntimeUtility.m

@@ -11,7 +11,12 @@
 #import "FLEXObjcInternal.h"
 #import "FLEXTypeEncodingParser.h"
 
-NSString * const FLEXRuntimeUtilityErrorDomain = @"FLEXRuntimeUtilityErrorDomain";
+static NSString *const FLEXRuntimeUtilityErrorDomain = @"FLEXRuntimeUtilityErrorDomain";
+typedef NS_ENUM(NSInteger, FLEXRuntimeUtilityErrorCode) {
+    FLEXRuntimeUtilityErrorCodeDoesNotRecognizeSelector = 0,
+    FLEXRuntimeUtilityErrorCodeInvocationFailed = 1,
+    FLEXRuntimeUtilityErrorCodeArgumentTypeMismatch = 2
+};
 
 @implementation FLEXRuntimeUtility
 
@@ -91,24 +96,12 @@ NSString * const FLEXRuntimeUtilityErrorDomain = @"FLEXRuntimeUtilityErrorDomain
     return superClasses;
 }
 
-+ (NSString *)safeClassNameForObject:(id)object {
-    // Don't assume that we have an NSObject subclass
-    if ([self safeObject:object respondsToSelector:@selector(class)]) {
-        return NSStringFromClass([object class]);
-    }
-
-    return NSStringFromClass(object_getClass(object));
-}
-
 /// Could be nil
 + (NSString *)safeDescriptionForObject:(id)object {
-    // Don't assume that we have an NSObject subclass; not all objects respond to -description
+    // Don't assume that we have an NSObject subclass.
+    // Check to make sure the object responds to the description method
     if ([self safeObject:object respondsToSelector:@selector(description)]) {
-        @try {
-            return [object description];
-        } @catch (NSException *exception) {
-            return nil;
-        }
+        return [object description];
     }
 
     return nil;
@@ -118,10 +111,10 @@ NSString * const FLEXRuntimeUtilityErrorDomain = @"FLEXRuntimeUtilityErrorDomain
 + (NSString *)safeDebugDescriptionForObject:(id)object {
     NSString *description = nil;
 
+    // Don't assume that we have an NSObject subclass.
+    // Check to make sure the object responds to the description method
     if ([self safeObject:object respondsToSelector:@selector(debugDescription)]) {
-        @try {
-            description = [object debugDescription];
-        } @catch (NSException *exception) { }
+        description = [object debugDescription];
     } else {
         description = [self safeDescriptionForObject:object];
     }
@@ -184,18 +177,18 @@ NSString * const FLEXRuntimeUtilityErrorDomain = @"FLEXRuntimeUtilityErrorDomain
 }
 
 + (BOOL)safeObject:(id)object respondsToSelector:(SEL)sel {
-    // If we're given a class, we want to know if classes respond to this selector.
-    // Similarly, if we're given an instance, we want to know if instances respond. 
-    BOOL isClass = object_isClass(object);
-    Class cls = isClass ? object : object_getClass(object);
-    // BOOL isMetaclass = class_isMetaClass(cls);
+    static BOOL (*respondsToSelector)(id, SEL, SEL) = nil;
+    static BOOL (*respondsToSelector_meta)(id, SEL, SEL) = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        respondsToSelector = (BOOL(*)(id, SEL, SEL))[NSObject instanceMethodForSelector:@selector(respondsToSelector:)];
+        respondsToSelector_meta = (BOOL(*)(id, SEL, SEL))[NSObject methodForSelector:@selector(respondsToSelector:)];
+    });
     
-    if (isClass) {
-        // In theory, this should also work for metaclasses...
-        return class_getClassMethod(cls, sel) != nil;
-    } else {
-        return class_getInstanceMethod(cls, sel) != nil;
-    }
+    BOOL isClass = object_isClass(object);
+    return (isClass ? respondsToSelector_meta : respondsToSelector)(
+        object, @selector(respondsToSelector:), sel
+    );
 }
 
 
@@ -295,31 +288,18 @@ NSString * const FLEXRuntimeUtilityErrorDomain = @"FLEXRuntimeUtilityErrorDomain
              onObject:(id)object
         withArguments:(NSArray *)arguments
                 error:(NSError * __autoreleasing *)error {
-    return [self performSelector:selector
-        onObject:object
-        withArguments:arguments
-        allowForwarding:NO
-        error:error
-    ];
-}
-
-+ (id)performSelector:(SEL)selector
-             onObject:(id)object
-        withArguments:(NSArray *)arguments
-      allowForwarding:(BOOL)mightForwardMsgSend
-                error:(NSError * __autoreleasing *)error {
     static dispatch_once_t onceToken;
     static SEL stdStringExclusion = nil;
     dispatch_once(&onceToken, ^{
         stdStringExclusion = NSSelectorFromString(@"stdString");
     });
 
-    // Bail if the object won't respond to this selector
-    if (mightForwardMsgSend || ![self safeObject:object respondsToSelector:selector]) {
+    // Bail if the object won't respond to this selector.
+    if (![self safeObject:object respondsToSelector:selector]) {
         if (error) {
             NSString *msg = [NSString
-                stringWithFormat:@"This object does not respond to the selector %@",
-                NSStringFromSelector(selector)
+                stringWithFormat:@"%@ does not respond to the selector %@",
+                object, NSStringFromSelector(selector)
             ];
             NSDictionary<NSString *, id> *userInfo = @{ NSLocalizedDescriptionKey : msg };
             *error = [NSError

Classes/Utility/Runtime/Objc/Reflection/FLEXProperty.h

@@ -51,10 +51,6 @@
 @property (nonatomic, readonly) NSString *likelyGetterString;
 /// Not valid unless initialized with the owning class.
 @property (nonatomic, readonly) BOOL likelyGetterExists;
-/// Always \c nil for class properties.
-@property (nonatomic, readonly) NSString *likelyIvarName;
-/// Not valid unless initialized with the owning class.
-@property (nonatomic, readonly) BOOL likelyIvarExists;
 
 /// Whether there are certainly multiple definitions of this property,
 /// such as in categories in other binary images or something.

Classes/Utility/Runtime/Objc/Reflection/FLEXProperty.m

@@ -124,10 +124,6 @@
     _likelySetterString = NSStringFromSelector(_likelySetter);
 
     _isClassProperty = _cls ? class_isMetaClass(_cls) : NO;
-    
-    _likelyIvarName = _isClassProperty ? nil : (
-        self.attributes.backingIvar ?: [@"_" stringByAppendingString:_name]
-    );
 }
 
 #pragma mark Overrides
@@ -191,14 +187,6 @@
     return _imageName;
 }
 
-- (BOOL)likelyIvarExists {
-    if (_likelyIvarName && _cls) {
-        return class_getInstanceVariable(_cls, _likelyIvarName.UTF8String) != nil;
-    }
-    
-    return NO;
-}
-
 - (NSString *)fullDescription {
     NSMutableArray<NSString *> *attributesStrings = [NSMutableArray new];
     FLEXPropertyAttributes *attributes = self.attributes;

Classes/ViewHierarchy/FLEXImagePreviewViewController.m

@@ -15,9 +15,6 @@
 @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 -
@@ -34,19 +31,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;
 }
 
@@ -56,10 +53,12 @@
 - (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.backgroundColors.firstObject;
+    self.scrollView.backgroundColor = self.view.backgroundColor;
     self.scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     [self.scrollView addSubview:self.imageView];
     self.scrollView.contentSize = self.imageView.frame.size;
@@ -67,14 +66,7 @@
     self.scrollView.maximumZoomScale = 2.0;
     [self.view addSubview:self.scrollView];
     
-    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:)
-    ];
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(actionButtonPressed:)];
 }
 
 - (void)viewDidLayoutSubviews {
@@ -107,12 +99,6 @@
     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;

Classes/ViewHierarchy/TreeExplorer/FLEXHierarchyTableViewController.m

@@ -8,7 +8,6 @@
 
 #import "FLEXColor.h"
 #import "FLEXHierarchyTableViewController.h"
-#import "NSMapTable+FLEX_Subscripting.h"
 #import "FLEXUtility.h"
 #import "FLEXHierarchyTableViewCell.h"
 #import "FLEXObjectExplorerViewController.h"

Example/FLEXample.xcodeproj/project.pbxproj

@@ -23,7 +23,6 @@
 		C386D70C241AA67800699085 /* Owner.m in Sources */ = {isa = PBXBuildFile; fileRef = C386D70A241AA67800699085 /* Owner.m */; };
 		C3A67856241AB8AD005A4681 /* MiscNetworkRequests.m in Sources */ = {isa = PBXBuildFile; fileRef = C3A67855241AB8AD005A4681 /* MiscNetworkRequests.m */; };
 		C3A67858241ADDF7005A4681 /* Commit.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3A67857241ADDF7005A4681 /* Commit.swift */; };
-		C3B3760025B8CDA300AD43AB /* Person.m in Sources */ = {isa = PBXBuildFile; fileRef = C3B375FF25B8CDA300AD43AB /* Person.m */; };
 		E211705F801A8167D308F94A /* libPods-FLEXample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BBD699DDBAC5A16D8CFD39AC /* libPods-FLEXample.a */; };
 /* End PBXBuildFile section */
 
@@ -55,8 +54,6 @@
 		C3A67854241AB8AD005A4681 /* MiscNetworkRequests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MiscNetworkRequests.h; sourceTree = "<group>"; };
 		C3A67855241AB8AD005A4681 /* MiscNetworkRequests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MiscNetworkRequests.m; sourceTree = "<group>"; };
 		C3A67857241ADDF7005A4681 /* Commit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Commit.swift; sourceTree = "<group>"; };
-		C3B375FE25B8CDA300AD43AB /* Person.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Person.h; sourceTree = "<group>"; };
-		C3B375FF25B8CDA300AD43AB /* Person.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Person.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -141,8 +138,6 @@
 		C3A67852241AB86D005A4681 /* App */ = {
 			isa = PBXGroup;
 			children = (
-				C3B375FE25B8CDA300AD43AB /* Person.h */,
-				C3B375FF25B8CDA300AD43AB /* Person.m */,
 				C3A67857241ADDF7005A4681 /* Commit.swift */,
 				C386D6E42419984700699085 /* CommitListViewController.h */,
 				C386D6E52419984700699085 /* CommitListViewController.m */,
@@ -284,7 +279,6 @@
 			files = (
 				C3A67858241ADDF7005A4681 /* Commit.swift in Sources */,
 				C386D6D02419975A00699085 /* AppDelegate.swift in Sources */,
-				C3B3760025B8CDA300AD43AB /* Person.m in Sources */,
 				C386D6E62419984700699085 /* CommitListViewController.m in Sources */,
 				C386D70B241AA67800699085 /* Dog.m in Sources */,
 				C3A67856241AB8AD005A4681 /* MiscNetworkRequests.m in Sources */,

Example/FLEXample/App/CommitListViewController.m

@@ -8,7 +8,6 @@
 
 #import "CommitListViewController.h"
 #import "FLEXample-Swift.h"
-#import "Person.h"
 #import <FLEX.h>
 
 @interface CommitListViewController ()
@@ -47,18 +46,6 @@
             ];
         }
     }];
-    
-    FLEXManager *flex = FLEXManager.sharedManager;
-    
-    // Register 't' for testing: quickly present an object explorer for debugging
-    [flex registerSimulatorShortcutWithKey:@"t" modifiers:0 action:^{
-        [flex showExplorer];
-        [flex presentTool:^UINavigationController *{
-            return [FLEXNavigationController withRootViewController:[FLEXObjectExplorerFactory
-                explorerViewControllerForObject:Person.bob
-            ]];
-        } completion:nil];
-    } description:@"Present an object explorer for debugging"];
 }
 
 - (void)viewWillAppear:(BOOL)animated {

Example/FLEXample/App/Person.h

@@ -1,26 +0,0 @@
-//
-//  Person.h
-//  UICatalog
-//
-//  Created by Tanner on 4/17/19.
-//  Copyright © 2019 . All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface Person : NSObject <NSCoding>
-
-+ (instancetype)bob;
-
-@property (nonatomic, readonly) NSString *name;
-@property (nonatomic, readonly) NSInteger age;
-@property (nonatomic, readonly) CGFloat height;
-@property (nonatomic, readonly) NSNumber *numberOfKids;
-
-@property (nonatomic) NSDecimalNumber *netWorth;
-
-@end
-
-NS_ASSUME_NONNULL_END

Example/FLEXample/App/Person.m

@@ -1,63 +0,0 @@
-//
-//  Person.m
-//  UICatalog
-//
-//  Created by Tanner on 4/17/19.
-//  Copyright © 2019 f. All rights reserved.
-//
-
-#import "Person.h"
-
-@implementation Person
-
-+ (id)bob {
-    Person *bob = [Person new];
-    bob->_name = @"Bob";
-    bob->_age = 50;
-    bob->_height = 5.8;
-    bob->_numberOfKids = @3;
-    bob->_netWorth = [NSDecimalNumber decimalNumberWithString:@"12345.67"];
-    return bob;
-}
-
-- (void)encodeWithCoder:(nonnull NSCoder *)coder {
-    [coder encodeObject:self.name forKey:@"name"];
-    [coder encodeInteger:self.age forKey:@"age"];
-    [coder encodeDouble:self.height forKey:@"height"];
-    [coder encodeObject:self.numberOfKids forKey:@"numberOfKids"];
-    [coder encodeObject:self.netWorth forKey:@"netWorth"];
-}
-
-- (nullable instancetype)initWithCoder:(nonnull NSCoder *)coder {
-    self->_name = [coder decodeObjectForKey:@"name"];
-    self->_age = [coder decodeIntegerForKey:@"age"];
-    self->_height = [coder decodeDoubleForKey:@"height"];
-    self->_numberOfKids = [coder decodeObjectForKey:@"numberOfKids"];
-    self->_netWorth = [coder decodeObjectForKey:@"netWorth"];
-    return self;
-}
-
-- (void)setNetWorth:(NSDecimalNumber *)netWorth {
-    _netWorth = netWorth;
-}
-
-- (NSUInteger)hash {
-    return self.name.hash ^ @(self.age).hash ^ self.numberOfKids.hash ^ self.netWorth.hash;
-}
-
-- (BOOL)isEqual:(id)object {
-    if ([object isKindOfClass:[Person class]])
-        return [self isEqualToPerson:object];
-
-    return [super isEqual:object];
-}
-
-- (BOOL)isEqualToPerson:(Person *)person {
-    return [self.name isEqualToString:person.name];
-}
-
-+ (NSInteger)version {
-    return 2;
-}
-
-@end

Example/FLEXample/AppDelegate.swift

@@ -12,15 +12,6 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var repeatingLogExampleTimer: Timer!
     var window: UIWindow?
-    
-    @available(iOS 13.0, *)
-    func application(_ application: UIApplication,
-                     configurationForConnecting session: UISceneSession,
-                     options: UIScene.ConnectionOptions) -> UISceneConfiguration {
-        // Called when a new scene session is being created.
-        // Use this method to select a configuration to create the new scene with.
-        return UISceneConfiguration(name: nil, sessionRole: session.role)
-    }
 
     func application(_ application: UIApplication,
         didFinishLaunchingWithOptions options: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
@@ -30,53 +21,48 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         UserDefaults.standard.set("foo", forKey: "FLEXamplePrefFoo")
         
         // To show off the system log viewer, send 10 example log messages at 3 second intervals
-        self.repeatingLogExampleTimer = Timer.scheduledTimer(withTimeInterval: 3, repeats: true) { [weak self] (_) in
-            if let self = self {
-                NSLog("Example log \(self.exampleLogSent)")
-        
-                self.exampleLogSent += 1
-                if self.exampleLogSent > self.exampleLogLimit {
-                    self.repeatingLogExampleTimer.invalidate()
-                }
-            }
-        }
+        self.repeatingLogExampleTimer = Timer(
+            timeInterval: 3, target: self,
+            selector: #selector(sendExampleLogMessage),
+            userInfo: nil, repeats: true
+        )
         
         // To show off the network logger, send several misc network requests
         MiscNetworkRequests.sendExampleRequests()
         
-        // For testing unarchiving of objects
-        self.archiveBob()
-        
         // For < iOS 13, set up the window here
-        self.setupWindow()
+        if ProcessInfo.processInfo.operatingSystemVersion.majorVersion < 13 {
+            let window = UIWindow(frame: UIScreen.main.bounds)
+            window.rootViewController = FLEXNavigationController(
+                rootViewController: CommitListViewController()
+            )
+            self.window = window
+            window.makeKeyAndVisible()
+            FLEXManager.shared.showExplorer()
+        }
         
         return true
     }
-    
-    func setupWindow() {
-        guard ProcessInfo.processInfo.operatingSystemVersion.majorVersion < 13 else {
-            return
-        }
-        
-        let window = UIWindow(frame: UIScreen.main.bounds)
-        window.rootViewController = FLEXNavigationController(
-            rootViewController: CommitListViewController()
-        )
-        self.window = window
-        window.makeKeyAndVisible()
-        FLEXManager.shared.showExplorer()
+
+    @available(iOS 13.0, *)
+    func application(_ application: UIApplication,
+                     configurationForConnecting session: UISceneSession,
+                     options: UIScene.ConnectionOptions) -> UISceneConfiguration {
+        // Called when a new scene session is being created.
+        // Use this method to select a configuration to create the new scene with.
+        return UISceneConfiguration(name: nil, sessionRole: session.role)
     }
     
-    func archiveBob() {
-        let documents = NSSearchPathForDirectoriesInDomains(
-            .documentDirectory, .userDomainMask, true
-        ).first! as NSString
-        let whereToSaveBob = documents.appendingPathComponent("Bob.plist")
-        try! NSKeyedArchiver.archivedData(
-            withRootObject: Person.bob(), requiringSecureCoding: false
-        ).write(to: URL(fileURLWithPath: whereToSaveBob), options: [])
-    }
     
     let exampleLogLimit = 10
     var exampleLogSent = 0
+
+    func sendExampleLogMessage() {
+        NSLog("Example log \(self.exampleLogSent)")
+        
+        self.exampleLogSent += 1
+        if self.exampleLogSent > self.exampleLogLimit {
+            self.repeatingLogExampleTimer.invalidate()
+        }
+    }
 }

Example/FLEXample/Supporting Files/FLEXample-Bridging-Header.h

@@ -5,4 +5,3 @@
 #import <FLEX.h>
 #import "MiscNetworkRequests.h"
 #import "CommitListViewController.h"
-#import "Person.h"

FLEX.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name             = "FLEX"
-  spec.version          = "4.4.1"
+  spec.version          = "4.2"
   spec.summary          = "A set of in-app debugging and exploration tools for iOS"
   spec.description      = <<-DESC
                         - Inspect and modify views in the hierarchy.
@@ -40,6 +40,6 @@ Pod::Spec.new do |spec|
                                "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h",
                                "Classes/Core/**/*.h", "Classes/Utility/Runtime/Objc/**/*.h",
                                "Classes/ObjectExplorers/**/*.h", "Classes/Editing/**/*.h",
-                               "Classes/Utility/Categories/*.h", "Classes/Utility/FLEXAlert.h",
-                               "Classes/Utility/FLEXResources.h" ]
+                               "Classes/Utility/FLEXMacros.h", "Classes/Utility/Categories/*.h",
+                               "Classes/Utility/FLEXAlert.h", "Classes/Utility/FLEXResources.h" ]
 end