Fix #168 by restructuring try-catch branching

#178 made methods with no arguments appear to take one argument by forcibly returning the selector name as the only argument. This is not desired behavior. Updating the test to reflect desired behavior reveals this.

This commit makes this method return an empty array when selectors consist of one component, and does some housekeeping on the tests added in #178.

.gitignore

@@ -17,6 +17,3 @@ DerivedData
 *.ipa
 *.xcuserstate
 .DS_Store
-/Example/Pods
-Podfile.lock
-IDEWorkspaceChecks.plist

Classes/Core/Controllers/FLEXFilteringTableViewController.h

@@ -1,89 +0,0 @@
-//
-//  FLEXFilteringTableViewController.h
-//  FLEX
-//
-//  Created by Tanner on 3/9/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableViewController.h"
-
-#pragma mark - FLEXTableViewFiltering
-@protocol FLEXTableViewFiltering <FLEXSearchResultsUpdating>
-
-/// An array of visible, "filtered" sections. For example,
-/// if you have 3 sections in \c allSections and the user searches
-/// for something that matches rows in only one section, then
-/// this property would only contain that on matching section.
-@property (nonatomic, copy) NSArray<FLEXTableViewSection *> *sections;
-/// An array of all possible sections. Empty sections are to be removed
-/// and the resulting array stored in the \c section property. Setting
-/// this property should immediately set \c sections to \c nonemptySections 
-///
-/// Do not manually initialize this property, it will be
-/// initialized for you using the result of \c makeSections.
-@property (nonatomic, copy) NSArray<FLEXTableViewSection *> *allSections;
-
-/// This computed property should filter \c allSections for assignment to \c sections
-@property (nonatomic, readonly, copy) NSArray<FLEXTableViewSection *> *nonemptySections;
-
-/// This should be able to re-initialize \c allSections
-- (NSArray<FLEXTableViewSection *> *)makeSections;
-
-@end
-
-
-#pragma mark - FLEXFilteringTableViewController
-/// A table view which implements \c UITableView* methods using arrays of
-/// \c FLEXTableViewSection objects provied by a special delegate.
-@interface FLEXFilteringTableViewController : FLEXTableViewController <FLEXTableViewFiltering>
-
-/// Stores the current search query.
-@property (nonatomic, copy) NSString *filterText;
-
-/// This property is set to \c self by default.
-///
-/// This property is used to power almost all of the table view's data source
-/// and delegate methods automatically, including row and section filtering
-/// when the user searches, 3D Touch context menus, row selection, etc.
-///
-/// Setting this property will also set \c searchDelegate to that object.
-@property (nonatomic, weak) id<FLEXTableViewFiltering> filterDelegate;
-
-/// Defaults to \c NO. If enabled, all filtering will be done by calling
-/// \c onBackgroundQueue:thenOnMainQueue: with the UI updated on the main queue.
-@property (nonatomic) BOOL filterInBackground;
-
-/// Defaults to \c NO. If enabled, one • will be supplied as an index title for each section.
-@property (nonatomic) BOOL wantsSectionIndexTitles;
-
-/// Recalculates the non-empty sections and reloads the table view.
-///
-/// Subclasses may override to perform additional reloading logic,
-/// such as calling \c -reloadSections if needed. Be sure to call
-/// \c super after any logic that would affect the appearance of 
-/// the table view, since the table view is reloaded last.
-///
-/// Called at the end of this class's implementation of \c updateSearchResults:
-- (void)reloadData;
-
-/// Invoke this method to call \c -reloadData on each section
-/// in \c self.filterDelegate.allSections.
-- (void)reloadSections;
-
-#pragma mark FLEXTableViewFiltering
-
-@property (nonatomic, copy) NSArray<FLEXTableViewSection *> *sections;
-@property (nonatomic, copy) NSArray<FLEXTableViewSection *> *allSections;
-
-/// Subclasses can override to hide specific sections under certain conditions
-/// if using \c self as the \c filterDelegate, as is the default.
-///
-/// For example, the object explorer hides the description section when searching.
-@property (nonatomic, readonly, copy) NSArray<FLEXTableViewSection *> *nonemptySections;
-
-/// If using \c self as the \c filterDelegate, as is the default,
-/// subclasses should override to provide the sections for the table view.
-- (NSArray<FLEXTableViewSection *> *)makeSections;
-
-@end

Classes/Core/Controllers/FLEXFilteringTableViewController.m

@@ -1,203 +0,0 @@
-//
-//  FLEXFilteringTableViewController.m
-//  FLEX
-//
-//  Created by Tanner on 3/9/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXFilteringTableViewController.h"
-#import "FLEXTableViewSection.h"
-#import "NSArray+FLEX.h"
-
-@interface FLEXFilteringTableViewController ()
-
-@end
-
-@implementation FLEXFilteringTableViewController
-@synthesize allSections = _allSections;
-
-#pragma mark - View controller lifecycle
-
-- (void)loadView {
-    [super loadView];
-    
-    if (!self.filterDelegate) {
-        self.filterDelegate = self;
-    } else {
-        [self _registerCellsForReuse];
-    }
-}
-
-- (void)_registerCellsForReuse {
-    for (FLEXTableViewSection *section in self.filterDelegate.allSections) {
-        if (section.cellRegistrationMapping) {
-            [self.tableView registerCells:section.cellRegistrationMapping];
-        }
-    }
-}
-
-
-#pragma mark - Public
-
-- (void)setFilterDelegate:(id<FLEXTableViewFiltering>)filterDelegate {
-    _filterDelegate = filterDelegate;
-    filterDelegate.allSections = [filterDelegate makeSections];
-    
-    if (self.isViewLoaded) {
-        [self _registerCellsForReuse];
-    }
-}
-
-- (void)reloadData {
-    [self reloadData:self.nonemptySections];
-}
-
-- (void)reloadData:(NSArray *)nonemptySections {
-    // Recalculate displayed sections
-    self.filterDelegate.sections = nonemptySections;
-
-    // Refresh table view
-    if (self.isViewLoaded) {
-        [self.tableView reloadData];
-    }
-}
-
-- (void)reloadSections {
-    for (FLEXTableViewSection *section in self.filterDelegate.allSections) {
-        [section reloadData];
-    }
-}
-
-
-#pragma mark - Search
-
-- (void)updateSearchResults:(NSString *)newText {
-    NSArray *(^filter)() = ^NSArray *{
-        self.filterText = newText;
-
-        // Sections will adjust data based on this property
-        for (FLEXTableViewSection *section in self.filterDelegate.allSections) {
-            section.filterText = newText;
-        }
-        
-        return nil;
-    };
-    
-    if (self.filterInBackground) {
-        [self onBackgroundQueue:filter thenOnMainQueue:^(NSArray *unused) {
-            if ([self.searchText isEqualToString:newText]) {
-                [self reloadData];
-            }
-        }];
-    } else {
-        filter();
-        [self reloadData];
-    }
-}
-
-
-#pragma mark Filtering
-
-- (NSArray<FLEXTableViewSection *> *)nonemptySections {
-    return [self.filterDelegate.allSections flex_filtered:^BOOL(FLEXTableViewSection *section, NSUInteger idx) {
-        return section.numberOfRows > 0;
-    }];
-}
-
-- (NSArray<FLEXTableViewSection *> *)makeSections {
-    return @[];
-}
-
-- (void)setAllSections:(NSArray<FLEXTableViewSection *> *)allSections {
-    _allSections = allSections.copy;
-    self.sections = self.nonemptySections;
-}
-
-
-#pragma mark - UITableViewDataSource
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return self.filterDelegate.sections.count;
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return self.filterDelegate.sections[section].numberOfRows;
-}
-
-- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
-    return self.filterDelegate.sections[section].title;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    NSString *reuse = [self.filterDelegate.sections[indexPath.section] reuseIdentifierForRow:indexPath.row];
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:reuse forIndexPath:indexPath];
-    [self.filterDelegate.sections[indexPath.section] configureCell:cell forRow:indexPath.row];
-    return cell;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return UITableViewAutomaticDimension;
-}
-
-- (NSArray<NSString *> *)sectionIndexTitlesForTableView:(UITableView *)tableView {
-    if (self.wantsSectionIndexTitles) {
-        return [NSArray flex_forEachUpTo:self.filterDelegate.sections.count map:^id(NSUInteger i) {
-            return @"⦁";
-        }];
-    }
-    
-    return nil;
-}
-
-
-#pragma mark - UITableViewDelegate
-
-- (BOOL)tableView:(UITableView *)tableView shouldHighlightRowAtIndexPath:(NSIndexPath *)indexPath {
-    return [self.filterDelegate.sections[indexPath.section] canSelectRow:indexPath.row];
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    FLEXTableViewSection *section = self.filterDelegate.sections[indexPath.section];
-
-    void (^action)(UIViewController *) = [section didSelectRowAction:indexPath.row];
-    UIViewController *details = [section viewControllerToPushForRow:indexPath.row];
-
-    if (action) {
-        action(self);
-        [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    } else if (details) {
-        [self.navigationController pushViewController:details animated:YES];
-    } else {
-        [NSException raise:NSInternalInconsistencyException
-                    format:@"Row is selectable but has no action or view controller"];
-    }
-}
-
-- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath {
-    [self.filterDelegate.sections[indexPath.section] didPressInfoButtonAction:indexPath.row](self);
-}
-
-#if FLEX_AT_LEAST_IOS13_SDK
-
-- (UIContextMenuConfiguration *)tableView:(UITableView *)tableView contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath point:(CGPoint)point __IOS_AVAILABLE(13.0) {
-    FLEXTableViewSection *section = self.filterDelegate.sections[indexPath.section];
-    NSString *title = [section menuTitleForRow:indexPath.row];
-    NSArray<UIMenuElement *> *menuItems = [section menuItemsForRow:indexPath.row sender:self];
-    
-    if (menuItems.count) {
-        return [UIContextMenuConfiguration
-            configurationWithIdentifier:nil
-            previewProvider:nil
-            actionProvider:^UIMenu *(NSArray<UIMenuElement *> *suggestedActions) {
-                return [UIMenu menuWithTitle:title children:menuItems];
-            }
-        ];
-    }
-    
-    return nil;
-}
-
-#endif
-
-@end

Classes/Core/Controllers/FLEXNavigationController.h

@@ -1,19 +0,0 @@
-//
-//  FLEXNavigationController.h
-//  FLEX
-//
-//  Created by Tanner on 1/30/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FLEXNavigationController : UINavigationController
-
-+ (instancetype)withRootViewController:(UIViewController *)rootVC;
-
-@end
-
-NS_ASSUME_NONNULL_END

Classes/Core/Controllers/FLEXNavigationController.m

@@ -1,178 +0,0 @@
-//
-//  FLEXNavigationController.m
-//  FLEX
-//
-//  Created by Tanner on 1/30/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXNavigationController.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXTabList.h"
-
-@interface UINavigationController (Private) <UIGestureRecognizerDelegate>
-- (void)_gestureRecognizedInteractiveHide:(UIGestureRecognizer *)sender;
-@end
-@interface UIPanGestureRecognizer (Private)
-- (void)_setDelegate:(id)delegate;
-@end
-
-@interface FLEXNavigationController ()
-@property (nonatomic, readonly) BOOL toolbarWasHidden;
-@property (nonatomic) BOOL waitingToAddTab;
-@property (nonatomic) BOOL didSetupPendingDismissButtons;
-@property (nonatomic) UISwipeGestureRecognizer *navigationBarSwipeGesture;
-@end
-
-@implementation FLEXNavigationController
-
-+ (instancetype)withRootViewController:(UIViewController *)rootVC {
-    return [[self alloc] initWithRootViewController:rootVC];
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    self.waitingToAddTab = YES;
-    
-    // Add gesture to reveal toolbar if hidden
-    self.navigationBar.userInteractionEnabled = YES;
-    [self.navigationBar addGestureRecognizer:[[UITapGestureRecognizer alloc]
-        initWithTarget:self action:@selector(handleNavigationBarTap:)
-    ]];
-    
-    // Add gesture to dismiss if not presented with a sheet style
-    if (@available(iOS 13, *)) {
-        switch (self.modalPresentationStyle) {
-            case UIModalPresentationAutomatic:
-            case UIModalPresentationPageSheet:
-            case UIModalPresentationFormSheet:
-                break;
-                
-            default:
-                [self addNavigationBarSwipeGesture];
-                break;
-        }
-    } else {
-        [self addNavigationBarSwipeGesture];
-    }
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    
-    if (self.beingPresented && !self.didSetupPendingDismissButtons) {
-        for (UIViewController *vc in self.viewControllers) {
-            [self addNavigationBarItemsToViewController:vc.navigationItem];
-        }
-        
-        self.didSetupPendingDismissButtons = YES;
-    }
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    
-    if (self.waitingToAddTab) {
-        // Only add new tab if we're presented properly
-        if ([self.presentingViewController isKindOfClass:[FLEXExplorerViewController class]]) {
-            // New navigation controllers always add themselves as new tabs,
-            // tabs are closed by FLEXExplorerViewController
-            [FLEXTabList.sharedList addTab:self];
-            self.waitingToAddTab = NO;
-        }
-    }
-}
-
-- (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {
-    [super pushViewController:viewController animated:animated];
-    [self addNavigationBarItemsToViewController:viewController.navigationItem];
-}
-
-- (void)dismissAnimated {
-    // Tabs are only closed if the done button is pressed; this
-    // allows you to leave a tab open by dragging down to dismiss
-    [FLEXTabList.sharedList closeTab:self];
-    [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (void)addNavigationBarItemsToViewController:(UINavigationItem *)navigationItem {
-    if (!self.presentingViewController) {
-        return;
-    }
-    
-    // Check if a done item already exists
-    for (UIBarButtonItem *item in navigationItem.rightBarButtonItems) {
-        if (item.style == UIBarButtonItemStyleDone) {
-            return;
-        }
-    }
-    
-    // Give root view controllers a Done button if it does not already have one
-    UIBarButtonItem *done = [[UIBarButtonItem alloc]
-        initWithBarButtonSystemItem:UIBarButtonSystemItemDone
-        target:self
-        action:@selector(dismissAnimated)
-    ];
-    
-    // Prepend the button if other buttons exist already
-    NSArray *existingItems = navigationItem.rightBarButtonItems;
-    if (existingItems.count) {
-        navigationItem.rightBarButtonItems = [@[done] arrayByAddingObjectsFromArray:existingItems];
-    } else {
-        navigationItem.rightBarButtonItem = done;
-    }
-    
-    // Keeps us from calling this method again on
-    // the same view controllers in -viewWillAppear:
-    self.didSetupPendingDismissButtons = YES;
-}
-
-- (void)addNavigationBarSwipeGesture {
-    UISwipeGestureRecognizer *swipe = [[UISwipeGestureRecognizer alloc]
-        initWithTarget:self action:@selector(handleNavigationBarSwipe:)
-    ];
-    swipe.direction = UISwipeGestureRecognizerDirectionDown;
-    swipe.delegate = self;
-    self.navigationBarSwipeGesture = swipe;
-    [self.navigationBar addGestureRecognizer:swipe];
-}
-
-- (void)handleNavigationBarSwipe:(UISwipeGestureRecognizer *)sender {
-    if (sender.state == UIGestureRecognizerStateRecognized) {
-        [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
-    }
-}
-     
-- (void)handleNavigationBarTap:(UIGestureRecognizer *)sender {
-    if (sender.state == UIGestureRecognizerStateRecognized) {
-        if (self.toolbarHidden) {
-            [self setToolbarHidden:NO animated:YES];
-        }
-    }
-}
-
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)g1 shouldBeRequiredToFailByGestureRecognizer:(UIGestureRecognizer *)g2 {
-    if (g1 == self.navigationBarSwipeGesture && g2 == self.barHideOnSwipeGestureRecognizer) {
-        return YES;
-    }
-    
-    return NO;
-}
-
-- (void)_gestureRecognizedInteractiveHide:(UIPanGestureRecognizer *)sender {
-    if (sender.state == UIGestureRecognizerStateRecognized) {
-        BOOL show = self.topViewController.toolbarItems.count;
-        CGFloat yTranslation = [sender translationInView:self.view].y;
-        CGFloat yVelocity = [sender velocityInView:self.view].y;
-        if (yVelocity > 2000) {
-            [self setToolbarHidden:YES animated:YES];
-        } else if (show && yTranslation > 20 && yVelocity > 250) {
-            [self setToolbarHidden:NO animated:YES];
-        } else if (yTranslation < -20) {
-            [self setToolbarHidden:YES animated:YES];
-        }
-    }
-}
-
-@end

Classes/Core/Controllers/FLEXTableViewController.h

@@ -1,149 +0,0 @@
-//
-//  FLEXTableViewController.h
-//  FLEX
-//
-//  Created by Tanner on 7/5/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "FLEXTableView.h"
-@class FLEXScopeCarousel, FLEXWindow, FLEXTableViewSection;
-
-typedef CGFloat FLEXDebounceInterval;
-/// No delay, all events delivered
-extern CGFloat const kFLEXDebounceInstant;
-/// Small delay which makes UI seem smoother by avoiding rapid events
-extern CGFloat const kFLEXDebounceFast;
-/// Slower than Fast, faster than ExpensiveIO
-extern CGFloat const kFLEXDebounceForAsyncSearch;
-/// The least frequent, at just over once per second; for I/O or other expensive operations
-extern CGFloat const kFLEXDebounceForExpensiveIO;
-
-@protocol FLEXSearchResultsUpdating <NSObject>
-/// A method to handle search query update events.
-///
-/// \c searchBarDebounceInterval is used to reduce the frequency at which this
-/// method is called. This method is also called when the search bar becomes
-/// the first responder, and when the selected search bar scope index changes.
-- (void)updateSearchResults:(NSString *)newText;
-@end
-
-@interface FLEXTableViewController : UITableViewController <
-    UISearchResultsUpdating, UISearchControllerDelegate, UISearchBarDelegate
->
-
-/// A grouped table view. Inset on iOS 13.
-///
-/// Simply calls into \c initWithStyle:
-- (id)init;
-
-/// Subclasses may override to configure the controller before \c viewDidLoad:
-- (id)initWithStyle:(UITableViewStyle)style;
-
-@property (nonatomic) FLEXTableView *tableView;
-
-/// If your subclass conforms to \c FLEXSearchResultsUpdating
-/// then this property is assigned to \c self automatically.
-///
-/// Setting \c filterDelegate will also set this property to that object.
-@property (nonatomic, weak) id<FLEXSearchResultsUpdating> searchDelegate;
-
-/// Defaults to NO.
-///
-/// Setting this to YES will initialize the carousel and the view.
-@property (nonatomic) BOOL showsCarousel;
-/// A horizontally scrolling list with functionality similar to
-/// that of a search bar's scope bar. You'd want to use this when
-/// you have potentially more than 4 scope options.
-@property (nonatomic) FLEXScopeCarousel *carousel;
-
-/// Defaults to NO.
-///
-/// Setting this to YES will initialize searchController and the view.
-@property (nonatomic) BOOL showsSearchBar;
-/// Defaults to NO.
-///
-/// 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;
-
-/// nil unless showsSearchBar is set to YES.
-///
-/// self is used as the default search results updater and delegate.
-/// The search bar will not dim the background or hide the navigation bar by default.
-/// On iOS 11 and up, the search bar will appear in the navigation bar below the title.
-@property (nonatomic) UISearchController *searchController;
-/// Used to initialize the search controller. Defaults to nil.
-@property (nonatomic) UIViewController *searchResultsController;
-/// Defaults to "Fast"
-///
-/// Determines how often search bar results will be "debounced."
-/// Empty query events are always sent instantly. Query events will
-/// be sent when the user has not changed the query for this interval.
-@property (nonatomic) FLEXDebounceInterval searchBarDebounceInterval;
-/// Whether the search bar stays at the top of the view while scrolling.
-///
-/// Calls into self.navigationItem.hidesSearchBarWhenScrolling.
-/// Do not change self.navigationItem.hidesSearchBarWhenScrolling directly,
-/// or it will not be respsected. Use this instead.
-/// Defaults to NO.
-@property (nonatomic) BOOL pinSearchBar;
-/// By default, we will show the search bar's cancel button when
-/// search becomes active and hide it when search is dismissed.
-///
-/// Do not set the showsCancelButton property on the searchController's
-/// searchBar manually. Set this property after turning on showsSearchBar.
-///
-/// Does nothing pre-iOS 13, safe to call on any version.
-@property (nonatomic) BOOL automaticallyShowsSearchBarCancelButton;
-
-/// If using the scope bar, self.searchController.searchBar.selectedScopeButtonIndex.
-/// Otherwise, this is the selected index of the carousel, or NSNotFound if using neither.
-@property (nonatomic) NSInteger selectedScope;
-/// self.searchController.searchBar.text
-@property (nonatomic, readonly, copy) NSString *searchText;
-
-/// A totally optional delegate to forward search results updater calls to.
-/// If a delegate is set, updateSearchResults: is not called on this view controller.
-@property (nonatomic, weak) id<FLEXSearchResultsUpdating> searchResultsUpdater;
-
-/// self.view.window as a \c FLEXWindow
-@property (nonatomic, readonly) FLEXWindow *window;
-
-/// Convenient for doing some async processor-intensive searching
-/// in the background before updating the UI back on the main queue.
-- (void)onBackgroundQueue:(NSArray *(^)(void))backgroundBlock thenOnMainQueue:(void(^)(NSArray *))mainBlock;
-
-/// Adds up to 3 additional items to the toolbar in right-to-left order.
-///
-/// That is, the first item in the given array will be the rightmost item behind
-/// any existing toolbar items. By default, buttons for bookmarks and tabs are shown.
-///
-/// If you wish to have more control over how the buttons are arranged or which
-/// buttons are displayed, you can access the properties for the pre-existing
-/// toolbar items directly and manually set \c self.toolbarItems by overriding
-/// the \c setupToolbarItems method below.
-- (void)addToolbarItems:(NSArray<UIBarButtonItem *> *)items;
-
-/// Subclasses may override. You should not need to call this method directly.
-- (void)setupToolbarItems;
-
-@property (nonatomic, readonly) UIBarButtonItem *shareToolbarItem;
-@property (nonatomic, readonly) UIBarButtonItem *bookmarksToolbarItem;
-@property (nonatomic, readonly) UIBarButtonItem *openTabsToolbarItem;
-
-/// Whether or not to display the "share" icon in the middle of the toolbar. NO by default.
-///
-/// Turning this on after you have added custom toolbar items will
-/// push off the leftmost toolbar item and shift the others leftward.
-@property (nonatomic) BOOL showsShareToolbarItem;
-/// Called when the share button is pressed.
-/// Default implementation does nothign. Subclasses may override.
-- (void)shareButtonPressed:(UIBarButtonItem *)sender;
-
-/// Subclasses may call this to opt-out of all toolbar related behavior.
-/// This is necessary if you want to disable the gesture which reveals the toolbar.
-- (void)disableToolbar;
-
-@end

Classes/Core/Controllers/FLEXTableViewController.m

@@ -1,590 +0,0 @@
-//
-//  FLEXTableViewController.m
-//  FLEX
-//
-//  Created by Tanner on 7/5/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableViewController.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXBookmarksViewController.h"
-#import "FLEXTabsViewController.h"
-#import "FLEXScopeCarousel.h"
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "FLEXResources.h"
-#import "UIBarButtonItem+FLEX.h"
-#import <objc/runtime.h>
-
-@interface Block : NSObject
-- (void)invoke;
-@end
-
-CGFloat const kFLEXDebounceInstant = 0.f;
-CGFloat const kFLEXDebounceFast = 0.05;
-CGFloat const kFLEXDebounceForAsyncSearch = 0.15;
-CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
-
-@interface FLEXTableViewController ()
-@property (nonatomic) NSTimer *debounceTimer;
-@property (nonatomic) BOOL didInitiallyRevealSearchBar;
-@property (nonatomic) UITableViewStyle style;
-
-@property (nonatomic) BOOL hasAppeared;
-@property (nonatomic, readonly) UIView *tableHeaderViewContainer;
-
-@property (nonatomic, readonly) BOOL manuallyDeactivateSearchOnDisappear;
-
-@property (nonatomic) UIBarButtonItem *middleToolbarItem;
-@property (nonatomic) UIBarButtonItem *middleLeftToolbarItem;
-@property (nonatomic) UIBarButtonItem *leftmostToolbarItem;
-@end
-
-@implementation FLEXTableViewController
-@dynamic tableView;
-@synthesize showsShareToolbarItem = _showsShareToolbarItem;
-@synthesize tableHeaderViewContainer = _tableHeaderViewContainer;
-@synthesize automaticallyShowsSearchBarCancelButton = _automaticallyShowsSearchBarCancelButton;
-
-#pragma mark - Initialization
-
-- (id)init {
-#if FLEX_AT_LEAST_IOS13_SDK
-    if (@available(iOS 13.0, *)) {
-        self = [self initWithStyle:UITableViewStyleInsetGrouped];
-    } else {
-        self = [self initWithStyle:UITableViewStyleGrouped];
-    }
-#else
-    self = [self initWithStyle:UITableViewStyleGrouped];
-#endif
-    return self;
-}
-
-- (id)initWithStyle:(UITableViewStyle)style {
-    self = [super initWithStyle:style];
-    
-    if (self) {
-        _searchBarDebounceInterval = kFLEXDebounceFast;
-        _showSearchBarInitially = YES;
-        _style = style;
-        _manuallyDeactivateSearchOnDisappear = ({
-            NSProcessInfo.processInfo.operatingSystemVersion.majorVersion < 11;
-        });
-        
-        // We will be our own search delegate if we implement this method
-        if ([self respondsToSelector:@selector(updateSearchResults:)]) {
-            self.searchDelegate = (id)self;
-        }
-    }
-    
-    return self;
-}
-
-
-#pragma mark - Public
-
-- (FLEXWindow *)window {
-    return (id)self.view.window;
-}
-
-- (void)setShowsSearchBar:(BOOL)showsSearchBar {
-    if (_showsSearchBar == showsSearchBar) return;
-    _showsSearchBar = showsSearchBar;
-    
-    if (showsSearchBar) {
-        UIViewController *results = self.searchResultsController;
-        self.searchController = [[UISearchController alloc] initWithSearchResultsController:results];
-        self.searchController.searchBar.placeholder = @"Filter";
-        self.searchController.searchResultsUpdater = (id)self;
-        self.searchController.delegate = (id)self;
-        self.searchController.dimsBackgroundDuringPresentation = NO;
-        self.searchController.hidesNavigationBarDuringPresentation = NO;
-        /// Not necessary in iOS 13; remove this when iOS 13 is the minimum deployment target
-        self.searchController.searchBar.delegate = self;
-
-        self.automaticallyShowsSearchBarCancelButton = YES;
-
-        #if FLEX_AT_LEAST_IOS13_SDK
-        if (@available(iOS 13, *)) {
-            self.searchController.automaticallyShowsScopeBar = NO;
-        }
-        #endif
-        
-        [self addSearchController:self.searchController];
-    } else {
-        // Search already shown and just set to NO, so remove it
-        [self removeSearchController:self.searchController];
-    }
-}
-
-- (void)setShowsCarousel:(BOOL)showsCarousel {
-    if (_showsCarousel == showsCarousel) return;
-    _showsCarousel = showsCarousel;
-    
-    if (showsCarousel) {
-        _carousel = ({
-            __weak __typeof(self) weakSelf = self;
-
-            FLEXScopeCarousel *carousel = [FLEXScopeCarousel new];
-            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 *carousel) {
-                __typeof(self) self = weakSelf;
-                [self layoutTableHeaderIfNeeded];
-            }];
-
-            carousel;
-        });
-        [self addCarousel:_carousel];
-    } else {
-        // Carousel already shown and just set to NO, so remove it
-        [self removeCarousel:_carousel];
-    }
-}
-
-- (NSInteger)selectedScope {
-    if (self.searchController.searchBar.showsScopeBar) {
-        return self.searchController.searchBar.selectedScopeButtonIndex;
-    } else if (self.showsCarousel) {
-        return self.carousel.selectedIndex;
-    } else {
-        return 0;
-    }
-}
-
-- (void)setSelectedScope:(NSInteger)selectedScope {
-    if (self.searchController.searchBar.showsScopeBar) {
-        self.searchController.searchBar.selectedScopeButtonIndex = selectedScope;
-    } else if (self.showsCarousel) {
-        self.carousel.selectedIndex = selectedScope;
-    }
-
-    [self.searchDelegate updateSearchResults:self.searchText];
-}
-
-- (NSString *)searchText {
-    return self.searchController.searchBar.text;
-}
-
-- (BOOL)automaticallyShowsSearchBarCancelButton {
-#if FLEX_AT_LEAST_IOS13_SDK
-    if (@available(iOS 13, *)) {
-        return self.searchController.automaticallyShowsCancelButton;
-    }
-#endif
-
-    return _automaticallyShowsSearchBarCancelButton;
-}
-
-- (void)setAutomaticallyShowsSearchBarCancelButton:(BOOL)value {
-#if FLEX_AT_LEAST_IOS13_SDK
-    if (@available(iOS 13, *)) {
-        self.searchController.automaticallyShowsCancelButton = value;
-    }
-#endif
-
-    _automaticallyShowsSearchBarCancelButton = value;
-}
-
-- (void)onBackgroundQueue:(NSArray *(^)(void))backgroundBlock thenOnMainQueue:(void(^)(NSArray *))mainBlock {
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        NSArray *items = backgroundBlock();
-        dispatch_async(dispatch_get_main_queue(), ^{
-            mainBlock(items);
-        });
-    });
-}
-
-- (void)setsShowsShareToolbarItem:(BOOL)showsShareToolbarItem {
-    _showsShareToolbarItem = showsShareToolbarItem;
-    if (self.isViewLoaded) {
-        [self setupToolbarItems];
-    }
-}
-
-- (void)disableToolbar {
-    self.navigationController.toolbarHidden = YES;
-    self.navigationController.hidesBarsOnSwipe = NO;
-    self.toolbarItems = nil;
-}
-
-
-#pragma mark - View Controller Lifecycle
-
-- (void)loadView {
-    self.view = [FLEXTableView style:self.style];
-    self.tableView.dataSource = self;
-    self.tableView.delegate = self;
-    
-    _shareToolbarItem = FLEXBarButtonItemSystem(Action, self, @selector(shareButtonPressed:));
-    _bookmarksToolbarItem = [UIBarButtonItem
-        itemWithImage:FLEXResources.bookmarksIcon target:self action:@selector(showBookmarks)
-    ];
-    _openTabsToolbarItem = [UIBarButtonItem
-        itemWithImage:FLEXResources.openTabsIcon target:self action:@selector(showTabSwitcher)
-    ];
-    
-    self.leftmostToolbarItem = UIBarButtonItem.flex_fixedSpace;
-    self.middleLeftToolbarItem = UIBarButtonItem.flex_fixedSpace;
-    self.middleToolbarItem = UIBarButtonItem.flex_fixedSpace;
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeOnDrag;
-    
-    // Toolbar
-    self.navigationController.toolbarHidden = NO;
-    self.navigationController.hidesBarsOnSwipe = YES;
-
-    // On iOS 13, the root view controller shows it's search bar no matter what.
-    // Turning this off avoids some weird flash the navigation bar does when we
-    // toggle navigationItem.hidesSearchBarWhenScrolling on and off. The flash
-    // will still happen on subsequent view controllers, but we can at least
-    // avoid it for the root view controller
-    if (@available(iOS 13, *)) {
-        if (self.navigationController.viewControllers.firstObject == self) {
-            _showSearchBarInitially = NO;
-        }
-    }
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    
-    // When going back, make the search bar reappear instead of hiding
-    if (@available(iOS 11.0, *)) {
-        if ((self.pinSearchBar || self.showSearchBarInitially) && !self.didInitiallyRevealSearchBar) {
-            self.navigationItem.hidesSearchBarWhenScrolling = NO;
-        }
-    }
-
-    [self setupToolbarItems];
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-
-    // Allow scrolling to collapse the search bar, only if we don't want it pinned
-    if (@available(iOS 11.0, *)) {
-        if (self.showSearchBarInitially && !self.pinSearchBar && !self.didInitiallyRevealSearchBar) {
-            // All this mumbo jumbo is necessary to work around a bug in iOS 13 up to 13.2
-            // wherein quickly toggling navigationItem.hidesSearchBarWhenScrolling to make
-            // the search bar appear initially results in a bugged search bar that
-            // becomes transparent and floats over the screen as you scroll
-            [UIView animateWithDuration:0.2 animations:^{
-                self.navigationItem.hidesSearchBarWhenScrolling = YES;
-                [self.navigationController.view setNeedsLayout];
-                [self.navigationController.view layoutIfNeeded];
-            }];
-        }
-    }
-
-    // We only want to reveal the search bar when the view controller first appears.
-    self.didInitiallyRevealSearchBar = YES;
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    
-    if (self.manuallyDeactivateSearchOnDisappear && self.searchController.isActive) {
-        self.searchController.active = NO;
-    }
-}
-
-- (void)didMoveToParentViewController:(UIViewController *)parent {
-    [super didMoveToParentViewController:parent];
-    // Reset this since we are re-appearing under a new
-    // parent view controller and need to show it again
-    self.didInitiallyRevealSearchBar = NO;
-}
-
-
-#pragma mark - Toolbar, Public
-
-- (void)setupToolbarItems {
-    if (!self.isViewLoaded) {
-        return;
-    }
-    
-    self.toolbarItems = @[
-        self.leftmostToolbarItem,
-        UIBarButtonItem.flex_flexibleSpace,
-        self.middleLeftToolbarItem,
-        UIBarButtonItem.flex_flexibleSpace,
-        self.middleToolbarItem,
-        UIBarButtonItem.flex_flexibleSpace,
-        self.bookmarksToolbarItem,
-        UIBarButtonItem.flex_flexibleSpace,
-        self.openTabsToolbarItem,
-    ];
-    
-    for (UIBarButtonItem *item in self.toolbarItems) {
-        [item _setWidth:60];
-        // This does not work for anything but fixed spaces for some reason
-        // item.width = 60;
-    }
-    
-    // Disable tabs entirely when not presented by FLEXExplorerViewController
-    UIViewController *presenter = self.navigationController.presentingViewController;
-    if (![presenter isKindOfClass:[FLEXExplorerViewController class]]) {
-        self.openTabsToolbarItem.enabled = NO;
-    }
-}
-
-- (void)addToolbarItems:(NSArray<UIBarButtonItem *> *)items {
-    if (self.showsShareToolbarItem) {
-        // Share button is in the middle, skip middle button
-        if (items.count > 0) {
-            self.middleLeftToolbarItem = items[0];
-        }
-        if (items.count > 1) {
-            self.leftmostToolbarItem = items[1];
-        }
-    } else {
-        // Add buttons right-to-left
-        if (items.count > 0) {
-            self.middleToolbarItem = items[0];
-        }
-        if (items.count > 1) {
-            self.middleLeftToolbarItem = items[1];
-        }
-        if (items.count > 2) {
-            self.leftmostToolbarItem = items[2];
-        }
-    }
-    
-    [self setupToolbarItems];
-}
-
-- (void)setShowsShareToolbarItem:(BOOL)showShare {
-    if (_showsShareToolbarItem != showShare) {
-        _showsShareToolbarItem = showShare;
-        
-        if (showShare) {
-            // Push out leftmost item
-            self.leftmostToolbarItem = self.middleLeftToolbarItem;
-            self.middleLeftToolbarItem = self.middleToolbarItem;
-            
-            // Use share for middle
-            self.middleToolbarItem = self.shareToolbarItem;
-        } else {
-            // Remove share, shift custom items rightward
-            self.middleToolbarItem = self.middleLeftToolbarItem;
-            self.middleLeftToolbarItem = self.leftmostToolbarItem;
-            self.leftmostToolbarItem = UIBarButtonItem.flex_fixedSpace;
-        }
-    }
-    
-    [self setupToolbarItems];
-}
-
-- (void)shareButtonPressed:(UIBarButtonItem *)sender {
-
-}
-
-
-#pragma mark - Private
-
-- (void)debounce:(void(^)(void))block {
-    [self.debounceTimer invalidate];
-    
-    self.debounceTimer = [NSTimer
-        scheduledTimerWithTimeInterval:self.searchBarDebounceInterval
-        target:block
-        selector:@selector(invoke)
-        userInfo:nil
-        repeats:NO
-    ];
-}
-
-- (void)layoutTableHeaderIfNeeded {
-    if (self.showsCarousel) {
-        self.carousel.frame = FLEXRectSetHeight(
-            self.carousel.frame, self.carousel.intrinsicContentSize.height
-        );
-    }
-    
-    self.tableView.tableHeaderView = self.tableView.tableHeaderView;
-}
-
-- (void)addCarousel:(FLEXScopeCarousel *)carousel {
-    if (@available(iOS 11.0, *)) {
-        self.tableView.tableHeaderView = carousel;
-    } else {
-        carousel.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
-        
-        CGRect frame = self.tableHeaderViewContainer.frame;
-        CGRect subviewFrame = carousel.frame;
-        subviewFrame.origin.y = 0;
-        
-        // Put the carousel below the search bar if it's already there
-        if (self.showsSearchBar) {
-            carousel.frame = subviewFrame = FLEXRectSetY(
-                subviewFrame, self.searchController.searchBar.frame.size.height
-            );
-            frame.size.height += carousel.intrinsicContentSize.height;
-        } else {
-            frame.size.height = carousel.intrinsicContentSize.height;
-        }
-        
-        self.tableHeaderViewContainer.frame = frame;
-        [self.tableHeaderViewContainer addSubview:carousel];
-    }
-    
-    [self layoutTableHeaderIfNeeded];
-}
-
-- (void)removeCarousel:(FLEXScopeCarousel *)carousel {
-    [carousel removeFromSuperview];
-    
-    if (@available(iOS 11.0, *)) {
-        self.tableView.tableHeaderView = nil;
-    } else {
-        if (self.showsSearchBar) {
-            [self removeSearchController:self.searchController];
-            [self addSearchController:self.searchController];
-        } else {
-            self.tableView.tableHeaderView = nil;
-            _tableHeaderViewContainer = nil;
-        }
-    }
-}
-
-- (void)addSearchController:(UISearchController *)controller {
-    if (@available(iOS 11.0, *)) {
-        self.navigationItem.searchController = controller;
-    } else {
-        controller.searchBar.autoresizingMask |= UIViewAutoresizingFlexibleBottomMargin;
-        [self.tableHeaderViewContainer addSubview:controller.searchBar];
-        CGRect subviewFrame = controller.searchBar.frame;
-        CGRect frame = self.tableHeaderViewContainer.frame;
-        frame.size.width = MAX(frame.size.width, subviewFrame.size.width);
-        frame.size.height = subviewFrame.size.height;
-        
-        // Move the carousel down if it's already there
-        if (self.showsCarousel) {
-            self.carousel.frame = FLEXRectSetY(
-                self.carousel.frame, subviewFrame.size.height
-            );
-            frame.size.height += self.carousel.frame.size.height;
-        }
-        
-        self.tableHeaderViewContainer.frame = frame;
-        [self layoutTableHeaderIfNeeded];
-    }
-}
-
-- (void)removeSearchController:(UISearchController *)controller {
-    if (@available(iOS 11.0, *)) {
-        self.navigationItem.searchController = nil;
-    } else {
-        [controller.searchBar removeFromSuperview];
-        
-        if (self.showsCarousel) {
-//            self.carousel.frame = FLEXRectRemake(CGPointZero, self.carousel.frame.size);
-            [self removeCarousel:self.carousel];
-            [self addCarousel:self.carousel];
-        } else {
-            self.tableView.tableHeaderView = nil;
-            _tableHeaderViewContainer = nil;
-        }
-    }
-}
-
-- (UIView *)tableHeaderViewContainer {
-    if (!_tableHeaderViewContainer) {
-        _tableHeaderViewContainer = [UIView new];
-        self.tableView.tableHeaderView = self.tableHeaderViewContainer;
-    }
-    
-    return _tableHeaderViewContainer;
-}
-
-- (void)showBookmarks {
-    UINavigationController *nav = [[UINavigationController alloc]
-        initWithRootViewController:[FLEXBookmarksViewController new]
-    ];
-    [self presentViewController:nav animated:YES completion:nil];
-}
-
-- (void)showTabSwitcher {
-    UINavigationController *nav = [[UINavigationController alloc]
-        initWithRootViewController:[FLEXTabsViewController new]
-    ];
-    [self presentViewController:nav animated:YES completion:nil];
-}
-
-
-#pragma mark - Search Bar
-
-#pragma mark UISearchResultsUpdating
-
-- (void)updateSearchResultsForSearchController:(UISearchController *)searchController {
-    [self.debounceTimer invalidate];
-    NSString *text = searchController.searchBar.text;
-    
-    void (^updateSearchResults)() = ^{
-        if (self.searchResultsUpdater) {
-            [self.searchResultsUpdater updateSearchResults:text];
-        } else {
-            [self.searchDelegate updateSearchResults:text];
-        }
-    };
-    
-    // Only debounce if we want to, and if we have a non-empty string
-    // Empty string events are sent instantly
-    if (text.length && self.searchBarDebounceInterval > kFLEXDebounceInstant) {
-        [self debounce:updateSearchResults];
-    } else {
-        updateSearchResults();
-    }
-}
-
-
-#pragma mark UISearchControllerDelegate
-
-- (void)willPresentSearchController:(UISearchController *)searchController {
-    // Manually show cancel button for < iOS 13
-    if (!@available(iOS 13, *) && self.automaticallyShowsSearchBarCancelButton) {
-        [searchController.searchBar setShowsCancelButton:YES animated:YES];
-    }
-}
-
-- (void)willDismissSearchController:(UISearchController *)searchController {
-    // Manually hide cancel button for < iOS 13
-    if (!@available(iOS 13, *) && self.automaticallyShowsSearchBarCancelButton) {
-        [searchController.searchBar setShowsCancelButton:NO animated:YES];
-    }
-}
-
-
-#pragma mark UISearchBarDelegate
-
-/// Not necessary in iOS 13; remove this when iOS 13 is the deployment target
-- (void)searchBar:(UISearchBar *)searchBar selectedScopeButtonIndexDidChange:(NSInteger)selectedScope {
-    [self updateSearchResultsForSearchController:self.searchController];
-}
-
-
-#pragma mark Table View
-
-/// Not having a title in the first section looks weird with a rounded-corner table view style
-- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
-    if (@available(iOS 13, *)) {
-        if (self.style == UITableViewStyleInsetGrouped) {
-            return @" ";
-        }
-    }
-
-    return nil; // For plain/gropued style
-}
-
-@end

Classes/Core/FLEXSingleRowSection.h

@@ -1,28 +0,0 @@
-//
-//  FLEXSingleRowSection.h
-//  FLEX
-//
-//  Created by Tanner Bennett on 9/25/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableViewSection.h"
-
-/// A section providing a specific single row.
-///
-/// You may optionally provide a view controller to push when the row
-/// is selected, or an action to perform when it is selected.
-/// Which one is used first is up to the table view data source.
-@interface FLEXSingleRowSection : FLEXTableViewSection
-
-/// @param reuseIdentifier if nil, kFLEXDefaultCell is used.
-+ (instancetype)title:(NSString *)sectionTitle
-                reuse:(NSString *)reuseIdentifier
-                 cell:(void(^)(__kindof UITableViewCell *cell))cellConfiguration;
-
-@property (nonatomic) UIViewController *pushOnSelection;
-@property (nonatomic) void (^selectionAction)(UIViewController *host);
-/// Called to determine whether the single row should display itself or not.
-@property (nonatomic) BOOL (^filterMatcher)(NSString *filterText);
-
-@end

Classes/Core/FLEXSingleRowSection.m

@@ -1,87 +0,0 @@
-//
-//  FLEXSingleRowSection.m
-//  FLEX
-//
-//  Created by Tanner Bennett on 9/25/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXSingleRowSection.h"
-#import "FLEXTableView.h"
-
-@interface FLEXSingleRowSection ()
-@property (nonatomic, readonly) NSString *reuseIdentifier;
-@property (nonatomic, readonly) void (^cellConfiguration)(__kindof UITableViewCell *cell);
-
-@property (nonatomic) NSString *lastTitle;
-@property (nonatomic) NSString *lastSubitle;
-@end
-
-@implementation FLEXSingleRowSection
-
-#pragma mark - Public
-
-+ (instancetype)title:(NSString *)title
-                reuse:(NSString *)reuse
-                 cell:(void (^)(__kindof UITableViewCell *))config {
-    return [[self alloc] initWithTitle:title reuse:reuse cell:config];
-}
-
-- (id)initWithTitle:(NSString *)sectionTitle
-              reuse:(NSString *)reuseIdentifier
-               cell:(void (^)(__kindof UITableViewCell *))cellConfiguration {
-    self = [super init];
-    if (self) {
-        _title = sectionTitle;
-        _reuseIdentifier = reuseIdentifier ?: kFLEXDefaultCell;
-        _cellConfiguration = cellConfiguration;
-    }
-
-    return self;
-}
-
-#pragma mark - Overrides
-
-- (NSInteger)numberOfRows {
-    if (self.filterMatcher && self.filterText.length) {
-        return self.filterMatcher(self.filterText) ? 1 : 0;
-    }
-    
-    return 1;
-}
-
-- (BOOL)canSelectRow:(NSInteger)row {
-    return self.pushOnSelection || self.selectionAction;
-}
-
-- (void (^)(__kindof UIViewController *))didSelectRowAction:(NSInteger)row {
-    return self.selectionAction;
-}
-
-- (UIViewController *)viewControllerToPushForRow:(NSInteger)row {
-    return self.pushOnSelection;
-}
-
-- (NSString *)reuseIdentifierForRow:(NSInteger)row {
-    return self.reuseIdentifier;
-}
-
-- (void)configureCell:(__kindof UITableViewCell *)cell forRow:(NSInteger)row {
-    cell.textLabel.text = nil;
-    cell.detailTextLabel.text = nil;
-    cell.accessoryType = UITableViewCellAccessoryNone;
-    
-    self.cellConfiguration(cell);
-    self.lastTitle = cell.textLabel.text;
-    self.lastSubitle = cell.detailTextLabel.text;
-}
-
-- (NSString *)titleForRow:(NSInteger)row {
-    return self.lastTitle;
-}
-
-- (NSString *)subtitleForRow:(NSInteger)row {
-    return self.lastSubitle;
-}
-
-@end

Classes/Core/FLEXTableViewSection.h

@@ -1,134 +0,0 @@
-//
-//  FLEXTableViewSection.h
-//  FLEX
-//
-//  Created by Tanner on 1/29/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "FLEXMacros.h"
-#import "NSArray+FLEX.h"
-@class FLEXTableView;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark FLEXTableViewSection
-
-/// An abstract base class for table view sections.
-///
-/// Many properties or methods here return nil or some logical equivalent by default.
-/// Even so, most of the methods with defaults are intended to be overriden by subclasses.
-/// Some methods are not implemented at all and MUST be implemented by a subclass.
-@interface FLEXTableViewSection : NSObject {
-    @protected
-    /// Unused by default, use if you want
-    NSString *_title;
-}
-
-#pragma mark - Data
-
-/// A title to be displayed for the custom section.
-/// Subclasses may override or use the \c _title ivar.
-@property (nonatomic, readonly, nullable, copy) NSString *title;
-/// The number of rows in this section. Subclasses must override.
-/// This should not change until \c filterText is changed or \c reloadData is called.
-@property (nonatomic, readonly) NSInteger numberOfRows;
-/// A map of reuse identifiers to \c UITableViewCell (sub)class objects.
-/// Subclasses \e may override this as necessary, but are not required to.
-/// See \c FLEXTableView.h for more information.
-/// @return nil by default.
-@property (nonatomic, readonly, nullable) NSDictionary<NSString *, Class> *cellRegistrationMapping;
-
-/// The section should filter itself based on the contents of this property
-/// as it is set. If it is set to nil or an empty string, it should not filter.
-/// Subclasses should override or observe this property and react to changes.
-///
-/// It is common practice to use two arrays for the underlying model:
-/// One to hold all rows, and one to hold unfiltered rows. When \c setFilterText:
-/// is called, call \c super to store the new value, and re-filter your model accordingly.
-@property (nonatomic, nullable) NSString *filterText;
-
-/// Provides an avenue for the section to refresh data or change the number of rows.
-///
-/// This is called before reloading the table view itself. If your section pulls data
-/// from an external data source, this is a good place to refresh that data entirely.
-/// If your section does not, then it might be simpler for you to just override
-/// \c setFilterText: to call \c super and call \c reloadData.
-- (void)reloadData;
-
-#pragma mark - Row Selection
-
-/// Whether the given row should be selectable, such as if tapping the cell
-/// should take the user to a new screen or trigger an action.
-/// Subclasses \e may override this as necessary, but are not required to.
-/// @return \c NO by default
-- (BOOL)canSelectRow:(NSInteger)row;
-
-/// An action "future" to be triggered when the row is selected, if the row
-/// supports being selected as indicated by \c canSelectRow:. Subclasses
-/// must implement this in accordance with how they implement \c canSelectRow:
-/// if they do not implement \c viewControllerToPushForRow:
-/// @return This returns \c nil if no view controller is provided by
-/// \c viewControllerToPushForRow: — otherwise it pushes that view controller
-/// onto \c host.navigationController
-- (nullable void(^)(__kindof UIViewController *host))didSelectRowAction:(NSInteger)row;
-
-/// A view controller to display when the row is selected, if the row
-/// supports being selected as indicated by \c canSelectRow:. Subclasses
-/// must implement this in accordance with how they implement \c canSelectRow:
-/// if they do not implement \c didSelectRowAction:
-/// @return \c nil by default
-- (nullable UIViewController *)viewControllerToPushForRow:(NSInteger)row;
-
-/// Called when the accessory view's detail button is pressed.
-/// @return \c nil by default.
-- (nullable void(^)(__kindof UIViewController *host))didPressInfoButtonAction:(NSInteger)row;
-
-#pragma mark - Context Menus
-#if FLEX_AT_LEAST_IOS13_SDK
-
-/// By default, this is the title of the row.
-/// @return The title of the context menu, if any.
-- (nullable NSString *)menuTitleForRow:(NSInteger)row API_AVAILABLE(ios(13.0));
-/// Protected, not intended for public use. \c menuTitleForRow:
-/// already includes the value returned from this method.
-/// 
-/// By default, this returns \c @"". Subclasses may override to
-/// provide a detailed description of the target of the context menu.
-- (NSString *)menuSubtitleForRow:(NSInteger)row API_AVAILABLE(ios(13.0));
-/// The context menu items, if any. Subclasses may override.
-/// By default, only inludes items for \c copyMenuItemsForRow:.
-- (nullable NSArray<UIMenuElement *> *)menuItemsForRow:(NSInteger)row sender:(UIViewController *)sender API_AVAILABLE(ios(13.0));
-/// Subclasses may override to return a list of copiable items.
-///
-/// Every two elements in the list compose a key-value pair, where the key
-/// should be a description of what will be copied, and the values should be
-/// the strings to copy. Return an empty string as a value to show a disabled action.
-- (nullable NSArray<NSString *> *)copyMenuItemsForRow:(NSInteger)row API_AVAILABLE(ios(13.0));
-#endif
-
-#pragma mark - Cell Configuration
-
-/// Provide a reuse identifier for the given row. Subclasses should override.
-///
-/// Custom reuse identifiers should be specified in \c cellRegistrationMapping.
-/// You may return any of the identifiers in \c FLEXTableView.h
-/// without including them in the \c cellRegistrationMapping.
-/// @return \c kFLEXDefaultCell by default.
-- (NSString *)reuseIdentifierForRow:(NSInteger)row;
-/// Configure a cell for the given row. Subclasses must override.
-- (void)configureCell:(__kindof UITableViewCell *)cell forRow:(NSInteger)row;
-
-#pragma mark - External Convenience
-
-/// For use by whatever view controller uses your section. Not required.
-/// @return An optional title.
-- (nullable NSString *)titleForRow:(NSInteger)row;
-/// For use by whatever view controller uses your section. Not required.
-/// @return An optional subtitle.
-- (nullable NSString *)subtitleForRow:(NSInteger)row;
-
-@end
-
-NS_ASSUME_NONNULL_END

Classes/Core/FLEXTableViewSection.m

@@ -1,128 +0,0 @@
-//
-//  FLEXTableViewSection.m
-//  FLEX
-//
-//  Created by Tanner on 1/29/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableViewSection.h"
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "UIMenu+FLEX.h"
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wincomplete-implementation"
-
-@implementation FLEXTableViewSection
-
-- (NSInteger)numberOfRows {
-    return 0;
-}
-
-- (void)reloadData { }
-
-- (NSDictionary<NSString *,Class> *)cellRegistrationMapping {
-    return nil;
-}
-
-- (BOOL)canSelectRow:(NSInteger)row { return NO; }
-
-- (void (^)(__kindof UIViewController *))didSelectRowAction:(NSInteger)row {
-    UIViewController *toPush = [self viewControllerToPushForRow:row];
-    if (toPush) {
-        return ^(UIViewController *host) {
-            [host.navigationController pushViewController:toPush animated:YES];
-        };
-    }
-
-    return nil;
-}
-
-- (UIViewController *)viewControllerToPushForRow:(NSInteger)row {
-    return nil;
-}
-
-- (void (^)(__kindof UIViewController *))didPressInfoButtonAction:(NSInteger)row {
-    return nil;
-}
-
-- (NSString *)reuseIdentifierForRow:(NSInteger)row {
-    return kFLEXDefaultCell;
-}
-
-#if FLEX_AT_LEAST_IOS13_SDK
-
-- (NSString *)menuTitleForRow:(NSInteger)row {
-    NSString *title = [self titleForRow:row];
-    NSString *subtitle = [self menuSubtitleForRow:row];
-    
-    if (subtitle.length) {
-        return [NSString stringWithFormat:@"%@\n\n%@", title, subtitle];
-    }
-    
-    return title;
-}
-
-- (NSString *)menuSubtitleForRow:(NSInteger)row {
-    return @"";
-}
-
-- (NSArray<UIMenuElement *> *)menuItemsForRow:(NSInteger)row sender:(UIViewController *)sender API_AVAILABLE(ios(13)) {
-    NSArray<NSString *> *copyItems = [self copyMenuItemsForRow:row];
-    NSAssert(copyItems.count % 2 == 0, @"copyMenuItemsForRow: should return an even list");
-    
-    if (copyItems.count) {
-        NSInteger numberOfActions = copyItems.count / 2;
-        BOOL collapseMenu = numberOfActions > 4;
-        UIImage *copyIcon = [UIImage systemImageNamed:@"doc.on.doc"];
-        
-        NSMutableArray *actions = [NSMutableArray new];
-        
-        for (NSInteger i = 0; i < copyItems.count; i += 2) {
-            NSString *key = copyItems[i], *value = copyItems[i+1];
-            NSString *title = collapseMenu ? key : [@"Copy " stringByAppendingString:key];
-            
-            UIAction *copy = [UIAction
-                actionWithTitle:title
-                image:copyIcon
-                identifier:nil
-                handler:^(__kindof UIAction *action) {
-                    UIPasteboard.generalPasteboard.string = value;
-                }
-            ];
-            if (!value.length) {
-                copy.attributes = UIMenuElementAttributesDisabled;
-            }
-            
-            [actions addObject:copy];
-        }
-        
-        UIMenu *copyMenu = [UIMenu
-            inlineMenuWithTitle:@"Copy…" 
-            image:copyIcon
-            children:actions
-        ];
-        
-        if (collapseMenu) {
-            return @[[copyMenu collapsed]];
-        } else {
-            return @[copyMenu];
-        }
-    }
-    
-    return @[];
-}
-
-#endif
-
-- (NSArray<NSString *> *)copyMenuItemsForRow:(NSInteger)row {
-    return nil;
-}
-
-- (NSString *)titleForRow:(NSInteger)row { return nil; }
-- (NSString *)subtitleForRow:(NSInteger)row { return nil; }
-
-@end
-
-#pragma clang diagnostic pop

Classes/Core/Views/Carousel/FLEXCarouselCell.h

@@ -1,15 +0,0 @@
-//
-//  FLEXCarouselCell.h
-//  FLEX
-//
-//  Created by Tanner Bennett on 7/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface FLEXCarouselCell : UICollectionViewCell
-
-@property (nonatomic, copy) NSString *title;
-
-@end

Classes/Core/Views/Carousel/FLEXCarouselCell.m

@@ -1,93 +0,0 @@
-//
-//  FLEXCarouselCell.m
-//  FLEX
-//
-//  Created by Tanner Bennett on 7/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXCarouselCell.h"
-#import "FLEXColor.h"
-#import "UIView+FLEX_Layout.h"
-
-@interface FLEXCarouselCell ()
-@property (nonatomic, readonly) UILabel *titleLabel;
-@property (nonatomic, readonly) UIView *selectionIndicatorStripe;
-@property (nonatomic) BOOL constraintsInstalled;
-@end
-
-@implementation FLEXCarouselCell
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        _titleLabel = [UILabel new];
-        _selectionIndicatorStripe = [UIView new];
-
-        self.titleLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
-        self.selectionIndicatorStripe.backgroundColor = self.tintColor;
-        if (@available(iOS 10, *)) {
-            self.titleLabel.adjustsFontForContentSizeCategory = YES;
-        }
-
-        [self.contentView addSubview:self.titleLabel];
-        [self.contentView addSubview:self.selectionIndicatorStripe];
-
-        [self installConstraints];
-
-        [self updateAppearance];
-    }
-
-    return self;
-}
-
-- (void)updateAppearance {
-    self.selectionIndicatorStripe.hidden = !self.selected;
-
-    if (self.selected) {
-        self.titleLabel.textColor = self.tintColor;
-    } else {
-        self.titleLabel.textColor = FLEXColor.deemphasizedTextColor;
-    }
-}
-
-#pragma mark Public
-
-- (NSString *)title {
-    return self.titleLabel.text;
-}
-
-- (void)setTitle:(NSString *)title {
-    self.titleLabel.text = title;
-    [self.titleLabel sizeToFit];
-    [self setNeedsLayout];
-}
-
-#pragma mark Overrides
-
-- (void)prepareForReuse {
-    [super prepareForReuse];
-    [self updateAppearance];
-}
-
-- (void)installConstraints {
-    CGFloat stripeHeight = 2;
-
-    self.titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
-    self.selectionIndicatorStripe.translatesAutoresizingMaskIntoConstraints = NO;
-
-    UIView *superview = self.contentView;
-    [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;
-    [self.selectionIndicatorStripe.trailingAnchor constraintEqualToAnchor:superview.trailingAnchor].active = YES;
-    [self.selectionIndicatorStripe.heightAnchor constraintEqualToConstant:stripeHeight].active = YES;
-}
-
-- (void)setSelected:(BOOL)selected {
-    super.selected = selected;
-    [self updateAppearance];
-}
-
-@end

Classes/Core/Views/Carousel/FLEXScopeCarousel.h

@@ -1,20 +0,0 @@
-//
-//  FLEXScopeCarousel.h
-//  FLEX
-//
-//  Created by Tanner Bennett on 7/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-/// Only use on iOS 10 and up. Requires iOS 10 APIs for calculating row sizes.
-@interface FLEXScopeCarousel : UIControl
-
-@property (nonatomic, copy) NSArray<NSString *> *items;
-@property (nonatomic) NSInteger selectedIndex;
-@property (nonatomic) void(^selectedIndexChangedAction)(NSInteger idx);
-
-- (void)registerBlockForDynamicTypeChanges:(void(^)(FLEXScopeCarousel *))handler;
-
-@end

Classes/Core/Views/Carousel/FLEXScopeCarousel.m

@@ -1,204 +0,0 @@
-//
-//  FLEXScopeCarousel.m
-//  FLEX
-//
-//  Created by Tanner Bennett on 7/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXScopeCarousel.h"
-#import "FLEXCarouselCell.h"
-#import "FLEXColor.h"
-#import "UIView+FLEX_Layout.h"
-
-const CGFloat kCarouselItemSpacing = 0;
-NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
-
-@interface FLEXScopeCarousel () <UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout>
-@property (nonatomic, readonly) UICollectionView *collectionView;
-@property (nonatomic, readonly) FLEXCarouselCell *sizingCell;
-
-@property (nonatomic, readonly) id dynamicTypeObserver;
-@property (nonatomic, readonly) NSMutableArray *dynamicTypeHandlers;
-
-@property (nonatomic) BOOL constraintsInstalled;
-@end
-
-@implementation FLEXScopeCarousel
-
-- (id)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        self.backgroundColor = FLEXColor.primaryBackgroundColor;
-        self.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-        self.translatesAutoresizingMaskIntoConstraints = YES;
-        _dynamicTypeHandlers = [NSMutableArray new];
-        
-        CGSize itemSize = CGSizeZero;
-        if (@available(iOS 10.0, *)) {
-            itemSize = UICollectionViewFlowLayoutAutomaticSize;
-        }
-
-        // Collection view layout
-        UICollectionViewFlowLayout *layout = ({
-            UICollectionViewFlowLayout *layout = [UICollectionViewFlowLayout new];
-            layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
-            layout.sectionInset = UIEdgeInsetsZero;
-            layout.minimumLineSpacing = kCarouselItemSpacing;
-            layout.itemSize = itemSize;
-            layout.estimatedItemSize = itemSize;
-            layout;
-        });
-
-        // Collection view
-        _collectionView = ({
-            UICollectionView *cv = [[UICollectionView alloc]
-                initWithFrame:CGRectZero
-                collectionViewLayout:layout
-            ];
-            cv.showsHorizontalScrollIndicator = NO;
-            cv.backgroundColor = UIColor.clearColor;
-            cv.delegate = self;
-            cv.dataSource = self;
-            [cv registerClass:[FLEXCarouselCell class] forCellWithReuseIdentifier:kCarouselCellReuseIdentifier];
-
-            [self addSubview:cv];
-            cv;
-        });
-
-
-        // Sizing cell
-        _sizingCell = [FLEXCarouselCell new];
-        self.sizingCell.title = @"NSObject";
-
-        // Dynamic type
-        __weak __typeof(self) weakSelf = self;
-        _dynamicTypeObserver = [NSNotificationCenter.defaultCenter
-            addObserverForName:UIContentSizeCategoryDidChangeNotification
-            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);
-                }
-            }
-        ];
-    }
-
-    return self;
-}
-
-- (void)dealloc {
-    [NSNotificationCenter.defaultCenter removeObserver:self.dynamicTypeObserver];
-}
-
-#pragma mark - Overrides
-
-- (void)drawRect:(CGRect)rect {
-    [super drawRect:rect];
-
-    CGFloat width = 1.f / UIScreen.mainScreen.scale;
-
-    // Draw hairline
-    CGContextRef context = UIGraphicsGetCurrentContext();
-    CGContextSetStrokeColorWithColor(context, FLEXColor.hairlineColor.CGColor);
-    CGContextSetLineWidth(context, width);
-    CGContextMoveToPoint(context, 0, rect.size.height - width);
-    CGContextAddLineToPoint(context, rect.size.width, rect.size.height - width);
-    CGContextStrokePath(context);
-}
-
-+ (BOOL)requiresConstraintBasedLayout {
-    return YES;
-}
-
-- (void)updateConstraints {
-    if (!self.constraintsInstalled) {
-        self.collectionView.translatesAutoresizingMaskIntoConstraints = NO;
-        [self.collectionView pinEdgesToSuperview];
-        
-        self.constraintsInstalled = YES;
-    }
-    
-    [super updateConstraints];
-}
-
-- (CGSize)intrinsicContentSize {
-    return CGSizeMake(
-        UIViewNoIntrinsicMetric,
-        [self.sizingCell systemLayoutSizeFittingSize:UILayoutFittingCompressedSize].height
-    );
-}
-
-#pragma mark - Public
-
-- (void)setItems:(NSArray<NSString *> *)items {
-    NSParameterAssert(items.count);
-
-    _items = items.copy;
-
-    // Refresh list, select first item initially
-    [self.collectionView reloadData];
-    self.selectedIndex = 0;
-}
-
-- (void)setSelectedIndex:(NSInteger)idx {
-    NSParameterAssert(idx < self.items.count);
-
-    _selectedIndex = idx;
-    NSIndexPath *path = [NSIndexPath indexPathForItem:idx inSection:0];
-    [self.collectionView selectItemAtIndexPath:path
-                                      animated:YES
-                                scrollPosition:UICollectionViewScrollPositionCenteredHorizontally];
-    [self collectionView:self.collectionView didSelectItemAtIndexPath:path];
-}
-
-- (void)registerBlockForDynamicTypeChanges:(void (^)(FLEXScopeCarousel *))handler {
-    [self.dynamicTypeHandlers addObject:handler];
-}
-
-#pragma mark - UICollectionView
-
-- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-//    if (@available(iOS 10.0, *)) {
-//        return UICollectionViewFlowLayoutAutomaticSize;
-//    }
-    
-    self.sizingCell.title = self.items[indexPath.item];
-    return [self.sizingCell systemLayoutSizeFittingSize:UILayoutFittingCompressedSize];
-}
-
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    return self.items.count;
-}
-
-- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView
-                  cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-    FLEXCarouselCell *cell = (id)[collectionView dequeueReusableCellWithReuseIdentifier:kCarouselCellReuseIdentifier
-                                                                           forIndexPath:indexPath];
-    cell.title = self.items[indexPath.row];
-    return cell;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
-    _selectedIndex = indexPath.item; // In case self.selectedIndex didn't trigger this call
-
-    if (self.selectedIndexChangedAction) {
-        self.selectedIndexChangedAction(indexPath.row);
-    }
-
-    // TODO: dynamically choose a scroll position. Very wide items should
-    // get "Left" while smaller items should not scroll at all, unless
-    // they are only partially on the screen, in which case they
-    // should get "HorizontallyCentered" to bring them onto the screen.
-    // For now, everything goes to the left, as this has a similar effect.
-    [collectionView scrollToItemAtIndexPath:indexPath
-                           atScrollPosition:UICollectionViewScrollPositionLeft
-                                   animated:YES];
-    [self sendActionsForControlEvents:UIControlEventValueChanged];
-}
-
-@end

Classes/Core/Views/Cells/FLEXCodeFontCell.h

@@ -1,17 +0,0 @@
-//
-//  FLEXCodeFontCell.h
-//  FLEX
-//
-//  Created by Tanner on 12/27/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXMultilineTableViewCell.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FLEXCodeFontCell : FLEXMultilineDetailTableViewCell
-
-@end
-
-NS_ASSUME_NONNULL_END

Classes/Core/Views/Cells/FLEXCodeFontCell.m

@@ -1,34 +0,0 @@
-//
-//  FLEXCodeFontCell.m
-//  FLEX
-//
-//  Created by Tanner on 12/27/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXCodeFontCell.h"
-#import "UIFont+FLEX.h"
-
-@implementation FLEXCodeFontCell
-
-- (void)postInit {
-    [super postInit];
-    
-    self.titleLabel.font = UIFont.flex_codeFont;
-    self.subtitleLabel.font = UIFont.flex_codeFont;
-
-    self.titleLabel.adjustsFontSizeToFitWidth = YES;
-    self.titleLabel.minimumScaleFactor = 0.9;
-    self.subtitleLabel.adjustsFontSizeToFitWidth = YES;
-    self.subtitleLabel.minimumScaleFactor = 0.75;
-    
-    // Disable mutli-line pre iOS 11
-    if (@available(iOS 11, *)) {
-        self.subtitleLabel.numberOfLines = 5;
-    } else {
-        self.titleLabel.numberOfLines = 1;
-        self.subtitleLabel.numberOfLines = 1;
-    }
-}
-
-@end

Classes/Core/Views/Cells/FLEXKeyValueTableViewCell.h

@@ -1,13 +0,0 @@
-//
-//  FLEXKeyValueTableViewCell.h
-//  FLEX
-//
-//  Created by Tanner Bennett on 1/23/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableViewCell.h"
-
-@interface FLEXKeyValueTableViewCell : FLEXTableViewCell
-
-@end

Classes/Core/Views/Cells/FLEXKeyValueTableViewCell.m

@@ -1,17 +0,0 @@
-//
-//  FLEXKeyValueTableViewCell.m
-//  FLEX
-//
-//  Created by Tanner Bennett on 1/23/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXKeyValueTableViewCell.h"
-
-@implementation FLEXKeyValueTableViewCell
-
-- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-    return [super initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:reuseIdentifier];
-}
-
-@end

Classes/Core/Views/Cells/FLEXMultilineTableViewCell.h

@@ -1,24 +0,0 @@
-//
-//  FLEXMultilineTableViewCell.h
-//  FLEX
-//
-//  Created by Ryan Olson on 2/13/15.
-//  Copyright (c) 2015 f. All rights reserved.
-//
-
-#import "FLEXTableViewCell.h"
-
-/// A cell with both labels set to be multi-line capable.
-@interface FLEXMultilineTableViewCell : FLEXTableViewCell
-
-+ (CGFloat)preferredHeightWithAttributedText:(NSAttributedString *)attributedText
-                                    maxWidth:(CGFloat)contentViewWidth
-                                       style:(UITableViewStyle)style
-                              showsAccessory:(BOOL)showsAccessory;
-
-@end
-
-/// A \c FLEXMultilineTableViewCell initialized with \c UITableViewCellStyleSubtitle
-@interface FLEXMultilineDetailTableViewCell : FLEXMultilineTableViewCell
-
-@end

Classes/Core/Views/Cells/FLEXMultilineTableViewCell.m

@@ -1,67 +0,0 @@
-//
-//  FLEXMultilineTableViewCell.m
-//  FLEX
-//
-//  Created by Ryan Olson on 2/13/15.
-//  Copyright (c) 2015 f. All rights reserved.
-//
-
-#import "FLEXMultilineTableViewCell.h"
-#import "UIView+FLEX_Layout.h"
-#import "FLEXUtility.h"
-
-@interface FLEXMultilineTableViewCell ()
-@property (nonatomic, readonly) UILabel *_titleLabel;
-@property (nonatomic, readonly) UILabel *_subtitleLabel;
-@property (nonatomic) BOOL constraintsUpdated;
-@end
-
-@implementation FLEXMultilineTableViewCell
-
-- (void)postInit {
-    [super postInit];
-    
-    self.titleLabel.numberOfLines = 0;
-    self.subtitleLabel.numberOfLines = 0;
-}
-
-+ (UIEdgeInsets)labelInsets {
-    return UIEdgeInsetsMake(10.0, 16.0, 10.0, 8.0);
-}
-
-+ (CGFloat)preferredHeightWithAttributedText:(NSAttributedString *)attributedText
-                                    maxWidth:(CGFloat)contentViewWidth
-                                       style:(UITableViewStyle)style
-                              showsAccessory:(BOOL)showsAccessory {
-    CGFloat labelWidth = contentViewWidth;
-
-    // Content view inset due to accessory view observed on iOS 8.1 iPhone 6.
-    if (showsAccessory) {
-        labelWidth -= 34.0;
-    }
-
-    UIEdgeInsets labelInsets = [self labelInsets];
-    labelWidth -= (labelInsets.left + labelInsets.right);
-
-    CGSize constrainSize = CGSizeMake(labelWidth, CGFLOAT_MAX);
-    CGRect boundingBox = [attributedText
-        boundingRectWithSize:constrainSize
-        options:NSStringDrawingUsesLineFragmentOrigin
-        context:nil
-    ];
-    CGFloat preferredLabelHeight = FLEXFloor(boundingBox.size.height);
-    CGFloat preferredCellHeight = preferredLabelHeight + labelInsets.top + labelInsets.bottom + 1.0;
-
-    return preferredCellHeight;
-}
-
-@end
-
-
-@implementation FLEXMultilineDetailTableViewCell
-
-- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-    return [super initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:reuseIdentifier];
-}
-
-@end

Classes/Core/Views/Cells/FLEXSubtitleTableViewCell.h

@@ -1,14 +0,0 @@
-//
-//  FLEXSubtitleTableViewCell.h
-//  FLEX
-//
-//  Created by Tanner on 4/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableViewCell.h"
-
-/// A cell initialized with \c UITableViewCellStyleSubtitle
-@interface FLEXSubtitleTableViewCell : FLEXTableViewCell
-
-@end

Classes/Core/Views/Cells/FLEXSubtitleTableViewCell.m

@@ -1,17 +0,0 @@
-//
-//  FLEXSubtitleTableViewCell.m
-//  FLEX
-//
-//  Created by Tanner on 4/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXSubtitleTableViewCell.h"
-
-@implementation FLEXSubtitleTableViewCell
-
-- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-    return [super initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:reuseIdentifier];
-}
-
-@end

Classes/Core/Views/Cells/FLEXTableViewCell.h

@@ -1,23 +0,0 @@
-//
-//  FLEXTableViewCell.h
-//  FLEX
-//
-//  Created by Tanner on 4/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface FLEXTableViewCell : UITableViewCell
-
-/// Use this instead of .textLabel
-@property (nonatomic, readonly) UILabel *titleLabel;
-/// Use this instead of .detailTextLabel
-@property (nonatomic, readonly) UILabel *subtitleLabel;
-
-/// Subclasses can override this instead of initializers to
-/// perform additional initialization without lots of boilerplate.
-/// Remember to call super!
-- (void)postInit;
-
-@end

Classes/Core/Views/Cells/FLEXTableViewCell.m

@@ -1,57 +0,0 @@
-//
-//  FLEXTableViewCell.m
-//  FLEX
-//
-//  Created by Tanner on 4/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableViewCell.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
-#import "FLEXTableView.h"
-
-@interface UITableView (Internal)
-// Exists at least since iOS 5
-- (BOOL)_canPerformAction:(SEL)action forCell:(UITableViewCell *)cell sender:(id)sender;
-- (void)_performAction:(SEL)action forCell:(UITableViewCell *)cell sender:(id)sender;
-@end
-
-@interface UITableViewCell (Internal)
-// Exists at least since iOS 5
-@property (nonatomic, readonly) FLEXTableView *_tableView;
-@end
-
-@implementation FLEXTableViewCell
-
-- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
-    if (self) {
-        [self postInit];
-    }
-
-    return self;
-}
-
-- (void)postInit {
-    UIFont *cellFont = UIFont.flex_defaultTableCellFont;
-    self.titleLabel.font = cellFont;
-    self.subtitleLabel.font = cellFont;
-    self.subtitleLabel.textColor = FLEXColor.deemphasizedTextColor;
-    
-    self.titleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
-    self.subtitleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
-    
-    self.titleLabel.numberOfLines = 1;
-    self.subtitleLabel.numberOfLines = 1;
-}
-
-- (UILabel *)titleLabel {
-    return self.textLabel;
-}
-
-- (UILabel *)subtitleLabel {
-    return self.detailTextLabel;
-}
-
-@end

Classes/Core/Views/FLEXTableView.h

@@ -1,48 +0,0 @@
-//
-//  FLEXTableView.h
-//  FLEX
-//
-//  Created by Tanner on 4/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark Reuse identifiers
-
-typedef NSString * FLEXTableViewCellReuseIdentifier;
-
-/// A regular \c FLEXTableViewCell initialized with \c UITableViewCellStyleDefault
-extern FLEXTableViewCellReuseIdentifier const kFLEXDefaultCell;
-/// A \c FLEXSubtitleTableViewCell initialized with \c UITableViewCellStyleSubtitle
-extern FLEXTableViewCellReuseIdentifier const kFLEXDetailCell;
-/// A \c FLEXMultilineTableViewCell initialized with \c UITableViewCellStyleDefault
-extern FLEXTableViewCellReuseIdentifier const kFLEXMultilineCell;
-/// A \c FLEXMultilineTableViewCell initialized with \c UITableViewCellStyleSubtitle
-extern FLEXTableViewCellReuseIdentifier const kFLEXMultilineDetailCell;
-/// A \c FLEXTableViewCell initialized with \c UITableViewCellStyleValue1
-extern FLEXTableViewCellReuseIdentifier const kFLEXKeyValueCell;
-/// A \c FLEXSubtitleTableViewCell which uses monospaced fonts for both labels
-extern FLEXTableViewCellReuseIdentifier const kFLEXCodeFontCell;
-
-#pragma mark - FLEXTableView
-@interface FLEXTableView : UITableView
-
-+ (instancetype)flexDefaultTableView;
-+ (instancetype)groupedTableView;
-+ (instancetype)plainTableView;
-+ (instancetype)style:(UITableViewStyle)style;
-
-/// You do not need to register classes for any of the default reuse identifiers above
-/// (annotated as \c FLEXTableViewCellReuseIdentifier types) unless you wish to provide
-/// a custom cell for any of those reuse identifiers. By default, \c FLEXTableViewCell,
-/// \c FLEXSubtitleTableViewCell, and \c FLEXMultilineTableViewCell are used, respectively.
-///
-/// @param registrationMapping A map of reuse identifiers to \c UITableViewCell (sub)class objects.
-- (void)registerCells:(NSDictionary<NSString *, Class> *)registrationMapping;
-
-@end
-
-NS_ASSUME_NONNULL_END

Classes/Core/Views/FLEXTableView.m

@@ -1,91 +0,0 @@
-//
-//  FLEXTableView.m
-//  FLEX
-//
-//  Created by Tanner on 4/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "FLEXSubtitleTableViewCell.h"
-#import "FLEXMultilineTableViewCell.h"
-#import "FLEXKeyValueTableViewCell.h"
-#import "FLEXCodeFontCell.h"
-
-FLEXTableViewCellReuseIdentifier const kFLEXDefaultCell = @"kFLEXDefaultCell";
-FLEXTableViewCellReuseIdentifier const kFLEXDetailCell = @"kFLEXDetailCell";
-FLEXTableViewCellReuseIdentifier const kFLEXMultilineCell = @"kFLEXMultilineCell";
-FLEXTableViewCellReuseIdentifier const kFLEXMultilineDetailCell = @"kFLEXMultilineDetailCell";
-FLEXTableViewCellReuseIdentifier const kFLEXKeyValueCell = @"kFLEXKeyValueCell";
-FLEXTableViewCellReuseIdentifier const kFLEXCodeFontCell = @"kFLEXCodeFontCell";
-
-#pragma mark Private
-
-@interface UITableView (Private)
-- (CGFloat)_heightForHeaderInSection:(NSInteger)section;
-- (NSString *)_titleForHeaderInSection:(NSInteger)section;
-@end
-
-@implementation FLEXTableView
-
-+ (instancetype)flexDefaultTableView {
-#if FLEX_AT_LEAST_IOS13_SDK
-    if (@available(iOS 13.0, *)) {
-        return [[self alloc] initWithFrame:CGRectZero style:UITableViewStyleInsetGrouped];
-    } else {
-        return [[self alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
-    }
-#else
-    return [[self alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
-#endif
-}
-
-#pragma mark - Initialization
-
-+ (id)groupedTableView {
-#if FLEX_AT_LEAST_IOS13_SDK
-    if (@available(iOS 13.0, *)) {
-        return [[self alloc] initWithFrame:CGRectZero style:UITableViewStyleInsetGrouped];
-    } else {
-        return [[self alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
-    }
-#else
-    return [[self alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
-#endif
-}
-
-+ (id)plainTableView {
-    return [[self alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
-}
-
-+ (id)style:(UITableViewStyle)style {
-    return [[self alloc] initWithFrame:CGRectZero style:style];
-}
-
-- (id)initWithFrame:(CGRect)frame style:(UITableViewStyle)style {
-    self = [super initWithFrame:frame style:style];
-    if (self) {
-        [self registerCells:@{
-            kFLEXDefaultCell : [FLEXTableViewCell class],
-            kFLEXDetailCell : [FLEXSubtitleTableViewCell class],
-            kFLEXMultilineCell : [FLEXMultilineTableViewCell class],
-            kFLEXMultilineDetailCell : [FLEXMultilineDetailTableViewCell class],
-            kFLEXKeyValueCell : [FLEXKeyValueTableViewCell class],
-            kFLEXCodeFontCell : [FLEXCodeFontCell class],
-        }];
-    }
-
-    return self;
-}
-
-
-#pragma mark - Public
-
-- (void)registerCells:(NSDictionary<NSString*, Class> *)registrationMapping {
-    [registrationMapping enumerateKeysAndObjectsUsingBlock:^(NSString *identifier, Class cellClass, BOOL *stop) {
-        [self registerClass:cellClass forCellReuseIdentifier:identifier];
-    }];
-}
-
-@end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/30/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/30/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputColorView.h"
@@ -14,8 +14,8 @@
 
 @interface FLEXColorComponentInputView : UIView
 
-@property (nonatomic) UISlider *slider;
-@property (nonatomic) UILabel *valueLabel;
+@property (nonatomic, strong) UISlider *slider;
+@property (nonatomic, strong) UILabel *valueLabel;
 
 @property (nonatomic, weak) id <FLEXColorComponentInputViewDelegate> delegate;
 
@@ -30,16 +30,18 @@
 
 @implementation FLEXColorComponentInputView
 
-- (id)initWithFrame:(CGRect)frame {
+- (id)initWithFrame:(CGRect)frame
+{
     self = [super initWithFrame:frame];
     if (self) {
-        self.slider = [UISlider new];
+        self.slider = [[UISlider alloc] init];
+        self.slider.backgroundColor = self.backgroundColor;
         [self.slider addTarget:self action:@selector(sliderChanged:) forControlEvents:UIControlEventValueChanged];
         [self addSubview:self.slider];
         
-        self.valueLabel = [UILabel new];
+        self.valueLabel = [[UILabel alloc] init];
         self.valueLabel.backgroundColor = self.backgroundColor;
-        self.valueLabel.font = [UIFont systemFontOfSize:14.0];
+        self.valueLabel.font = [FLEXUtility defaultFontOfSize:14.0];
         self.valueLabel.textAlignment = NSTextAlignmentRight;
         [self addSubview:self.valueLabel];
         
@@ -48,13 +50,15 @@
     return self;
 }
 
-- (void)setBackgroundColor:(UIColor *)backgroundColor {
+- (void)setBackgroundColor:(UIColor *)backgroundColor
+{
     [super setBackgroundColor:backgroundColor];
     self.slider.backgroundColor = backgroundColor;
     self.valueLabel.backgroundColor = backgroundColor;
 }
 
-- (void)layoutSubviews {
+- (void)layoutSubviews
+{
     [super layoutSubviews];
     
     const CGFloat kValueLabelWidth = 50.0;
@@ -69,16 +73,19 @@
     self.valueLabel.frame = CGRectMake(valueLabelOriginX, valueLabelOriginY, kValueLabelWidth, self.valueLabel.frame.size.height);
 }
 
-- (void)sliderChanged:(id)sender {
+- (void)sliderChanged:(id)sender
+{
     [self.delegate colorComponentInputViewValueDidChange:self];
     [self updateValueLabel];
 }
 
-- (void)updateValueLabel {
+- (void)updateValueLabel
+{
     self.valueLabel.text = [NSString stringWithFormat:@"%.3f", self.slider.value];
 }
 
-- (CGSize)sizeThatFits:(CGSize)size {
+- (CGSize)sizeThatFits:(CGSize)size
+{
     CGFloat height = [self.slider sizeThatFits:size].height;
     return CGSizeMake(size.width, height);
 }
@@ -87,48 +94,52 @@
 
 @interface FLEXColorPreviewBox : UIView
 
-@property (nonatomic) UIColor *color;
+@property (nonatomic, strong) UIColor *color;
 
-@property (nonatomic) UIView *colorOverlayView;
+@property (nonatomic, strong) UIView *colorOverlayView;
 
 @end
 
 @implementation FLEXColorPreviewBox
 
-- (id)initWithFrame:(CGRect)frame {
+- (id)initWithFrame:(CGRect)frame
+{
     self = [super initWithFrame:frame];
     if (self) {
         self.layer.borderWidth = 1.0;
-        self.layer.borderColor = UIColor.blackColor.CGColor;
+        self.layer.borderColor = [[UIColor blackColor] CGColor];
         self.backgroundColor = [UIColor colorWithPatternImage:[[self class] backgroundPatternImage]];
         
         self.colorOverlayView = [[UIView alloc] initWithFrame:self.bounds];
         self.colorOverlayView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-        self.colorOverlayView.backgroundColor = UIColor.clearColor;
+        self.colorOverlayView.backgroundColor = [UIColor clearColor];
         [self addSubview:self.colorOverlayView];
     }
     return self;
 }
 
-- (void)setColor:(UIColor *)color {
+- (void)setColor:(UIColor *)color
+{
     self.colorOverlayView.backgroundColor = color;
 }
 
-- (UIColor *)color {
+- (UIColor *)color
+{
     return self.colorOverlayView.backgroundColor;
 }
 
-+ (UIImage *)backgroundPatternImage {
++ (UIImage *)backgroundPatternImage
+{
     const CGFloat kSquareDimension = 5.0;
     CGSize squareSize = CGSizeMake(kSquareDimension, kSquareDimension);
     CGSize imageSize = CGSizeMake(2.0 * kSquareDimension, 2.0 * kSquareDimension);
     
-    UIGraphicsBeginImageContextWithOptions(imageSize, YES, UIScreen.mainScreen.scale);
+    UIGraphicsBeginImageContextWithOptions(imageSize, YES, [[UIScreen mainScreen] scale]);
     
-    [UIColor.whiteColor setFill];
+    [[UIColor whiteColor] setFill];
     UIRectFill(CGRectMake(0, 0, imageSize.width, imageSize.height));
     
-    [UIColor.grayColor setFill];
+    [[UIColor grayColor] setFill];
     UIRectFill(CGRectMake(squareSize.width, 0, squareSize.width, squareSize.height));
     UIRectFill(CGRectMake(0, squareSize.height, squareSize.width, squareSize.height));
     
@@ -142,53 +153,55 @@
 
 @interface FLEXArgumentInputColorView () <FLEXColorComponentInputViewDelegate>
 
-@property (nonatomic) FLEXColorPreviewBox *colorPreviewBox;
-@property (nonatomic) UILabel *hexLabel;
-@property (nonatomic) FLEXColorComponentInputView *alphaInput;
-@property (nonatomic) FLEXColorComponentInputView *redInput;
-@property (nonatomic) FLEXColorComponentInputView *greenInput;
-@property (nonatomic) FLEXColorComponentInputView *blueInput;
+@property (nonatomic, strong) FLEXColorPreviewBox *colorPreviewBox;
+@property (nonatomic, strong) UILabel *hexLabel;
+@property (nonatomic, strong) FLEXColorComponentInputView *alphaInput;
+@property (nonatomic, strong) FLEXColorComponentInputView *redInput;
+@property (nonatomic, strong) FLEXColorComponentInputView *greenInput;
+@property (nonatomic, strong) FLEXColorComponentInputView *blueInput;
 
 @end
 
 @implementation FLEXArgumentInputColorView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithArgumentTypeEncoding:typeEncoding];
     if (self) {
-        self.colorPreviewBox = [FLEXColorPreviewBox new];
+        self.colorPreviewBox = [[FLEXColorPreviewBox alloc] init];
         [self addSubview:self.colorPreviewBox];
         
-        self.hexLabel = [UILabel new];
+        self.hexLabel = [[UILabel alloc] init];
         self.hexLabel.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.9];
         self.hexLabel.textAlignment = NSTextAlignmentCenter;
-        self.hexLabel.font = [UIFont systemFontOfSize:12.0];
+        self.hexLabel.font = [FLEXUtility defaultFontOfSize:12.0];
         [self addSubview:self.hexLabel];
         
-        self.alphaInput = [FLEXColorComponentInputView new];
-        self.alphaInput.slider.minimumTrackTintColor = UIColor.blackColor;
+        self.alphaInput = [[FLEXColorComponentInputView alloc] init];
+        self.alphaInput.slider.minimumTrackTintColor = [UIColor blackColor];
         self.alphaInput.delegate = self;
         [self addSubview:self.alphaInput];
         
-        self.redInput = [FLEXColorComponentInputView new];
-        self.redInput.slider.minimumTrackTintColor = UIColor.redColor;
+        self.redInput = [[FLEXColorComponentInputView alloc] init];
+        self.redInput.slider.minimumTrackTintColor = [UIColor redColor];
         self.redInput.delegate = self;
         [self addSubview:self.redInput];
         
-        self.greenInput = [FLEXColorComponentInputView new];
-        self.greenInput.slider.minimumTrackTintColor = UIColor.greenColor;
+        self.greenInput = [[FLEXColorComponentInputView alloc] init];
+        self.greenInput.slider.minimumTrackTintColor = [UIColor greenColor];
         self.greenInput.delegate = self;
         [self addSubview:self.greenInput];
         
-        self.blueInput = [FLEXColorComponentInputView new];
-        self.blueInput.slider.minimumTrackTintColor = UIColor.blueColor;
+        self.blueInput = [[FLEXColorComponentInputView alloc] init];
+        self.blueInput.slider.minimumTrackTintColor = [UIColor blueColor];
         self.blueInput.delegate = self;
         [self addSubview:self.blueInput];
     }
     return self;
 }
 
-- (void)setBackgroundColor:(UIColor *)backgroundColor {
+- (void)setBackgroundColor:(UIColor *)backgroundColor
+{
     [super setBackgroundColor:backgroundColor];
     self.alphaInput.backgroundColor = backgroundColor;
     self.redInput.backgroundColor = backgroundColor;
@@ -196,7 +209,8 @@
     self.blueInput.backgroundColor = backgroundColor;
 }
 
-- (void)layoutSubviews {
+- (void)layoutSubviews
+{
     [super layoutSubviews];
     
     CGFloat runningOriginY = 0;
@@ -207,8 +221,8 @@
     
     [self.hexLabel sizeToFit];
     const CGFloat kLabelVerticalOutsetAmount = 0.0;
-    const CGFloat kLabelHorizontalOutsetAmount = 2.0;
-    UIEdgeInsets labelOutset = UIEdgeInsetsMake(-kLabelVerticalOutsetAmount, -kLabelHorizontalOutsetAmount, -kLabelVerticalOutsetAmount, -kLabelHorizontalOutsetAmount);
+    const CGFloat kLabelHorizonalOutsetAmount = 2.0;
+    UIEdgeInsets labelOutset = UIEdgeInsetsMake(-kLabelVerticalOutsetAmount, -kLabelHorizonalOutsetAmount, -kLabelVerticalOutsetAmount, -kLabelHorizonalOutsetAmount);
     self.hexLabel.frame = UIEdgeInsetsInsetRect(self.hexLabel.frame, labelOutset);
     CGFloat hexLabelOriginX = self.colorPreviewBox.layer.borderWidth;
     CGFloat hexLabelOriginY = CGRectGetMaxY(self.colorPreviewBox.frame) - self.colorPreviewBox.layer.borderWidth - self.hexLabel.frame.size.height;
@@ -222,7 +236,8 @@
     }
 }
 
-- (void)setInputValue:(id)inputValue {
+- (void)setInputValue:(id)inputValue
+{
     if ([inputValue isKindOfClass:[UIColor class]]) {
         [self updateWithColor:inputValue];
     } else if ([inputValue isKindOfClass:[NSValue class]]) {
@@ -233,20 +248,21 @@
             UIColor *color = [[UIColor alloc] initWithCGColor:colorRef];
             [self updateWithColor:color];
         }
-    } else {
-        [self updateWithColor:UIColor.clearColor];
     }
 }
 
-- (id)inputValue {
+- (id)inputValue
+{
     return [UIColor colorWithRed:self.redInput.slider.value green:self.greenInput.slider.value blue:self.blueInput.slider.value alpha:self.alphaInput.slider.value];
 }
 
-- (void)colorComponentInputViewValueDidChange:(FLEXColorComponentInputView *)colorComponentInputView {
+- (void)colorComponentInputViewValueDidChange:(FLEXColorComponentInputView *)colorComponentInputView
+{
     [self updateColorPreview];
 }
 
-- (void)updateWithColor:(UIColor *)color {
+- (void)updateWithColor:(UIColor *)color
+{
     CGFloat red, green, blue, white, alpha;
     if ([color getRed:&red green:&green blue:&blue alpha:&alpha]) {
         self.alphaInput.slider.value = alpha;
@@ -270,7 +286,8 @@
     [self updateColorPreview];
 }
 
-- (void)updateColorPreview {
+- (void)updateColorPreview
+{
     self.colorPreviewBox.color = self.inputValue;
     unsigned char redByte = self.redInput.slider.value * 255;
     unsigned char greenByte = self.greenInput.slider.value * 255;
@@ -279,7 +296,8 @@
     [self setNeedsLayout];
 }
 
-- (CGSize)sizeThatFits:(CGSize)size {
+- (CGSize)sizeThatFits:(CGSize)size
+{
     CGFloat height = 0;
     height += [[self class] colorPreviewBoxHeight];
     height += [[self class] inputViewVerticalPadding];
@@ -293,19 +311,19 @@
     return CGSizeMake(size.width, height);
 }
 
-+ (CGFloat)inputViewVerticalPadding {
++ (CGFloat)inputViewVerticalPadding
+{
     return 10.0;
 }
 
-+ (CGFloat)colorPreviewBoxHeight {
++ (CGFloat)colorPreviewBoxHeight
+{
     return 40.0;
 }
 
-+ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
-    NSParameterAssert(type);
-
-    // We don't care if currentValue is a color or not; we will default to +clearColor
-    return (strcmp(type, @encode(CGColorRef)) == 0) || (strcmp(type, FLEXEncodeClass(UIColor)) == 0);
++ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value
+{
+    return (type && (strcmp(type, @encode(CGColorRef)) == 0 || strcmp(type, FLEXEncodeClass(UIColor)) == 0)) || [value isKindOfClass:[UIColor class]];
 }
 
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputDateView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Daniel Rodriguez Troitino on 2/14/15.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2015 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputDateView.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Daniel Rodriguez Troitino on 2/14/15.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2015 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputDateView.h"
@@ -11,16 +11,17 @@
 
 @interface FLEXArgumentInputDateView ()
 
-@property (nonatomic) UIDatePicker *datePicker;
+@property (nonatomic, strong) UIDatePicker *datePicker;
 
 @end
 
 @implementation FLEXArgumentInputDateView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithArgumentTypeEncoding:typeEncoding];
     if (self) {
-        self.datePicker = [UIDatePicker new];
+        self.datePicker = [[UIDatePicker alloc] init];
         self.datePicker.datePickerMode = UIDatePickerModeDateAndTime;
         // Using UTC, because that's what the NSDate description prints
         self.datePicker.calendar = [NSCalendar calendarWithIdentifier:NSCalendarIdentifierGregorian];
@@ -30,29 +31,33 @@
     return self;
 }
 
-- (void)setInputValue:(id)inputValue {
+- (void)setInputValue:(id)inputValue
+{
     if ([inputValue isKindOfClass:[NSDate class]]) {
         self.datePicker.date = inputValue;
     }
 }
 
-- (id)inputValue {
+- (id)inputValue
+{
     return self.datePicker.date;
 }
 
-- (void)layoutSubviews {
+- (void)layoutSubviews
+{
     [super layoutSubviews];
     self.datePicker.frame = self.bounds;
 }
 
-- (CGSize)sizeThatFits:(CGSize)size {
+- (CGSize)sizeThatFits:(CGSize)size
+{
     CGFloat height = [self.datePicker sizeThatFits:size].height;
     return CGSizeMake(size.width, height);
 }
 
-+ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
-    NSParameterAssert(type);
-    return strcmp(type, FLEXEncodeClass(NSDate)) == 0;
++ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value
+{
+    return (type && (strcmp(type, FLEXEncodeClass(NSDate)) == 0)) || [value isKindOfClass:[NSDate class]];
 }
 
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/28/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontView.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/28/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputFontView.h"
@@ -13,22 +13,25 @@
 
 @interface FLEXArgumentInputFontView ()
 
-@property (nonatomic) FLEXArgumentInputView *fontNameInput;
-@property (nonatomic) FLEXArgumentInputView *pointSizeInput;
+@property (nonatomic, strong) FLEXArgumentInputView *fontNameInput;
+@property (nonatomic, strong) FLEXArgumentInputView *pointSizeInput;
 
 @end
 
 @implementation FLEXArgumentInputFontView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithArgumentTypeEncoding:typeEncoding];
     if (self) {
         self.fontNameInput = [[FLEXArgumentInputFontsPickerView alloc] initWithArgumentTypeEncoding:FLEXEncodeClass(NSString)];
+        self.fontNameInput.backgroundColor = self.backgroundColor;
         self.fontNameInput.targetSize = FLEXArgumentInputViewSizeSmall;
         self.fontNameInput.title = @"Font Name:";
         [self addSubview:self.fontNameInput];
         
         self.pointSizeInput = [FLEXArgumentInputViewFactory argumentInputViewForTypeEncoding:@encode(CGFloat)];
+        self.pointSizeInput.backgroundColor = self.backgroundColor;
         self.pointSizeInput.targetSize = FLEXArgumentInputViewSizeSmall;
         self.pointSizeInput.title = @"Point Size:";
         [self addSubview:self.pointSizeInput];
@@ -36,13 +39,15 @@
     return self;
 }
 
-- (void)setBackgroundColor:(UIColor *)backgroundColor {
+- (void)setBackgroundColor:(UIColor *)backgroundColor
+{
     [super setBackgroundColor:backgroundColor];
     self.fontNameInput.backgroundColor = backgroundColor;
     self.pointSizeInput.backgroundColor = backgroundColor;
 }
 
-- (void)setInputValue:(id)inputValue {
+- (void)setInputValue:(id)inputValue
+{
     if ([inputValue isKindOfClass:[UIFont class]]) {
         UIFont *font = (UIFont *)inputValue;
         self.fontNameInput.inputValue = font.fontName;
@@ -50,7 +55,8 @@
     }
 }
 
-- (id)inputValue {
+- (id)inputValue
+{
     CGFloat pointSize = 0;
     if ([self.pointSizeInput.inputValue isKindOfClass:[NSValue class]]) {
         NSValue *pointSizeValue = (NSValue *)self.pointSizeInput.inputValue;
@@ -61,14 +67,16 @@
     return [UIFont fontWithName:self.fontNameInput.inputValue size:pointSize];
 }
 
-- (BOOL)inputViewIsFirstResponder {
+- (BOOL)inputViewIsFirstResponder
+{
     return [self.fontNameInput inputViewIsFirstResponder] || [self.pointSizeInput inputViewIsFirstResponder];
 }
 
 
 #pragma mark - Layout and Sizing
 
-- (void)layoutSubviews {
+- (void)layoutSubviews
+{
     [super layoutSubviews];
     
     CGFloat runningOriginY = self.topInputFieldVerticalLayoutGuide;
@@ -81,11 +89,13 @@
     self.pointSizeInput.frame = CGRectMake(0, runningOriginY, pointSizeFitSize.width, pointSizeFitSize.height);
 }
 
-+ (CGFloat)verticalPaddingBetweenFields {
++ (CGFloat)verticalPaddingBetweenFields
+{
     return 10.0;
 }
 
-- (CGSize)sizeThatFits:(CGSize)size {
+- (CGSize)sizeThatFits:(CGSize)size
+{
     CGSize fitSize = [super sizeThatFits:size];
     
     CGSize constrainSize = CGSizeMake(size.width, CGFLOAT_MAX);
@@ -101,9 +111,11 @@
 
 #pragma mark -
 
-+ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
-    NSParameterAssert(type);
-    return strcmp(type, FLEXEncodeClass(UIFont)) == 0;
++ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value
+{
+    BOOL supported = type && strcmp(type, FLEXEncodeClass(UIFont)) == 0;
+    supported = supported || (value && [value isKindOfClass:[UIFont class]]);
+    return supported;
 }
 
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.h

@@ -1,6 +1,6 @@
 //
 //  FLEXArgumentInputFontsPickerView.h
-//  FLEX
+//  UICatalog
 //
 //  Created by 啟倫 陳 on 2014/7/27.
 //  Copyright (c) 2014年 f. All rights reserved.

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.m

@@ -1,6 +1,6 @@
 //
 //  FLEXArgumentInputFontsPickerView.m
-//  FLEX
+//  UICatalog
 //
 //  Created by 啟倫 陳 on 2014/7/27.
 //  Copyright (c) 2014年 f. All rights reserved.
@@ -11,14 +11,15 @@
 
 @interface FLEXArgumentInputFontsPickerView ()
 
-@property (nonatomic) NSMutableArray<NSString *> *availableFonts;
+@property (nonatomic, strong) NSMutableArray<NSString *> *availableFonts;
 
 @end
 
 
 @implementation FLEXArgumentInputFontsPickerView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithArgumentTypeEncoding:typeEncoding];
     if (self) {
         self.targetSize = FLEXArgumentInputViewSizeSmall;
@@ -28,7 +29,8 @@
     return self;
 }
 
-- (void)setInputValue:(id)inputValue {
+- (void)setInputValue:(id)inputValue
+{
     self.inputTextView.text = inputValue;
     if ([self.availableFonts indexOfObject:inputValue] == NSNotFound) {
         [self.availableFonts insertObject:inputValue atIndex:0];
@@ -36,13 +38,15 @@
     [(UIPickerView *)self.inputTextView.inputView selectRow:[self.availableFonts indexOfObject:inputValue] inComponent:0 animated:NO];
 }
 
-- (id)inputValue {
-    return self.inputTextView.text.length > 0 ? [self.inputTextView.text copy] : nil;
+- (id)inputValue
+{
+    return [self.inputTextView.text length] > 0 ? [self.inputTextView.text copy] : nil;
 }
 
 #pragma mark - private
 
-- (UIPickerView*)createFontsPicker {
+- (UIPickerView*)createFontsPicker
+{
     UIPickerView *fontsPicker = [UIPickerView new];
     fontsPicker.dataSource = self;
     fontsPicker.delegate = self;
@@ -50,9 +54,10 @@
     return fontsPicker;
 }
 
-- (void)createAvailableFonts {
-    NSMutableArray<NSString *> *unsortedFontsArray = [NSMutableArray new];
-    for (NSString *eachFontFamily in UIFont.familyNames) {
+- (void)createAvailableFonts
+{
+    NSMutableArray<NSString *> *unsortedFontsArray = [NSMutableArray array];
+    for (NSString *eachFontFamily in [UIFont familyNames]) {
         for (NSString *eachFontName in [UIFont fontNamesForFamilyName:eachFontFamily]) {
             [unsortedFontsArray addObject:eachFontName];
         }
@@ -62,21 +67,24 @@
 
 #pragma mark - UIPickerViewDataSource
 
-- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView {
+- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
+{
     return 1;
 }
 
-- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component {
-    return self.availableFonts.count;
+- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component
+{
+    return [self.availableFonts count];
 }
 
 #pragma mark - UIPickerViewDelegate
 
-- (UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view {
+- (UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view
+{
     UILabel *fontLabel;
     if (!view) {
         fontLabel = [UILabel new];
-        fontLabel.backgroundColor = UIColor.clearColor;
+        fontLabel.backgroundColor = [UIColor clearColor];
         fontLabel.textAlignment = NSTextAlignmentCenter;
     } else {
         fontLabel = (UILabel*)view;
@@ -89,7 +97,8 @@
     return fontLabel;
 }
 
-- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component {
+- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
+{
     self.inputTextView.text = self.availableFonts[row];
 }
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputJSONObjectView.h

@@ -0,0 +1,13 @@
+//
+//  FLEXArgumentInputJSONObjectView.h
+//  Flipboard
+//
+//  Created by Ryan Olson on 6/15/14.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
+//
+
+#import "FLEXArgumentInputTextView.h"
+
+@interface FLEXArgumentInputJSONObjectView : FLEXArgumentInputTextView
+
+@end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputJSONObjectView.m

@@ -0,0 +1,65 @@
+//
+//  FLEXArgumentInputJSONObjectView.m
+//  Flipboard
+//
+//  Created by Ryan Olson on 6/15/14.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
+//
+
+#import "FLEXArgumentInputJSONObjectView.h"
+#import "FLEXRuntimeUtility.h"
+
+@implementation FLEXArgumentInputJSONObjectView
+
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
+    self = [super initWithArgumentTypeEncoding:typeEncoding];
+    if (self) {
+        // Start with the numbers and punctuation keyboard since quotes, curly braces, or
+        // square brackets are likely to be the first characters type for the JSON.
+        self.inputTextView.keyboardType = UIKeyboardTypeNumbersAndPunctuation;
+        self.targetSize = FLEXArgumentInputViewSizeLarge;
+    }
+    return self;
+}
+
+- (void)setInputValue:(id)inputValue
+{
+    self.inputTextView.text = [FLEXRuntimeUtility editableJSONStringForObject:inputValue];
+}
+
+- (id)inputValue
+{
+    return [FLEXRuntimeUtility objectValueFromEditableJSONString:self.inputTextView.text];
+}
+
++ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value
+{
+    // Must be object type.
+    BOOL supported = type && type[0] == '@';
+    
+    if (supported) {
+        if (value) {
+            // If there's a current value, it must be serializable to JSON
+            supported = [FLEXRuntimeUtility editableJSONStringForObject:value] != nil;
+        } else {
+            // Otherwise, see if we have more type information than just 'id'.
+            // If we do, make sure the encoding is something serializable to JSON.
+            // Properties and ivars keep more detailed type encoding information than method arguments.
+            if (strcmp(type, @encode(id)) != 0) {
+                BOOL isJSONSerializableType = NO;
+                // Note: we can't use @encode(NSString) here because that drops the string information and just goes to @encode(id).
+                isJSONSerializableType = isJSONSerializableType || strcmp(type, FLEXEncodeClass(NSString)) == 0;
+                isJSONSerializableType = isJSONSerializableType || strcmp(type, FLEXEncodeClass(NSNumber)) == 0;
+                isJSONSerializableType = isJSONSerializableType || strcmp(type, FLEXEncodeClass(NSArray)) == 0;
+                isJSONSerializableType = isJSONSerializableType || strcmp(type, FLEXEncodeClass(NSDictionary)) == 0;
+                
+                supported = isJSONSerializableType;
+            }
+        }
+    }
+    
+    return supported;
+}
+
+@end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/18/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputTextView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.m

@@ -3,20 +3,20 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/18/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputNotSupportedView.h"
-#import "FLEXColor.h"
 
 @implementation FLEXArgumentInputNotSupportedView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithArgumentTypeEncoding:typeEncoding];
     if (self) {
         self.inputTextView.userInteractionEnabled = NO;
-        self.inputTextView.backgroundColor = [FLEXColor secondaryGroupedBackgroundColorWithAlpha:0.5];
-        self.inputPlaceholderText = @"nil  (type not supported)";
+        self.inputTextView.backgroundColor = [UIColor colorWithWhite:0.8 alpha:1.0];
+        self.inputTextView.text = @"nil";
         self.targetSize = FLEXArgumentInputViewSizeSmall;
     }
     return self;

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNumberView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/15/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputTextView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNumberView.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/15/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputNumberView.h"
@@ -11,52 +11,47 @@
 
 @implementation FLEXArgumentInputNumberView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithArgumentTypeEncoding:typeEncoding];
     if (self) {
         self.inputTextView.keyboardType = UIKeyboardTypeNumbersAndPunctuation;
         self.targetSize = FLEXArgumentInputViewSizeSmall;
     }
-    
     return self;
 }
 
-- (void)setInputValue:(id)inputValue {
+- (void)setInputValue:(id)inputValue
+{
     if ([inputValue respondsToSelector:@selector(stringValue)]) {
         self.inputTextView.text = [inputValue stringValue];
     }
 }
 
-- (id)inputValue {
-    return [FLEXRuntimeUtility valueForNumberWithObjCType:self.typeEncoding.UTF8String fromInputString:self.inputTextView.text];
+- (id)inputValue
+{
+    return [FLEXRuntimeUtility valueForNumberWithObjCType:[self.typeEncoding UTF8String] fromInputString:self.inputTextView.text];
 }
 
-+ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
-    NSParameterAssert(type);
-    
-    static NSArray<NSString *> *supportedTypes = nil;
++ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value
+{
+    static NSArray<NSString *> *primitiveTypes = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        supportedTypes = @[
-            @FLEXEncodeClass(NSNumber),
-            @FLEXEncodeClass(NSDecimalNumber),
-            @(@encode(char)),
-            @(@encode(int)),
-            @(@encode(short)),
-            @(@encode(long)),
-            @(@encode(long long)),
-            @(@encode(unsigned char)),
-            @(@encode(unsigned int)),
-            @(@encode(unsigned short)),
-            @(@encode(unsigned long)),
-            @(@encode(unsigned long long)),
-            @(@encode(float)),
-            @(@encode(double)),
-            @(@encode(long double))
-        ];
+        primitiveTypes = @[@(@encode(char)),
+                           @(@encode(int)),
+                           @(@encode(short)),
+                           @(@encode(long)),
+                           @(@encode(long long)),
+                           @(@encode(unsigned char)),
+                           @(@encode(unsigned int)),
+                           @(@encode(unsigned short)),
+                           @(@encode(unsigned long)),
+                           @(@encode(unsigned long long)),
+                           @(@encode(float)),
+                           @(@encode(double))];
     });
-    
-    return type && [supportedTypes containsObject:@(type)];
+    return type && [primitiveTypes containsObject:@(type)];
 }
 
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.h

@@ -1,13 +0,0 @@
-//
-//  FLEXArgumentInputObjectView.h
-//  Flipboard
-//
-//  Created by Ryan Olson on 6/15/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXArgumentInputTextView.h"
-
-@interface FLEXArgumentInputObjectView : FLEXArgumentInputTextView
-
-@end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.m

@@ -1,232 +0,0 @@
-//
-//  FLEXArgumentInputJSONObjectView.m
-//  Flipboard
-//
-//  Created by Ryan Olson on 6/15/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXArgumentInputObjectView.h"
-#import "FLEXRuntimeUtility.h"
-
-static const CGFloat kSegmentInputMargin = 10;
-
-typedef NS_ENUM(NSUInteger, FLEXArgInputObjectType) {
-    FLEXArgInputObjectTypeJSON,
-    FLEXArgInputObjectTypeAddress
-};
-
-@interface FLEXArgumentInputObjectView ()
-
-@property (nonatomic) UISegmentedControl *objectTypeSegmentControl;
-@property (nonatomic) FLEXArgInputObjectType inputType;
-
-@end
-
-@implementation FLEXArgumentInputObjectView
-
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
-    self = [super initWithArgumentTypeEncoding:typeEncoding];
-    if (self) {
-        // Start with the numbers and punctuation keyboard since quotes, curly braces, or
-        // square brackets are likely to be the first characters type for the JSON.
-        self.inputTextView.keyboardType = UIKeyboardTypeNumbersAndPunctuation;
-        self.targetSize = FLEXArgumentInputViewSizeLarge;
-
-        self.objectTypeSegmentControl = [[UISegmentedControl alloc] initWithItems:@[@"Value", @"Address"]];
-        [self.objectTypeSegmentControl addTarget:self action:@selector(didChangeType) forControlEvents:UIControlEventValueChanged];
-        self.objectTypeSegmentControl.selectedSegmentIndex = 0;
-        [self addSubview:self.objectTypeSegmentControl];
-
-        self.inputType = [[self class] preferredDefaultTypeForObjCType:typeEncoding withCurrentValue:nil];
-        self.objectTypeSegmentControl.selectedSegmentIndex = self.inputType;
-    }
-
-    return self;
-}
-
-- (void)didChangeType {
-    self.inputType = self.objectTypeSegmentControl.selectedSegmentIndex;
-
-    if (super.inputValue) {
-        // Trigger an update to the text field to show
-        // the address of the stored object we were given,
-        // or to show a JSON representation of the object
-        [self populateTextAreaFromValue:super.inputValue];
-    } else {
-        // Clear the text field
-        [self populateTextAreaFromValue:nil];
-    }
-}
-
-- (void)setInputType:(FLEXArgInputObjectType)inputType {
-    if (_inputType == inputType) return;
-
-    _inputType = inputType;
-
-    // Resize input view
-    switch (inputType) {
-        case FLEXArgInputObjectTypeJSON:
-            self.targetSize = FLEXArgumentInputViewSizeLarge;
-            break;
-        case FLEXArgInputObjectTypeAddress:
-            self.targetSize = FLEXArgumentInputViewSizeSmall;
-            break;
-    }
-
-    // Change placeholder
-    switch (inputType) {
-        case FLEXArgInputObjectTypeJSON:
-            self.inputPlaceholderText =
-            @"You can put any valid JSON here, such as a string, number, array, or dictionary:"
-            "\n\"This is a string\""
-            "\n1234"
-            "\n{ \"name\": \"Bob\", \"age\": 47 }"
-            "\n["
-            "\n   1, 2, 3"
-            "\n]";
-            break;
-        case FLEXArgInputObjectTypeAddress:
-            self.inputPlaceholderText = @"0x0000deadb33f";
-            break;
-    }
-
-    [self setNeedsLayout];
-    [self.superview setNeedsLayout];
-}
-
-- (void)setInputValue:(id)inputValue {
-    super.inputValue = inputValue;
-    [self populateTextAreaFromValue:inputValue];
-}
-
-- (id)inputValue {
-    switch (self.inputType) {
-        case FLEXArgInputObjectTypeJSON:
-            return [FLEXRuntimeUtility objectValueFromEditableJSONString:self.inputTextView.text];
-        case FLEXArgInputObjectTypeAddress: {
-            NSScanner *scanner = [NSScanner scannerWithString:self.inputTextView.text];
-
-            unsigned long long objectPointerValue;
-            if ([scanner scanHexLongLong:&objectPointerValue]) {
-                return (__bridge id)(void *)objectPointerValue;
-            }
-
-            return nil;
-        }
-    }
-}
-
-- (void)populateTextAreaFromValue:(id)value {
-    if (!value) {
-        self.inputTextView.text = nil;
-    } else {
-        if (self.inputType == FLEXArgInputObjectTypeJSON) {
-            self.inputTextView.text = [FLEXRuntimeUtility editableJSONStringForObject:value];
-        } else if (self.inputType == FLEXArgInputObjectTypeAddress) {
-            self.inputTextView.text = [NSString stringWithFormat:@"%p", value];
-        }
-    }
-
-    // Delegate methods are not called for programmatic changes
-    [self textViewDidChange:self.inputTextView];
-}
-
-- (CGSize)sizeThatFits:(CGSize)size {
-    CGSize fitSize = [super sizeThatFits:size];
-    fitSize.height += [self.objectTypeSegmentControl sizeThatFits:size].height + kSegmentInputMargin;
-
-    return fitSize;
-}
-
-- (void)layoutSubviews {
-    CGFloat segmentHeight = [self.objectTypeSegmentControl sizeThatFits:self.frame.size].height;
-    self.objectTypeSegmentControl.frame = CGRectMake(
-        0.0,
-        // Our segmented control is taking the position
-        // of the text view, as far as super is concerned,
-        // and we override this property to be different
-        super.topInputFieldVerticalLayoutGuide,
-        self.frame.size.width,
-        segmentHeight
-    );
-
-    [super layoutSubviews];
-}
-
-- (CGFloat)topInputFieldVerticalLayoutGuide {
-    // Our text view is offset from the segmented control
-    CGFloat segmentHeight = [self.objectTypeSegmentControl sizeThatFits:self.frame.size].height;
-    return segmentHeight + super.topInputFieldVerticalLayoutGuide + kSegmentInputMargin;
-}
-
-+ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
-    NSParameterAssert(type);
-    // Must be object type
-    return type[0] == FLEXTypeEncodingObjcObject || type[0] == FLEXTypeEncodingObjcClass;
-}
-
-+ (FLEXArgInputObjectType)preferredDefaultTypeForObjCType:(const char *)type withCurrentValue:(id)value {
-    NSParameterAssert(type[0] == FLEXTypeEncodingObjcObject || type[0] == FLEXTypeEncodingObjcClass);
-
-    if (value) {
-        // If there's a current value, it must be serializable to JSON
-        // to display the JSON editor. Otherwise display the address field.
-        if ([FLEXRuntimeUtility editableJSONStringForObject:value]) {
-            return FLEXArgInputObjectTypeJSON;
-        } else {
-            return FLEXArgInputObjectTypeAddress;
-        }
-    } else {
-        // Otherwise, see if we have more type information than just 'id'.
-        // If we do, make sure the encoding is something serializable to JSON.
-        // Properties and ivars keep more detailed type encoding information than method arguments.
-        if (strcmp(type, @encode(id)) != 0) {
-            BOOL isJSONSerializableType = NO;
-
-            // Parse class name out of the string,
-            // which is in the form `@"ClassName"`
-            Class cls = NSClassFromString(({
-                NSString *className = nil;
-                NSScanner *scan = [NSScanner scannerWithString:@(type)];
-                NSCharacterSet *allowed = [NSCharacterSet
-                    characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$"
-                ];
-
-                // Skip over the @" then scan the name
-                if ([scan scanString:@"@\"" intoString:nil]) {
-                    [scan scanCharactersFromSet:allowed intoString:&className];
-                }
-
-                className;
-            }));
-
-            // Note: we can't use @encode(NSString) here because that drops
-            // the class information and just goes to @encode(id).
-            NSArray<Class> *jsonTypes = @[
-                [NSString class],
-                [NSNumber class],
-                [NSArray class],
-                [NSDictionary class],
-            ];
-
-            // Look for matching types
-            for (Class jsonClass in jsonTypes) {
-                if ([cls isSubclassOfClass:jsonClass]) {
-                    isJSONSerializableType = YES;
-                    break;
-                }
-            }
-
-            if (isJSONSerializableType) {
-                return FLEXArgInputObjectTypeJSON;
-            } else {
-                return FLEXArgInputObjectTypeAddress;
-            }
-        } else {
-            return FLEXArgInputObjectTypeAddress;
-        }
-    }
-}
-
-@end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStringView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/28/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputTextView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStringView.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/28/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputStringView.h"
@@ -11,119 +11,35 @@
 
 @implementation FLEXArgumentInputStringView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithArgumentTypeEncoding:typeEncoding];
     if (self) {
-        FLEXTypeEncoding type = typeEncoding[0];
-        if (type == FLEXTypeEncodingConst) {
-            // A crash here would mean an invalid type encoding string
-            type = typeEncoding[1];
-        }
-
-        // Selectors don't need a multi-line text box
-        if (type == FLEXTypeEncodingSelector) {
-            self.targetSize = FLEXArgumentInputViewSizeSmall;
-        } else {
-            self.targetSize = FLEXArgumentInputViewSizeLarge;
-        }
+        self.targetSize = FLEXArgumentInputViewSizeLarge;
     }
     return self;
 }
 
-- (void)setInputValue:(id)inputValue {
-    if ([inputValue isKindOfClass:[NSString class]]) {
-        self.inputTextView.text = inputValue;
-    } else if ([inputValue isKindOfClass:[NSValue class]]) {
-        NSValue *value = (id)inputValue;
-        NSParameterAssert(strlen(value.objCType) == 1);
-
-        // C-String or SEL from NSValue
-        FLEXTypeEncoding type = value.objCType[0];
-        if (type == FLEXTypeEncodingConst) {
-            // A crash here would mean an invalid type encoding string
-            type = value.objCType[1];
-        }
-
-        if (type == FLEXTypeEncodingCString) {
-            self.inputTextView.text = @((const char *)value.pointerValue);
-        } else if (type == FLEXTypeEncodingSelector) {
-            self.inputTextView.text = NSStringFromSelector((SEL)value.pointerValue);
-        }
-    }
+- (void)setInputValue:(id)inputValue
+{
+    self.inputTextView.text = inputValue;
 }
 
-- (id)inputValue {
-    NSString *text = self.inputTextView.text;
-    // Interpret empty string as nil. We loose the ability to set empty string as a string value,
+- (id)inputValue
+{
+    // Interpret empty string as nil. We loose the ablitiy to set empty string as a string value,
     // but we accept that tradeoff in exchange for not having to type quotes for every string.
-    if (!text.length) {
-        return nil;
-    }
-
-    // Case: C-strings and SELs
-    if (self.typeEncoding.length <= 2) {
-        FLEXTypeEncoding type = [self.typeEncoding characterAtIndex:0];
-        if (type == FLEXTypeEncodingConst) {
-            // A crash here would mean an invalid type encoding string
-            type = [self.typeEncoding characterAtIndex:1];
-        }
-
-        if (type == FLEXTypeEncodingCString || type == FLEXTypeEncodingSelector) {
-            const char *encoding = self.typeEncoding.UTF8String;
-            SEL selector = NSSelectorFromString(text);
-            return [NSValue valueWithBytes:&selector objCType:encoding];
-        }
-    }
-
-    // Case: NSStrings
-    return self.inputTextView.text.copy;
+    return [self.inputTextView.text length] > 0 ? [self.inputTextView.text copy] : nil;
 }
 
-// TODO: Support using object address for strings, as in the object arg view.
 
-+ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
-    NSParameterAssert(type);
-    unsigned long len = strlen(type);
+#pragma mark -
 
-    BOOL isConst = type[0] == FLEXTypeEncodingConst;
-    NSInteger i = isConst ? 1 : 0;
-
-    BOOL typeIsString = strcmp(type, FLEXEncodeClass(NSString)) == 0;
-    BOOL typeIsCString = len <= 2 && type[i] == FLEXTypeEncodingCString;
-    BOOL typeIsSEL = len <= 2 && type[i] == FLEXTypeEncodingSelector;
-    BOOL valueIsString = [value isKindOfClass:[NSString class]];
-
-    BOOL typeIsPrimitiveString = typeIsSEL || typeIsCString;
-    BOOL typeIsSupported = typeIsString || typeIsCString || typeIsSEL;
-
-    BOOL valueIsNSValueWithCorrectType = NO;
-    if ([value isKindOfClass:[NSValue class]]) {
-        NSValue *v = (id)value;
-        len = strlen(v.objCType);
-        if (len == 1) {
-            FLEXTypeEncoding type = v.objCType[i];
-            if (type == FLEXTypeEncodingCString && typeIsCString) {
-                valueIsNSValueWithCorrectType = YES;
-            } else if (type == FLEXTypeEncodingSelector && typeIsSEL) {
-                valueIsNSValueWithCorrectType = YES;
-            }
-        }
-    }
-
-    if (!value && typeIsSupported) {
-        return YES;
-    }
-
-    if (typeIsString && valueIsString) {
-        return YES;
-    }
-
-    // Primitive strings can be input as NSStrings or NSValues
-    if (typeIsPrimitiveString && (valueIsString || valueIsNSValueWithCorrectType)) {
-        return YES;
-    }
-
-    return NO;
++ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value
+{
+    BOOL supported = type && strcmp(type, FLEXEncodeClass(NSString)) == 0;
+    supported = supported || (value && [value isKindOfClass:[NSString class]]);
+    return supported;
 }
 
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.m

@@ -3,45 +3,37 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputStructView.h"
 #import "FLEXArgumentInputViewFactory.h"
 #import "FLEXRuntimeUtility.h"
-#import "FLEXTypeEncodingParser.h"
 
-@interface FLEXArgumentInputStructView () <FLEXArgumentInputViewDelegate>
+@interface FLEXArgumentInputStructView ()
 
-@property (nonatomic) NSArray<FLEXArgumentInputView *> *argumentInputViews;
+@property (nonatomic, strong) NSArray<FLEXArgumentInputView *> *argumentInputViews;
 
 @end
 
 @implementation FLEXArgumentInputStructView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithArgumentTypeEncoding:typeEncoding];
     if (self) {
-        NSMutableArray<FLEXArgumentInputView *> *inputViews = [NSMutableArray new];
+        NSMutableArray<FLEXArgumentInputView *> *inputViews = [NSMutableArray array];
         NSArray<NSString *> *customTitles = [[self class] customFieldTitlesForTypeEncoding:typeEncoding];
-        [FLEXRuntimeUtility enumerateTypesInStructEncoding:typeEncoding usingBlock:^(NSString *structName,
-                                                                                     const char *fieldTypeEncoding,
-                                                                                     NSString *prettyTypeEncoding,
-                                                                                     NSUInteger fieldIndex,
-                                                                                     NSUInteger fieldOffset) {
+        [FLEXRuntimeUtility enumerateTypesInStructEncoding:typeEncoding usingBlock:^(NSString *structName, const char *fieldTypeEncoding, NSString *prettyTypeEncoding, NSUInteger fieldIndex, NSUInteger fieldOffset) {
             
-            FLEXArgumentInputView *inputView = [FLEXArgumentInputViewFactory
-                argumentInputViewForTypeEncoding:fieldTypeEncoding
-            ];
+            FLEXArgumentInputView *inputView = [FLEXArgumentInputViewFactory argumentInputViewForTypeEncoding:fieldTypeEncoding];
+            inputView.backgroundColor = self.backgroundColor;
             inputView.targetSize = FLEXArgumentInputViewSizeSmall;
-            inputView.delegate = self;
             
-            if (fieldIndex < customTitles.count) {
+            if (fieldIndex < [customTitles count]) {
                 inputView.title = customTitles[fieldIndex];
             } else {
-                inputView.title = [NSString stringWithFormat:@"%@ field %lu (%@)",
-                    structName, (unsigned long)fieldIndex, prettyTypeEncoding
-                ];
+                inputView.title = [NSString stringWithFormat:@"%@ field %lu (%@)", structName, (unsigned long)fieldIndex, prettyTypeEncoding];
             }
 
             [inputViews addObject:inputView];
@@ -55,32 +47,34 @@
 
 #pragma mark - Superclass Overrides
 
-- (void)setBackgroundColor:(UIColor *)backgroundColor {
+- (void)setBackgroundColor:(UIColor *)backgroundColor
+{
     [super setBackgroundColor:backgroundColor];
     for (FLEXArgumentInputView *inputView in self.argumentInputViews) {
         inputView.backgroundColor = backgroundColor;
     }
 }
 
-- (void)setInputValue:(id)inputValue {
+- (void)setInputValue:(id)inputValue
+{
     if ([inputValue isKindOfClass:[NSValue class]]) {
         const char *structTypeEncoding = [inputValue objCType];
-        if (strcmp(self.typeEncoding.UTF8String, structTypeEncoding) == 0) {
+        if (strcmp([self.typeEncoding UTF8String], structTypeEncoding) == 0) {
             NSUInteger valueSize = 0;
+            @try {
+                // NSGetSizeAndAlignment barfs on type encoding for bitfields.
+                NSGetSizeAndAlignment(structTypeEncoding, &valueSize, NULL);
+            } @catch (NSException *exception) { }
             
-            if (FLEXGetSizeAndAlignment(structTypeEncoding, &valueSize, NULL)) {
+            if (valueSize > 0) {
                 void *unboxedValue = malloc(valueSize);
                 [inputValue getValue:unboxedValue];
-                [FLEXRuntimeUtility enumerateTypesInStructEncoding:structTypeEncoding usingBlock:^(NSString *structName,
-                                                                                                   const char *fieldTypeEncoding,
-                                                                                                   NSString *prettyTypeEncoding,
-                                                                                                   NSUInteger fieldIndex,
-                                                                                                   NSUInteger fieldOffset) {
+                [FLEXRuntimeUtility enumerateTypesInStructEncoding:structTypeEncoding usingBlock:^(NSString *structName, const char *fieldTypeEncoding, NSString *prettyTypeEncoding, NSUInteger fieldIndex, NSUInteger fieldOffset) {
                     
                     void *fieldPointer = unboxedValue + fieldOffset;
                     FLEXArgumentInputView *inputView = self.argumentInputViews[fieldIndex];
                     
-                    if (fieldTypeEncoding[0] == FLEXTypeEncodingObjcObject || fieldTypeEncoding[0] == FLEXTypeEncodingObjcClass) {
+                    if (fieldTypeEncoding[0] == @encode(id)[0] || fieldTypeEncoding[0] == @encode(Class)[0]) {
                         inputView.inputValue = (__bridge id)fieldPointer;
                     } else {
                         NSValue *boxedField = [FLEXRuntimeUtility valueForPrimitivePointer:fieldPointer objCType:fieldTypeEncoding];
@@ -93,23 +87,24 @@
     }
 }
 
-- (id)inputValue {
+- (id)inputValue
+{
     NSValue *boxedStruct = nil;
-    const char *structTypeEncoding = self.typeEncoding.UTF8String;
+    const char *structTypeEncoding = [self.typeEncoding UTF8String];
     NSUInteger structSize = 0;
+    @try {
+        // NSGetSizeAndAlignment barfs on type encoding for bitfields.
+        NSGetSizeAndAlignment(structTypeEncoding, &structSize, NULL);
+    } @catch (NSException *exception) { }
     
-    if (FLEXGetSizeAndAlignment(structTypeEncoding, &structSize, NULL)) {
+    if (structSize > 0) {
         void *unboxedStruct = malloc(structSize);
-        [FLEXRuntimeUtility enumerateTypesInStructEncoding:structTypeEncoding usingBlock:^(NSString *structName,
-                                                                                           const char *fieldTypeEncoding,
-                                                                                           NSString *prettyTypeEncoding,
-                                                                                           NSUInteger fieldIndex,
-                                                                                           NSUInteger fieldOffset) {
+        [FLEXRuntimeUtility enumerateTypesInStructEncoding:structTypeEncoding usingBlock:^(NSString *structName, const char *fieldTypeEncoding, NSString *prettyTypeEncoding, NSUInteger fieldIndex, NSUInteger fieldOffset) {
             
             void *fieldPointer = unboxedStruct + fieldOffset;
             FLEXArgumentInputView *inputView = self.argumentInputViews[fieldIndex];
             
-            if (fieldTypeEncoding[0] == FLEXTypeEncodingObjcObject || fieldTypeEncoding[0] == FLEXTypeEncodingObjcClass) {
+            if (fieldTypeEncoding[0] == @encode(id)[0] || fieldTypeEncoding[0] == @encode(Class)[0]) {
                 // Object fields
                 memcpy(fieldPointer, (__bridge void *)inputView.inputValue, sizeof(id));
             } else {
@@ -128,51 +123,23 @@
     return boxedStruct;
 }
 
-- (FLEXArgumentInputView *)firstResponderInputView {
+- (BOOL)inputViewIsFirstResponder
+{
+    BOOL isFirstResponder = NO;
     for (FLEXArgumentInputView *inputView in self.argumentInputViews) {
         if ([inputView inputViewIsFirstResponder]) {
-            return inputView;
+            isFirstResponder = YES;
+            break;
         }
     }
-    
-    return nil;
-}
-
-- (BOOL)resignFirstResponder {
-    FLEXArgumentInputView *responder = [self firstResponderInputView];
-    if (responder) {
-        return [responder resignFirstResponder];
-    } else {
-        return [super resignFirstResponder];
-    }
-}
-
-
-#pragma mark - FLEXArgumentInputViewDelegate
-
-- (void)argumentInputViewValueDidChange:(FLEXArgumentInputView *)inputView {
-    // Nothing to see here
-}
-
-- (void)argumentInputViewWantsNextAsFirstResponder:(FLEXArgumentInputView *)inputView {
-    if (self.argumentInputViews.lastObject == inputView) {
-        // If this is our last or only input view,
-        // notify the delegate or dismiss the keyboard
-        if (self.delegate) {
-            [self.delegate argumentInputViewWantsNextAsFirstResponder:self];
-        } else {
-            [inputView resignFirstResponder];
-        }
-    } else {
-        NSInteger idx = [self.argumentInputViews indexOfObject:inputView];
-        [self.argumentInputViews[idx+1] becomeFirstResponder];
-    }
+    return isFirstResponder;
 }
 
 
 #pragma mark - Layout and Sizing
 
-- (void)layoutSubviews {
+- (void)layoutSubviews
+{
     [super layoutSubviews];
     
     CGFloat runningOriginY = self.topInputFieldVerticalLayoutGuide;
@@ -184,11 +151,13 @@
     }
 }
 
-+ (CGFloat)verticalPaddingBetweenFields {
++ (CGFloat)verticalPaddingBetweenFields
+{
     return 10.0;
 }
 
-- (CGSize)sizeThatFits:(CGSize)size {
+- (CGSize)sizeThatFits:(CGSize)size
+{
     CGSize fitSize = [super sizeThatFits:size];
     
     CGSize constrainSize = CGSizeMake(size.width, CGFLOAT_MAX);
@@ -205,16 +174,13 @@
 
 #pragma mark - Class Helpers
 
-+ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
-    NSParameterAssert(type);
-    if (type[0] == FLEXTypeEncodingStructBegin) {
-        return FLEXGetSizeAndAlignment(type, nil, nil);
-    }
-
-    return NO;
++ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value
+{
+    return type && type[0] == '{';
 }
 
-+ (NSArray<NSString *> *)customFieldTitlesForTypeEncoding:(const char *)typeEncoding {
++ (NSArray<NSString *> *)customFieldTitlesForTypeEncoding:(const char *)typeEncoding
+{
     NSArray<NSString *> *customTitles = nil;
     if (strcmp(typeEncoding, @encode(CGRect)) == 0) {
         customTitles = @[@"CGPoint origin", @"CGSize size"];
@@ -222,8 +188,6 @@
         customTitles = @[@"CGFloat x", @"CGFloat y"];
     } else if (strcmp(typeEncoding, @encode(CGSize)) == 0) {
         customTitles = @[@"CGFloat width", @"CGFloat height"];
-    } else if (strcmp(typeEncoding, @encode(CGVector)) == 0) {
-        customTitles = @[@"CGFloat dx", @"CGFloat dy"];
     } else if (strcmp(typeEncoding, @encode(UIEdgeInsets)) == 0) {
         customTitles = @[@"CGFloat top", @"CGFloat left", @"CGFloat bottom", @"CGFloat right"];
     } else if (strcmp(typeEncoding, @encode(UIOffset)) == 0) {
@@ -239,13 +203,6 @@
         customTitles = @[@"CGFloat a", @"CGFloat b",
                          @"CGFloat c", @"CGFloat d",
                          @"CGFloat tx", @"CGFloat ty"];
-    } else {
-        if (@available(iOS 11.0, *)) {
-            if (strcmp(typeEncoding, @encode(NSDirectionalEdgeInsets)) == 0) {
-                customTitles = @[@"CGFloat top", @"CGFloat leading",
-                                 @"CGFloat bottom", @"CGFloat trailing"];
-            }
-        }
     }
     return customTitles;
 }

Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.m

@@ -3,23 +3,24 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputSwitchView.h"
 
 @interface FLEXArgumentInputSwitchView ()
 
-@property (nonatomic) UISwitch *inputSwitch;
+@property (nonatomic, strong) UISwitch *inputSwitch;
 
 @end
 
 @implementation FLEXArgumentInputSwitchView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithArgumentTypeEncoding:typeEncoding];
     if (self) {
-        self.inputSwitch = [UISwitch new];
+        self.inputSwitch = [[UISwitch alloc] init];
         [self.inputSwitch addTarget:self action:@selector(switchValueDidChange:) forControlEvents:UIControlEventValueChanged];
         [self.inputSwitch sizeToFit];
         [self addSubview:self.inputSwitch];
@@ -30,7 +31,8 @@
 
 #pragma mark Input/Output
 
-- (void)setInputValue:(id)inputValue {
+- (void)setInputValue:(id)inputValue
+{
     BOOL on = NO;
     if ([inputValue isKindOfClass:[NSNumber class]]) {
         NSNumber *number = (NSNumber *)inputValue;
@@ -44,26 +46,30 @@
     self.inputSwitch.on = on;
 }
 
-- (id)inputValue {
+- (id)inputValue
+{
     BOOL isOn = [self.inputSwitch isOn];
     NSValue *boxedBool = [NSValue value:&isOn withObjCType:@encode(BOOL)];
     return boxedBool;
 }
 
-- (void)switchValueDidChange:(id)sender {
+- (void)switchValueDidChange:(id)sender
+{
     [self.delegate argumentInputViewValueDidChange:self];
 }
 
 
 #pragma mark - Layout and Sizing
 
-- (void)layoutSubviews {
+- (void)layoutSubviews
+{
     [super layoutSubviews];
     
     self.inputSwitch.frame = CGRectMake(0, self.topInputFieldVerticalLayoutGuide, self.inputSwitch.frame.size.width, self.inputSwitch.frame.size.height);
 }
 
-- (CGSize)sizeThatFits:(CGSize)size {
+- (CGSize)sizeThatFits:(CGSize)size
+{
     CGSize fitSize = [super sizeThatFits:size];
     fitSize.height += self.inputSwitch.frame.size.height;
     return fitSize;
@@ -72,10 +78,10 @@
 
 #pragma mark - Class Helpers
 
-+ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
-    NSParameterAssert(type);
++ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value
+{
     // Only BOOLs. Current value is irrelevant.
-    return strcmp(type, @encode(BOOL)) == 0;
+    return type && strcmp(type, @encode(BOOL)) == 0;
 }
 
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h

@@ -8,15 +8,10 @@
 
 #import "FLEXArgumentInputView.h"
 
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FLEXArgumentInputTextView : FLEXArgumentInputView <UITextViewDelegate>
+@interface FLEXArgumentInputTextView : FLEXArgumentInputView
 
 // For subclass eyes only
 
-@property (nonatomic, readonly) UITextView *inputTextView;
-@property (nonatomic, nullable) NSString *inputPlaceholderText;
+@property (nonatomic, strong, readonly) UITextView *inputTextView;
 
 @end
-
-NS_ASSUME_NONNULL_END

Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.m

@@ -6,161 +6,105 @@
 //
 //
 
-#import "FLEXColor.h"
 #import "FLEXArgumentInputTextView.h"
 #import "FLEXUtility.h"
 
-@interface FLEXArgumentInputTextView ()
+@interface FLEXArgumentInputTextView () <UITextViewDelegate>
 
-@property (nonatomic) UITextView *inputTextView;
-@property (nonatomic) UILabel *placeholderLabel;
+@property (nonatomic, strong) UITextView *inputTextView;
 @property (nonatomic, readonly) NSUInteger numberOfInputLines;
 
 @end
 
 @implementation FLEXArgumentInputTextView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithArgumentTypeEncoding:typeEncoding];
     if (self) {
-        self.inputTextView = [UITextView new];
+        self.inputTextView = [[UITextView alloc] init];
         self.inputTextView.font = [[self class] inputFont];
-        self.inputTextView.backgroundColor = FLEXColor.secondaryGroupedBackgroundColor;
-        self.inputTextView.layer.cornerRadius = 10.f;
-        self.inputTextView.contentInset = UIEdgeInsetsMake(0, 5, 0, 0);
+        self.inputTextView.backgroundColor = [UIColor whiteColor];
+        self.inputTextView.layer.borderColor = [[UIColor blackColor] CGColor];
+        self.inputTextView.layer.borderWidth = 1.0;
         self.inputTextView.autocapitalizationType = UITextAutocapitalizationTypeNone;
         self.inputTextView.autocorrectionType = UITextAutocorrectionTypeNo;
         self.inputTextView.delegate = self;
-        self.inputAccessoryView = [self createToolBar];
-        if (@available(iOS 11, *)) {
-            [self.inputTextView.layer setValue:@YES forKey:@"continuousCorners"];
-        } else {
-            self.inputTextView.layer.borderWidth = 1.f;
-            self.inputTextView.layer.borderColor = FLEXColor.borderColor.CGColor;
-        }
-
-        self.placeholderLabel = [UILabel new];
-        self.placeholderLabel.font = self.inputTextView.font;
-        self.placeholderLabel.textColor = FLEXColor.deemphasizedTextColor;
-        self.placeholderLabel.numberOfLines = 0;
-
+        self.inputTextView.inputAccessoryView = [self createToolBar];
         [self addSubview:self.inputTextView];
-        [self.inputTextView addSubview:self.placeholderLabel];
-
     }
     return self;
 }
 
-- (UIToolbar *)inputAccessoryView {
-    return (id)self.inputTextView.inputAccessoryView;
-}
+#pragma mark - private
 
-- (void)setInputAccessoryView:(UIToolbar *)inputAccessoryView {
-    self.inputTextView.inputAccessoryView = inputAccessoryView;
-}
-
-#pragma mark - Private
-
-- (UIToolbar *)createToolBar {
+- (UIToolbar*)createToolBar
+{
     UIToolbar *toolBar = [UIToolbar new];
     [toolBar sizeToFit];
-    UIBarButtonItem *spaceItem = [[UIBarButtonItem alloc]
-        initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
-        target:nil action:nil
-    ];
-    UIBarButtonItem *pasteItem = [[UIBarButtonItem alloc]
-        initWithTitle:@"Paste" style:UIBarButtonItemStyleDone
-        target:self action:@selector(paste:)
-    ];
-    UIBarButtonItem *doneItem = [[UIBarButtonItem alloc]
-        initWithBarButtonSystemItem:UIBarButtonSystemItemDone
-        target:self.inputTextView action:@selector(resignFirstResponder)
-    ];
-    toolBar.items = @[spaceItem, pasteItem, doneItem];
+    UIBarButtonItem *spaceItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
+    UIBarButtonItem *doneItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(textViewDone)];
+    toolBar.items = @[spaceItem, doneItem];
     return toolBar;
 }
 
-- (void)setInputPlaceholderText:(NSString *)placeholder {
-    self.placeholderLabel.text = placeholder;
-    if (placeholder.length) {
-        if (!self.inputTextView.text.length) {
-            self.placeholderLabel.hidden = NO;
-        } else {
-            self.placeholderLabel.hidden = YES;
-        }
-    } else {
-        self.placeholderLabel.hidden = YES;
-    }
-
-    [self setNeedsLayout];
+- (void)textViewDone
+{
+    [self.inputTextView resignFirstResponder];
 }
 
-- (NSString *)inputPlaceholderText {
-    return self.placeholderLabel.text;
-}
 
-- (void)paste:(id)sender {
-    [self.inputTextView paste:sender];
-    
-    if (self.delegate) {
-        [self.delegate argumentInputViewWantsNextAsFirstResponder:self];
-    } else {
-        [self.inputTextView resignFirstResponder];
-    }
+#pragma mark - Text View Changes
+
+- (void)textViewDidChange:(UITextView *)textView
+{
+    [self.delegate argumentInputViewValueDidChange:self];
 }
 
 
 #pragma mark - Superclass Overrides
 
-- (BOOL)inputViewIsFirstResponder {
+- (BOOL)inputViewIsFirstResponder
+{
     return self.inputTextView.isFirstResponder;
 }
 
-- (BOOL)becomeFirstResponder {
-    return [self.inputTextView becomeFirstResponder];
-}
-
-- (BOOL)resignFirstResponder {
-    if (self.inputViewIsFirstResponder) {
-        return self.inputTextView.resignFirstResponder;
-    } else {
-        return [super resignFirstResponder];
-    }
-}
-
 
 #pragma mark - Layout and Sizing
 
-- (void)layoutSubviews {
+- (void)layoutSubviews
+{
     [super layoutSubviews];
     
     self.inputTextView.frame = CGRectMake(0, self.topInputFieldVerticalLayoutGuide, self.bounds.size.width, [self inputTextViewHeight]);
-    // Placeholder label is positioned by insetting then origin
-    // by the content inset then the text container inset
-    CGSize s = self.inputTextView.frame.size;
-    self.placeholderLabel.frame = CGRectMake(0, 0, s.width, s.height);
-    self.placeholderLabel.frame = UIEdgeInsetsInsetRect(
-        UIEdgeInsetsInsetRect(self.placeholderLabel.frame, self.inputTextView.contentInset),
-        self.inputTextView.textContainerInset
-    );
 }
 
-- (NSUInteger)numberOfInputLines {
+- (NSUInteger)numberOfInputLines
+{
+    NSUInteger numberOfInputLines = 0;
     switch (self.targetSize) {
         case FLEXArgumentInputViewSizeDefault:
-            return 2;
+            numberOfInputLines = 2;
+            break;
+            
         case FLEXArgumentInputViewSizeSmall:
-            return 1;
+            numberOfInputLines = 1;
+            break;
+            
         case FLEXArgumentInputViewSizeLarge:
-            return 8;
+            numberOfInputLines = 8;
+            break;
     }
+    return numberOfInputLines;
 }
 
-- (CGFloat)inputTextViewHeight {
+- (CGFloat)inputTextViewHeight
+{
     return ceil([[self class] inputFont].lineHeight * self.numberOfInputLines) + 16.0;
 }
 
-- (CGSize)sizeThatFits:(CGSize)size {
+- (CGSize)sizeThatFits:(CGSize)size
+{
     CGSize fitSize = [super sizeThatFits:size];
     fitSize.height += [self inputTextViewHeight];
     return fitSize;
@@ -169,16 +113,9 @@
 
 #pragma mark - Class Helpers
 
-+ (UIFont *)inputFont {
-    return [UIFont systemFontOfSize:14.0];
-}
-
-
-#pragma mark - UITextViewDelegate
-
-- (void)textViewDidChange:(UITextView *)textView {
-    [self.delegate argumentInputViewValueDidChange:self];
-    self.placeholderLabel.hidden = !(self.inputPlaceholderText.length && !textView.text.length);
++ (UIFont *)inputFont
+{
+    return [FLEXUtility defaultFontOfSize:14.0];
 }
 
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h

@@ -3,24 +3,19 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/30/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
 
 typedef NS_ENUM(NSUInteger, FLEXArgumentInputViewSize) {
-    /// 2 lines, medium-sized
     FLEXArgumentInputViewSizeDefault = 0,
-    /// One line
     FLEXArgumentInputViewSizeSmall,
-    /// Several lines
     FLEXArgumentInputViewSizeLarge
 };
 
 @protocol FLEXArgumentInputViewDelegate;
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface FLEXArgumentInputView : UIView
 
 - (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding;
@@ -31,43 +26,35 @@ NS_ASSUME_NONNULL_BEGIN
 /// To populate the filed with an initial value, set this property.
 /// To reteive the value input by the user, access the property.
 /// Primitive types and structs should/will be boxed in NSValue containers.
-/// Concrete subclasses should override both the setter and getter for this property.
-/// Subclasses can call super.inputValue to access a backing store for the value.
-@property (nonatomic, nullable) id inputValue;
+/// Concrete subclasses *must* override both the setter and getter for this property.
+@property (nonatomic) id inputValue;
 
 /// Setting this value to large will make some argument input views increase the size of their input field(s).
 /// Useful to increase the use of space if there is only one input view on screen (i.e. for property and ivar editing).
-@property (nonatomic) FLEXArgumentInputViewSize targetSize;
+@property (nonatomic, assign) FLEXArgumentInputViewSize targetSize;
 
 /// Users of the input view can get delegate callbacks for incremental changes in user input.
-@property (nonatomic, weak, nullable) id <FLEXArgumentInputViewDelegate> delegate;
+@property (nonatomic, weak) id <FLEXArgumentInputViewDelegate> delegate;
 
 // Subclasses can override
 
-@property (nonatomic, nullable) UIToolbar *inputAccessoryView;
-
 /// If the input view has one or more text views, returns YES when one of them is focused.
 @property (nonatomic, readonly) BOOL inputViewIsFirstResponder;
 
 /// For subclasses to indicate that they can handle editing a field the give type and value.
 /// Used by FLEXArgumentInputViewFactory to create appropriate input views.
-+ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(nullable id)value;
++ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value;
 
 // For subclass eyes only
 
-@property (nonatomic, readonly) UILabel *titleLabel;
-@property (nonatomic, readonly) NSString *typeEncoding;
+@property (nonatomic, strong, readonly) UILabel *titleLabel;
+@property (nonatomic, strong, readonly) NSString *typeEncoding;
 @property (nonatomic, readonly) CGFloat topInputFieldVerticalLayoutGuide;
 
 @end
 
 @protocol FLEXArgumentInputViewDelegate <NSObject>
 
-//- (void)
 - (void)argumentInputViewValueDidChange:(FLEXArgumentInputView *)argumentInputView;
-- (void)argumentInputViewWantsNextAsFirstResponder:(FLEXArgumentInputView *)argumentInputView;
 
 @end
-
-NS_ASSUME_NONNULL_END
-

Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.m

@@ -3,23 +3,23 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/30/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputView.h"
 #import "FLEXUtility.h"
-#import "FLEXColor.h"
 
 @interface FLEXArgumentInputView ()
 
-@property (nonatomic) UILabel *titleLabel;
-@property (nonatomic) NSString *typeEncoding;
+@property (nonatomic, strong) UILabel *titleLabel;
+@property (nonatomic, strong) NSString *typeEncoding;
 
 @end
 
 @implementation FLEXArgumentInputView
 
-- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
+- (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding
+{
     self = [super initWithFrame:CGRectZero];
     if (self) {
         self.typeEncoding = typeEncoding != NULL ? @(typeEncoding) : nil;
@@ -27,7 +27,8 @@
     return self;
 }
 
-- (void)layoutSubviews {
+- (void)layoutSubviews
+{
     [super layoutSubviews];
     
     if (self.showsTitle) {
@@ -37,12 +38,14 @@
     }
 }
 
-- (void)setBackgroundColor:(UIColor *)backgroundColor {
+- (void)setBackgroundColor:(UIColor *)backgroundColor
+{
     [super setBackgroundColor:backgroundColor];
     self.titleLabel.backgroundColor = backgroundColor;
 }
 
-- (void)setTitle:(NSString *)title {
+- (void)setTitle:(NSString *)title
+{
     if (![_title isEqual:title]) {
         _title = title;
         self.titleLabel.text = title;
@@ -50,22 +53,26 @@
     }
 }
 
-- (UILabel *)titleLabel {
+- (UILabel *)titleLabel
+{
     if (!_titleLabel) {
-        _titleLabel = [UILabel new];
+        _titleLabel = [[UILabel alloc] init];
         _titleLabel.font = [[self class] titleFont];
-        _titleLabel.textColor = FLEXColor.primaryTextColor;
+        _titleLabel.backgroundColor = self.backgroundColor;
+        _titleLabel.textColor = [UIColor colorWithWhite:0.3 alpha:1.0];
         _titleLabel.numberOfLines = 0;
         [self addSubview:_titleLabel];
     }
     return _titleLabel;
 }
 
-- (BOOL)showsTitle {
-    return self.title.length > 0;
+- (BOOL)showsTitle
+{
+    return [self.title length] > 0;
 }
 
-- (CGFloat)topInputFieldVerticalLayoutGuide {
+- (CGFloat)topInputFieldVerticalLayoutGuide
+{
     CGFloat verticalLayoutGuide = 0;
     if (self.showsTitle) {
         CGFloat titleHeight = [self.titleLabel sizeThatFits:self.bounds.size].height;
@@ -77,32 +84,48 @@
 
 #pragma mark - Subclasses Can Override
 
-- (BOOL)inputViewIsFirstResponder {
+- (BOOL)inputViewIsFirstResponder
+{
     return NO;
 }
 
-+ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
+- (void)setInputValue:(id)inputValue
+{
+    // Subclasses should override.
+}
+
+- (id)inputValue
+{
+    // Subclasses should override.
+    return nil;
+}
+
++ (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value
+{
     return NO;
 }
 
 
 #pragma mark - Class Helpers
 
-+ (UIFont *)titleFont {
-    return [UIFont systemFontOfSize:12.0];
++ (UIFont *)titleFont
+{
+    return [FLEXUtility defaultFontOfSize:12.0];
 }
 
-+ (CGFloat)titleBottomPadding {
++ (CGFloat)titleBottomPadding
+{
     return 4.0;
 }
 
 
 #pragma mark - Sizing
 
-- (CGSize)sizeThatFits:(CGSize)size {
+- (CGSize)sizeThatFits:(CGSize)size
+{
     CGFloat height = 0;
     
-    if (self.title.length > 0) {
+    if ([self.title length] > 0) {
         CGSize constrainSize = CGSizeMake(size.width, CGFLOAT_MAX);
         height += ceil([self.titleLabel sizeThatFits:constrainSize].height);
         height += [[self class] titleBottomPadding];

Classes/Editing/ArgumentInputViews/FLEXArgumentInputViewFactory.h

@@ -7,7 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "FLEXArgumentInputSwitchView.h"
+
+@class FLEXArgumentInputView;
 
 @interface FLEXArgumentInputViewFactory : NSObject
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputViewFactory.m

@@ -8,7 +8,7 @@
 
 #import "FLEXArgumentInputViewFactory.h"
 #import "FLEXArgumentInputView.h"
-#import "FLEXArgumentInputObjectView.h"
+#import "FLEXArgumentInputJSONObjectView.h"
 #import "FLEXArgumentInputNumberView.h"
 #import "FLEXArgumentInputSwitchView.h"
 #import "FLEXArgumentInputStructView.h"
@@ -17,53 +17,55 @@
 #import "FLEXArgumentInputFontView.h"
 #import "FLEXArgumentInputColorView.h"
 #import "FLEXArgumentInputDateView.h"
-#import "FLEXRuntimeUtility.h"
 
 @implementation FLEXArgumentInputViewFactory
 
-+ (FLEXArgumentInputView *)argumentInputViewForTypeEncoding:(const char *)typeEncoding {
++ (FLEXArgumentInputView *)argumentInputViewForTypeEncoding:(const char *)typeEncoding
+{
     return [self argumentInputViewForTypeEncoding:typeEncoding currentValue:nil];
 }
 
-+ (FLEXArgumentInputView *)argumentInputViewForTypeEncoding:(const char *)typeEncoding currentValue:(id)currentValue {
++ (FLEXArgumentInputView *)argumentInputViewForTypeEncoding:(const char *)typeEncoding currentValue:(id)currentValue
+{
     Class subclass = [self argumentInputViewSubclassForTypeEncoding:typeEncoding currentValue:currentValue];
     if (!subclass) {
         // Fall back to a FLEXArgumentInputNotSupportedView if we can't find a subclass that fits the type encoding.
         // The unsupported view shows "nil" and does not allow user input.
         subclass = [FLEXArgumentInputNotSupportedView class];
     }
-    // Remove the field name if there is any (e.g. \"width\"d -> d)
-    const NSUInteger fieldNameOffset = [FLEXRuntimeUtility fieldNameOffsetForTypeEncoding:typeEncoding];
-    return [[subclass alloc] initWithArgumentTypeEncoding:typeEncoding + fieldNameOffset];
+    return [[subclass alloc] initWithArgumentTypeEncoding:typeEncoding];
 }
 
-+ (Class)argumentInputViewSubclassForTypeEncoding:(const char *)typeEncoding currentValue:(id)currentValue {
-    // Remove the field name if there is any (e.g. \"width\"d -> d)
-    const NSUInteger fieldNameOffset = [FLEXRuntimeUtility fieldNameOffsetForTypeEncoding:typeEncoding];
++ (Class)argumentInputViewSubclassForTypeEncoding:(const char *)typeEncoding currentValue:(id)currentValue
+{
     Class argumentInputViewSubclass = nil;
-    NSArray<Class> *inputViewClasses = @[[FLEXArgumentInputColorView class],
-                                         [FLEXArgumentInputFontView class],
-                                         [FLEXArgumentInputStringView class],
-                                         [FLEXArgumentInputStructView class],
-                                         [FLEXArgumentInputSwitchView class],
-                                         [FLEXArgumentInputDateView class],
-                                         [FLEXArgumentInputNumberView class],
-                                         [FLEXArgumentInputObjectView class]];
-
+    
     // Note that order is important here since multiple subclasses may support the same type.
     // An example is the number subclass and the bool subclass for the type @encode(BOOL).
     // Both work, but we'd prefer to use the bool subclass.
-    for (Class inputViewClass in inputViewClasses) {
-        if ([inputViewClass supportsObjCType:typeEncoding + fieldNameOffset withCurrentValue:currentValue]) {
-            argumentInputViewSubclass = inputViewClass;
-            break;
-        }
+    if ([FLEXArgumentInputColorView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
+        argumentInputViewSubclass = [FLEXArgumentInputColorView class];
+    } else if ([FLEXArgumentInputFontView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
+        argumentInputViewSubclass = [FLEXArgumentInputFontView class];
+    } else if ([FLEXArgumentInputStringView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
+        argumentInputViewSubclass = [FLEXArgumentInputStringView class];
+    } else if ([FLEXArgumentInputStructView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
+        argumentInputViewSubclass = [FLEXArgumentInputStructView class];
+    } else if ([FLEXArgumentInputSwitchView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
+        argumentInputViewSubclass = [FLEXArgumentInputSwitchView class];
+    } else if ([FLEXArgumentInputDateView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
+        argumentInputViewSubclass = [FLEXArgumentInputDateView class];
+    } else if ([FLEXArgumentInputNumberView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
+        argumentInputViewSubclass = [FLEXArgumentInputNumberView class];
+    } else if ([FLEXArgumentInputJSONObjectView supportsObjCType:typeEncoding withCurrentValue:currentValue]) {
+        argumentInputViewSubclass = [FLEXArgumentInputJSONObjectView class];
     }
-
+    
     return argumentInputViewSubclass;
 }
 
-+ (BOOL)canEditFieldWithTypeEncoding:(const char *)typeEncoding currentValue:(id)currentValue {
++ (BOOL)canEditFieldWithTypeEncoding:(const char *)typeEncoding currentValue:(id)currentValue
+{
     return [self argumentInputViewSubclassForTypeEncoding:typeEncoding currentValue:currentValue] != nil;
 }
 

Classes/Editing/FLEXDefaultEditorViewController.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/23/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXFieldEditorViewController.h"

Classes/Editing/FLEXDefaultEditorViewController.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/23/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXDefaultEditorViewController.h"
@@ -15,13 +15,14 @@
 @interface FLEXDefaultEditorViewController ()
 
 @property (nonatomic, readonly) NSUserDefaults *defaults;
-@property (nonatomic) NSString *key;
+@property (nonatomic, strong) NSString *key;
 
 @end
 
 @implementation FLEXDefaultEditorViewController
 
-- (id)initWithDefaults:(NSUserDefaults *)defaults key:(NSString *)key {
+- (id)initWithDefaults:(NSUserDefaults *)defaults key:(NSString *)key
+{
     self = [super initWithTarget:defaults];
     if (self) {
         self.key = key;
@@ -30,27 +31,26 @@
     return self;
 }
 
-- (NSUserDefaults *)defaults {
+- (NSUserDefaults *)defaults
+{
     return [self.target isKindOfClass:[NSUserDefaults class]] ? self.target : nil;
 }
 
-- (void)viewDidLoad {
+- (void)viewDidLoad
+{
     [super viewDidLoad];
     
     self.fieldEditorView.fieldDescription = self.key;
 
     id currentValue = [self.defaults objectForKey:self.key];
-    FLEXArgumentInputView *inputView = [FLEXArgumentInputViewFactory
-        argumentInputViewForTypeEncoding:FLEXEncodeObject(currentValue)
-        currentValue:currentValue
-    ];
+    FLEXArgumentInputView *inputView = [FLEXArgumentInputViewFactory argumentInputViewForTypeEncoding:@encode(id) currentValue:currentValue];
     inputView.backgroundColor = self.view.backgroundColor;
     inputView.inputValue = currentValue;
-    inputView.delegate = self;
     self.fieldEditorView.argumentInputViews = @[inputView];
 }
 
-- (void)actionButtonPressed:(id)sender {
+- (void)actionButtonPressed:(id)sender
+{
     [super actionButtonPressed:sender];
     
     id value = self.firstInputView.inputValue;
@@ -64,17 +64,9 @@
     self.firstInputView.inputValue = [self.defaults objectForKey:self.key];
 }
 
-- (void)getterButtonPressed:(id)sender {
-    [super getterButtonPressed:sender];
-    id returnedObject = [self.defaults objectForKey:self.key];
-    [self exploreObjectOrPopViewController:returnedObject];
-}
-
-+ (BOOL)canEditDefaultWithValue:(id)currentValue {
-    return [FLEXArgumentInputViewFactory
-        canEditFieldWithTypeEncoding:FLEXEncodeObject(currentValue)
-        currentValue:currentValue
-    ];
++ (BOOL)canEditDefaultWithValue:(id)currentValue
+{
+    return [FLEXArgumentInputViewFactory canEditFieldWithTypeEncoding:@encode(id) currentValue:currentValue];
 }
 
 @end

Classes/Editing/FLEXFieldEditorView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
@@ -15,6 +15,6 @@
 @property (nonatomic, copy) NSString *targetDescription;
 @property (nonatomic, copy) NSString *fieldDescription;
 
-@property (nonatomic, copy) NSArray<FLEXArgumentInputView *> *argumentInputViews;
+@property (nonatomic, strong) NSArray<FLEXArgumentInputView *> *argumentInputViews;
 
 @end

Classes/Editing/FLEXFieldEditorView.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXFieldEditorView.h"
@@ -12,19 +12,20 @@
 
 @interface FLEXFieldEditorView ()
 
-@property (nonatomic) UILabel *targetDescriptionLabel;
-@property (nonatomic) UIView *targetDescriptionDivider;
-@property (nonatomic) UILabel *fieldDescriptionLabel;
-@property (nonatomic) UIView *fieldDescriptionDivider;
+@property (nonatomic, strong) UILabel *targetDescriptionLabel;
+@property (nonatomic, strong) UIView *targetDescriptionDivider;
+@property (nonatomic, strong) UILabel *fieldDescriptionLabel;
+@property (nonatomic, strong) UIView *fieldDescriptionDivider;
 
 @end
 
 @implementation FLEXFieldEditorView
 
-- (id)initWithFrame:(CGRect)frame {
+- (id)initWithFrame:(CGRect)frame
+{
     self = [super initWithFrame:frame];
     if (self) {
-        self.targetDescriptionLabel = [UILabel new];
+        self.targetDescriptionLabel = [[UILabel alloc] init];
         self.targetDescriptionLabel.numberOfLines = 0;
         self.targetDescriptionLabel.font = [[self class] labelFont];
         [self addSubview:self.targetDescriptionLabel];
@@ -32,7 +33,7 @@
         self.targetDescriptionDivider = [[self class] dividerView];
         [self addSubview:self.targetDescriptionDivider];
         
-        self.fieldDescriptionLabel = [UILabel new];
+        self.fieldDescriptionLabel = [[UILabel alloc] init];
         self.fieldDescriptionLabel.numberOfLines = 0;
         self.fieldDescriptionLabel.font = [[self class] labelFont];
         [self addSubview:self.fieldDescriptionLabel];
@@ -43,7 +44,8 @@
     return self;
 }
 
-- (void)layoutSubviews {
+- (void)layoutSubviews
+{
     [super layoutSubviews];
     
     CGFloat horizontalPadding = [[self class] horizontalPadding];
@@ -76,13 +78,15 @@
     }
 }
 
-- (void)setBackgroundColor:(UIColor *)backgroundColor {
+- (void)setBackgroundColor:(UIColor *)backgroundColor
+{
     [super setBackgroundColor:backgroundColor];
     self.targetDescriptionLabel.backgroundColor = backgroundColor;
     self.fieldDescriptionLabel.backgroundColor = backgroundColor;
 }
 
-- (void)setTargetDescription:(NSString *)targetDescription {
+- (void)setTargetDescription:(NSString *)targetDescription
+{
     if (![_targetDescription isEqual:targetDescription]) {
         _targetDescription = targetDescription;
         self.targetDescriptionLabel.text = targetDescription;
@@ -90,7 +94,8 @@
     }
 }
 
-- (void)setFieldDescription:(NSString *)fieldDescription {
+- (void)setFieldDescription:(NSString *)fieldDescription
+{
     if (![_fieldDescription isEqual:fieldDescription]) {
         _fieldDescription = fieldDescription;
         self.fieldDescriptionLabel.text = fieldDescription;
@@ -98,7 +103,8 @@
     }
 }
 
-- (void)setArgumentInputViews:(NSArray<FLEXArgumentInputView *> *)argumentInputViews {
+- (void)setArgumentInputViews:(NSArray<FLEXArgumentInputView *> *)argumentInputViews
+{
     if (![_argumentInputViews isEqual:argumentInputViews]) {
         
         for (FLEXArgumentInputView *inputView in _argumentInputViews) {
@@ -115,33 +121,40 @@
     }
 }
 
-+ (UIView *)dividerView {
-    UIView *dividerView = [UIView new];
++ (UIView *)dividerView
+{
+    UIView *dividerView = [[UIView alloc] init];
     dividerView.backgroundColor = [self dividerColor];
     return dividerView;
 }
 
-+ (UIColor *)dividerColor {
-    return UIColor.lightGrayColor;
++ (UIColor *)dividerColor
+{
+    return [UIColor lightGrayColor];
 }
 
-+ (CGFloat)horizontalPadding {
++ (CGFloat)horizontalPadding
+{
     return 10.0;
 }
 
-+ (CGFloat)verticalPadding {
++ (CGFloat)verticalPadding
+{
     return 20.0;
 }
 
-+ (UIFont *)labelFont {
-    return [UIFont systemFontOfSize:14.0];
++ (UIFont *)labelFont
+{
+    return [FLEXUtility defaultFontOfSize:14.0];
 }
 
-+ (CGFloat)dividerLineHeight {
++ (CGFloat)dividerLineHeight
+{
     return 1.0;
 }
 
-- (CGSize)sizeThatFits:(CGSize)size {
+- (CGSize)sizeThatFits:(CGSize)size
+{
     CGFloat horizontalPadding = [[self class] horizontalPadding];
     CGFloat verticalPadding = [[self class] verticalPadding];
     CGFloat dividerLineHeight = [[self class] dividerLineHeight];

Classes/Editing/FLEXFieldEditorViewController.h

@@ -1,29 +1,32 @@
 //
 //  FLEXFieldEditorViewController.h
-//  FLEX
+//  Flipboard
 //
-//  Created by Tanner on 11/22/18.
-//  Copyright © 2018 Flipboard. All rights reserved.
+//  Created by Ryan Olson on 5/16/14.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
-#import "FLEXVariableEditorViewController.h"
-#import "FLEXProperty.h"
-#import "FLEXIvar.h"
+#import <UIKit/UIKit.h>
 
-NS_ASSUME_NONNULL_BEGIN
+@class FLEXFieldEditorView;
+@class FLEXArgumentInputView;
 
-@interface FLEXFieldEditorViewController : FLEXVariableEditorViewController
+@interface FLEXFieldEditorViewController : UIViewController
 
-/// @return nil if the property is readonly or if the type is unsupported
-+ (nullable instancetype)target:(id)target property:(FLEXProperty *)property;
-/// @return nil if the ivar type is unsupported
-+ (nullable instancetype)target:(id)target ivar:(FLEXIvar *)ivar;
+- (id)initWithTarget:(id)target;
 
-/// Subclasses can change the button title via the \c title property
-@property (nonatomic, readonly) UIBarButtonItem *getterButton;
+// Convenience accessor since many subclasses only use one input view
+@property (nonatomic, readonly) FLEXArgumentInputView *firstInputView;
 
-- (void)getterButtonPressed:(id)sender;
+// For subclass use only.
+@property (nonatomic, strong, readonly) id target;
+@property (nonatomic, strong, readonly) FLEXFieldEditorView *fieldEditorView;
+@property (nonatomic, strong, readonly) UIBarButtonItem *setterButton;
+
+- (void)actionButtonPressed:(id)sender;
+- (NSString *)titleForActionButton;
+/// Pushes an explorer view controller for the given object
+/// or pops the current view controller.
+- (void)exploreObjectOrPopViewController:(id)objectOrNil;
 
 @end
-
-NS_ASSUME_NONNULL_END

Classes/Editing/FLEXFieldEditorViewController.m

@@ -1,163 +1,131 @@
 //
 //  FLEXFieldEditorViewController.m
-//  FLEX
+//  Flipboard
 //
-//  Created by Tanner on 11/22/18.
-//  Copyright © 2018 Flipboard. All rights reserved.
+//  Created by Ryan Olson on 5/16/14.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXFieldEditorViewController.h"
 #import "FLEXFieldEditorView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXPropertyAttributes.h"
 #import "FLEXRuntimeUtility.h"
 #import "FLEXUtility.h"
-#import "FLEXColor.h"
-#import "UIBarButtonItem+FLEX.h"
+#import "FLEXObjectExplorerFactory.h"
+#import "FLEXArgumentInputView.h"
+#import "FLEXArgumentInputViewFactory.h"
+#import "FLEXObjectExplorerViewController.h"
 
-@interface FLEXFieldEditorViewController () <FLEXArgumentInputViewDelegate>
+@interface FLEXFieldEditorViewController () <UIScrollViewDelegate>
 
-@property (nonatomic) FLEXProperty *property;
-@property (nonatomic) FLEXIvar *ivar;
+@property (nonatomic, strong) UIScrollView *scrollView;
 
-@property (nonatomic, readonly) id currentValue;
-@property (nonatomic, readonly) const FLEXTypeEncoding *typeEncoding;
-@property (nonatomic, readonly) NSString *fieldDescription;
+@property (nonatomic, strong, readwrite) id target;
+@property (nonatomic, strong, readwrite) FLEXFieldEditorView *fieldEditorView;
+@property (nonatomic, strong, readwrite) UIBarButtonItem *setterButton;
 
 @end
 
 @implementation FLEXFieldEditorViewController
 
-#pragma mark - Initialization
-
-+ (instancetype)target:(id)target property:(FLEXProperty *)property {
-    id value = [property getValue:target];
-    if (![self canEditProperty:property onObject:target currentValue:value]) {
-        return nil;
+- (id)initWithTarget:(id)target
+{
+    self = [super initWithNibName:nil bundle:nil];
+    if (self) {
+        self.target = target;
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidShow:) name:UIKeyboardDidShowNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
     }
-
-    FLEXFieldEditorViewController *editor = [self target:target];
-    editor.title = [@"Property: " stringByAppendingString:property.name];
-    editor.property = property;
-    return editor;
+    return self;
 }
 
-+ (instancetype)target:(id)target ivar:(nonnull FLEXIvar *)ivar {
-    FLEXFieldEditorViewController *editor = [self target:target];
-    editor.title = [@"Ivar: " stringByAppendingString:ivar.name];
-    editor.ivar = ivar;
-    return editor;
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-#pragma mark - Overrides
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-
-    self.view.backgroundColor = FLEXColor.groupedBackgroundColor;
-
-    // Create getter button
-    _getterButton = [[UIBarButtonItem alloc]
-        initWithTitle:@"Get"
-        style:UIBarButtonItemStyleDone
-        target:self
-        action:@selector(getterButtonPressed:)
-    ];
-    self.toolbarItems = @[
-        UIBarButtonItem.flex_flexibleSpace, self.getterButton, self.actionButton
-    ];
-
-    // Configure input view
-    self.fieldEditorView.fieldDescription = self.fieldDescription;
-    FLEXArgumentInputView *inputView = [FLEXArgumentInputViewFactory argumentInputViewForTypeEncoding:self.typeEncoding];
-    inputView.inputValue = self.currentValue;
-    inputView.delegate = self;
-    self.fieldEditorView.argumentInputViews = @[inputView];
-
-    // Don't show a "set" button for switches; we mutate when the switch is flipped
-    if ([inputView isKindOfClass:[FLEXArgumentInputSwitchView class]]) {
-        self.actionButton.enabled = NO;
-        self.actionButton.title = @"Flip the switch to call the setter";
-        // Put getter button before setter button 
-        self.toolbarItems = @[
-            UIBarButtonItem.flex_flexibleSpace, self.actionButton, self.getterButton
-        ];
-    }
-}
-
-- (void)actionButtonPressed:(id)sender {
-    [super actionButtonPressed:sender];
-
-    if (self.property) {
-        id userInputObject = self.firstInputView.inputValue;
-        NSArray *arguments = userInputObject ? @[userInputObject] : nil;
-        SEL setterSelector = self.property.likelySetter;
-        NSError *error = nil;
-        [FLEXRuntimeUtility performSelector:setterSelector onObject:self.target withArguments:arguments error:&error];
-        if (error) {
-            [FLEXAlert showAlert:@"Property Setter Failed" message:error.localizedDescription from:self];
-            sender = nil; // Don't pop back
+- (void)keyboardDidShow:(NSNotification *)notification
+{
+    CGRect keyboardRectInWindow = [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    CGSize keyboardSize = [self.view convertRect:keyboardRectInWindow fromView:nil].size;
+    UIEdgeInsets scrollInsets = self.scrollView.contentInset;
+    scrollInsets.bottom = keyboardSize.height;
+    self.scrollView.contentInset = scrollInsets;
+    self.scrollView.scrollIndicatorInsets = scrollInsets;
+    
+    // Find the active input view and scroll to make sure it's visible.
+    for (FLEXArgumentInputView *argumentInputView in self.fieldEditorView.argumentInputViews) {
+        if (argumentInputView.inputViewIsFirstResponder) {
+            CGRect scrollToVisibleRect = [self.scrollView convertRect:argumentInputView.bounds fromView:argumentInputView];
+            [self.scrollView scrollRectToVisible:scrollToVisibleRect animated:YES];
+            break;
         }
-    } else {
-        // TODO: check mutability and use mutableCopy if necessary;
-        // this currently could and would assign NSArray to NSMutableArray
-        [self.ivar setValue:self.firstInputView.inputValue onObject:self.target];
-    }
-
-    // Go back after setting, but not for switches.
-    if (sender) {
-        [self.navigationController popViewControllerAnimated:YES];
-    } else {
-        self.firstInputView.inputValue = self.currentValue;
     }
 }
 
-- (void)getterButtonPressed:(id)sender {
+- (void)keyboardWillHide:(NSNotification *)notification
+{
+    UIEdgeInsets scrollInsets = self.scrollView.contentInset;
+    scrollInsets.bottom = 0.0;
+    self.scrollView.contentInset = scrollInsets;
+    self.scrollView.scrollIndicatorInsets = scrollInsets;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    self.view.backgroundColor = [FLEXUtility scrollViewGrayColor];
+    
+    self.scrollView = [[UIScrollView alloc] initWithFrame:self.view.bounds];
+    self.scrollView.backgroundColor = self.view.backgroundColor;
+    self.scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    self.scrollView.delegate = self;
+    [self.view addSubview:self.scrollView];
+    
+    self.fieldEditorView = [[FLEXFieldEditorView alloc] init];
+    self.fieldEditorView.backgroundColor = self.view.backgroundColor;
+    self.fieldEditorView.targetDescription = [NSString stringWithFormat:@"%@ %p", [self.target class], self.target];
+    [self.scrollView addSubview:self.fieldEditorView];
+    
+    self.setterButton = [[UIBarButtonItem alloc] initWithTitle:[self titleForActionButton] style:UIBarButtonItemStyleDone target:self action:@selector(actionButtonPressed:)];
+    self.navigationItem.rightBarButtonItem = self.setterButton;
+}
+
+- (void)viewWillLayoutSubviews
+{
+    CGSize constrainSize = CGSizeMake(self.scrollView.bounds.size.width, CGFLOAT_MAX);
+    CGSize fieldEditorSize = [self.fieldEditorView sizeThatFits:constrainSize];
+    self.fieldEditorView.frame = CGRectMake(0, 0, fieldEditorSize.width, fieldEditorSize.height);
+    self.scrollView.contentSize = fieldEditorSize;
+}
+
+- (FLEXArgumentInputView *)firstInputView
+{
+    return [[self.fieldEditorView argumentInputViews] firstObject];
+}
+
+- (void)actionButtonPressed:(id)sender
+{
+    // Subclasses can override
     [self.fieldEditorView endEditing:YES];
-
-    [self exploreObjectOrPopViewController:self.currentValue];
 }
 
-- (void)argumentInputViewValueDidChange:(FLEXArgumentInputView *)inputView {
-    if ([inputView isKindOfClass:[FLEXArgumentInputSwitchView class]]) {
-        [self actionButtonPressed:nil];
-    }
+- (NSString *)titleForActionButton
+{
+    // Subclasses can override.
+    return @"Set";
 }
 
-#pragma mark - Private
-
-- (id)currentValue {
-    if (self.property) {
-        return [self.property getValue:self.target];
+- (void)exploreObjectOrPopViewController:(id)objectOrNil {
+    if (objectOrNil) {
+        // For non-nil (or void) return types, push an explorer view controller to display the object
+        FLEXObjectExplorerViewController *explorerViewController = [FLEXObjectExplorerFactory explorerViewControllerForObject:objectOrNil];
+        [self.navigationController pushViewController:explorerViewController animated:YES];
     } else {
-        return [self.ivar getValue:self.target];
+        // If we didn't get a returned object but the method call succeeded,
+        // pop this view controller off the stack to indicate that the call went through.
+        [self.navigationController popViewControllerAnimated:YES];
     }
 }
 
-- (const FLEXTypeEncoding *)typeEncoding {
-    if (self.property) {
-        return self.property.attributes.typeEncoding.UTF8String;
-    } else {
-        return self.ivar.typeEncoding.UTF8String;
-    }
-}
-
-- (NSString *)fieldDescription {
-    if (self.property) {
-        return self.property.fullDescription;
-    } else {
-        return self.ivar.description;
-    }
-}
-
-+ (BOOL)canEditProperty:(FLEXProperty *)property onObject:(id)object currentValue:(id)value {
-    const FLEXTypeEncoding *typeEncoding = property.attributes.typeEncoding.UTF8String;
-    BOOL canEditType = [FLEXArgumentInputViewFactory canEditFieldWithTypeEncoding:typeEncoding currentValue:value];
-    return canEditType && [object respondsToSelector:property.likelySetter];
-}
-
-+ (BOOL)canEditIvar:(Ivar)ivar currentValue:(id)value {
-    return [FLEXArgumentInputViewFactory canEditFieldWithTypeEncoding:ivar_getTypeEncoding(ivar) currentValue:value];
-}
-
 @end

Classes/Editing/FLEXIvarEditorViewController.h

@@ -0,0 +1,18 @@
+//
+//  FLEXIvarEditorViewController.h
+//  Flipboard
+//
+//  Created by Ryan Olson on 5/23/14.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
+//
+
+#import "FLEXMutableFieldEditorViewController.h"
+#import <objc/runtime.h>
+
+@interface FLEXIvarEditorViewController : FLEXMutableFieldEditorViewController
+
+- (id)initWithTarget:(id)target ivar:(Ivar)ivar;
+
++ (BOOL)canEditIvar:(Ivar)ivar currentValue:(id)value;
+
+@end

Classes/Editing/FLEXIvarEditorViewController.m

@@ -0,0 +1,83 @@
+//
+//  FLEXIvarEditorViewController.m
+//  Flipboard
+//
+//  Created by Ryan Olson on 5/23/14.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
+//
+
+#import "FLEXIvarEditorViewController.h"
+#import "FLEXFieldEditorView.h"
+#import "FLEXRuntimeUtility.h"
+#import "FLEXArgumentInputView.h"
+#import "FLEXArgumentInputViewFactory.h"
+#import "FLEXArgumentInputSwitchView.h"
+
+@interface FLEXIvarEditorViewController () <FLEXArgumentInputViewDelegate>
+
+@property (nonatomic, assign) Ivar ivar;
+
+@end
+
+@implementation FLEXIvarEditorViewController
+
+- (id)initWithTarget:(id)target ivar:(Ivar)ivar
+{
+    self = [super initWithTarget:target];
+    if (self) {
+        self.ivar = ivar;
+        self.title = @"Instance Variable";
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    self.fieldEditorView.fieldDescription = [FLEXRuntimeUtility prettyNameForIvar:self.ivar];
+    
+    FLEXArgumentInputView *inputView = [FLEXArgumentInputViewFactory argumentInputViewForTypeEncoding:ivar_getTypeEncoding(self.ivar)];
+    inputView.backgroundColor = self.view.backgroundColor;
+    inputView.inputValue = [FLEXRuntimeUtility valueForIvar:self.ivar onObject:self.target];
+    inputView.delegate = self;
+    self.fieldEditorView.argumentInputViews = @[inputView];
+    
+    // Don't show a "set" button for switches. Set the ivar when the switch toggles.
+    if ([inputView isKindOfClass:[FLEXArgumentInputSwitchView class]]) {
+        self.navigationItem.rightBarButtonItem = nil;
+    }
+}
+
+- (void)actionButtonPressed:(id)sender
+{
+    [super actionButtonPressed:sender];
+    
+    [FLEXRuntimeUtility setValue:self.firstInputView.inputValue forIvar:self.ivar onObject:self.target];
+    self.firstInputView.inputValue = [FLEXRuntimeUtility valueForIvar:self.ivar onObject:self.target];
+    
+    // Pop view controller for consistency;
+    // property setters and method calls also pop on success.
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+- (void)getterButtonPressed:(id)sender
+{
+    [super getterButtonPressed:sender];
+    id returnedObject = [FLEXRuntimeUtility valueForIvar:self.ivar onObject:self.target];
+    [self exploreObjectOrPopViewController:returnedObject];
+}
+
+- (void)argumentInputViewValueDidChange:(FLEXArgumentInputView *)argumentInputView
+{
+    if ([argumentInputView isKindOfClass:[FLEXArgumentInputSwitchView class]]) {
+        [self actionButtonPressed:nil];
+    }
+}
+
++ (BOOL)canEditIvar:(Ivar)ivar currentValue:(id)value
+{
+    return [FLEXArgumentInputViewFactory canEditFieldWithTypeEncoding:ivar_getTypeEncoding(ivar) currentValue:value];
+}
+
+@end

Classes/Editing/FLEXMethodCallingViewController.h

@@ -3,14 +3,14 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/23/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
-#import "FLEXVariableEditorViewController.h"
-#import "FLEXMethod.h"
+#import "FLEXFieldEditorViewController.h"
+#import <objc/runtime.h>
 
-@interface FLEXMethodCallingViewController : FLEXVariableEditorViewController
+@interface FLEXMethodCallingViewController : FLEXFieldEditorViewController
 
-+ (instancetype)target:(id)target method:(FLEXMethod *)method;
+- (id)initWithTarget:(id)target method:(Method)method;
 
 @end

Classes/Editing/FLEXMethodCallingViewController.m

@@ -3,104 +3,101 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/23/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXMethodCallingViewController.h"
 #import "FLEXRuntimeUtility.h"
 #import "FLEXFieldEditorView.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXObjectExplorerViewController.h"
 #import "FLEXArgumentInputView.h"
 #import "FLEXArgumentInputViewFactory.h"
-#import "FLEXUtility.h"
 
 @interface FLEXMethodCallingViewController ()
-@property (nonatomic) FLEXMethod *method;
+
+@property (nonatomic, assign) Method method;
+@property (nonatomic, assign) FLEXTypeEncoding *returnType;
+
 @end
 
 @implementation FLEXMethodCallingViewController
 
-+ (instancetype)target:(id)target method:(FLEXMethod *)method {
-    return [[self alloc] initWithTarget:target method:method];
-}
-
-- (id)initWithTarget:(id)target method:(FLEXMethod *)method {
-    NSParameterAssert(method.isInstanceMethod == !object_isClass(target));
-
+- (id)initWithTarget:(id)target method:(Method)method
+{
     self = [super initWithTarget:target];
     if (self) {
         self.method = method;
-        self.title = method.isInstanceMethod ? @"Method: " : @"Class Method: ";
-        self.title = [self.title stringByAppendingString:method.selectorString];
+        self.returnType = [FLEXRuntimeUtility returnTypeForMethod:method];
+        self.title = [self isClassMethod] ? @"Class Method" : @"Method";;
     }
-
     return self;
 }
 
-- (void)viewDidLoad {
+- (void)viewDidLoad
+{
     [super viewDidLoad];
-
-    self.actionButton.title = @"Call";
-
-    // Configure field editor view
-    self.fieldEditorView.argumentInputViews = [self argumentInputViews];
-    self.fieldEditorView.fieldDescription = [NSString stringWithFormat:
-        @"Signature:\n%@\n\nReturn Type:\n%s",
-        self.method.description, (char *)self.method.returnType
-    ];
-}
-
-- (NSArray<FLEXArgumentInputView *> *)argumentInputViews {
-    Method method = self.method.objc_method;
-    NSArray *methodComponents = [FLEXRuntimeUtility prettyArgumentComponentsForMethod:method];
-    NSMutableArray<FLEXArgumentInputView *> *argumentInputViews = [NSMutableArray new];
+    
+    NSString *returnType = @((const char *)self.returnType);
+    NSString *methodDescription = [FLEXRuntimeUtility prettyNameForMethod:self.method isClassMethod:[self isClassMethod]];
+    NSString *format = @"Signature:\n%@\n\nReturn Type:\n%@";
+    NSString *info = [NSString stringWithFormat:format, methodDescription, returnType];
+    self.fieldEditorView.fieldDescription = info;
+    
+    NSArray<NSString *> *methodComponents = [FLEXRuntimeUtility prettyArgumentComponentsForMethod:self.method];
+    NSMutableArray<FLEXArgumentInputView *> *argumentInputViews = [NSMutableArray array];
     unsigned int argumentIndex = kFLEXNumberOfImplicitArgs;
-
     for (NSString *methodComponent in methodComponents) {
-        char *argumentTypeEncoding = method_copyArgumentType(method, argumentIndex);
+        char *argumentTypeEncoding = method_copyArgumentType(self.method, argumentIndex);
         FLEXArgumentInputView *inputView = [FLEXArgumentInputViewFactory argumentInputViewForTypeEncoding:argumentTypeEncoding];
         free(argumentTypeEncoding);
-
+        
         inputView.backgroundColor = self.view.backgroundColor;
         inputView.title = methodComponent;
-        inputView.delegate = self;
         [argumentInputViews addObject:inputView];
         argumentIndex++;
     }
-
-    return argumentInputViews;
+    self.fieldEditorView.argumentInputViews = argumentInputViews;
 }
 
-- (void)actionButtonPressed:(id)sender {
+- (void)dealloc
+{
+    free(self.returnType);
+    self.returnType = NULL;
+}
+
+- (BOOL)isClassMethod
+{
+    return self.target && self.target == [self.target class];
+}
+
+- (NSString *)titleForActionButton
+{
+    return @"Call";
+}
+
+- (void)actionButtonPressed:(id)sender
+{
     [super actionButtonPressed:sender];
-
-    // Gather arguments
-    NSMutableArray *arguments = [NSMutableArray new];
+    
+    NSMutableArray *arguments = [NSMutableArray array];
     for (FLEXArgumentInputView *inputView in self.fieldEditorView.argumentInputViews) {
-        // Use NSNull as a nil placeholder; it will be interpreted as nil
-        [arguments addObject:inputView.inputValue ?: NSNull.null];
+        id argumentValue = inputView.inputValue;
+        if (!argumentValue) {
+            // Use NSNulls as placeholders in the array. They will be interpreted as nil arguments.
+            argumentValue = [NSNull null];
+        }
+        [arguments addObject:argumentValue];
     }
-
-    // Call method
+    
     NSError *error = nil;
-    id returnValue = [FLEXRuntimeUtility
-        performSelector:self.method.selector
-        onObject:self.target
-        withArguments:arguments
-        error:&error
-    ];
-
-    // Display return value or error
+    id returnedObject = [FLEXRuntimeUtility performSelector:method_getName(self.method) onObject:self.target withArguments:arguments error:&error];
+    
     if (error) {
-        [FLEXAlert showAlert:@"Method Call Failed" message:error.localizedDescription from:self];
-    } else if (returnValue) {
-        // For non-nil (or void) return types, push an explorer view controller to display the returned object
-        returnValue = [FLEXRuntimeUtility potentiallyUnwrapBoxedPointer:returnValue type:self.method.returnType];
-        FLEXObjectExplorerViewController *explorer = [FLEXObjectExplorerFactory explorerViewControllerForObject:returnValue];
-        [self.navigationController pushViewController:explorer animated:YES];
+        NSString *title = @"Method Call Failed";
+        NSString *message = [error localizedDescription];
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
+        [alert show];
     } else {
-        [self exploreObjectOrPopViewController:returnValue];
+        [self exploreObjectOrPopViewController:returnedObject];
     }
 }
 

Classes/Editing/FLEXMutableFieldEditorViewController.h

@@ -0,0 +1,18 @@
+//
+//  FLEXMutableFieldEditorViewController.h
+//  FLEX
+//
+//  Created by Tanner on 11/22/18.
+//  Copyright © 2018 Flipboard. All rights reserved.
+//
+
+#import "FLEXFieldEditorViewController.h"
+
+@interface FLEXMutableFieldEditorViewController : FLEXFieldEditorViewController
+
+@property (nonatomic, strong, readonly) UIBarButtonItem *getterButton;
+
+- (void)getterButtonPressed:(id)sender;
+- (NSString *)titleForGetterButton;
+
+@end

Classes/Editing/FLEXMutableFieldEditorViewController.m

@@ -0,0 +1,36 @@
+//
+//  FLEXMutableFieldEditorViewController.m
+//  FLEX
+//
+//  Created by Tanner on 11/22/18.
+//  Copyright © 2018 Flipboard. All rights reserved.
+//
+
+#import "FLEXMutableFieldEditorViewController.h"
+#import "FLEXFieldEditorView.h"
+
+@interface FLEXMutableFieldEditorViewController ()
+
+@property (nonatomic, strong, readwrite) UIBarButtonItem *getterButton;
+
+@end
+
+@implementation FLEXMutableFieldEditorViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.getterButton = [[UIBarButtonItem alloc] initWithTitle:[self titleForGetterButton] style:UIBarButtonItemStyleDone target:self action:@selector(getterButtonPressed:)];
+    self.navigationItem.rightBarButtonItems = @[self.setterButton, self.getterButton];
+}
+
+- (void)getterButtonPressed:(id)sender {
+    // Subclasses can override
+    [self.fieldEditorView endEditing:YES];
+}
+
+- (NSString *)titleForGetterButton {
+    return @"Get";
+}
+
+@end

Classes/Editing/FLEXPropertyEditorViewController.h

@@ -0,0 +1,18 @@
+//
+//  FLEXPropertyEditorViewController.h
+//  Flipboard
+//
+//  Created by Ryan Olson on 5/20/14.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
+//
+
+#import "FLEXMutableFieldEditorViewController.h"
+#import <objc/runtime.h>
+
+@interface FLEXPropertyEditorViewController : FLEXMutableFieldEditorViewController
+
+- (id)initWithTarget:(id)target property:(objc_property_t)property;
+
++ (BOOL)canEditProperty:(objc_property_t)property currentValue:(id)value;
+
+@end

Classes/Editing/FLEXPropertyEditorViewController.m

@@ -0,0 +1,101 @@
+//
+//  FLEXPropertyEditorViewController.m
+//  Flipboard
+//
+//  Created by Ryan Olson on 5/20/14.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
+//
+
+#import "FLEXPropertyEditorViewController.h"
+#import "FLEXRuntimeUtility.h"
+#import "FLEXFieldEditorView.h"
+#import "FLEXArgumentInputView.h"
+#import "FLEXArgumentInputViewFactory.h"
+#import "FLEXArgumentInputSwitchView.h"
+
+@interface FLEXPropertyEditorViewController () <FLEXArgumentInputViewDelegate>
+
+@property (nonatomic, assign) objc_property_t property;
+
+@end
+
+@implementation FLEXPropertyEditorViewController
+
+- (id)initWithTarget:(id)target property:(objc_property_t)property
+{
+    self = [super initWithTarget:target];
+    if (self) {
+        self.property = property;
+        self.title = @"Property";
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    self.fieldEditorView.fieldDescription = [FLEXRuntimeUtility fullDescriptionForProperty:self.property];
+    id currentValue = [FLEXRuntimeUtility valueForProperty:self.property onObject:self.target];
+    self.setterButton.enabled = [[self class] canEditProperty:self.property currentValue:currentValue];
+    
+    const char *typeEncoding = [[FLEXRuntimeUtility typeEncodingForProperty:self.property] UTF8String];
+    FLEXArgumentInputView *inputView = [FLEXArgumentInputViewFactory argumentInputViewForTypeEncoding:typeEncoding];
+    inputView.backgroundColor = self.view.backgroundColor;
+    inputView.inputValue = [FLEXRuntimeUtility valueForProperty:self.property onObject:self.target];
+    inputView.delegate = self;
+    self.fieldEditorView.argumentInputViews = @[inputView];
+    
+    // Don't show a "set" button for switches - just call the setter immediately after the switch toggles.
+    if ([inputView isKindOfClass:[FLEXArgumentInputSwitchView class]]) {
+        self.navigationItem.rightBarButtonItem = nil;
+    }
+}
+
+- (void)actionButtonPressed:(id)sender
+{
+    [super actionButtonPressed:sender];
+    
+    id userInputObject = self.firstInputView.inputValue;
+    NSArray *arguments = userInputObject ? @[userInputObject] : nil;
+    SEL setterSelector = [FLEXRuntimeUtility setterSelectorForProperty:self.property];
+    NSError *error = nil;
+    [FLEXRuntimeUtility performSelector:setterSelector onObject:self.target withArguments:arguments error:&error];
+    if (error) {
+        NSString *title = @"Property Setter Failed";
+        NSString *message = [error localizedDescription];
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
+        [alert show];
+        self.firstInputView.inputValue = [FLEXRuntimeUtility valueForProperty:self.property onObject:self.target];
+    } else {
+        // If the setter was called without error, pop the view controller to indicate that and make the user's life easier.
+        // Don't do this for simulated taps on the action button (i.e. from switch/BOOL editors). The experience is weird there.
+        if (sender) {
+            [self.navigationController popViewControllerAnimated:YES];
+        }
+    }
+}
+
+- (void)getterButtonPressed:(id)sender
+{
+    [super getterButtonPressed:sender];
+    id returnedObject = [FLEXRuntimeUtility valueForProperty:self.property onObject:self.target];
+    [self exploreObjectOrPopViewController:returnedObject];
+}
+
+- (void)argumentInputViewValueDidChange:(FLEXArgumentInputView *)argumentInputView
+{
+    if ([argumentInputView isKindOfClass:[FLEXArgumentInputSwitchView class]]) {
+        [self actionButtonPressed:nil];
+    }
+}
+
++ (BOOL)canEditProperty:(objc_property_t)property currentValue:(id)value
+{
+    const char *typeEncoding = [[FLEXRuntimeUtility typeEncodingForProperty:property] UTF8String];
+    BOOL canEditType = [FLEXArgumentInputViewFactory canEditFieldWithTypeEncoding:typeEncoding currentValue:value];
+    BOOL isReadonly = [FLEXRuntimeUtility isReadonlyProperty:property];
+    return canEditType && !isReadonly;
+}
+
+@end

Classes/Editing/FLEXVariableEditorViewController.h

@@ -1,36 +0,0 @@
-//
-//  FLEXVariableEditorViewController.h
-//  Flipboard
-//
-//  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXArgumentInputView.h"
-
-@class FLEXFieldEditorView;
-
-/// Provides a screen for editing or configuring one or more variables.
-@interface FLEXVariableEditorViewController : UIViewController <FLEXArgumentInputViewDelegate>
-
-+ (instancetype)target:(id)target;
-- (id)initWithTarget:(id)target;
-
-// Convenience accessor since many subclasses only use one input view
-@property (nonatomic, readonly) FLEXArgumentInputView *firstInputView;
-// Also a convenience accessor
-@property (nonatomic, readonly) NSArray<FLEXArgumentInputView *> *inputViews;
-
-// For subclass use only.
-@property (nonatomic, readonly) id target;
-@property (nonatomic, readonly) FLEXFieldEditorView *fieldEditorView;
-/// Subclasses can change the button title via the button's \c title property
-@property (nonatomic, readonly) UIBarButtonItem *actionButton;
-
-- (void)actionButtonPressed:(id)sender;
-
-/// Pushes an explorer view controller for the given object
-/// or pops the current view controller.
-- (void)exploreObjectOrPopViewController:(id)objectOrNil;
-
-@end

Classes/Editing/FLEXVariableEditorViewController.m

@@ -1,157 +0,0 @@
-//
-//  FLEXVariableEditorViewController.m
-//  Flipboard
-//
-//  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXColor.h"
-#import "FLEXVariableEditorViewController.h"
-#import "FLEXFieldEditorView.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXUtility.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXObjectExplorerViewController.h"
-#import "UIBarButtonItem+FLEX.h"
-
-@interface FLEXVariableEditorViewController () <UIScrollViewDelegate>
-@property (nonatomic) UIScrollView *scrollView;
-@property (nonatomic) id target;
-@end
-
-@implementation FLEXVariableEditorViewController
-
-#pragma mark - Initialization
-
-+ (instancetype)target:(id)target {
-    return [[self alloc] initWithTarget:target];
-}
-
-- (id)initWithTarget:(id)target {
-    self = [super init];
-    if (self) {
-        self.target = target;
-        [NSNotificationCenter.defaultCenter
-            addObserver:self selector:@selector(keyboardDidShow:)
-            name:UIKeyboardDidShowNotification object:nil
-        ];
-        [NSNotificationCenter.defaultCenter
-            addObserver:self selector:@selector(keyboardWillHide:)
-            name:UIKeyboardWillHideNotification object:nil
-        ];
-    }
-    
-    return self;
-}
-
-- (void)dealloc {
-    [NSNotificationCenter.defaultCenter removeObserver:self];
-}
-
-#pragma mark - UIViewController methods
-
-- (void)keyboardDidShow:(NSNotification *)notification {
-    CGRect keyboardRect = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
-    CGSize keyboardSize = [self.view convertRect:keyboardRect fromView:nil].size;
-    UIEdgeInsets scrollInsets = self.scrollView.contentInset;
-    scrollInsets.bottom = keyboardSize.height;
-    self.scrollView.contentInset = scrollInsets;
-    self.scrollView.scrollIndicatorInsets = scrollInsets;
-    
-    // Find the active input view and scroll to make sure it's visible.
-    for (FLEXArgumentInputView *argumentInputView in self.fieldEditorView.argumentInputViews) {
-        if (argumentInputView.inputViewIsFirstResponder) {
-            CGRect scrollToVisibleRect = [self.scrollView convertRect:argumentInputView.bounds fromView:argumentInputView];
-            [self.scrollView scrollRectToVisible:scrollToVisibleRect animated:YES];
-            break;
-        }
-    }
-}
-
-- (void)keyboardWillHide:(NSNotification *)notification {
-    UIEdgeInsets scrollInsets = self.scrollView.contentInset;
-    scrollInsets.bottom = 0.0;
-    self.scrollView.contentInset = scrollInsets;
-    self.scrollView.scrollIndicatorInsets = scrollInsets;
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    self.view.backgroundColor = FLEXColor.scrollViewBackgroundColor;
-    
-    self.scrollView = [[UIScrollView alloc] initWithFrame:self.view.bounds];
-    self.scrollView.backgroundColor = self.view.backgroundColor;
-    self.scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    self.scrollView.delegate = self;
-    [self.view addSubview:self.scrollView];
-    
-    _fieldEditorView = [FLEXFieldEditorView new];
-    self.fieldEditorView.targetDescription = [NSString stringWithFormat:@"%@ %p", [self.target class], self.target];
-    [self.scrollView addSubview:self.fieldEditorView];
-    
-    _actionButton = [[UIBarButtonItem alloc]
-        initWithTitle:@"Set"
-        style:UIBarButtonItemStyleDone
-        target:self
-        action:@selector(actionButtonPressed:)
-    ];
-    
-    self.navigationController.toolbarHidden = NO;
-    self.toolbarItems = @[UIBarButtonItem.flex_flexibleSpace, self.actionButton];
-}
-
-- (void)viewWillLayoutSubviews {
-    CGSize constrainSize = CGSizeMake(self.scrollView.bounds.size.width, CGFLOAT_MAX);
-    CGSize fieldEditorSize = [self.fieldEditorView sizeThatFits:constrainSize];
-    self.fieldEditorView.frame = CGRectMake(0, 0, fieldEditorSize.width, fieldEditorSize.height);
-    self.scrollView.contentSize = fieldEditorSize;
-}
-
-#pragma mark - Public
-
-- (FLEXArgumentInputView *)firstInputView {
-    return self.fieldEditorView.argumentInputViews.firstObject;
-}
-
-- (NSArray<FLEXArgumentInputView *> *)inputViews {
-    return self.fieldEditorView.argumentInputViews;
-}
-
-- (void)actionButtonPressed:(id)sender {
-    // Subclasses can override
-    [self.fieldEditorView endEditing:YES];
-}
-
-- (void)exploreObjectOrPopViewController:(id)objectOrNil {
-    if (objectOrNil) {
-        // For non-nil (or void) return types, push an explorer view controller to display the object
-        FLEXObjectExplorerViewController *explorerViewController = [FLEXObjectExplorerFactory explorerViewControllerForObject:objectOrNil];
-        [self.navigationController pushViewController:explorerViewController animated:YES];
-    } else {
-        // If we didn't get a returned object but the method call succeeded,
-        // pop this view controller off the stack to indicate that the call went through.
-        [self.navigationController popViewControllerAnimated:YES];
-    }
-}
-
-#pragma mark - FLEXArgumentInputViewDelegate
-
-- (void)argumentInputViewValueDidChange:(FLEXArgumentInputView *)inputView {
-    // Subclasses might want to do something here but we don't
-}
-
-- (void)argumentInputViewWantsNextAsFirstResponder:(FLEXArgumentInputView *)inputView {
-    if (self.inputViews.lastObject == inputView) {
-        // If this is our last or only input view, dismiss the keyboard
-        [inputView resignFirstResponder];
-    } else {
-        NSInteger idx = [self.inputViews indexOfObject:inputView];
-        [self.inputViews[idx+1] becomeFirstResponder];
-    }
-}
-
-@end

Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.h

@@ -1,19 +0,0 @@
-//
-//  FLEXBookmarkManager.h
-//  FLEX
-//
-//  Created by Tanner on 2/6/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FLEXBookmarkManager : NSObject
-
-@property (nonatomic, readonly, class) NSMutableArray *bookmarks;
-
-@end
-
-NS_ASSUME_NONNULL_END

Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.m

@@ -1,25 +0,0 @@
-//
-//  FLEXBookmarkManager.m
-//  FLEX
-//
-//  Created by Tanner on 2/6/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXBookmarkManager.h"
-
-static NSMutableArray *kFLEXBookmarkManagerBookmarks = nil;
-
-@implementation FLEXBookmarkManager
-
-+ (void)initialize {
-    if (self == [FLEXBookmarkManager class]) {
-        kFLEXBookmarkManagerBookmarks = [NSMutableArray new];
-    }
-}
-
-+ (NSMutableArray *)bookmarks {
-    return kFLEXBookmarkManagerBookmarks;
-}
-
-@end

Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.h

@@ -1,17 +0,0 @@
-//
-//  FLEXBookmarksViewController.h
-//  FLEX
-//
-//  Created by Tanner on 2/6/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableViewController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FLEXBookmarksViewController : FLEXTableViewController
-
-@end
-
-NS_ASSUME_NONNULL_END

Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.m

@@ -1,235 +0,0 @@
-//
-//  FLEXBookmarksViewController.m
-//  FLEX
-//
-//  Created by Tanner on 2/6/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXBookmarksViewController.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXNavigationController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXBookmarkManager.h"
-#import "UIBarButtonItem+FLEX.h"
-#import "FLEXColor.h"
-#import "FLEXUtility.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXTableView.h"
-
-@interface FLEXBookmarksViewController ()
-@property (nonatomic, copy) NSArray *bookmarks;
-@property (nonatomic, readonly) FLEXExplorerViewController *corePresenter;
-@end
-
-@implementation FLEXBookmarksViewController
-
-#pragma mark - Initialization
-
-- (id)init {
-    return [self initWithStyle:UITableViewStylePlain];
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    self.navigationController.hidesBarsOnSwipe = NO;
-    self.tableView.allowsMultipleSelectionDuringEditing = YES;
-    
-    [self reloadData];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    [self setupDefaultBarItems];
-}
-
-
-#pragma mark - Private
-
-- (void)reloadData {
-    // We assume the bookmarks aren't going to change out from under us, since
-    // presenting any other tool via keyboard shortcuts should dismiss us first
-    self.bookmarks = FLEXBookmarkManager.bookmarks;
-    self.title = [NSString stringWithFormat:@"Bookmarks (%@)", @(self.bookmarks.count)];
-}
-
-- (void)setupDefaultBarItems {
-    self.navigationItem.rightBarButtonItem = FLEXBarButtonItemSystem(Done, self, @selector(dismissAnimated));
-    self.toolbarItems = @[
-        UIBarButtonItem.flex_flexibleSpace,
-        FLEXBarButtonItemSystem(Edit, self, @selector(toggleEditing)),
-    ];
-    
-    // Disable editing if no bookmarks available
-    self.toolbarItems.lastObject.enabled = self.bookmarks.count > 0;
-}
-
-- (void)setupEditingBarItems {
-    self.navigationItem.rightBarButtonItem = nil;
-    self.toolbarItems = @[
-        [UIBarButtonItem itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed:)],
-        UIBarButtonItem.flex_flexibleSpace,
-        // We use a non-system done item because we change its title dynamically
-        [UIBarButtonItem doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
-    ];
-    
-    self.toolbarItems.firstObject.tintColor = FLEXColor.destructiveColor;
-}
-
-- (FLEXExplorerViewController *)corePresenter {
-    // We must be presented by a FLEXExplorerViewController, or presented
-    // by another view controller that was presented by FLEXExplorerViewController
-    FLEXExplorerViewController *presenter = (id)self.presentingViewController;
-    presenter = (id)presenter.presentingViewController ?: presenter;
-    presenter = (id)presenter.presentingViewController ?: presenter;
-    NSAssert(
-        [presenter isKindOfClass:[FLEXExplorerViewController class]],
-        @"The bookmarks view controller expects to be presented by the explorer controller"
-    );
-    return presenter;
-}
-
-#pragma mark Button Actions
-
-- (void)dismissAnimated {
-    [self dismissAnimated:nil];
-}
-
-- (void)dismissAnimated:(id)selectedObject {
-    if (selectedObject) {
-        UIViewController *explorer = [FLEXObjectExplorerFactory
-            explorerViewControllerForObject:selectedObject
-        ];
-        if ([self.presentingViewController isKindOfClass:[FLEXNavigationController class]]) {
-            // I am presented on an existing navigation stack, so
-            // dismiss myself and push the bookmark there
-            UINavigationController *presenter = (id)self.presentingViewController;
-            [presenter dismissViewControllerAnimated:YES completion:^{
-                [presenter pushViewController:explorer animated:YES];
-            }];
-        } else {
-            // Dismiss myself and present explorer
-            UIViewController *presenter = self.corePresenter;
-            [presenter dismissViewControllerAnimated:YES completion:^{
-                [presenter presentViewController:[FLEXNavigationController
-                    withRootViewController:explorer
-                ] animated:YES completion:nil];
-            }];
-        }
-    } else {
-        // Just dismiss myself
-        [self dismissViewControllerAnimated:YES completion:nil];
-    }
-}
-
-- (void)toggleEditing {
-    NSArray<NSIndexPath *> *selected = self.tableView.indexPathsForSelectedRows;
-    self.editing = !self.editing;
-    
-    if (self.isEditing) {
-        [self setupEditingBarItems];
-    } else {
-        [self setupDefaultBarItems];
-        
-        // Get index set of bookmarks to close
-        NSMutableIndexSet *indexes = [NSMutableIndexSet new];
-        for (NSIndexPath *ip in selected) {
-            [indexes addIndex:ip.row];
-        }
-        
-        if (selected.count) {
-            // Close bookmarks and update data source
-            [FLEXBookmarkManager.bookmarks removeObjectsAtIndexes:indexes];
-            [self reloadData];
-            
-            // Remove deleted rows
-            [self.tableView deleteRowsAtIndexPaths:selected withRowAnimation:UITableViewRowAnimationAutomatic];
-        }
-    }
-}
-
-- (void)closeAllButtonPressed:(UIBarButtonItem *)sender {
-    [FLEXAlert makeSheet:^(FLEXAlert *make) {
-        NSInteger count = self.bookmarks.count;
-        NSString *title = FLEXPluralFormatString(count, @"Remove %@ bookmarks", @"Remove %@ bookmark");
-        make.button(title).destructiveStyle().handler(^(NSArray<NSString *> *strings) {
-            [self closeAll];
-            [self toggleEditing];
-        });
-        make.button(@"Cancel").cancelStyle();
-    } showFrom:self source:sender];
-}
-
-- (void)closeAll {
-    NSInteger rowCount = self.bookmarks.count;
-    
-    // Close bookmarks and update data source
-    [FLEXBookmarkManager.bookmarks removeAllObjects];
-    [self reloadData];
-    
-    // Delete rows from table view
-    NSArray<NSIndexPath *> *allRows = [NSArray flex_forEachUpTo:rowCount map:^id(NSUInteger row) {
-        return [NSIndexPath indexPathForRow:row inSection:0];
-    }];
-    [self.tableView deleteRowsAtIndexPaths:allRows withRowAnimation:UITableViewRowAnimationAutomatic];
-}
-
-
-#pragma mark - Table View Data Source
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return self.bookmarks.count;
-}
-
-- (UITableViewCell *)tableView:(FLEXTableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kFLEXDetailCell forIndexPath:indexPath];
-    
-    id object = self.bookmarks[indexPath.row];
-    cell.textLabel.text = [FLEXRuntimeUtility safeDescriptionForObject:object];
-    cell.detailTextLabel.text = [NSString stringWithFormat:@"%@ — %p", [object class], object];
-    
-    return cell;
-}
-
-
-#pragma mark - Table View Delegate
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (self.editing) {
-        // Case: editing with multi-select
-        self.toolbarItems.lastObject.title = @"Remove Selected";
-        self.toolbarItems.lastObject.tintColor = FLEXColor.destructiveColor;
-    } else {
-        // Case: selected a bookmark
-        [self dismissAnimated:self.bookmarks[indexPath.row]];
-    }
-}
-
-- (void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath {
-    NSParameterAssert(self.editing);
-    
-    if (tableView.indexPathsForSelectedRows.count == 0) {
-        self.toolbarItems.lastObject.title = @"Done";
-        self.toolbarItems.lastObject.tintColor = self.view.tintColor;
-    }
-}
-
-- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
-    return YES;
-}
-
-- (void)tableView:(UITableView *)table
-commitEditingStyle:(UITableViewCellEditingStyle)edit
-forRowAtIndexPath:(NSIndexPath *)indexPath {
-    NSParameterAssert(edit == UITableViewCellEditingStyleDelete);
-    
-    // Remove bookmark and update data source
-    [FLEXBookmarkManager.bookmarks removeObjectAtIndex:indexPath.row];
-    [self reloadData];
-    
-    // Delete row from table view
-    [table deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic];
-}
-
-@end

Classes/ExplorerInterface/FLEXExplorerViewController.h

@@ -3,29 +3,25 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 4/4/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
-#import "FLEXExplorerToolbar.h"
+#import <UIKit/UIKit.h>
 
-@class FLEXWindow;
 @protocol FLEXExplorerViewControllerDelegate;
 
-/// A view controller that manages the FLEX toolbar.
 @interface FLEXExplorerViewController : UIViewController
 
 @property (nonatomic, weak) id <FLEXExplorerViewControllerDelegate> delegate;
-@property (nonatomic, readonly) BOOL wantsWindowToBecomeKey;
-
-@property (nonatomic, readonly) FLEXExplorerToolbar *explorerToolbar;
 
 - (BOOL)shouldReceiveTouchAtWindowPoint:(CGPoint)pointInWindowCoordinates;
+- (BOOL)wantsWindowToBecomeKey;
 
 /// @brief Used to present (or dismiss) a modal view controller ("tool"), typically triggered by pressing a button in the toolbar.
 ///
 /// 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:(UIViewController *(^)(void))future completion:(void(^)(void))completion;
 
 // Keyboard shortcut helpers
 
@@ -33,19 +29,15 @@
 - (void)toggleMoveTool;
 - (void)toggleViewsTool;
 - (void)toggleMenuTool;
-
-/// @return YES if the explorer used the key press to perform an action, NO otherwise
-- (BOOL)handleDownArrowKeyPressed;
-/// @return YES if the explorer used the key press to perform an action, NO otherwise
-- (BOOL)handleUpArrowKeyPressed;
-/// @return YES if the explorer used the key press to perform an action, NO otherwise
-- (BOOL)handleRightArrowKeyPressed;
-/// @return YES if the explorer used the key press to perform an action, NO otherwise
-- (BOOL)handleLeftArrowKeyPressed;
+- (void)handleDownArrowKeyPressed;
+- (void)handleUpArrowKeyPressed;
+- (void)handleRightArrowKeyPressed;
+- (void)handleLeftArrowKeyPressed;
 
 @end
 
-#pragma mark -
 @protocol FLEXExplorerViewControllerDelegate <NSObject>
+
 - (void)explorerViewControllerDidFinish:(FLEXExplorerViewController *)explorerViewController;
+
 @end

Classes/ExplorerInterface/FLEXViewControllersViewController.h

@@ -1,19 +0,0 @@
-//
-//  FLEXViewControllersViewController.h
-//  FLEX
-//
-//  Created by Tanner Bennett on 2/13/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXFilteringTableViewController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FLEXViewControllersViewController : FLEXFilteringTableViewController
-
-+ (instancetype)controllersForViews:(NSArray<UIView *> *)views;
-
-@end
-
-NS_ASSUME_NONNULL_END

Classes/ExplorerInterface/FLEXViewControllersViewController.m

@@ -1,79 +0,0 @@
-//
-//  FLEXViewControllersViewController.m
-//  FLEX
-//
-//  Created by Tanner Bennett on 2/13/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXViewControllersViewController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXMutableListSection.h"
-#import "FLEXUtility.h"
-
-@interface FLEXViewControllersViewController ()
-@property (nonatomic, readonly) FLEXMutableListSection *section;
-@property (nonatomic, readonly) NSArray<UIViewController *> *controllers;
-@end
-
-@implementation FLEXViewControllersViewController
-@dynamic sections, allSections;
-
-#pragma mark - Initialization
-
-+ (instancetype)controllersForViews:(NSArray<UIView *> *)views {
-    return [[self alloc] initWithViews:views];
-}
-
-- (id)initWithViews:(NSArray<UIView *> *)views {
-    NSParameterAssert(views.count);
-    
-    self = [self initWithStyle:UITableViewStylePlain];
-    if (self) {
-        _controllers = [views flex_mapped:^id(UIView *view, NSUInteger idx) {
-            return [FLEXUtility viewControllerForView:view];
-        }];
-    }
-    
-    return self;
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    self.title = @"View Controllers at Tap";
-    self.showsSearchBar = YES;
-    [self disableToolbar];
-}
-
-- (NSArray<FLEXTableViewSection *> *)makeSections {
-    _section = [FLEXMutableListSection list:self.controllers
-        cellConfiguration:^(UITableViewCell *cell, UIViewController *controller, NSInteger row) {
-            cell.textLabel.text = [NSString
-                stringWithFormat:@"%@ — %p", NSStringFromClass(controller.class), controller
-            ];
-            cell.detailTextLabel.text = controller.view.description;
-            cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-            cell.textLabel.lineBreakMode = NSLineBreakByTruncatingTail;
-    } filterMatcher:^BOOL(NSString *filterText, UIViewController *controller) {
-        return [NSStringFromClass(controller.class) localizedCaseInsensitiveContainsString:filterText];
-    }];
-    
-    self.section.selectionHandler = ^(UIViewController *host, UIViewController *controller) {
-        [host.navigationController pushViewController:
-            [FLEXObjectExplorerFactory explorerViewControllerForObject:controller]
-        animated:YES];
-    };
-    
-    self.section.customTitle = @"View Controllers";
-    return @[self.section];
-}
-
-
-#pragma mark - Private
-
-- (void)dismissAnimated {
-    [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-@end

Classes/ExplorerInterface/FLEXWindow.h

@@ -3,27 +3,22 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 4/13/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
 
+@protocol FLEXWindowEventDelegate;
+
+@interface FLEXWindow : UIWindow
+
+@property (nonatomic, weak) id <FLEXWindowEventDelegate> eventDelegate;
+
+@end
+
 @protocol FLEXWindowEventDelegate <NSObject>
 
 - (BOOL)shouldHandleTouchAtPoint:(CGPoint)pointInWindow;
 - (BOOL)canBecomeKeyWindow;
 
 @end
-
-#pragma mark -
-@interface FLEXWindow : UIWindow
-
-@property (nonatomic, weak) id <FLEXWindowEventDelegate> eventDelegate;
-
-/// Tracked so we can restore the key window after dismissing a modal.
-/// We need to become key after modal presentation so we can correctly capture input.
-/// If we're just showing the toolbar, we want the main app's window to remain key
-/// so that we don't interfere with input, status bar, etc.
-@property (nonatomic, readonly) UIWindow *previousKeyWindow;
-
-@end

Classes/ExplorerInterface/FLEXWindow.m

@@ -3,18 +3,19 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 4/13/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXWindow.h"
-#import "FLEXUtility.h"
 #import <objc/runtime.h>
 
 @implementation FLEXWindow
 
-- (id)initWithFrame:(CGRect)frame {
+- (id)initWithFrame:(CGRect)frame
+{
     self = [super initWithFrame:frame];
     if (self) {
+        self.backgroundColor = [UIColor clearColor];
         // Some apps have windows at UIWindowLevelStatusBar + n.
         // If we make the window level too high, we block out UIAlertViews.
         // There's a balance between staying above the app's windows and staying below alerts.
@@ -24,7 +25,8 @@
     return self;
 }
 
-- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event {
+- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
+{
     BOOL pointInside = NO;
     if ([self.eventDelegate shouldHandleTouchAtPoint:point]) {
         pointInside = [super pointInside:point withEvent:event];
@@ -32,29 +34,22 @@
     return pointInside;
 }
 
-- (BOOL)shouldAffectStatusBarAppearance {
+- (BOOL)shouldAffectStatusBarAppearance
+{
     return [self isKeyWindow];
 }
 
-- (BOOL)canBecomeKeyWindow {
+- (BOOL)canBecomeKeyWindow
+{
     return [self.eventDelegate canBecomeKeyWindow];
 }
 
-- (void)makeKeyWindow {
-    _previousKeyWindow = FLEXUtility.appKeyWindow;
-    [super makeKeyWindow];
-}
-
-- (void)resignKeyWindow {
-    [super resignKeyWindow];
-    _previousKeyWindow = nil;
-}
-
-+ (void)initialize {
++ (void)initialize
+{
     // This adds a method (superclass override) at runtime which gives us the status bar behavior we want.
     // The FLEX window is intended to be an overlay that generally doesn't affect the app underneath.
     // Most of the time, we want the app's main window(s) to be in control of status bar behavior.
-    // Done at runtime with an obfuscated selector because it is private API. But you shouldn't ship this to the App Store anyways...
+    // Done at runtime with an obfuscated selector because it is private API. But you shoudn't ship this to the App Store anyways...
     NSString *canAffectSelectorString = [@[@"_can", @"Affect", @"Status", @"Bar", @"Appearance"] componentsJoinedByString:@""];
     SEL canAffectSelector = NSSelectorFromString(canAffectSelectorString);
     Method shouldAffectMethod = class_getInstanceMethod(self, @selector(shouldAffectStatusBarAppearance));

Classes/ExplorerInterface/FLEXWindowManagerController.h

@@ -1,17 +0,0 @@
-//
-//  FLEXWindowManagerController.h
-//  FLEX
-//
-//  Created by Tanner on 2/6/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableViewController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FLEXWindowManagerController : FLEXTableViewController
-
-@end
-
-NS_ASSUME_NONNULL_END

Classes/ExplorerInterface/FLEXWindowManagerController.m

@@ -1,302 +0,0 @@
-//
-//  FLEXWindowManagerController.m
-//  FLEX
-//
-//  Created by Tanner on 2/6/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXWindowManagerController.h"
-#import "FLEXManager+Private.h"
-#import "FLEXUtility.h"
-#import "FLEXObjectExplorerFactory.h"
-
-@interface FLEXWindowManagerController ()
-@property (nonatomic) UIWindow *keyWindow;
-@property (nonatomic, copy) NSString *keyWindowSubtitle;
-@property (nonatomic, copy) NSArray<UIWindow *> *windows;
-@property (nonatomic, copy) NSArray<NSString *> *windowSubtitles;
-@property (nonatomic, copy) NSArray<UIScene *> *scenes API_AVAILABLE(ios(13));
-@property (nonatomic, copy) NSArray<NSString *> *sceneSubtitles;
-@property (nonatomic, copy) NSArray<NSArray *> *sections;
-@end
-
-@implementation FLEXWindowManagerController
-
-#pragma mark - Initialization
-
-- (id)init {
-    return [self initWithStyle:UITableViewStylePlain];
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    self.title = @"Windows";
-    if (@available(iOS 13, *)) {
-        self.title = @"Windows and Scenes";
-    }
-    
-    [self disableToolbar];
-    [self reloadData];
-}
-
-
-#pragma mark - Private
-
-- (void)reloadData {
-    self.keyWindow = UIApplication.sharedApplication.keyWindow;
-    self.windows = UIApplication.sharedApplication.windows;
-    self.keyWindowSubtitle = self.windowSubtitles[[self.windows indexOfObject:self.keyWindow]];
-    self.windowSubtitles = [self.windows flex_mapped:^id(UIWindow *window, NSUInteger idx) {
-        return [NSString stringWithFormat:@"Level: %@ — Root: %@",
-            @(window.windowLevel), window.rootViewController
-        ];
-    }];
-    
-    if (@available(iOS 13, *)) {
-        self.scenes = UIApplication.sharedApplication.connectedScenes.allObjects;
-        self.sceneSubtitles = [self.scenes flex_mapped:^id(UIScene *scene, NSUInteger idx) {
-            return [self sceneDescription:scene];
-        }];
-        
-        self.sections = @[@[self.keyWindow], self.windows, self.scenes];
-    } else {
-        self.sections = @[@[self.keyWindow], self.windows];
-    }
-    
-    [self.tableView reloadData];
-}
-
-- (void)dismissAnimated {
-    [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (void)showRevertOrDismissAlert:(void(^)())revertBlock {
-    [self.tableView deselectRowAtIndexPath:self.tableView.indexPathForSelectedRow animated:YES];
-    [self reloadData];
-    [self.tableView reloadData];
-    
-    UIWindow *highestWindow = UIApplication.sharedApplication.keyWindow;
-    UIWindowLevel maxLevel = 0;
-    for (UIWindow *window in UIApplication.sharedApplication.windows) {
-        if (window.windowLevel > maxLevel) {
-            maxLevel = window.windowLevel;
-            highestWindow = window;
-        }
-    }
-    
-    [FLEXAlert makeAlert:^(FLEXAlert *make) {
-        make.title(@"Keep Changes?");
-        make.message(@"If you do not wish to keep these settings, choose 'Revert Changes' below.");
-        
-        make.button(@"Keep Changes").destructiveStyle();
-        make.button(@"Keep Changes and Dismiss").destructiveStyle().handler(^(NSArray<NSString *> *strings) {
-            [self dismissAnimated];
-        });
-        make.button(@"Revert Changes").cancelStyle().handler(^(NSArray<NSString *> *strings) {
-            revertBlock();
-            [self reloadData];
-            [self.tableView reloadData];
-        });
-    } showFrom:[FLEXUtility topViewControllerInWindow:highestWindow]];
-}
-
-- (NSString *)sceneDescription:(UIScene *)scene API_AVAILABLE(ios(13)) {
-    NSString *state = [self stringFromSceneState:scene.activationState];
-    NSString *title = scene.title.length ? scene.title : nil;
-    NSString *suffix = nil;
-    
-    if ([scene isKindOfClass:[UIWindowScene class]]) {
-        UIWindowScene *windowScene = (id)scene;
-        suffix = FLEXPluralString(windowScene.windows.count, @"windows", @"window");
-    }
-    
-    NSMutableString *description = state.mutableCopy;
-    if (title) {
-        [description appendFormat:@" — %@", title];
-    }
-    if (suffix) {
-        [description appendFormat:@" — %@", suffix];
-    }
-    
-    return description.copy;
-}
-
-- (NSString *)stringFromSceneState:(UISceneActivationState)state API_AVAILABLE(ios(13)) {
-    switch (state) {
-        case UISceneActivationStateUnattached:
-            return @"Unattached";
-        case UISceneActivationStateForegroundActive:
-            return @"Active";
-        case UISceneActivationStateForegroundInactive:
-            return @"Inactive";
-        case UISceneActivationStateBackground:
-            return @"Backgrounded";
-    }
-    
-    return [NSString stringWithFormat:@"Unknown state: %@", @(state)];
-}
-
-
-#pragma mark - Table View Data Source
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return self.sections.count;
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return self.sections[section].count;
-}
-
-- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
-    switch (section) {
-        case 0: return @"Key Window";
-        case 1: return @"Windows";
-        case 2: return @"Connected Scenes";
-    }
-    
-    return nil;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kFLEXDetailCell forIndexPath:indexPath];
-    cell.accessoryType = UITableViewCellAccessoryDetailButton;
-    cell.textLabel.lineBreakMode = NSLineBreakByTruncatingTail;
-    
-    UIWindow *window = nil;
-    NSString *subtitle = nil;
-    
-    switch (indexPath.section) {
-        case 0:
-            window = self.keyWindow;
-            subtitle = self.keyWindowSubtitle;
-            break;
-        case 1:
-            window = self.windows[indexPath.row];
-            subtitle = self.windowSubtitles[indexPath.row];
-            break;
-        case 2:
-            if (@available(iOS 13, *)) {
-                UIScene *scene = self.scenes[indexPath.row];
-                cell.textLabel.text = scene.description;
-                cell.detailTextLabel.text = self.sceneSubtitles[indexPath.row];
-                return cell;
-            }
-    }
-    
-    cell.textLabel.text = window.description;
-    cell.detailTextLabel.text = [NSString
-        stringWithFormat:@"Level: %@ — Root: %@",
-        @((NSInteger)window.windowLevel), window.rootViewController.class
-    ];
-    
-    return cell;
-}
-
-
-#pragma mark - Table View Delegate
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    UIWindow *window = nil;
-    NSString *subtitle = nil;
-    FLEXWindow *flex = FLEXManager.sharedManager.explorerWindow;
-    
-    id cancelHandler = ^{
-        [self.tableView deselectRowAtIndexPath:self.tableView.indexPathForSelectedRow animated:YES];
-    };
-    
-    switch (indexPath.section) {
-        case 0:
-            window = self.keyWindow;
-            subtitle = self.keyWindowSubtitle;
-            break;
-        case 1:
-            window = self.windows[indexPath.row];
-            subtitle = self.windowSubtitles[indexPath.row];
-            break;
-        case 2:
-            if (@available(iOS 13, *)) {
-                UIScene *scene = self.scenes[indexPath.row];
-                UIWindowScene *oldScene = flex.windowScene;
-                BOOL isWindowScene = [scene isKindOfClass:[UIWindowScene class]];
-                BOOL isFLEXScene = isWindowScene ? flex.windowScene == scene : NO;
-                
-                [FLEXAlert makeAlert:^(FLEXAlert *make) {
-                    make.title(NSStringFromClass(scene.class));
-                    
-                    if (isWindowScene) {
-                        if (isFLEXScene) {
-                            make.message(@"Already the FLEX window scene");
-                        }
-                        
-                        make.button(@"Set as FLEX Window Scene")
-                        .handler(^(NSArray<NSString *> *strings) {
-                            flex.windowScene = (id)scene;
-                            [self showRevertOrDismissAlert:^{
-                                flex.windowScene = oldScene;
-                            }];
-                        }).enabled(!isFLEXScene);
-                        make.button(@"Cancel").cancelStyle();
-                    } else {
-                        make.message(@"Not a UIWindowScene");
-                        make.button(@"Dismiss").cancelStyle().handler(cancelHandler);
-                    }
-                } showFrom:self];
-            }
-    }
-
-    __block UIWindow *targetWindow = nil, *oldKeyWindow = nil;
-    __block UIWindowLevel oldLevel;
-    __block BOOL wasVisible;
-    
-    subtitle = [subtitle stringByAppendingString:
-        @"\n\n1) Adjust the FLEX window level relative to this window,\n"
-        "2) adjust this window's level relative to the FLEX window,\n"
-        "3) set this window's level to a specific value, or\n"
-        "4) make this window the key window if it isn't already."
-    ];
-    
-    [FLEXAlert makeAlert:^(FLEXAlert *make) {
-        make.title(NSStringFromClass(window.class)).message(subtitle);
-        make.button(@"Adjust FLEX Window Level").handler(^(NSArray<NSString *> *strings) {
-            targetWindow = flex; oldLevel = flex.windowLevel;
-            flex.windowLevel = window.windowLevel + strings.firstObject.integerValue;
-            
-            [self showRevertOrDismissAlert:^{ targetWindow.windowLevel = oldLevel; }];
-        });
-        make.button(@"Adjust This Window's Level").handler(^(NSArray<NSString *> *strings) {
-            targetWindow = window; oldLevel = window.windowLevel;
-            window.windowLevel = flex.windowLevel + strings.firstObject.integerValue;
-            
-            [self showRevertOrDismissAlert:^{ targetWindow.windowLevel = oldLevel; }];
-        });
-        make.button(@"Set This Window's Level").handler(^(NSArray<NSString *> *strings) {
-            targetWindow = window; oldLevel = window.windowLevel;
-            window.windowLevel = strings.firstObject.integerValue;
-            
-            [self showRevertOrDismissAlert:^{ targetWindow.windowLevel = oldLevel; }];
-        });
-        make.button(@"Make Key And Visible").handler(^(NSArray<NSString *> *strings) {
-            oldKeyWindow = UIApplication.sharedApplication.keyWindow;
-            wasVisible = window.hidden;
-            [window makeKeyAndVisible];
-            
-            [self showRevertOrDismissAlert:^{
-                window.hidden = wasVisible;
-                [oldKeyWindow makeKeyWindow];
-            }];
-        }).enabled(!window.isKeyWindow && !window.hidden);
-        make.button(@"Cancel").cancelStyle().handler(cancelHandler);
-        
-        make.textField(@"+/- window level, i.e. 5 or -10");
-    } showFrom:self];
-}
-
-- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)ip {
-    [self.navigationController pushViewController:
-        [FLEXObjectExplorerFactory explorerViewControllerForObject:self.sections[ip.section][ip.row]]
-    animated:YES];
-}
-
-@end

Classes/ExplorerInterface/Tabs/FLEXTabList.h

@@ -1,45 +0,0 @@
-//
-//  FLEXTabList.h
-//  FLEX
-//
-//  Created by Tanner on 2/1/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FLEXTabList : NSObject
-
-@property (nonatomic, readonly, class) FLEXTabList *sharedList;
-
-@property (nonatomic, readonly, nullable) UINavigationController *activeTab;
-@property (nonatomic, readonly) NSArray<UINavigationController *> *openTabs;
-/// Snapshots of each tab when they were last active.
-@property (nonatomic, readonly) NSArray<UIImage *> *openTabSnapshots;
-/// \c NSNotFound if no tabs are present.
-/// Setting this property changes the active tab to one of the already open tabs.
-@property (nonatomic) NSInteger activeTabIndex;
-
-/// Adds a new tab and sets the new tab as the active tab.
-- (void)addTab:(UINavigationController *)newTab;
-/// Closes the given tab. If this tab was the active tab,
-/// the most recent tab before that becomes the active tab.
-- (void)closeTab:(UINavigationController *)tab;
-/// Closes a tab at the given index. If this tab was the active tab,
-/// the most recent tab before that becomes the active tab.
-- (void)closeTabAtIndex:(NSInteger)idx;
-/// Closes all of the tabs at the given indexes. If the active tab
-/// is included, the most recent still-open tab becomes the active tab.
-- (void)closeTabsAtIndexes:(NSIndexSet *)indexes;
-/// A shortcut to close the active tab.
-- (void)closeActiveTab;
-/// A shortcut to close \e every tab.
-- (void)closeAllTabs;
-
-- (void)updateSnapshotForActiveTab;
-
-@end
-
-NS_ASSUME_NONNULL_END

Classes/ExplorerInterface/Tabs/FLEXTabList.m

@@ -1,133 +0,0 @@
-//
-//  FLEXTabList.m
-//  FLEX
-//
-//  Created by Tanner on 2/1/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXTabList.h"
-#import "FLEXUtility.h"
-
-@interface FLEXTabList () {
-    NSMutableArray *_openTabs;
-    NSMutableArray *_openTabSnapshots;
-}
-@end
-#pragma mark -
-@implementation FLEXTabList
-
-#pragma mark Initialization
-
-+ (FLEXTabList *)sharedList {
-    static FLEXTabList *sharedList = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sharedList = [self new];
-    });
-    
-    return sharedList;
-}
-
-- (id)init {
-    self = [super init];
-    if (self) {
-        _openTabs = [NSMutableArray new];
-        _openTabSnapshots = [NSMutableArray new];
-        _activeTabIndex = NSNotFound;
-    }
-    
-    return self;
-}
-
-
-#pragma mark Private
-
-- (void)chooseNewActiveTab {
-    if (self.openTabs.count) {
-        self.activeTabIndex = self.openTabs.count - 1;
-    } else {
-        self.activeTabIndex = NSNotFound;
-    }
-}
-
-
-#pragma mark Public
-
-- (void)setActiveTabIndex:(NSInteger)idx {
-    NSParameterAssert(idx < self.openTabs.count || idx == NSNotFound);
-    if (_activeTabIndex == idx) return;
-    
-    _activeTabIndex = idx;
-    _activeTab = (idx == NSNotFound) ? nil : self.openTabs[idx];
-}
-
-- (void)addTab:(UINavigationController *)newTab {
-    NSParameterAssert(newTab);
-    
-    // Update snapshot of the last active tab
-    if (self.activeTab) {
-        [self updateSnapshotForActiveTab];
-    }
-    
-    // Add new tab and snapshot,
-    // update active tab and index
-    [_openTabs addObject:newTab];
-    [_openTabSnapshots addObject:[FLEXUtility previewImageForView:newTab.view]];
-    _activeTab = newTab;
-    _activeTabIndex = self.openTabs.count - 1;
-}
-
-- (void)closeTab:(UINavigationController *)tab {
-    NSParameterAssert(tab);
-    NSParameterAssert([self.openTabs containsObject:tab]);
-    NSInteger idx = [self.openTabs indexOfObject:tab];
-    
-    [self closeTabAtIndex:idx];
-}
-
-- (void)closeTabAtIndex:(NSInteger)idx {
-    NSParameterAssert(idx < self.openTabs.count);
-    
-    // Remove old tab and snapshot
-    [_openTabs removeObjectAtIndex:idx];
-    [_openTabSnapshots removeObjectAtIndex:idx];
-    
-    // Update active tab and index if needed
-    if (self.activeTabIndex == idx) {
-        [self chooseNewActiveTab];
-    }
-}
-
-- (void)closeTabsAtIndexes:(NSIndexSet *)indexes {
-    // Remove old tabs and snapshot
-    [_openTabs removeObjectsAtIndexes:indexes];
-    [_openTabSnapshots removeObjectsAtIndexes:indexes];
-    
-    // Update active tab and index if needed
-    if ([indexes containsIndex:self.activeTabIndex]) {
-        [self chooseNewActiveTab];
-    }
-}
-
-- (void)closeActiveTab {
-    [self closeTab:self.activeTab];
-}
-
-- (void)closeAllTabs {
-    // Remove tabs and snapshots
-    [_openTabs removeAllObjects];
-    [_openTabSnapshots removeAllObjects];
-    
-    // Update active tab index
-    self.activeTabIndex = NSNotFound;
-}
-
-- (void)updateSnapshotForActiveTab {
-    if (self.activeTabIndex != NSNotFound) {
-        UIImage *newSnapshot = [FLEXUtility previewImageForView:self.activeTab.view];
-        [_openTabSnapshots replaceObjectAtIndex:self.activeTabIndex withObject:newSnapshot];
-    }
-}
-
-@end

Classes/ExplorerInterface/Tabs/FLEXTabsViewController.h

@@ -1,13 +0,0 @@
-//
-//  FLEXTabsViewController.h
-//  FLEX
-//
-//  Created by Tanner on 2/4/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXTableViewController.h"
-
-@interface FLEXTabsViewController : FLEXTableViewController
-
-@end

Classes/ExplorerInterface/Tabs/FLEXTabsViewController.m

@@ -1,335 +0,0 @@
-//
-//  FLEXTabsViewController.m
-//  FLEX
-//
-//  Created by Tanner on 2/4/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import "FLEXTabsViewController.h"
-#import "FLEXNavigationController.h"
-#import "FLEXTabList.h"
-#import "FLEXBookmarkManager.h"
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
-#import "UIBarButtonItem+FLEX.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXGlobalsViewController.h"
-#import "FLEXBookmarksViewController.h"
-
-@interface FLEXTabsViewController ()
-@property (nonatomic, copy) NSArray<UINavigationController *> *openTabs;
-@property (nonatomic, copy) NSArray<UIImage *> *tabSnapshots;
-@property (nonatomic) NSInteger activeIndex;
-@property (nonatomic) BOOL presentNewActiveTabOnDismiss;
-
-@property (nonatomic, readonly) FLEXExplorerViewController *corePresenter;
-@end
-
-@implementation FLEXTabsViewController
-
-#pragma mark - Initialization
-
-- (id)init {
-    return [self initWithStyle:UITableViewStylePlain];
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    self.title = @"Open Tabs";
-    self.navigationController.hidesBarsOnSwipe = NO;
-    self.tableView.allowsMultipleSelectionDuringEditing = YES;
-    
-    [self reloadData:NO];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    [self setupDefaultBarItems];
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    
-    // Instead of updating the active snapshot before we present,
-    // we update it after we present to avoid pre-presenation latency
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [FLEXTabList.sharedList updateSnapshotForActiveTab];
-        [self reloadData:NO];
-        [self.tableView reloadData];
-    });
-}
-
-
-#pragma mark - Private
-
-/// @param trackActiveTabDelta whether to check if the active
-/// tab changed and needs to be presented upon "Done" dismissal.
-/// @return whether the active tab changed or not (if there are any tabs left)
-- (BOOL)reloadData:(BOOL)trackActiveTabDelta {
-    BOOL activeTabDidChange = NO;
-    FLEXTabList *list = FLEXTabList.sharedList;
-    
-    // Flag to enable check to determine whether
-    if (trackActiveTabDelta) {
-        NSInteger oldActiveIndex = self.activeIndex;
-        if (oldActiveIndex != list.activeTabIndex && list.activeTabIndex != NSNotFound) {
-            self.presentNewActiveTabOnDismiss = YES;
-            activeTabDidChange = YES;
-        } else if (self.presentNewActiveTabOnDismiss) {
-            // If we had something to present before, now we don't
-            // (i.e. activeTabIndex == NSNotFound)
-            self.presentNewActiveTabOnDismiss = NO;
-        }
-    }
-    
-    // We assume the tabs aren't going to change out from under us, since
-    // presenting any other tool via keyboard shortcuts should dismiss us first
-    self.openTabs = list.openTabs;
-    self.tabSnapshots = list.openTabSnapshots;
-    self.activeIndex = list.activeTabIndex;
-    
-    return activeTabDidChange;
-}
-
-- (void)reloadActiveTabRowIfChanged:(BOOL)activeTabChanged {
-    // Refresh the newly active tab row if needed
-    if (activeTabChanged) {
-        NSIndexPath *active = [NSIndexPath
-           indexPathForRow:self.activeIndex inSection:0
-        ];
-        [self.tableView reloadRowsAtIndexPaths:@[active] withRowAnimation:UITableViewRowAnimationNone];
-    }
-}
-
-- (void)setupDefaultBarItems {
-    self.navigationItem.rightBarButtonItem = FLEXBarButtonItemSystem(Done, self, @selector(dismissAnimated));
-    self.toolbarItems = @[
-        UIBarButtonItem.flex_fixedSpace,
-        UIBarButtonItem.flex_flexibleSpace,
-        FLEXBarButtonItemSystem(Add, self, @selector(addTabButtonPressed:)),
-        UIBarButtonItem.flex_flexibleSpace,
-        FLEXBarButtonItemSystem(Edit, self, @selector(toggleEditing)),
-    ];
-    
-    // Disable editing if no tabs available
-    self.toolbarItems.lastObject.enabled = self.openTabs.count > 0;
-}
-
-- (void)setupEditingBarItems {
-    self.navigationItem.rightBarButtonItem = nil;
-    self.toolbarItems = @[
-        [UIBarButtonItem itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed:)],
-        UIBarButtonItem.flex_flexibleSpace,
-        [UIBarButtonItem disabledSystemItem:UIBarButtonSystemItemAdd],
-        UIBarButtonItem.flex_flexibleSpace,
-        // We use a non-system done item because we change its title dynamically
-        [UIBarButtonItem doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
-    ];
-    
-    self.toolbarItems.firstObject.tintColor = FLEXColor.destructiveColor;
-}
-
-- (FLEXExplorerViewController *)corePresenter {
-    // We must be presented by a FLEXExplorerViewController, or presented
-    // by another view controller that was presented by FLEXExplorerViewController
-    FLEXExplorerViewController *presenter = (id)self.presentingViewController;
-    presenter = (id)presenter.presentingViewController ?: presenter;
-    NSAssert(
-        [presenter isKindOfClass:[FLEXExplorerViewController class]],
-        @"The tabs view controller expects to be presented by the explorer controller"
-    );
-    return presenter;
-}
-
-
-#pragma mark Button Actions
-
-- (void)dismissAnimated {
-    if (self.presentNewActiveTabOnDismiss) {
-        // The active tab was closed so we need to present the new one
-        UIViewController *activeTab = FLEXTabList.sharedList.activeTab;
-        FLEXExplorerViewController *presenter = self.corePresenter;
-        [presenter dismissViewControllerAnimated:YES completion:^{
-            [presenter presentViewController:activeTab animated:YES completion:nil];
-        }];
-    } else if (self.activeIndex == NSNotFound) {
-        // The only tab was closed, so dismiss everything
-        [self.corePresenter dismissViewControllerAnimated:YES completion:nil];
-    } else {
-        // Simple dismiss with the same active tab, only dismiss myself
-        [self dismissViewControllerAnimated:YES completion:nil];
-    }
-}
-
-- (void)toggleEditing {
-    NSArray<NSIndexPath *> *selected = self.tableView.indexPathsForSelectedRows;
-    self.editing = !self.editing;
-    
-    if (self.isEditing) {
-        [self setupEditingBarItems];
-    } else {
-        [self setupDefaultBarItems];
-        
-        // Get index set of tabs to close
-        NSMutableIndexSet *indexes = [NSMutableIndexSet new];
-        for (NSIndexPath *ip in selected) {
-            [indexes addIndex:ip.row];
-        }
-        
-        if (selected.count) {
-            // Close tabs and update data source
-            [FLEXTabList.sharedList closeTabsAtIndexes:indexes];
-            BOOL activeTabChanged = [self reloadData:YES];
-            
-            // Remove deleted rows
-            [self.tableView deleteRowsAtIndexPaths:selected withRowAnimation:UITableViewRowAnimationAutomatic];
-            
-            // Refresh the newly active tab row if needed
-            [self reloadActiveTabRowIfChanged:activeTabChanged];
-        }
-    }
-}
-
-- (void)addTabButtonPressed:(UIBarButtonItem *)sender {
-    if (FLEXBookmarkManager.bookmarks.count) {
-        [FLEXAlert makeSheet:^(FLEXAlert *make) {
-            make.title(@"New Tab");
-            make.button(@"Main Menu").handler(^(NSArray<NSString *> *strings) {
-                [self addTabAndDismiss:[FLEXNavigationController
-                    withRootViewController:[FLEXGlobalsViewController new]
-                ]];
-            });
-            make.button(@"Choose from Bookmarks").handler(^(NSArray<NSString *> *strings) {
-                [self presentViewController:[FLEXNavigationController
-                    withRootViewController:[FLEXBookmarksViewController new]
-                ] animated:YES completion:nil];
-            });
-            make.button(@"Cancel").cancelStyle();
-        } showFrom:self source:sender];
-    } else {
-        // No bookmarks, just open the main menu
-        [self addTabAndDismiss:[FLEXNavigationController
-            withRootViewController:[FLEXGlobalsViewController new]
-        ]];
-    }
-}
-
-- (void)addTabAndDismiss:(UINavigationController *)newTab {
-    FLEXExplorerViewController *presenter = self.corePresenter;
-    [presenter dismissViewControllerAnimated:YES completion:^{
-        [presenter presentViewController:newTab animated:YES completion:nil];
-    }];
-}
-
-- (void)closeAllButtonPressed:(UIBarButtonItem *)sender {
-    [FLEXAlert makeSheet:^(FLEXAlert *make) {
-        NSInteger count = self.openTabs.count;
-        NSString *title = FLEXPluralFormatString(count, @"Close %@ tabs", @"Close %@ tab");
-        make.button(title).destructiveStyle().handler(^(NSArray<NSString *> *strings) {
-            [self closeAll];
-            [self toggleEditing];
-        });
-        make.button(@"Cancel").cancelStyle();
-    } showFrom:self source:sender];
-}
-
-- (void)closeAll {
-    NSInteger rowCount = self.openTabs.count;
-    
-    // Close tabs and update data source
-    [FLEXTabList.sharedList closeAllTabs];
-    [self reloadData:YES];
-    
-    // Delete rows from table view
-    NSArray<NSIndexPath *> *allRows = [NSArray flex_forEachUpTo:rowCount map:^id(NSUInteger row) {
-        return [NSIndexPath indexPathForRow:row inSection:0];
-    }];
-    [self.tableView deleteRowsAtIndexPaths:allRows withRowAnimation:UITableViewRowAnimationAutomatic];
-}
-
-
-#pragma mark - Table View Data Source
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return self.openTabs.count;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kFLEXDetailCell forIndexPath:indexPath];
-    
-    UINavigationController *tab = self.openTabs[indexPath.row];
-    cell.imageView.image = self.tabSnapshots[indexPath.row];
-    cell.textLabel.text = tab.topViewController.title;
-    cell.detailTextLabel.text = FLEXPluralString(tab.viewControllers.count, @"pages", @"page");
-    
-    if (!cell.tag) {
-        cell.textLabel.lineBreakMode = NSLineBreakByTruncatingTail;
-        cell.textLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline];
-        cell.detailTextLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleSubheadline];
-        cell.tag = 1;
-    }
-    
-    if (indexPath.row == self.activeIndex) {
-        cell.backgroundColor = FLEXColor.secondaryBackgroundColor;
-    } else {
-        cell.backgroundColor = FLEXColor.primaryBackgroundColor;
-    }
-    
-    return cell;
-}
-
-
-#pragma mark - Table View Delegate
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (self.editing) {
-        // Case: editing with multi-select
-        self.toolbarItems.lastObject.title = @"Close Selected";
-        self.toolbarItems.lastObject.tintColor = FLEXColor.destructiveColor;
-    } else {
-        if (self.activeIndex == indexPath.row && self.corePresenter != self.presentingViewController) {
-            // Case: selected the already active tab
-            [self dismissAnimated];
-        } else {
-            // Case: selected a different tab,
-            // or selected a tab when presented from the FLEX toolbar
-            FLEXTabList.sharedList.activeTabIndex = indexPath.row;
-            self.presentNewActiveTabOnDismiss = YES;
-            [self dismissAnimated];
-        }
-    }
-}
-
-- (void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath {
-    NSParameterAssert(self.editing);
-    
-    if (tableView.indexPathsForSelectedRows.count == 0) {
-        self.toolbarItems.lastObject.title = @"Done";
-        self.toolbarItems.lastObject.tintColor = self.view.tintColor;
-    }
-}
-
-- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
-    return YES;
-}
-
-- (void)tableView:(UITableView *)table
-commitEditingStyle:(UITableViewCellEditingStyle)edit
-forRowAtIndexPath:(NSIndexPath *)indexPath {
-    NSParameterAssert(edit == UITableViewCellEditingStyleDelete);
-    
-    // Close tab and update data source
-    [FLEXTabList.sharedList closeTab:self.openTabs[indexPath.row]];
-    BOOL activeTabChanged = [self reloadData:YES];
-    
-    // Delete row from table view
-    [table deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic];
-    
-    // Refresh the newly active tab row if needed
-    [self reloadActiveTabRowIfChanged:activeTabChanged];
-}
-
-@end

Classes/FLEX-Categories.h

@@ -1,27 +0,0 @@
-//
-//  FLEX-Categories.h
-//  FLEX
-//
-//  Created by Tanner on 3/12/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-
-
-#import <FLEX/UIBarButtonItem+FLEX.h>
-#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-Core.h

@@ -1,23 +0,0 @@
-//
-//  FLEX-Core.h
-//  FLEX
-//
-//  Created by Tanner on 3/11/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import <FLEX/FLEXFilteringTableViewController.h>
-#import <FLEX/FLEXNavigationController.h>
-#import <FLEX/FLEXTableViewController.h>
-#import <FLEX/FLEXTableView.h>
-
-#import <FLEX/FLEXSingleRowSection.h>
-#import <FLEX/FLEXTableViewSection.h>
-
-#import <FLEX/FLEXCodeFontCell.h>
-#import <FLEX/FLEXSubtitleTableViewCell.h>
-#import <FLEX/FLEXTableViewCell.h>
-#import <FLEX/FLEXMultilineTableViewCell.h>
-#import <FLEX/FLEXKeyValueTableViewCell.h>
-
-#import <FLEX/FLEXScopeCarousel.h>

Classes/FLEX-ObjectExploring.h

@@ -1,30 +0,0 @@
-//
-//  FLEX-ObjectExploring.h
-//  FLEX
-//
-//  Created by Tanner on 3/11/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import <FLEX/FLEXObjectExplorerFactory.h>
-#import <FLEX/FLEXObjectExplorerViewController.h>
-
-#import <FLEX/FLEXObjectExplorer.h>
-
-#import <FLEX/FLEXShortcut.h>
-#import <FLEX/FLEXShortcutsFactory+Defaults.h>
-#import <FLEX/FLEXShortcutsSection.h>
-#import <FLEX/FLEXBlockShortcuts.h>
-#import <FLEX/FLEXBundleShortcuts.h>
-#import <FLEX/FLEXClassShortcuts.h>
-#import <FLEX/FLEXImageShortcuts.h>
-#import <FLEX/FLEXLayerShortcuts.h>
-#import <FLEX/FLEXViewControllerShortcuts.h>
-#import <FLEX/FLEXViewShortcuts.h>
-
-#import <FLEX/FLEXCollectionContentSection.h>
-#import <FLEX/FLEXColorPreviewSection.h>
-#import <FLEX/FLEXDefaultsContentSection.h>
-#import <FLEX/FLEXMetadataSection.h>
-#import <FLEX/FLEXMutableListSection.h>
-#import <FLEX/FLEXObjectInfoSection.h>

Classes/FLEX-Runtime.h

@@ -1,25 +0,0 @@
-//
-//  FLEX-Runtime.h
-//  FLEX
-//
-//  Created by Tanner on 3/11/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import <FLEX/FLEXObjcInternal.h>
-#import <FLEX/FLEXRuntimeSafety.h>
-#import <FLEX/FLEXBlockDescription.h>
-#import <FLEX/FLEXTypeEncodingParser.h>
-
-#import <FLEX/FLEXMirror.h>
-#import <FLEX/FLEXProtocol.h>
-#import <FLEX/FLEXProperty.h>
-#import <FLEX/FLEXIvar.h>
-#import <FLEX/FLEXMethodBase.h>
-#import <FLEX/FLEXMethod.h>
-#import <FLEX/FLEXPropertyAttributes.h>
-#import <FLEX/FLEXRuntime+Compare.h>
-#import <FLEX/FLEXRuntime+UIKitHelpers.h>
-
-#import <FLEX/FLEXProtocolBuilder.h>
-#import <FLEX/FLEXClassBuilder.h>

Classes/FLEX.h

@@ -3,23 +3,7 @@
 //  FLEX
 //
 //  Created by Eric Horacek on 7/18/15.
-//  Modified by Tanner Bennett on 3/12/20.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2015 Flipboard. All rights reserved.
 //
 
 #import <FLEX/FLEXManager.h>
-#import <FLEX/FLEXManager+Extensibility.h>
-#import <FLEX/FLEXManager+Networking.h>
-
-#import <FLEX/FLEXExplorerToolbar.h>
-#import <FLEX/FLEXExplorerToolbarItem.h>
-#import <FLEX/FLEXGlobalsEntry.h>
-
-#import <FLEX/FLEX-Core.h>
-#import <FLEX/FLEX-Runtime.h>
-#import <FLEX/FLEX-Categories.h>
-#import <FLEX/FLEX-ObjectExploring.h>
-
-#import <FLEX/FLEXMacros.h>
-#import <FLEX/FLEXAlert.h>
-#import <FLEX/FLEXResources.h>

Classes/FLEXManager.h

@@ -0,0 +1,91 @@
+//
+//  FLEXManager.h
+//  Flipboard
+//
+//  Created by Ryan Olson on 4/4/14.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+typedef UIViewController *(^FLEXCustomContentViewerFuture)(NSData *data);
+
+@interface FLEXManager : NSObject
+
++ (instancetype)sharedManager;
+
+@property (nonatomic, readonly) BOOL isHidden;
+
+- (void)showExplorer;
+- (void)hideExplorer;
+- (void)toggleExplorer;
+
+#pragma mark - Network Debugging
+
+/// If this property is set to YES, FLEX will swizzle NSURLConnection*Delegate and NSURLSession*Delegate methods
+/// on classes that conform to the protocols. This allows you to view network activity history from the main FLEX menu.
+/// Full responses are kept temporarily in a size-limited cache and may be pruned under memory pressure.
+@property (nonatomic, assign, getter=isNetworkDebuggingEnabled) BOOL networkDebuggingEnabled;
+
+/// Defaults to 25 MB if never set. Values set here are presisted across launches of the app.
+/// The response cache uses an NSCache, so it may purge prior to hitting the limit when the app is under memory pressure.
+@property (nonatomic, assign) NSUInteger networkResponseCacheByteLimit;
+
+/// 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, copy) NSArray<NSString *> *networkRequestHostBlacklist;
+
+
+#pragma mark - Keyboard Shortcuts
+
+/// Simulator keyboard shortcuts are enabled by default.
+/// The shortcuts will not fire when there is an active text field, text view, or other responder accepting key input.
+/// You can disable keyboard shortcuts if you have existing keyboard shortcuts that conflict with FLEX, or if you like doing things the hard way ;)
+/// Keyboard shortcuts are always disabled (and support is compiled out) in non-simulator builds
+@property (nonatomic, assign) BOOL simulatorShortcutsEnabled;
+
+/// Adds an action to run when the specified key & modifier combination is pressed
+/// @param key A single character string matching a key on the keyboard
+/// @param modifiers Modifier keys such as shift, command, or alt/option
+/// @param action The block to run on the main thread when the key & modifier combination is recognized.
+/// @param description Shown the the keyboard shortcut help menu, which is accessed via the '?' key.
+/// @note The action block will be retained for the duration of the application. You may want to use weak references.
+/// @note FLEX registers several default keyboard shortcuts. Use the '?' key to see a list of shortcuts.
+- (void)registerSimulatorShortcutWithKey:(NSString *)key modifiers:(UIKeyModifierFlags)modifiers action:(dispatch_block_t)action description:(NSString *)description;
+
+#pragma mark - Extensions
+
+/// Default database password is @c nil by default.
+/// Set this to the password you want the databases to open with.
+@property (copy, nonatomic) NSString *defaultSqliteDatabasePassword;
+
+/// 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 by this block will be displayed.
+/// Passing a block that returns an object allows you to display information about an object whose actual pointer may change at runtime (e.g. +currentUser)
+/// @note This method must be called from the main thread.
+/// The objectFutureBlock will be invoked from the main thread and may return nil.
+/// @note The passed block will be copied and retain for the duration of the application, you may want to use __weak references.
+- (void)registerGlobalEntryWithName:(NSString *)entryName objectFutureBlock:(id (^)(void))objectFutureBlock;
+
+/// 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 by this block will be pushed on the navigation controller stack.
+/// @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.
+- (void)registerGlobalEntryWithName:(NSString *)entryName
+          viewControllerFutureBlock:(UIViewController * (^)(void))viewControllerFutureBlock;
+
+/// Sets custom viewer for specific content type.
+/// @param contentType Mime type like application/json
+/// @param viewControllerFutureBlock Viewer (view controller) creation block
+/// @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.
+- (void)setCustomViewerForContentType:(NSString *)contentType
+            viewControllerFutureBlock:(FLEXCustomContentViewerFuture)viewControllerFutureBlock;
+
+@end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.h

@@ -1,19 +0,0 @@
-//
-//  FLEXDBQueryRowCell.h
-//  FLEX
-//
-//  Created by Peng Tao on 15/11/24.
-//  Copyright © 2015年 f. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-extern NSString * const kFLEXDBQueryRowCellReuse;
-
-
-@interface FLEXDBQueryRowCell : UITableViewCell
-
-/// An array of NSString, NSNumber, or NSData objects
-@property (nonatomic) NSArray *data;
-
-@end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.m

@@ -1,74 +0,0 @@
-//
-//  FLEXDBQueryRowCell.m
-//  FLEX
-//
-//  Created by Peng Tao on 15/11/24.
-//  Copyright © 2015年 f. All rights reserved.
-//
-
-#import "FLEXDBQueryRowCell.h"
-#import "FLEXMultiColumnTableView.h"
-#import "NSArray+FLEX.h"
-#import "UIFont+FLEX.h"
-#import "FLEXColor.h"
-
-NSString * const kFLEXDBQueryRowCellReuse = @"kFLEXDBQueryRowCellReuse";
-
-@interface FLEXDBQueryRowCell ()
-@property (nonatomic) NSInteger columnCount;
-@property (nonatomic) NSArray<UILabel *> *labels;
-@end
-
-@implementation FLEXDBQueryRowCell
-
-- (void)setData:(NSArray *)data {
-    _data = data;
-    self.columnCount = data.count;
-    
-    [self.labels flex_forEach:^(UILabel *label, NSUInteger idx) {
-        id content = self.data[idx];
-        
-        if ([content isKindOfClass:[NSString class]]) {
-            label.text = content;
-        } else if (content == NSNull.null) {
-            label.text = @"<null>";
-            label.textColor = FLEXColor.deemphasizedTextColor;
-        } else {
-            label.text = [content description];
-        }
-    }];
-}
-
-- (void)setColumnCount:(NSInteger)columnCount {
-    if (columnCount != _columnCount) {
-        _columnCount = columnCount;
-        
-        // Remove existing labels
-        for (UILabel *l in self.labels) {
-            [l removeFromSuperview];
-        }
-        
-        // Create new labels
-        self.labels = [NSArray flex_forEachUpTo:columnCount map:^id(NSUInteger i) {
-            UILabel *label = [UILabel new];
-            label.font = UIFont.flex_defaultTableCellFont;
-            label.textAlignment = NSTextAlignmentLeft;
-            [self.contentView addSubview:label];
-            
-            return label;
-        }];
-    }
-}
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    
-    CGFloat width  = self.contentView.frame.size.width / self.labels.count;
-    CGFloat height = self.contentView.frame.size.height;
-    
-    [self.labels flex_forEach:^(UILabel *label, NSUInteger i) {
-        label.frame = CGRectMake(width * i + 5, 0, (width - 10), height);
-    }];
-}
-
-@end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDatabaseManager.h

@@ -12,23 +12,15 @@
 //  which Flying Meat Inc. licenses this file to you.
 
 #import <Foundation/Foundation.h>
-#import "FLEXSQLResult.h"
 
-/// Conformers should automatically open and close the database
 @protocol FLEXDatabaseManager <NSObject>
 
 @required
+- (instancetype)initWithPath:(NSString*)path;
 
-/// @return \c nil if the database couldn't be opened
-+ (instancetype)managerForDatabase:(NSString *)path;
-
-/// @return a list of all table names
-- (NSArray<NSString *> *)queryAllTables;
-- (NSArray<NSString *> *)queryAllColumnsOfTable:(NSString *)tableName;
-- (NSArray<NSArray *> *)queryAllDataInTable:(NSString *)tableName;
-
-@optional
-
-- (FLEXSQLResult *)executeStatement:(NSString *)SQLStatement;
+- (BOOL)open;
+- (NSArray<NSDictionary<NSString *, id> *> *)queryAllTables;
+- (NSArray<NSString *> *)queryAllColumnsWithTableName:(NSString *)tableName;
+- (NSArray<NSDictionary<NSString *, id> *> *)queryAllDataWithTableName:(NSString *)tableName;
 
 @end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.h

@@ -14,8 +14,8 @@
 @protocol FLEXMultiColumnTableViewDelegate <NSObject>
 
 @required
-- (void)multiColumnTableView:(FLEXMultiColumnTableView *)tableView didSelectRow:(NSInteger)row;
-- (void)multiColumnTableView:(FLEXMultiColumnTableView *)tableView didSelectHeaderForColumn:(NSInteger)column sortType:(FLEXTableColumnHeaderSortType)sortType;
+- (void)multiColumnTableView:(FLEXMultiColumnTableView *)tableView didTapLabelWithText:(NSString *)text;
+- (void)multiColumnTableView:(FLEXMultiColumnTableView *)tableView didTapHeaderWithText:(NSString *)text sortType:(FLEXTableColumnHeaderSortType)sortType;
 
 @end
 
@@ -25,9 +25,10 @@
 
 - (NSInteger)numberOfColumnsInTableView:(FLEXMultiColumnTableView *)tableView;
 - (NSInteger)numberOfRowsInTableView:(FLEXMultiColumnTableView *)tableView;
-- (NSString *)columnTitle:(NSInteger)column;
-- (NSString *)rowTitle:(NSInteger)row;
-- (NSArray<NSString *> *)contentForRow:(NSInteger)row;
+- (NSString *)columnNameInColumn:(NSInteger)column;
+- (NSString *)rowNameInRow:(NSInteger)row;
+- (NSString *)contentAtColumn:(NSInteger)column row:(NSInteger)row;
+- (NSArray *)contentAtRow:(NSInteger)row;
 
 - (CGFloat)multiColumnTableView:(FLEXMultiColumnTableView *)tableView widthForContentCellInColumn:(NSInteger)column;
 - (CGFloat)multiColumnTableView:(FLEXMultiColumnTableView *)tableView heightForContentCellInRow:(NSInteger)row;
@@ -39,8 +40,8 @@
 
 @interface FLEXMultiColumnTableView : UIView
 
-@property (nonatomic, weak) id<FLEXMultiColumnTableViewDataSource> dataSource;
-@property (nonatomic, weak) id<FLEXMultiColumnTableViewDelegate> delegate;
+@property (nonatomic, weak) id<FLEXMultiColumnTableViewDataSource>dataSource;
+@property (nonatomic, weak) id<FLEXMultiColumnTableViewDelegate>delegate;
 
 - (void)reloadData;
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.m

@@ -7,248 +7,247 @@
 //
 
 #import "FLEXMultiColumnTableView.h"
-#import "FLEXDBQueryRowCell.h"
+#import "FLEXTableContentCell.h"
 #import "FLEXTableLeftCell.h"
-#import "FLEXColor.h"
 
-@interface FLEXMultiColumnTableView () <
-    UITableViewDataSource, UITableViewDelegate, UIScrollViewDelegate
->
+@interface FLEXMultiColumnTableView ()
+<UITableViewDataSource, UITableViewDelegate,UIScrollViewDelegate, FLEXTableContentCellDelegate>
 
-@property (nonatomic) UIScrollView *contentScrollView;
-@property (nonatomic) UIScrollView *headerScrollView;
-@property (nonatomic) UITableView  *leftTableView;
-@property (nonatomic) UITableView  *contentTableView;
-@property (nonatomic) UIView       *leftHeader;
-
-/// \c NSNotFound if no column selected
-@property (nonatomic) NSInteger sortColumn;
-@property (nonatomic) FLEXTableColumnHeaderSortType sortType;
-
-@property (nonatomic) NSArray *rowData;
-
-@property (nonatomic, readonly) NSInteger numberOfColumns;
-@property (nonatomic, readonly) NSInteger numberOfRows;
-@property (nonatomic, readonly) CGFloat topHeaderHeight;
-@property (nonatomic, readonly) CGFloat leftHeaderWidth;
-@property (nonatomic, readonly) CGFloat columnMargin;
+@property (nonatomic, strong) UIScrollView *contentScrollView;
+@property (nonatomic, strong) UIScrollView *headerScrollView;
+@property (nonatomic, strong) UITableView  *leftTableView;
+@property (nonatomic, strong) UITableView  *contentTableView;
+@property (nonatomic, strong) UIView       *leftHeader;
 
+@property (nonatomic, strong) NSDictionary<NSString *, NSNumber *> *sortStatusDict;
+@property (nonatomic, strong) NSArray *rowData;
 @end
 
 static const CGFloat kColumnMargin = 1;
 
 @implementation FLEXMultiColumnTableView
 
-#pragma mark - Initialization
 
-- (instancetype)initWithFrame:(CGRect)frame {
+- (instancetype)initWithFrame:(CGRect)frame
+{
     self = [super initWithFrame:frame];
     if (self) {
-        self.autoresizingMask |= UIViewAutoresizingFlexibleWidth;
-        self.autoresizingMask |= UIViewAutoresizingFlexibleHeight;
-        self.autoresizingMask |= UIViewAutoresizingFlexibleTopMargin;
-        self.backgroundColor  = FLEXColor.groupedBackgroundColor;
-        
-        [self loadHeaderScrollView];
-        [self loadContentScrollView];
-        [self loadLeftView];
+        [self loadUI];
     }
-    
     return self;
 }
 
-- (void)layoutSubviews {
+- (void)didMoveToSuperview
+{
+    [super didMoveToSuperview];
+    [self reloadData];
+}
+
+- (void)layoutSubviews
+{
     [super layoutSubviews];
     
     CGFloat width  = self.frame.size.width;
     CGFloat height = self.frame.size.height;
-    CGFloat topheaderHeight = self.topHeaderHeight;
-    CGFloat leftHeaderWidth = self.leftHeaderWidth;
-    CGFloat topInsets = 0.f;
-
-    if (@available (iOS 11.0, *)) {
-        topInsets = self.safeAreaInsets.top;
-    }
+    CGFloat topheaderHeight = [self topHeaderHeight];
+    CGFloat leftHeaderWidth = [self leftHeaderWidth];
     
     CGFloat contentWidth = 0.0;
-    NSInteger rowsCount = self.numberOfColumns;
+    NSInteger rowsCount = [self numberOfColumns];
     for (int i = 0; i < rowsCount; i++) {
         contentWidth += [self contentWidthForColumn:i];
     }
     
-    CGFloat contentHeight = height - topheaderHeight - topInsets;
-    
-    self.leftHeader.frame = CGRectMake(0, topInsets, self.leftHeaderWidth, self.topHeaderHeight);
-    self.leftTableView.frame = CGRectMake(
-        0, topheaderHeight + topInsets, leftHeaderWidth, contentHeight
-    );
-    self.headerScrollView.frame = CGRectMake(
-        leftHeaderWidth, topInsets, width - leftHeaderWidth, topheaderHeight
-    );
-    self.headerScrollView.contentSize = CGSizeMake(
-        self.contentTableView.frame.size.width, self.headerScrollView.frame.size.height
-    );
-    self.contentTableView.frame = CGRectMake(
-        0, 0, contentWidth + self.numberOfColumns * self.columnMargin , contentHeight
-    );
-    self.contentScrollView.frame = CGRectMake(
-        leftHeaderWidth, topheaderHeight + topInsets, width - leftHeaderWidth, contentHeight
-    );
+    self.leftTableView.frame           = CGRectMake(0, topheaderHeight, leftHeaderWidth, height - topheaderHeight);
+    self.headerScrollView.frame        = CGRectMake(leftHeaderWidth, 0, width - leftHeaderWidth, topheaderHeight);
+    self.headerScrollView.contentSize  = CGSizeMake( self.contentTableView.frame.size.width, self.headerScrollView.frame.size.height);
+    self.contentTableView.frame        = CGRectMake(0, 0, contentWidth + [self numberOfColumns] * [self columnMargin] , height - topheaderHeight);
+    self.contentScrollView.frame       = CGRectMake(leftHeaderWidth, topheaderHeight, width - leftHeaderWidth, height - topheaderHeight);
     self.contentScrollView.contentSize = self.contentTableView.frame.size;
+    self.leftHeader.frame              = CGRectMake(0, 0, [self leftHeaderWidth], [self topHeaderHeight]);
 }
 
 
+- (void)loadUI
+{
+    [self loadHeaderScrollView];
+    [self loadContentScrollView];
+    [self loadLeftView];
+}
+
+- (void)reloadData
+{
+    [self loadLeftViewData];
+    [self loadContentData];
+    [self loadHeaderData];
+}
+
 #pragma mark - UI
 
-- (void)loadHeaderScrollView {
-    UIScrollView *headerScrollView   = [UIScrollView new];
-    headerScrollView.delegate        = self;
-    headerScrollView.backgroundColor = FLEXColor.secondaryGroupedBackgroundColor;
-    self.headerScrollView            = headerScrollView;
+- (void)loadHeaderScrollView
+{
+    UIScrollView *headerScrollView = [[UIScrollView alloc] init];
+    headerScrollView.delegate      = self;
+    self.headerScrollView          = headerScrollView;
+    self.headerScrollView.backgroundColor =  [UIColor colorWithWhite:0.803 alpha:0.850];
     
     [self addSubview:headerScrollView];
 }
 
-- (void)loadContentScrollView {
-    UIScrollView *scrollView = [UIScrollView new];
+- (void)loadContentScrollView
+{
+    
+    UIScrollView *scrollView = [[UIScrollView alloc] init];
     scrollView.bounces       = NO;
     scrollView.delegate      = self;
     
-    UITableView *tableView   = [UITableView new];
+    UITableView *tableView   = [[UITableView alloc] init];
     tableView.delegate       = self;
     tableView.dataSource     = self;
     tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-    [tableView registerClass:[FLEXDBQueryRowCell class]
-        forCellReuseIdentifier:kFLEXDBQueryRowCellReuse
-    ];
     
-    [scrollView addSubview:tableView];
     [self addSubview:scrollView];
+    [scrollView addSubview:tableView];
     
     self.contentScrollView = scrollView;
-    self.contentTableView  = tableView;
+    self.contentTableView    = tableView;
+    
 }
 
-- (void)loadLeftView {
-    UITableView *leftTableView   = [UITableView new];
+- (void)loadLeftView
+{
+    UITableView *leftTableView = [[UITableView alloc] init];
     leftTableView.delegate       = self;
     leftTableView.dataSource     = self;
     leftTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.leftTableView           = leftTableView;
     [self addSubview:leftTableView];
     
-    UIView *leftHeader         = [UIView new];
-    leftHeader.backgroundColor = FLEXColor.secondaryBackgroundColor;
+    UIView *leftHeader = [[UIView alloc] init];
+    leftHeader.backgroundColor = [UIColor colorWithWhite:0.950 alpha:0.668];
     self.leftHeader            = leftHeader;
     [self addSubview:leftHeader];
+    
 }
 
 
 #pragma mark - Data
 
-- (void)reloadData {
-    [self loadLeftViewData];
-    [self loadContentData];
-    [self loadHeaderData];
-}
-
-- (void)loadHeaderData {
-    // Remove existing headers, if any
-    for (UIView *subview in self.headerScrollView.subviews) {
+- (void)loadHeaderData
+{
+    NSArray<UIView *> *subviews = self.headerScrollView.subviews;
+    
+    for (UIView *subview in subviews) {
         [subview removeFromSuperview];
     }
-    
-    CGFloat xOffset = 0.0;
-    for (NSInteger column = 0; column < self.numberOfColumns; column++) {
-        CGFloat width = [self contentWidthForColumn:column] + self.columnMargin;
+    CGFloat x = 0.0;
+    CGFloat w = 0.0;
+    for (int i = 0; i < [self numberOfColumns] ; i++) {
+        w = [self contentWidthForColumn:i] + [self columnMargin];
         
-        FLEXTableColumnHeader *header = [[FLEXTableColumnHeader alloc]
-            initWithFrame:CGRectMake(xOffset, 0, width, self.topHeaderHeight - 1)
-        ];
-        header.titleLabel.text = [self columnTitle:column];
+        FLEXTableColumnHeader *cell = [[FLEXTableColumnHeader alloc] initWithFrame:CGRectMake(x, 0, w, [self topHeaderHeight] - 1)];
+        cell.label.text = [self columnTitleForColumn:i];
+        [self.headerScrollView addSubview:cell];
         
-        if (column == self.sortColumn) {
-            header.sortType = self.sortType;
-        }
+        FLEXTableColumnHeaderSortType type = [self.sortStatusDict[[self columnTitleForColumn:i]] integerValue];
+        [cell changeSortStatusWithType:type];
         
-        // Header tap gesture
-        UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc]
-            initWithTarget:self action:@selector(contentHeaderTap:)
-        ];
-        [header addGestureRecognizer:gesture];
-        header.userInteractionEnabled = YES;
+        UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc] initWithTarget:self
+                                                                                  action:@selector(contentHeaderTap:)];
+        [cell addGestureRecognizer:gesture];
+        cell.userInteractionEnabled = YES;
         
-        [self.headerScrollView addSubview:header];
-        xOffset += width;
+        x = x + w;
     }
 }
 
-- (void)contentHeaderTap:(UIGestureRecognizer *)gesture {
-    NSInteger newSortColumn = [self.headerScrollView.subviews indexOfObject:gesture.view];
-    FLEXTableColumnHeaderSortType newType = FLEXNextTableColumnHeaderSortType(self.sortType);
+- (void)contentHeaderTap:(UIGestureRecognizer *)gesture
+{
+    FLEXTableColumnHeader *header = (FLEXTableColumnHeader *)gesture.view;
+    NSString *string = header.label.text;
+    FLEXTableColumnHeaderSortType currentType = [self.sortStatusDict[string] integerValue];
+    FLEXTableColumnHeaderSortType newType ;
     
-    // Reset old header
-    FLEXTableColumnHeader *oldHeader = (id)self.headerScrollView.subviews[self.sortColumn];
-    oldHeader.sortType = FLEXTableColumnHeaderSortTypeNone;
+    switch (currentType) {
+        case FLEXTableColumnHeaderSortTypeNone:
+            newType = FLEXTableColumnHeaderSortTypeAsc;
+            break;
+        case FLEXTableColumnHeaderSortTypeAsc:
+            newType = FLEXTableColumnHeaderSortTypeDesc;
+            break;
+        case FLEXTableColumnHeaderSortTypeDesc:
+            newType = FLEXTableColumnHeaderSortTypeAsc;
+            break;
+    }
     
-    // Update new header
-    FLEXTableColumnHeader *newHeader = (id)self.headerScrollView.subviews[newSortColumn];
-    newHeader.sortType = newType;
+    self.sortStatusDict = @{header.label.text : @(newType)};
+    [header changeSortStatusWithType:newType];
+    [self.delegate multiColumnTableView:self didTapHeaderWithText:string sortType:newType];
     
-    // Update self
-    self.sortColumn = newSortColumn;
-    self.sortType = newType;
-
-    // Notify delegate
-    [self.delegate multiColumnTableView:self didSelectHeaderForColumn:newSortColumn sortType:newType];
 }
 
-- (void)loadContentData {
+- (void)loadContentData
+{
     [self.contentTableView reloadData];
 }
 
-- (void)loadLeftViewData {
+- (void)loadLeftViewData
+{
     [self.leftTableView reloadData];
 }
 
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    // Alternating background color
-    UIColor *backgroundColor = FLEXColor.primaryBackgroundColor;
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UIColor *backgroundColor = [UIColor whiteColor];
     if (indexPath.row % 2 != 0) {
-        backgroundColor = FLEXColor.secondaryBackgroundColor;
+        backgroundColor = [UIColor colorWithWhite:0.950 alpha:0.750];
     }
     
-    // Left side table view for row numbers
-    if (tableView == self.leftTableView) {
-        FLEXTableLeftCell *cell = [FLEXTableLeftCell cellWithTableView:tableView];
+    if (tableView != self.leftTableView) {
+        self.rowData = [self.dataSource contentAtRow:indexPath.row];
+        FLEXTableContentCell *cell = [FLEXTableContentCell cellWithTableView:tableView
+                                                                columnNumber:[self numberOfColumns]];
         cell.contentView.backgroundColor = backgroundColor;
-        cell.titlelabel.text = [self rowTitle:indexPath.row];
+        cell.delegate = self;
+        
+        for (int i = 0 ; i < cell.labels.count; i++) {
+            
+            UILabel *label  = cell.labels[i];
+            label.textColor = [UIColor blackColor];
+            
+            NSString *content = [NSString stringWithFormat:@"%@",self.rowData[i]];
+            if ([content isEqualToString:@"<null>"]) {
+                label.textColor = [UIColor lightGrayColor];
+                content = @"NULL";
+            }
+            label.text            = content;
+            label.backgroundColor = backgroundColor;
+        }
         return cell;
     }
-    // Right side table view for data
     else {
-        self.rowData = [self.dataSource contentForRow:indexPath.row];
-        FLEXDBQueryRowCell *cell = [tableView
-            dequeueReusableCellWithIdentifier:kFLEXDBQueryRowCellReuse forIndexPath:indexPath
-        ];
-        
+        FLEXTableLeftCell *cell          = [FLEXTableLeftCell cellWithTableView:tableView];
         cell.contentView.backgroundColor = backgroundColor;
-        cell.data = [self.dataSource contentForRow:indexPath.row];
-        NSAssert(cell.data.count == self.numberOfColumns, @"Count of data provided was incorrect");
+        cell.titlelabel.text             = [self rowTitleForRow:indexPath.row];
         return cell;
     }
 }
 
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
     return [self.dataSource numberOfRowsInTableView:self];
 }
 
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
     return [self.dataSource multiColumnTableView:self heightForContentCellInRow:indexPath.row];
 }
 
-// Scroll all scroll views in sync
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
     if (scrollView == self.contentScrollView) {
         self.headerScrollView.contentOffset = scrollView.contentOffset;
     }
@@ -263,59 +262,80 @@ static const CGFloat kColumnMargin = 1;
     }
 }
 
-
+#pragma mark -
 #pragma mark UITableView Delegate
 
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
     if (tableView == self.leftTableView) {
-        [self.contentTableView
-            selectRowAtIndexPath:indexPath
-            animated:NO
-            scrollPosition:UITableViewScrollPositionNone
-        ];
+        [self.contentTableView selectRowAtIndexPath:indexPath
+                                           animated:NO
+                                     scrollPosition:UITableViewScrollPositionNone];
     }
     else if (tableView == self.contentTableView) {
-        [self.delegate multiColumnTableView:self didSelectRow:indexPath.row];
+        [self.leftTableView selectRowAtIndexPath:indexPath
+                                        animated:NO
+                                  scrollPosition:UITableViewScrollPositionNone];
     }
 }
 
-
+#pragma mark -
 #pragma mark DataSource Accessor
 
-- (NSInteger)numberOfRows {
+- (NSInteger)numberOfrows
+{
     return [self.dataSource numberOfRowsInTableView:self];
 }
 
-- (NSInteger)numberOfColumns {
+- (NSInteger)numberOfColumns
+{
     return [self.dataSource numberOfColumnsInTableView:self];
 }
 
-- (NSString *)columnTitle:(NSInteger)column {
-    return [self.dataSource columnTitle:column];
+- (NSString *)columnTitleForColumn:(NSInteger)column
+{
+    return [self.dataSource columnNameInColumn:column];
 }
 
-- (NSString *)rowTitle:(NSInteger)row {
-    return [self.dataSource rowTitle:row];
+- (NSString *)rowTitleForRow:(NSInteger)row
+{
+    return [self.dataSource rowNameInRow:row];
 }
 
-- (CGFloat)contentWidthForColumn:(NSInteger)column {
+- (NSString *)contentAtColumn:(NSInteger)column row:(NSInteger)row;
+{
+    return [self.dataSource contentAtColumn:column row:row];
+}
+
+- (CGFloat)contentWidthForColumn:(NSInteger)column
+{
     return [self.dataSource multiColumnTableView:self widthForContentCellInColumn:column];
 }
 
-- (CGFloat)contentHeightForRow:(NSInteger)row {
+- (CGFloat)contentHeightForRow:(NSInteger)row
+{
     return [self.dataSource multiColumnTableView:self heightForContentCellInRow:row];
 }
 
-- (CGFloat)topHeaderHeight {
+- (CGFloat)topHeaderHeight
+{
     return [self.dataSource heightForTopHeaderInTableView:self];
 }
 
-- (CGFloat)leftHeaderWidth {
+- (CGFloat)leftHeaderWidth
+{
     return [self.dataSource widthForLeftHeaderInTableView:self];
 }
 
-- (CGFloat)columnMargin {
+- (CGFloat)columnMargin
+{
     return kColumnMargin;
 }
 
+
+- (void)tableContentCell:(FLEXTableContentCell *)tableView labelDidTapWithText:(NSString *)text
+{
+    [self.delegate multiColumnTableView:self didTapLabelWithText:text];
+}
+
 @end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.m

@@ -7,8 +7,6 @@
 //
 
 #import "FLEXRealmDatabaseManager.h"
-#import "NSArray+FLEX.h"
-#import "FLEXSQLResult.h"
 
 #if __has_include(<Realm/Realm.h>)
 #import <Realm/Realm.h>
@@ -20,83 +18,97 @@
 @interface FLEXRealmDatabaseManager ()
 
 @property (nonatomic, copy) NSString *path;
-@property (nonatomic) RLMRealm *realm;
+@property (nonatomic, strong) RLMRealm * realm;
 
 @end
 
+//#endif
+
 @implementation FLEXRealmDatabaseManager
-static Class RLMRealmClass = nil;
 
-+ (void)load {
-    RLMRealmClass = NSClassFromString(@"RLMRealm");
-}
-
-+ (instancetype)managerForDatabase:(NSString *)path {
-    return [[self alloc] initWithPath:path];
-}
-
-- (instancetype)initWithPath:(NSString *)path {
-    if (!RLMRealmClass) {
+- (instancetype)initWithPath:(NSString*)aPath
+{
+    Class realmClass = NSClassFromString(@"RLMRealm");
+    if (realmClass == nil) {
         return nil;
     }
     
     self = [super init];
-    if (self) {
-        _path = path;
-        
-        if (![self open]) {
-            return nil;
-        }
-    }
     
+    if (self) {
+        _path = aPath;
+    }
     return self;
 }
 
-- (BOOL)open {
+- (BOOL)open
+{
+    Class realmClass = NSClassFromString(@"RLMRealm");
     Class configurationClass = NSClassFromString(@"RLMRealmConfiguration");
-    if (!RLMRealmClass || !configurationClass) {
+    
+    if (realmClass == nil || configurationClass == nil) {
         return NO;
     }
     
     NSError *error = nil;
-    id configuration = [configurationClass new];
+    id configuration = [[configurationClass alloc] init];
     [(RLMRealmConfiguration *)configuration setFileURL:[NSURL fileURLWithPath:self.path]];
-    self.realm = [RLMRealmClass realmWithConfiguration:configuration error:&error];
-    
+    self.realm = [realmClass realmWithConfiguration:configuration error:&error];
     return (error == nil);
 }
 
-- (NSArray<NSString *> *)queryAllTables {
-    // Map each schema to its name
-    NSArray<NSString *> *tableNames = [self.realm.schema.objectSchema flex_mapped:^id(RLMObjectSchema *schema, NSUInteger idx) {
-        return schema.className ?: nil;
-    }];
-
-    return [tableNames sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
+- (NSArray<NSDictionary<NSString *, id> *> *)queryAllTables
+{
+    NSMutableArray<NSDictionary<NSString *, id> *> *allTables = [NSMutableArray array];
+    RLMSchema *schema = [self.realm schema];
+    
+    for (RLMObjectSchema *objectSchema in schema.objectSchema) {
+        if (objectSchema.className == nil) {
+            continue;
+        }
+        
+        NSDictionary<NSString *, id> *dictionary = @{@"name":objectSchema.className};
+        [allTables addObject:dictionary];
+    }
+    
+    return allTables;
 }
 
-- (NSArray<NSString *> *)queryAllColumnsOfTable:(NSString *)tableName {
-    RLMObjectSchema *objectSchema = [self.realm.schema schemaForClassName:tableName];
-    // Map each column to its name
-    return [objectSchema.properties flex_mapped:^id(RLMProperty *property, NSUInteger idx) {
-        return property.name;
-    }];
-}
-
-- (NSArray<NSArray *> *)queryAllDataInTable:(NSString *)tableName {
-    RLMObjectSchema *objectSchema = [self.realm.schema schemaForClassName:tableName];
-    RLMResults *results = [self.realm allObjects:tableName];
-    if (results.count == 0 || !objectSchema) {
+- (NSArray<NSString *> *)queryAllColumnsWithTableName:(NSString *)tableName
+{
+    RLMObjectSchema *objectSchema = [[self.realm schema] schemaForClassName:tableName];
+    if (objectSchema == nil) {
         return nil;
     }
     
-    // Map results to an array of rows
-    return [NSArray flex_mapped:results block:^id(RLMObject *result, NSUInteger idx) {
-        // Map each row to an array of the values of its properties 
-        return [objectSchema.properties flex_mapped:^id(RLMProperty *property, NSUInteger idx) {
-            return [result valueForKey:property.name] ?: NSNull.null;
-        }];
-    }];
+    NSMutableArray<NSString *> *columnNames = [NSMutableArray array];
+    for (RLMProperty *property in objectSchema.properties) {
+        [columnNames addObject:property.name];
+    }
+    
+    return columnNames;
+}
+
+- (NSArray<NSDictionary<NSString *, id> *> *)queryAllDataWithTableName:(NSString *)tableName
+{
+    RLMObjectSchema *objectSchema = [[self.realm schema] schemaForClassName:tableName];
+    RLMResults *results = [self.realm allObjects:tableName];
+    if (results.count == 0 || objectSchema == nil) {
+        return nil;
+    }
+    
+    NSMutableArray<NSDictionary<NSString *, id> *> *allDataEntries = [NSMutableArray array];
+    for (RLMObject *result in results) {
+        NSMutableDictionary<NSString *, id> *entry = [NSMutableDictionary dictionary];
+        for (RLMProperty *property in objectSchema.properties) {
+            id value = [result valueForKey:property.name];
+            entry[property.name] = (value) ? (value) : [NSNull null];
+        }
+        
+        [allDataEntries addObject:entry];
+    }
+    
+    return allDataEntries;
 }
 
 @end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.h

@@ -1,48 +0,0 @@
-//
-//  FLEXSQLResult.h
-//  FLEX
-//
-//  Created by Tanner on 3/3/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FLEXSQLResult : NSObject
-
-/// Describes the result of a non-select query, or an error of any kind of query
-+ (instancetype)message:(NSString *)message;
-/// Describes the result of a known failed execution
-+ (instancetype)error:(NSString *)message;
-
-/// @param rowData A list of rows, where each element in the row
-/// corresponds to the column given in /c columnNames
-+ (instancetype)columns:(NSArray<NSString *> *)columnNames
-                rows:(NSArray<NSArray<NSString *> *> *)rowData;
-
-@property (nonatomic, readonly, nullable) NSString *message;
-
-/// A value of YES means this is surely an error,
-/// but it still might be an error even with a value of NO
-@property (nonatomic, readonly) BOOL isError;
-
-/// A list of column names
-@property (nonatomic, readonly, nullable) NSArray<NSString *> *columns;
-/// A list of rows, where each element in the row corresponds
-/// to the value of the column at the same index in \c columns.
-///
-/// That is, given a row, looping over the contents of the row and
-/// the contents of \c columns will give you key-value pairs of
-/// column names to column values for that row.
-@property (nonatomic, readonly, nullable) NSArray<NSArray<NSString *> *> *rows;
-/// A list of rows where the fields are paired to column names.
-///
-/// This property is lazily constructed by looping over
-/// the rows and columns present in the other two properties.
-@property (nonatomic, readonly, nullable) NSArray<NSDictionary<NSString *, id> *> *keyedRows;
-
-@end
-
-NS_ASSUME_NONNULL_END