Add option to disable property/ivar previews

Classes/ObjectExplorers/FLEXObjectExplorer.h

@@ -8,10 +8,22 @@
 
 #import "FLEXRuntime+UIKitHelpers.h"
 
+/// Carries state about the current user defaults settings
+@interface FLEXObjectExplorerDefaults : NSObject
++ (instancetype)canEdit:(BOOL)editable wantsPreviews:(BOOL)showPreviews;
+
+/// Only \c YES for properties and ivars
+@property (nonatomic, readonly) BOOL isEditable;
+/// Only affects properties and ivars
+@property (nonatomic, readonly) BOOL wantsDynamicPreviews;
+@end
+
 @interface FLEXObjectExplorer : NSObject
 
 + (instancetype)forObject:(id)objectOrClass;
 
++ (void)configureDefaultsForItems:(NSArray<id<FLEXObjectExplorerItem>> *)items;
+
 @property (nonatomic, readonly) id object;
 /// Subclasses can override to provide a more useful description
 @property (nonatomic, readonly) NSString *objectDescription;

Classes/ObjectExplorers/FLEXObjectExplorer.m

@@ -17,6 +17,17 @@
 #import "FLEXMetadataSection.h"
 #import "NSUserDefaults+FLEX.h"
 
+@implementation FLEXObjectExplorerDefaults
+
++ (instancetype)canEdit:(BOOL)editable wantsPreviews:(BOOL)showPreviews {
+    FLEXObjectExplorerDefaults *defaults = [self new];
+    defaults->_isEditable = editable;
+    defaults->_wantsDynamicPreviews = showPreviews;
+    return defaults;
+}
+
+@end
+
 @interface FLEXObjectExplorer () {
     NSMutableArray<NSArray<FLEXProperty *> *> *_allProperties;
     NSMutableArray<NSArray<FLEXProperty *> *> *_allClassProperties;
@@ -55,6 +66,24 @@
 
 #pragma mark - Public
 
++ (void)configureDefaultsForItems:(NSArray<id<FLEXObjectExplorerItem>> *)items {
+    BOOL hidePreviews = NSUserDefaults.standardUserDefaults.flex_explorerHidesVariablePreviews;
+    FLEXObjectExplorerDefaults *mutable = [FLEXObjectExplorerDefaults
+        canEdit:YES wantsPreviews:!hidePreviews
+    ];
+    FLEXObjectExplorerDefaults *immutable = [FLEXObjectExplorerDefaults
+        canEdit:NO wantsPreviews:!hidePreviews
+    ];
+
+    // .tag is used to cache whether the value of .isEditable;
+    // This could change at runtime so it is important that
+    // it is cached every time shortcuts are requeted and not
+    // just once at as shortcuts are initially registered
+    for (id<FLEXObjectExplorerItem> metadata in items) {
+        metadata.defaults = metadata.isEditable ? mutable : immutable;
+    }
+}
+
 - (NSString *)objectDescription {
     if (!_objectDescription) {
         // Hard-code UIColor description
@@ -224,9 +253,7 @@
     // because no other metadata types support editing.
     for (NSArray *matrix in @[_allProperties, _allIvars, /* _allMethods, _allClassMethods, _allConformedProtocols */]) {
         for (NSArray *metadataByClass in matrix) {
-            for (id<FLEXRuntimeMetadata> metadata in metadataByClass) {
-                metadata.tag = metadata.isEditable ? @YES : nil;
-            }
+            [FLEXObjectExplorer configureDefaultsForItems:metadataByClass];
         }
     }
     

Classes/ObjectExplorers/FLEXObjectExplorerViewController.m

@@ -73,6 +73,7 @@
         kFLEXDefaultsHidePropertyIvarsKey,
         kFLEXDefaultsHidePropertyMethodsKey,
         kFLEXDefaultsHideMethodOverridesKey,
+        kFLEXDefaultsHideVariablePreviewsKey,
     ];
 }
 
@@ -122,12 +123,7 @@
     //
     // "If your app targets iOS 9.0 and later or macOS 10.11 and later,
     // you don't need to unregister an observer in its dealloc method."
-    NSArray<NSString *> *observedNotifications = @[
-        kFLEXDefaultsHidePropertyIvarsKey,
-        kFLEXDefaultsHidePropertyMethodsKey,
-        kFLEXDefaultsHideMethodOverridesKey,
-    ];
-    for (NSString *pref in observedNotifications) {
+    for (NSString *pref in self.observedNotifications) {
         [NSNotificationCenter.defaultCenter
             addObserver:self
             selector:@selector(fullyReloadData)
@@ -293,9 +289,10 @@
     NSUserDefaults *defaults = NSUserDefaults.standardUserDefaults;
     // Maps preference keys to a description of what they affect
     NSDictionary<NSString *, NSString *> *explorerToggles = @{
-        kFLEXDefaultsHidePropertyIvarsKey:   @"Property-Backing Ivars",
-        kFLEXDefaultsHidePropertyMethodsKey: @"Property-Backing Methods",
-        kFLEXDefaultsHideMethodOverridesKey: @"Method Overrides",
+        kFLEXDefaultsHidePropertyIvarsKey:    @"Property-Backing Ivars",
+        kFLEXDefaultsHidePropertyMethodsKey:  @"Property-Backing Methods",
+        kFLEXDefaultsHideMethodOverridesKey:  @"Method Overrides",
+        kFLEXDefaultsHideVariablePreviewsKey: @"Variable Previews"
     };
     
     // Maps the key of the action itself to a map of a description
@@ -303,9 +300,10 @@
     //
     // So keys that are hidden by default have NO mapped to "Show"
     NSDictionary<NSString *, NSDictionary *> *nextStateDescriptions = @{
-        kFLEXDefaultsHidePropertyIvarsKey:   @{ @NO: @"Hide ", @YES: @"Show " },
-        kFLEXDefaultsHidePropertyMethodsKey: @{ @NO: @"Hide ", @YES: @"Show " },
-        kFLEXDefaultsHideMethodOverridesKey: @{ @NO: @"Show ", @YES: @"Hide " },
+        kFLEXDefaultsHidePropertyIvarsKey:    @{ @NO: @"Hide ", @YES: @"Show " },
+        kFLEXDefaultsHidePropertyMethodsKey:  @{ @NO: @"Hide ", @YES: @"Show " },
+        kFLEXDefaultsHideMethodOverridesKey:  @{ @NO: @"Show ", @YES: @"Hide " },
+        kFLEXDefaultsHideVariablePreviewsKey: @{ @NO: @"Hide ", @YES: @"Show " },
     };
     
     [FLEXAlert makeSheet:^(FLEXAlert *make) {

Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcut.h

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Flipboard. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+#import "FLEXObjectExplorer.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///
 /// It is useful to make your own shortcuts to append/prepend
 /// them to the existing list of shortcuts for a class.
-@protocol FLEXShortcut <NSObject>
+@protocol FLEXShortcut <FLEXObjectExplorerItem>
 
 - (nonnull  NSString *)titleWith:(id)object;
 - (nullable NSString *)subtitleWith:(id)object;

Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcut.m

@@ -33,6 +33,7 @@
 @end
 
 @implementation FLEXShortcut
+@synthesize defaults = _defaults;
 
 + (id<FLEXShortcut>)shortcutFor:(id)item {
     if ([item conformsToProtocol:@protocol(FLEXShortcut)]) {
@@ -85,7 +86,7 @@
 
 - (NSString *)subtitleWith:(id)object {
     if (self.metadataKind) {
-        return [self.metadata previewWithTarget:object] ?: @"nil";
+        return [self.metadata previewWithTarget:object];
     }
 
     // Item is probably a string; must return empty string since
@@ -124,6 +125,32 @@
     return kFLEXMultilineCell;
 }
 
+#pragma mark FLEXObjectExplorerDefaults
+
+- (void)setDefaults:(FLEXObjectExplorerDefaults *)defaults {
+    _defaults = defaults;
+    
+    if (_metadataKind) {
+        self.metadata.defaults = defaults;
+    }
+}
+
+- (BOOL)isEditable {
+    if (_metadataKind) {
+        return self.metadata.isEditable;
+    }
+    
+    return NO;
+}
+
+- (BOOL)isCallable {
+    if (_metadataKind) {
+        return self.metadata.isCallable;
+    }
+    
+    return NO;
+}
+
 #pragma mark - Helpers
 
 - (FLEXProperty *)property { return _item; }
@@ -145,6 +172,7 @@
 @end
 
 @implementation FLEXActionShortcut
+@synthesize defaults = _defaults;
 
 + (instancetype)title:(NSString *)title
              subtitle:(NSString *(^)(id))subtitle
@@ -186,7 +214,11 @@
 }
 
 - (NSString *)subtitleWith:(id)object {
-    return self.subtitleFuture(object);
+    if (self.defaults.wantsDynamicPreviews) {
+        return self.subtitleFuture(object);
+    }
+    
+    return nil;
 }
 
 - (void (^)(UIViewController *))didSelectActionWith:(id)object {
@@ -216,4 +248,7 @@
     return nil;
 }
 
+- (BOOL)isEditable { return NO; }
+- (BOOL)isCallable { return NO; }
+
 @end

Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsSection.m

@@ -16,6 +16,7 @@
 #import "FLEXIvar.h"
 #import "FLEXMethod.h"
 #import "FLEXRuntime+UIKitHelpers.h"
+#import "FLEXObjectExplorer.h"
 
 #pragma mark Private
 
@@ -86,6 +87,7 @@
             return [FLEXShortcut shortcutFor:obj];
         }];
         _numberOfLines = 1;
+        
         // Populate titles and subtitles
         [self reloadData];
     }
@@ -156,6 +158,8 @@
 }
 
 - (void)reloadData {
+    [FLEXObjectExplorer configureDefaultsForItems:self.allShortcuts];
+    
     // Generate all (sub)titles from shortcuts
     if (self.allShortcuts) {
         self.allTitles = [self.allShortcuts flex_mapped:^id(FLEXShortcut *s, NSUInteger idx) {
@@ -303,15 +307,8 @@ static RegistrationBuckets *mMethods = nil;
             classKey = class_getSuperclass(classKey);
         }
     }
-
-    // .tag is used to cache whether the value of .isEditable;
-    // This could change at runtime so it is important that
-    // it is cached every time shortcuts are requeted and not
-    // just once at as shortcuts are initially registered
-    for (id<FLEXRuntimeMetadata> metadata in shortcuts) {
-        metadata.tag = metadata.isEditable ? @YES : nil;
-    }
-
+    
+    [FLEXObjectExplorer configureDefaultsForItems:shortcuts];
     return shortcuts;
 }
 

Classes/ObjectExplorers/Sections/Shortcuts/FLEXViewControllerShortcuts.m

@@ -40,7 +40,7 @@
 
 + (instancetype)forObject:(UIViewController *)viewController {
     BOOL (^vcIsInuse)(UIViewController *) = ^BOOL(UIViewController *controller) {
-        if (controller.view.window) {
+        if (controller.viewIfLoaded.window) {
             return YES;
         }
 

Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.h

@@ -12,15 +12,25 @@
 #import "FLEXMethod.h"
 #import "FLEXProtocol.h"
 
-@protocol FLEXRuntimeMetadata <NSObject>
-/// Used as the main title of the row
-- (NSString *)description;
-/// Used to compare metadata objects for uniqueness
-@property (nonatomic, readonly) NSString *name;
+@class FLEXObjectExplorerDefaults;
+
+/// Model objects of an object explorer screen adopt this
+/// protocol in order respond to user defaults changes 
+@protocol FLEXObjectExplorerItem <NSObject>
+/// Current explorer settings. Set when settings change.
+@property (nonatomic) FLEXObjectExplorerDefaults *defaults;
+
 /// YES for properties and ivars which surely support editing, NO for all methods.
 @property (nonatomic, readonly) BOOL isEditable;
 /// NO for ivars, YES for supported methods and properties
 @property (nonatomic, readonly) BOOL isCallable;
+@end
+
+@protocol FLEXRuntimeMetadata <FLEXObjectExplorerItem>
+/// Used as the main title of the row
+- (NSString *)description;
+/// Used to compare metadata objects for uniqueness
+@property (nonatomic, readonly) NSString *name;
 
 /// For internal use
 @property (nonatomic) id tag;
@@ -76,3 +86,7 @@ typedef NS_ENUM(NSUInteger, FLEXStaticMetadataRowStyle) {
 + (NSArray<FLEXStaticMetadata *> *)classHierarchy:(NSArray<Class> *)classes;
 
 @end
+
+
+/// This is assigned to the \c tag property of each metadata.
+

Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.m

@@ -18,8 +18,18 @@
 #import "NSArray+Functional.h"
 #import "NSString+FLEX.h"
 
+#define FLEXObjectExplorerDefaultsImpl \
+- (FLEXObjectExplorerDefaults *)defaults { \
+    return self.tag; \
+} \
+ \
+- (void)setDefaults:(FLEXObjectExplorerDefaults *)defaults { \
+    self.tag = defaults; \
+}
+
 #pragma mark FLEXProperty
 @implementation FLEXProperty (UIKitHelpers)
+FLEXObjectExplorerDefaultsImpl
 
 /// Decide whether to use potentialTarget or [potentialTarget class] to get or set property
 - (id)appropriateTargetForPropertyType:(id)potentialTarget {
@@ -67,11 +77,13 @@
 - (NSString *)previewWithTarget:(id)object {
     if (object_isClass(object) && !self.isClassProperty) {
         return self.attributes.fullDeclaration;
-    } else {
+    } else if (self.defaults.wantsDynamicPreviews) {
         return [FLEXRuntimeUtility
             summaryForObject:[self currentValueWithTarget:object]
         ];
     }
+    
+    return nil;
 }
 
 - (UIViewController *)viewerWithTarget:(id)object {
@@ -94,7 +106,7 @@
     // We use .tag to store the cached value of .isEditable that is
     // initialized by FLEXObjectExplorer in -reloadMetada
     if ([self getPotentiallyUnboxedValue:targetForValueCheck]) {
-        if (self.tag) {
+        if (self.defaults.isEditable) {
             // Editable non-nil value, both
             return UITableViewCellAccessoryDetailDisclosureButton;
         } else {
@@ -102,7 +114,7 @@
             return UITableViewCellAccessoryDisclosureIndicator;
         }
     } else {
-        if (self.tag) {
+        if (self.defaults.isEditable) {
             // Editable nil value, just (i)
             return UITableViewCellAccessoryDetailButton;
         } else {
@@ -177,6 +189,7 @@
 
 #pragma mark FLEXIvar
 @implementation FLEXIvar (UIKitHelpers)
+FLEXObjectExplorerDefaultsImpl
 
 - (BOOL)isEditable {
     const FLEXTypeEncoding *typeEncoding = self.typeEncoding.UTF8String;
@@ -198,10 +211,13 @@
 - (NSString *)previewWithTarget:(id)object {
     if (object_isClass(object)) {
         return self.details;
+    } else if (self.defaults.wantsDynamicPreviews) {
+        return [FLEXRuntimeUtility
+            summaryForObject:[self currentValueWithTarget:object]
+        ];
     }
-    return [FLEXRuntimeUtility
-        summaryForObject:[self currentValueWithTarget:object]
-    ];
+    
+    return nil;
 }
 
 - (UIViewController *)viewerWithTarget:(id)object {
@@ -222,7 +238,7 @@
 
     // Could use .isEditable here, but we use .tag for speed since it is cached
     if ([self getPotentiallyUnboxedValue:object]) {
-        if (self.tag) {
+        if (self.defaults.isEditable) {
             // Editable non-nil value, both
             return UITableViewCellAccessoryDetailDisclosureButton;
         } else {
@@ -230,7 +246,7 @@
             return UITableViewCellAccessoryDisclosureIndicator;
         }
     } else {
-        if (self.tag) {
+        if (self.defaults.isEditable) {
             // Editable nil value, just (i)
             return UITableViewCellAccessoryDetailButton;
         } else {
@@ -301,6 +317,7 @@
 
 #pragma mark FLEXMethod
 @implementation FLEXMethodBase (UIKitHelpers)
+FLEXObjectExplorerDefaultsImpl
 
 - (BOOL)isEditable {
     return NO;
@@ -402,6 +419,7 @@
 
 #pragma mark FLEXProtocol
 @implementation FLEXProtocol (UIKitHelpers)
+FLEXObjectExplorerDefaultsImpl
 
 - (BOOL)isEditable {
     return NO;
@@ -475,6 +493,8 @@
 @synthesize name = _name;
 @synthesize tag = _tag;
 
+FLEXObjectExplorerDefaultsImpl
+
 + (NSArray<FLEXStaticMetadata *> *)classHierarchy:(NSArray<Class> *)classes {
     return [classes flex_mapped:^id(Class cls, NSUInteger idx) {
         return [FLEXStaticMetadata_Class withClass:cls];

Classes/Utility/Categories/NSUserDefaults+FLEX.h

@@ -14,6 +14,7 @@ extern NSString * const kFLEXDefaultsiOSPersistentOSLogKey;
 extern NSString * const kFLEXDefaultsHidePropertyIvarsKey;
 extern NSString * const kFLEXDefaultsHidePropertyMethodsKey;
 extern NSString * const kFLEXDefaultsHideMethodOverridesKey;
+extern NSString * const kFLEXDefaultsHideVariablePreviewsKey;
 extern NSString * const kFLEXDefaultsNetworkHostBlacklistKey;
 
 @interface NSUserDefaults (FLEX)
@@ -31,6 +32,8 @@ extern NSString * const kFLEXDefaultsNetworkHostBlacklistKey;
 @property (nonatomic) BOOL flex_explorerHidesPropertyMethods;
 /// NO by default
 @property (nonatomic) BOOL flex_explorerShowsMethodOverrides;
+/// NO by default
+@property (nonatomic) BOOL flex_explorerHidesVariablePreviews;
 
 // Not actually stored in defaults, but written to a file
 @property (nonatomic) NSArray<NSString *> *flex_networkHostBlacklist;

Classes/Utility/Categories/NSUserDefaults+FLEX.m

@@ -13,6 +13,7 @@ NSString * const kFLEXDefaultsiOSPersistentOSLogKey = @"com.flipborad.flex.enabl
 NSString * const kFLEXDefaultsHidePropertyIvarsKey = @"com.flipboard.FLEX.hide_property_ivars";
 NSString * const kFLEXDefaultsHidePropertyMethodsKey = @"com.flipboard.FLEX.hide_property_methods";
 NSString * const kFLEXDefaultsHideMethodOverridesKey = @"com.flipboard.FLEX.hide_method_overrides";
+NSString * const kFLEXDefaultsHideVariablePreviewsKey = @"com.flipboard.FLEX.hide_variable_previews";
 NSString * const kFLEXDefaultsNetworkHostBlacklistKey = @"com.flipboard.FLEX.network_host_blacklist";
 
 #define FLEXDefaultsPathForFile(name) ({ \
@@ -100,6 +101,18 @@ NSString * const kFLEXDefaultsNetworkHostBlacklistKey = @"com.flipboard.FLEX.net
     ];
 }
 
+- (BOOL)flex_explorerHidesVariablePreviews {
+    return [self boolForKey:kFLEXDefaultsHideVariablePreviewsKey];
+}
+
+- (void)setFlex_explorerHidesVariablePreviews:(BOOL)hide {
+    [self setBool:hide forKey:kFLEXDefaultsHideVariablePreviewsKey];
+    [NSNotificationCenter.defaultCenter
+        postNotificationName:kFLEXDefaultsHideVariablePreviewsKey
+        object:nil
+    ];
+}
+
 - (NSArray<NSString *> *)flex_networkHostBlacklist {
     return [NSArray arrayWithContentsOfFile:[
         self flex_defaultsPathForFile:kFLEXDefaultsNetworkHostBlacklistKey