Well, this quickly became a pain.

This will be near impossible without importing thousands of lines of code from the compiler. Swift interop is already probably far too difficult to achieve without writing C++, and in Joe's own words:

"If you're writing code in C++ already then definitely just using the headers or MetadataReader as is will keep you better in sync with future additions to the runtime."

Another option to consider is libSwiftRemoteMirror.

This commit leaves the project in an incomplete and broken state.

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-github: [NSExceptional]

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.gitignore

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

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "search.exclude": {
-        "Classes/Headers": true
-    }
-}

Classes/Core/Controllers/FLEXFilteringTableViewController.h

@@ -1,89 +0,0 @@
-//
-//  FLEXFilteringTableViewController.h
-//  FLEX
-//
-//  Created by Tanner on 3/9/20.
-//  Copyright © 2020 FLEX Team. 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,209 +0,0 @@
-//
-//  FLEXFilteringTableViewController.m
-//  FLEX
-//
-//  Created by Tanner on 3/9/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
-//
-
-#import "FLEXFilteringTableViewController.h"
-#import "FLEXTableViewSection.h"
-#import "NSArray+FLEX.h"
-#import "FLEXMacros.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)(void) = ^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;
-    // Only display nonempty sections
-    self.sections = self.nonemptySections;
-}
-
-- (void)setSections:(NSArray<FLEXTableViewSection *> *)sections {
-    // Allow sections to reload a portion of the table view at will
-    [sections enumerateObjectsUsingBlock:^(FLEXTableViewSection *s, NSUInteger idx, BOOL *stop) {
-        [s setTable:self.tableView section:idx];
-    }];
-    _sections = sections.copy;
-}
-
-
-#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);
-}
-
-- (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;
-}
-
-@end

Classes/Core/Controllers/FLEXNavigationController.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 1/30/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Classes/Core/Controllers/FLEXNavigationController.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 1/30/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXNavigationController.h"
@@ -20,58 +20,35 @@
 @interface FLEXNavigationController ()
 @property (nonatomic, readonly) BOOL toolbarWasHidden;
 @property (nonatomic) BOOL waitingToAddTab;
-@property (nonatomic, readonly) BOOL canShowToolbar;
-@property (nonatomic) BOOL didSetupPendingDismissButtons;
-@property (nonatomic) UISwipeGestureRecognizer *navigationBarSwipeGesture;
 @end
 
 @implementation FLEXNavigationController
 
 + (instancetype)withRootViewController:(UIViewController *)rootVC {
-    return [[self alloc] initWithRootViewController:rootVC];
+    FLEXNavigationController *instance =  [[self alloc] initWithRootViewController:rootVC];
+    
+    // Give root view controllers a Done button
+    UIBarButtonItem *done = [[UIBarButtonItem alloc]
+        initWithBarButtonSystemItem:UIBarButtonSystemItemDone
+        target:instance
+        action:@selector(dismissAnimated)
+    ];
+    
+    // Prepend the button if other buttons exist already
+    NSArray *existingItems = rootVC.navigationItem.rightBarButtonItems;
+    if (existingItems.count) {
+        rootVC.navigationItem.rightBarButtonItems = [@[done] arrayByAddingObjectsFromArray:existingItems];
+    } else {
+        rootVC.navigationItem.rightBarButtonItem = done;
+    }
+    
+    return instance;
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
     
     self.waitingToAddTab = YES;
-    
-    // Add gesture to reveal toolbar if hidden
-    UITapGestureRecognizer *navbarTapGesture = [[UITapGestureRecognizer alloc]
-        initWithTarget:self action:@selector(handleNavigationBarTap:)
-    ];
-    
-    // Don't cancel touches to work around bug on versions of iOS prior to 13
-    navbarTapGesture.cancelsTouchesInView = NO;
-    [self.navigationBar addGestureRecognizer:navbarTapGesture];
-    
-    // Add gesture to dismiss if not presented with a sheet style
-    if (@available(iOS 13, *)) {
-        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 {
@@ -88,99 +65,15 @@
     }
 }
 
-- (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
-    if ([self.presentingViewController isKindOfClass:[FLEXExplorerViewController class]]) {
-        [FLEXTabList.sharedList closeTab:self];        
-    }
-    
+    // TODO tabs not closed on swipe down gesture
+    [FLEXTabList.sharedList closeTab:self];
     [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
 }
 
-- (BOOL)canShowToolbar {
-    return self.topViewController.toolbarItems.count > 0;
-}
-
-- (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 {
-    // Don't reveal the toolbar if we were just tapping a button
-    CGPoint location = [sender locationInView:self.navigationBar];
-    UIView *hitView = [self.navigationBar hitTest:location withEvent:nil];
-    if ([hitView isKindOfClass:[UIControl class]]) {
-        return;
-    }
-
-    if (sender.state == UIGestureRecognizerStateRecognized) {
-        if (self.toolbarHidden && self.canShowToolbar) {
-            [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.canShowToolbar;
+        BOOL show = self.topViewController.toolbarItems.count;
         CGFloat yTranslation = [sender translationInView:self.view].y;
         CGFloat yVelocity = [sender velocityInView:self.view].y;
         if (yVelocity > 2000) {

Classes/Core/Controllers/FLEXTableViewController.h

@@ -3,12 +3,12 @@
 //  FLEX
 //
 //  Created by Tanner on 7/5/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
 #import "FLEXTableView.h"
-@class FLEXScopeCarousel, FLEXWindow, FLEXTableViewSection;
+@class FLEXScopeCarousel, FLEXWindow;
 
 typedef CGFloat FLEXDebounceInterval;
 /// No delay, all events delivered
@@ -21,34 +21,19 @@ extern CGFloat const kFLEXDebounceForAsyncSearch;
 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
+    UISearchResultsUpdating, UISearchControllerDelegate,
+    UISearchBarDelegate, FLEXSearchResultsUpdating
 >
 
 /// A grouped table view. Inset on iOS 13.
 ///
-/// Simply calls into \c initWithStyle:
+/// Simply calls into 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.
@@ -67,10 +52,6 @@ extern CGFloat const kFLEXDebounceForExpensiveIO;
 /// Setting this to YES will make the search bar appear whenever the view appears.
 /// Otherwise, iOS will only show the search bar when you scroll up.
 @property (nonatomic) BOOL showSearchBarInitially;
-/// Defaults to NO.
-///
-/// Setting this to YES will make the search bar activate whenever the view appears.
-@property (nonatomic) BOOL activatesSearchBarAutomatically;
 
 /// nil unless showsSearchBar is set to YES.
 ///
@@ -93,7 +74,7 @@ extern CGFloat const kFLEXDebounceForExpensiveIO;
 /// 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
+/// 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
@@ -106,45 +87,31 @@ extern CGFloat const kFLEXDebounceForExpensiveIO;
 /// 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;
+@property (nonatomic, readonly) 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;
+/// 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;
 
+/// Subclasses should override to handle search query update events.
+///
+/// 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;
+
 /// 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;
+- (void)shareButtonPressed;
 
 /// 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.

Classes/Core/Controllers/FLEXTableViewController.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 7/5/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXTableViewController.h"
@@ -13,7 +13,6 @@
 #import "FLEXScopeCarousel.h"
 #import "FLEXTableView.h"
 #import "FLEXUtility.h"
-#import "FLEXResources.h"
 #import "UIBarButtonItem+FLEX.h"
 #import <objc/runtime.h>
 
@@ -31,31 +30,25 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
 @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;
 }
 
@@ -66,14 +59,6 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
         _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;
@@ -103,9 +88,11 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
 
         self.automaticallyShowsSearchBarCancelButton = YES;
 
+        #if FLEX_AT_LEAST_IOS13_SDK
         if (@available(iOS 13, *)) {
             self.searchController.automaticallyShowsScopeBar = NO;
         }
+        #endif
         
         [self addSearchController:self.searchController];
     } else {
@@ -119,15 +106,18 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
     _showsCarousel = showsCarousel;
     
     if (showsCarousel) {
-        _carousel = ({ weakify(self)
-            
+        _carousel = ({
+            __weak __typeof(self) weakSelf = self;
+
             FLEXScopeCarousel *carousel = [FLEXScopeCarousel new];
-            carousel.selectedIndexChangedAction = ^(NSInteger idx) { strongify(self);
-                [self.searchDelegate updateSearchResults:self.searchText];
+            carousel.selectedIndexChangedAction = ^(NSInteger idx) {
+                __typeof(self) self = weakSelf;
+                [self updateSearchResults:self.searchText];
             };
 
             // UITableView won't update the header size unless you reset the header view
-            [carousel registerBlockForDynamicTypeChanges:^(FLEXScopeCarousel *_) { strongify(self);
+            [carousel registerBlockForDynamicTypeChanges:^(FLEXScopeCarousel *carousel) {
+                __typeof(self) self = weakSelf;
                 [self layoutTableHeaderIfNeeded];
             }];
 
@@ -146,7 +136,7 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
     } else if (self.showsCarousel) {
         return self.carousel.selectedIndex;
     } else {
-        return 0;
+        return NSNotFound;
     }
 }
 
@@ -157,7 +147,7 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
         self.carousel.selectedIndex = selectedScope;
     }
 
-    [self.searchDelegate updateSearchResults:self.searchText];
+    [self updateSearchResults:self.searchText];
 }
 
 - (NSString *)searchText {
@@ -165,21 +155,27 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
 }
 
 - (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)updateSearchResults:(NSString *)newText { }
+
 - (void)onBackgroundQueue:(NSArray *(^)(void))backgroundBlock thenOnMainQueue:(void(^)(NSArray *))mainBlock {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         NSArray *items = backgroundBlock();
@@ -209,18 +205,6 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
     self.view = [FLEXTableView style:self.style];
     self.tableView.dataSource = self;
     self.tableView.delegate = self;
-    
-    _shareToolbarItem = FLEXBarButtonItemSystem(Action, self, @selector(shareButtonPressed:));
-    _bookmarksToolbarItem = [UIBarButtonItem
-        flex_itemWithImage:FLEXResources.bookmarksIcon target:self action:@selector(showBookmarks)
-    ];
-    _openTabsToolbarItem = [UIBarButtonItem
-        flex_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 {
@@ -229,7 +213,7 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
     self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeOnDrag;
     
     // Toolbar
-    self.navigationController.toolbarHidden = self.toolbarItems.count > 0;
+    self.navigationController.toolbarHidden = NO;
     self.navigationController.hidesBarsOnSwipe = YES;
 
     // On iOS 13, the root view controller shows it's search bar no matter what.
@@ -247,17 +231,12 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     
+    // When going back, make the search bar reappear instead of hiding
     if (@available(iOS 11.0, *)) {
-        // When going back, make the search bar reappear instead of hiding
         if ((self.pinSearchBar || self.showSearchBarInitially) && !self.didInitiallyRevealSearchBar) {
             self.navigationItem.hidesSearchBarWhenScrolling = NO;
         }
     }
-    
-    // Make the keyboard seem to appear faster
-    if (self.activatesSearchBarAutomatically) {
-        [self makeKeyboardAppearNow];
-    }
 
     [self setupToolbarItems];
 }
@@ -279,124 +258,48 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
             }];
         }
     }
-    
-    if (self.activatesSearchBarAutomatically) {
-        // Keyboard has appeared, now we call this as we soon present our search bar
-        [self removeDummyTextField];
-        
-        // Activate the search bar
-        dispatch_async(dispatch_get_main_queue(), ^{
-            // This doesn't work unless it's wrapped in this dispatch_async call
-            [self.searchController.searchBar becomeFirstResponder];
-        });
-    }
 
     // We only want to reveal the search bar when the view controller first appears.
     self.didInitiallyRevealSearchBar = YES;
 }
 
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    
-    if (self.manuallyDeactivateSearchOnDisappear && self.searchController.isActive) {
-        self.searchController.active = NO;
-    }
-}
-
-- (void)didMoveToParentViewController:(UIViewController *)parent {
-    [super didMoveToParentViewController:parent];
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+    [super willMoveToParentViewController: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
+#pragma mark - Private
 
 - (void)setupToolbarItems {
-    if (!self.isViewLoaded) {
-        return;
+    UIBarButtonItem *emptySpaceOrShare = UIBarButtonItem.flex_fixedSpace;
+    if (self.showsShareToolbarItem) {
+        emptySpaceOrShare = FLEXBarButtonItemSystem(Action, self, @selector(shareButtonPressed));
     }
     
     self.toolbarItems = @[
-        self.leftmostToolbarItem,
+        UIBarButtonItem.flex_fixedSpace,
         UIBarButtonItem.flex_flexibleSpace,
-        self.middleLeftToolbarItem,
+        UIBarButtonItem.flex_fixedSpace,
         UIBarButtonItem.flex_flexibleSpace,
-        self.middleToolbarItem,
+        UIBarButtonItem.flex_fixedSpace,
         UIBarButtonItem.flex_flexibleSpace,
-        self.bookmarksToolbarItem,
+        emptySpaceOrShare,
         UIBarButtonItem.flex_flexibleSpace,
-        self.openTabsToolbarItem,
+        FLEXBarButtonItemSystem(Bookmarks, self, @selector(showBookmarks)),
+        UIBarButtonItem.flex_flexibleSpace,
+        FLEXBarButtonItemSystem(Organize, self, @selector(showTabSwitcher)),
     ];
     
-    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;
+        self.toolbarItems.lastObject.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];
     
@@ -417,6 +320,7 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
     }
     
     self.tableView.tableHeaderView = self.tableView.tableHeaderView;
+    [self.tableView layoutIfNeeded];
 }
 
 - (void)addCarousel:(FLEXScopeCarousel *)carousel {
@@ -526,44 +430,24 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
     [self presentViewController:nav animated:YES completion:nil];
 }
 
+- (void)shareButtonPressed {
+
+}
+
 
 #pragma mark - Search Bar
 
-#pragma mark Faster keyboard
-
-static UITextField *kDummyTextField = nil;
-
-/// Make the keyboard appear instantly. We use this to make the
-/// keyboard appear faster when the search bar is set to appear initially.
-/// You must call \c -removeDummyTextField before your search bar is to appear.
-- (void)makeKeyboardAppearNow {
-    if (!kDummyTextField) {
-        kDummyTextField = [UITextField new];
-        kDummyTextField.autocorrectionType = UITextAutocorrectionTypeNo;
-    }
-    
-    kDummyTextField.inputAccessoryView = self.searchController.searchBar.inputAccessoryView;
-    [UIApplication.sharedApplication.keyWindow addSubview:kDummyTextField];
-    [kDummyTextField becomeFirstResponder];
-}
-
-- (void)removeDummyTextField {
-    if (kDummyTextField.superview) {
-        [kDummyTextField removeFromSuperview];
-    }
-}
-
 #pragma mark UISearchResultsUpdating
 
 - (void)updateSearchResultsForSearchController:(UISearchController *)searchController {
     [self.debounceTimer invalidate];
     NSString *text = searchController.searchBar.text;
     
-    void (^updateSearchResults)(void) = ^{
+    void (^updateSearchResults)() = ^{
         if (self.searchResultsUpdater) {
             [self.searchResultsUpdater updateSearchResults:text];
         } else {
-            [self.searchDelegate updateSearchResults:text];
+            [self updateSearchResults:text];
         }
     };
     
@@ -602,7 +486,7 @@ static UITextField *kDummyTextField = nil;
 }
 
 
-#pragma mark Table View
+#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 {

Classes/Core/FLEXSingleRowSection.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 9/25/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXTableViewSection.h"

Classes/Core/FLEXSingleRowSection.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 9/25/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXSingleRowSection.h"

Classes/Core/FLEXTableViewSection.h

@@ -3,11 +3,10 @@
 //  FLEX
 //
 //  Created by Tanner on 1/29/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-#import "NSArray+FLEX.h"
+#import "FLEXUtility.h"
 @class FLEXTableView;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -23,17 +22,13 @@ NS_ASSUME_NONNULL_BEGIN
     @protected
     /// Unused by default, use if you want
     NSString *_title;
-    
-    @private
-    __weak UITableView *_tableView;
-    NSInteger _sectionIndex;
 }
 
 #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;
+@property (nonatomic, readonly, nullable) 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;
@@ -60,17 +55,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// \c setFilterText: to call \c super and call \c reloadData.
 - (void)reloadData;
 
-/// Like \c reloadData, but optionally reloads the table view section
-/// associated with this section object, if any. Do not override.
-/// Do not call outside of the main thread.
-- (void)reloadData:(BOOL)updateTable;
-
-/// Provide a table view and section index to allow the section to efficiently reload
-/// its own section of the table when something changes it. The table reference is
-/// held weakly, and subclasses cannot access it or the index. Call this method again
-/// if the section numbers have changed since you last called it.
-- (void)setTable:(UITableView *)tableView section:(NSInteger)index;
-
 #pragma mark - Row Selection
 
 /// Whether the given row should be selectable, such as if tapping the cell
@@ -100,6 +84,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (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.
@@ -119,6 +104,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 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
 

Classes/Core/FLEXTableViewSection.m

@@ -3,12 +3,11 @@
 //  FLEX
 //
 //  Created by Tanner on 1/29/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXTableViewSection.h"
 #import "FLEXTableView.h"
-#import "FLEXUtility.h"
 #import "UIMenu+FLEX.h"
 
 #pragma clang diagnostic push
@@ -22,19 +21,6 @@
 
 - (void)reloadData { }
 
-- (void)reloadData:(BOOL)updateTable {
-    [self reloadData];
-    if (updateTable) {
-        NSIndexSet *index = [NSIndexSet indexSetWithIndex:_sectionIndex];
-        [_tableView reloadSections:index withRowAnimation:UITableViewRowAnimationNone];
-    }
-}
-
-- (void)setTable:(UITableView *)tableView section:(NSInteger)index {
-    _tableView = tableView;
-    _sectionIndex = index;
-}
-
 - (NSDictionary<NSString *,Class> *)cellRegistrationMapping {
     return nil;
 }
@@ -64,6 +50,8 @@
     return kFLEXDefaultCell;
 }
 
+#if FLEX_AT_LEAST_IOS13_SDK
+
 - (NSString *)menuTitleForRow:(NSInteger)row {
     NSString *title = [self titleForRow:row];
     NSString *subtitle = [self menuSubtitleForRow:row];
@@ -79,7 +67,7 @@
     return @"";
 }
 
-- (NSArray<UIMenuElement *> *)menuItemsForRow:(NSInteger)row sender:(UIViewController *)sender API_AVAILABLE(ios(13)) {
+- (NSArray<UIMenuElement *> *)menuItemsForRow:(NSInteger)row sender:(UIViewController *)sender {
     NSArray<NSString *> *copyItems = [self copyMenuItemsForRow:row];
     NSAssert(copyItems.count % 2 == 0, @"copyMenuItemsForRow: should return an even list");
     
@@ -110,13 +98,13 @@
         }
         
         UIMenu *copyMenu = [UIMenu
-            flex_inlineMenuWithTitle:@"Copy…" 
+            inlineMenuWithTitle:@"Copy…" 
             image:copyIcon
             children:actions
         ];
         
         if (collapseMenu) {
-            return @[[copyMenu flex_collapsed]];
+            return @[[copyMenu collapsed]];
         } else {
             return @[copyMenu];
         }
@@ -125,6 +113,8 @@
     return @[];
 }
 
+#endif
+
 - (NSArray<NSString *> *)copyMenuItemsForRow:(NSInteger)row {
     return nil;
 }

Classes/Core/Views/Carousel/FLEXCarouselCell.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 7/17/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Classes/Core/Views/Carousel/FLEXCarouselCell.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 7/17/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXCarouselCell.h"
@@ -25,10 +25,8 @@
         _selectionIndicatorStripe = [UIView new];
 
         self.titleLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
+        self.titleLabel.adjustsFontForContentSizeCategory = YES;
         self.selectionIndicatorStripe.backgroundColor = self.tintColor;
-        if (@available(iOS 10, *)) {
-            self.titleLabel.adjustsFontForContentSizeCategory = YES;
-        }
 
         [self.contentView addSubview:self.titleLabel];
         [self.contentView addSubview:self.selectionIndicatorStripe];
@@ -47,7 +45,7 @@
     if (self.selected) {
         self.titleLabel.textColor = self.tintColor;
     } else {
-        self.titleLabel.textColor = FLEXColor.deemphasizedTextColor;
+        self.titleLabel.textColor = [FLEXColor deemphasizedTextColor];
     }
 }
 
@@ -77,7 +75,7 @@
     self.selectionIndicatorStripe.translatesAutoresizingMaskIntoConstraints = NO;
 
     UIView *superview = self.contentView;
-    [self.titleLabel flex_pinEdgesToSuperviewWithInsets:UIEdgeInsetsMake(10, 15, 8 + stripeHeight, 15)];
+    [self.titleLabel pinEdgesToSuperviewWithInsets:UIEdgeInsetsMake(10, 15, 8 + stripeHeight, 15)];
 
     [self.selectionIndicatorStripe.leadingAnchor constraintEqualToAnchor:superview.leadingAnchor].active = YES;
     [self.selectionIndicatorStripe.bottomAnchor constraintEqualToAnchor:superview.bottomAnchor].active = YES;

Classes/Core/Views/Carousel/FLEXScopeCarousel.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 7/17/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Classes/Core/Views/Carousel/FLEXScopeCarousel.m

@@ -3,13 +3,12 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 7/17/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXScopeCarousel.h"
 #import "FLEXCarouselCell.h"
 #import "FLEXColor.h"
-#import "FLEXMacros.h"
 #import "UIView+FLEX_Layout.h"
 
 const CGFloat kCarouselItemSpacing = 0;
@@ -30,7 +29,7 @@ NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
 - (id)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        self.backgroundColor = FLEXColor.primaryBackgroundColor;
+        self.backgroundColor = [FLEXColor primaryBackgroundColor];
         self.autoresizingMask = UIViewAutoresizingFlexibleWidth;
         self.translatesAutoresizingMaskIntoConstraints = YES;
         _dynamicTypeHandlers = [NSMutableArray new];
@@ -73,14 +72,15 @@ NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
         self.sizingCell.title = @"NSObject";
 
         // Dynamic type
-        weakify(self);
+        __weak __typeof(self) weakSelf = self;
         _dynamicTypeObserver = [NSNotificationCenter.defaultCenter
             addObserverForName:UIContentSizeCategoryDidChangeNotification
-            object:nil queue:nil usingBlock:^(NSNotification *note) { strongify(self)
+            object:nil queue:nil usingBlock:^(NSNotification *note) {
                 [self.collectionView setNeedsLayout];
                 [self setNeedsUpdateConstraints];
 
                 // Notify observers
+                __typeof(self) self = weakSelf;
                 for (void (^block)(FLEXScopeCarousel *) in self.dynamicTypeHandlers) {
                     block(self);
                 }
@@ -104,7 +104,7 @@ NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
 
     // Draw hairline
     CGContextRef context = UIGraphicsGetCurrentContext();
-    CGContextSetStrokeColorWithColor(context, FLEXColor.hairlineColor.CGColor);
+    CGContextSetStrokeColorWithColor(context, [FLEXColor hairlineColor].CGColor);
     CGContextSetLineWidth(context, width);
     CGContextMoveToPoint(context, 0, rect.size.height - width);
     CGContextAddLineToPoint(context, rect.size.width, rect.size.height - width);
@@ -118,7 +118,7 @@ NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
 - (void)updateConstraints {
     if (!self.constraintsInstalled) {
         self.collectionView.translatesAutoresizingMaskIntoConstraints = NO;
-        [self.collectionView flex_pinEdgesToSuperview];
+        [self.collectionView pinEdgesToSuperview];
         
         self.constraintsInstalled = YES;
     }

Classes/Core/Views/Cells/FLEXCodeFontCell.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 12/27/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXMultilineTableViewCell.h"

Classes/Core/Views/Cells/FLEXCodeFontCell.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 12/27/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXCodeFontCell.h"

Classes/Core/Views/Cells/FLEXKeyValueTableViewCell.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 1/23/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXTableViewCell.h"

Classes/Core/Views/Cells/FLEXKeyValueTableViewCell.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 1/23/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXKeyValueTableViewCell.h"

Classes/Core/Views/Cells/FLEXMultilineTableViewCell.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Ryan Olson on 2/13/15.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2015 f. All rights reserved.
 //
 
 #import "FLEXTableViewCell.h"

Classes/Core/Views/Cells/FLEXMultilineTableViewCell.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Ryan Olson on 2/13/15.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2015 f. All rights reserved.
 //
 
 #import "FLEXMultilineTableViewCell.h"
@@ -26,7 +26,7 @@
 }
 
 + (UIEdgeInsets)labelInsets {
-    return UIEdgeInsetsMake(10.0, 16.0, 10.0, 8.0);
+    return UIEdgeInsetsMake(10.0, 15.0, 10.0, 15.0);
 }
 
 + (CGFloat)preferredHeightWithAttributedText:(NSAttributedString *)attributedText

Classes/Core/Views/Cells/FLEXSubtitleTableViewCell.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 4/17/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXTableViewCell.h"

Classes/Core/Views/Cells/FLEXSubtitleTableViewCell.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 4/17/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXSubtitleTableViewCell.h"

Classes/Core/Views/Cells/FLEXTableViewCell.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 4/17/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Classes/Core/Views/Cells/FLEXTableViewCell.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 4/17/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXTableViewCell.h"
@@ -37,7 +37,7 @@
     UIFont *cellFont = UIFont.flex_defaultTableCellFont;
     self.titleLabel.font = cellFont;
     self.subtitleLabel.font = cellFont;
-    self.subtitleLabel.textColor = FLEXColor.deemphasizedTextColor;
+    self.subtitleLabel.textColor = [FLEXColor deemphasizedTextColor];
     
     self.titleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
     self.subtitleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
@@ -54,4 +54,39 @@
     return self.detailTextLabel;
 }
 
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender {
+    return [self._tableView _canPerformAction:action forCell:self sender:sender];
+}
+
+/// We use this to allow our table view to allow its delegate
+/// to handle any action it chooses to support, without
+/// explicitly implementing the method ourselves.
+///
+/// Alternative considered: override respondsToSelector
+/// to return NO. I decided against this for simplicity's
+/// sake. I see this as "fixing" a poorly designed API.
+/// That approach would require lots of boilerplate to
+/// make the menu appear above this cell.
+- (void)forwardInvocation:(NSInvocation *)invocation {
+    // Must be unretained to avoid over-releasing
+    __unsafe_unretained id sender;
+    [invocation getArgument:&sender atIndex:2];
+    SEL action = invocation.selector;
+
+    // [self._tableView _performAction:action forCell:[self retain] sender:[sender retain]];
+    invocation.selector = @selector(_performAction:forCell:sender:);
+    [invocation setArgument:&action atIndex:2];
+    [invocation setArgument:(void *)&self atIndex:3];
+    [invocation setArgument:(void *)&sender atIndex:4];
+    [invocation invokeWithTarget:self._tableView];
+}
+
+- (NSMethodSignature *)methodSignatureForSelector:(SEL)selector {
+    if ([self canPerformAction:selector withSender:nil]) {
+        return [self._tableView methodSignatureForSelector:@selector(_performAction:forCell:sender:)];
+    }
+
+    return [super methodSignatureForSelector:selector];
+}
+
 @end

Classes/Core/Views/FLEXTableView.h

@@ -3,13 +3,11 @@
 //  FLEX
 //
 //  Created by Tanner on 4/17/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
 
-NS_ASSUME_NONNULL_BEGIN
-
 #pragma mark Reuse identifiers
 
 typedef NSString * FLEXTableViewCellReuseIdentifier;
@@ -44,5 +42,3 @@ extern FLEXTableViewCellReuseIdentifier const kFLEXCodeFontCell;
 - (void)registerCells:(NSDictionary<NSString *, Class> *)registrationMapping;
 
 @end
-
-NS_ASSUME_NONNULL_END

Classes/Core/Views/FLEXTableView.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 4/17/19.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2019 Flipboard. All rights reserved.
 //
 
 #import "FLEXTableView.h"
@@ -30,21 +30,53 @@ FLEXTableViewCellReuseIdentifier const kFLEXCodeFontCell = @"kFLEXCodeFontCell";
 @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
+}
+
+- (CGFloat)_heightForHeaderInSection:(NSInteger)section {
+    CGFloat height = [super _heightForHeaderInSection:section];
+    if (section == 0) {
+        NSString *title = [self _titleForHeaderInSection:section];
+        if (self.tableHeaderView) {
+            if (!@available(iOS 13, *)) {
+                return height - self.tableHeaderView.frame.size.height + 8;
+            }
+            // On iOS 13, returning an empty title for the table view
+            // messes with the height of the table view later on.
+            // We return a space to work around this.
+            else if ([title isEqualToString:@" "]) {
+                return height - self.tableHeaderView.frame.size.height + 5;
+            }
+        } else {
+            if (@available(iOS 13, *) && [title isEqualToString:@" "]) {
+                return 5;
+            }
+        }
+    }
+
+    return height;
 }
 
 #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 {

Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/30/14.
-//  Copyright (c) 2020 FLEX Team. 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 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputColorView.h"
@@ -234,7 +234,7 @@
             [self updateWithColor:color];
         }
     } else {
-        [self updateWithColor:UIColor.clearColor];
+        [self updateWithColor:[UIColor clearColor]];
     }
 }
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputDateView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Daniel Rodriguez Troitino on 2/14/15.
-//  Copyright (c) 2020 FLEX Team. 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 FLEX Team. All rights reserved.
+//  Copyright (c) 2015 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputDateView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/28/14.
-//  Copyright (c) 2020 FLEX Team. 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 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputFontView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.m

@@ -51,8 +51,8 @@
 }
 
 - (void)createAvailableFonts {
-    NSMutableArray<NSString *> *unsortedFontsArray = [NSMutableArray new];
-    for (NSString *eachFontFamily in UIFont.familyNames) {
+    NSMutableArray<NSString *> *unsortedFontsArray = [NSMutableArray array];
+    for (NSString *eachFontFamily in [UIFont familyNames]) {
         for (NSString *eachFontName in [UIFont fontNamesForFamilyName:eachFontFamily]) {
             [unsortedFontsArray addObject:eachFontName];
         }

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.h

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

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.m

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

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNumberView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/15/14.
-//  Copyright (c) 2020 FLEX Team. 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 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputNumberView.h"
@@ -17,7 +17,6 @@
         self.inputTextView.keyboardType = UIKeyboardTypeNumbersAndPunctuation;
         self.targetSize = FLEXArgumentInputViewSizeSmall;
     }
-    
     return self;
 }
 
@@ -34,29 +33,24 @@
 + (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
     NSParameterAssert(type);
     
-    static NSArray<NSString *> *supportedTypes = nil;
+    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)),
+                           @(@encode(long double))];
     });
-    
-    return type && [supportedTypes containsObject:@(type)];
+    return type && [primitiveTypes containsObject:@(type)];
 }
 
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.h

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

Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.m

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

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStringView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/28/14.
-//  Copyright (c) 2020 FLEX Team. 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 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputStringView.h"

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.h

@@ -3,14 +3,11 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/16/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputView.h"
 
 @interface FLEXArgumentInputStructView : FLEXArgumentInputView
 
-/// Enable displaying ivar names for custom struct types
-+ (void)registerFieldNames:(NSArray<NSString *> *)names forTypeEncoding:(NSString *)typeEncoding;
-
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.m

@@ -3,13 +3,12 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 6/16/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputStructView.h"
 #import "FLEXArgumentInputViewFactory.h"
 #import "FLEXRuntimeUtility.h"
-#import "FLEXTypeEncodingParser.h"
 
 @interface FLEXArgumentInputStructView ()
 
@@ -19,45 +18,10 @@
 
 @implementation FLEXArgumentInputStructView
 
-static NSMutableDictionary<NSString *, NSArray<NSString *> *> *structFieldNameRegistrar = nil;
-+ (void)initialize {
-    if (self == [FLEXArgumentInputStructView class]) {
-        structFieldNameRegistrar = [NSMutableDictionary new];
-        [self registerDefaultFieldNames];
-    }
-}
-
-+ (void)registerDefaultFieldNames {
-    NSDictionary *defaults = @{
-        @(@encode(CGRect)):             @[@"CGPoint origin", @"CGSize size"],
-        @(@encode(CGPoint)):            @[@"CGFloat x", @"CGFloat y"],
-        @(@encode(CGSize)):             @[@"CGFloat width", @"CGFloat height"],
-        @(@encode(CGVector)):           @[@"CGFloat dx", @"CGFloat dy"],
-        @(@encode(UIEdgeInsets)):       @[@"CGFloat top", @"CGFloat left", @"CGFloat bottom", @"CGFloat right"],
-        @(@encode(UIOffset)):           @[@"CGFloat horizontal", @"CGFloat vertical"],
-        @(@encode(NSRange)):            @[@"NSUInteger location", @"NSUInteger length"],
-        @(@encode(CATransform3D)):      @[@"CGFloat m11", @"CGFloat m12", @"CGFloat m13", @"CGFloat m14",
-                                          @"CGFloat m21", @"CGFloat m22", @"CGFloat m23", @"CGFloat m24",
-                                          @"CGFloat m31", @"CGFloat m32", @"CGFloat m33", @"CGFloat m34",
-                                          @"CGFloat m41", @"CGFloat m42", @"CGFloat m43", @"CGFloat m44"],
-        @(@encode(CGAffineTransform)):  @[@"CGFloat a", @"CGFloat b",
-                                          @"CGFloat c", @"CGFloat d",
-                                          @"CGFloat tx", @"CGFloat ty"],
-    };
-    
-    [structFieldNameRegistrar addEntriesFromDictionary:defaults];
-    
-    if (@available(iOS 11.0, *)) {
-        structFieldNameRegistrar[@(@encode(NSDirectionalEdgeInsets))] = @[
-            @"CGFloat top", @"CGFloat leading", @"CGFloat bottom", @"CGFloat trailing"
-        ];
-    }
-}
-
 - (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,
@@ -99,8 +63,12 @@ static NSMutableDictionary<NSString *, NSArray<NSString *> *> *structFieldNameRe
         const char *structTypeEncoding = [inputValue objCType];
         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,
@@ -129,8 +97,12 @@ static NSMutableDictionary<NSString *, NSArray<NSString *> *> *structFieldNameRe
     NSValue *boxedStruct = nil;
     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,
@@ -210,19 +182,54 @@ static NSMutableDictionary<NSString *, NSArray<NSString *> *> *structFieldNameRe
 + (BOOL)supportsObjCType:(const char *)type withCurrentValue:(id)value {
     NSParameterAssert(type);
     if (type[0] == FLEXTypeEncodingStructBegin) {
-        return FLEXGetSizeAndAlignment(type, nil, nil);
+        // We cannot support anything with bitfields or structs,
+        // and this will throw an exception if it does
+        @try {
+            NSGetSizeAndAlignment(type, nil, nil);
+        } @catch (NSException *exception) {
+            return NO;
+        }
+
+        return YES;
     }
 
     return NO;
 }
 
-+ (void)registerFieldNames:(NSArray<NSString *> *)names forTypeEncoding:(NSString *)typeEncoding {
-    NSParameterAssert(typeEncoding); NSParameterAssert(names);
-    structFieldNameRegistrar[typeEncoding] = names;
-}
-
 + (NSArray<NSString *> *)customFieldTitlesForTypeEncoding:(const char *)typeEncoding {
-    return structFieldNameRegistrar[@(typeEncoding)];
+    NSArray<NSString *> *customTitles = nil;
+    if (strcmp(typeEncoding, @encode(CGRect)) == 0) {
+        customTitles = @[@"CGPoint origin", @"CGSize size"];
+    } else if (strcmp(typeEncoding, @encode(CGPoint)) == 0) {
+        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) {
+        customTitles = @[@"CGFloat horizontal", @"CGFloat vertical"];
+    } else if (strcmp(typeEncoding, @encode(NSRange)) == 0) {
+        customTitles = @[@"NSUInteger location", @"NSUInteger length"];
+    } else if (strcmp(typeEncoding, @encode(CATransform3D)) == 0) {
+        customTitles = @[@"CGFloat m11", @"CGFloat m12", @"CGFloat m13", @"CGFloat m14",
+                         @"CGFloat m21", @"CGFloat m22", @"CGFloat m23", @"CGFloat m24",
+                         @"CGFloat m31", @"CGFloat m32", @"CGFloat m33", @"CGFloat m34",
+                         @"CGFloat m41", @"CGFloat m42", @"CGFloat m43", @"CGFloat m44"];
+    } else if (strcmp(typeEncoding, @encode(CGAffineTransform)) == 0) {
+        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;
 }
 
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.h

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

Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.m

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

Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.m

@@ -25,7 +25,7 @@
     if (self) {
         self.inputTextView = [UITextView new];
         self.inputTextView.font = [[self class] inputFont];
-        self.inputTextView.backgroundColor = FLEXColor.secondaryGroupedBackgroundColor;
+        self.inputTextView.backgroundColor = [FLEXColor secondaryGroupedBackgroundColor];
         self.inputTextView.layer.cornerRadius = 10.f;
         self.inputTextView.contentInset = UIEdgeInsetsMake(0, 5, 0, 0);
         self.inputTextView.autocapitalizationType = UITextAutocapitalizationTypeNone;
@@ -33,16 +33,15 @@
         self.inputTextView.delegate = self;
         self.inputTextView.inputAccessoryView = [self createToolBar];
         if (@available(iOS 11, *)) {
-            self.inputTextView.smartQuotesType = UITextSmartQuotesTypeNo;
             [self.inputTextView.layer setValue:@YES forKey:@"continuousCorners"];
         } else {
             self.inputTextView.layer.borderWidth = 1.f;
-            self.inputTextView.layer.borderColor = FLEXColor.borderColor.CGColor;
+            self.inputTextView.layer.borderColor = [FLEXColor borderColor].CGColor;
         }
 
         self.placeholderLabel = [UILabel new];
         self.placeholderLabel.font = self.inputTextView.font;
-        self.placeholderLabel.textColor = FLEXColor.deemphasizedTextColor;
+        self.placeholderLabel.textColor = [FLEXColor deemphasizedTextColor];
         self.placeholderLabel.numberOfLines = 0;
 
         [self addSubview:self.inputTextView];

Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/30/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/30/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXArgumentInputView.h"
@@ -54,7 +54,7 @@
     if (!_titleLabel) {
         _titleLabel = [UILabel new];
         _titleLabel.font = [[self class] titleFont];
-        _titleLabel.textColor = FLEXColor.primaryTextColor;
+        _titleLabel.textColor = [FLEXColor primaryTextColor];
         _titleLabel.numberOfLines = 0;
         [self addSubview:_titleLabel];
     }

Classes/Editing/ArgumentInputViews/FLEXArgumentInputViewFactory.h

@@ -21,7 +21,4 @@
 /// Useful when deciding whether to edit or explore a property, ivar, or NSUserDefaults value.
 + (BOOL)canEditFieldWithTypeEncoding:(const char *)typeEncoding currentValue:(id)currentValue;
 
-/// Enable displaying ivar names for custom struct types
-+ (void)registerFieldNames:(NSArray<NSString *> *)names forTypeEncoding:(NSString *)typeEncoding;
-
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputViewFactory.m

@@ -67,9 +67,4 @@
     return [self argumentInputViewSubclassForTypeEncoding:typeEncoding currentValue:currentValue] != nil;
 }
 
-/// Enable displaying ivar names for custom struct types
-+ (void)registerFieldNames:(NSArray<NSString *> *)names forTypeEncoding:(NSString *)typeEncoding {
-    [FLEXArgumentInputStructView registerFieldNames:names forTypeEncoding:typeEncoding];
-}
-
 @end

Classes/Editing/FLEXDefaultEditorViewController.h

@@ -3,19 +3,15 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/23/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXFieldEditorViewController.h"
 
-NS_ASSUME_NONNULL_BEGIN
+@interface FLEXDefaultEditorViewController : FLEXFieldEditorViewController
 
-@interface FLEXDefaultEditorViewController : FLEXVariableEditorViewController
+- (id)initWithDefaults:(NSUserDefaults *)defaults key:(NSString *)key;
 
-+ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)(void))onCommit;
-
-+ (BOOL)canEditDefaultWithValue:(nullable id)currentValue;
++ (BOOL)canEditDefaultWithValue:(id)currentValue;
 
 @end
-
-NS_ASSUME_NONNULL_END

Classes/Editing/FLEXDefaultEditorViewController.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/23/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXDefaultEditorViewController.h"
@@ -15,24 +15,23 @@
 @interface FLEXDefaultEditorViewController ()
 
 @property (nonatomic, readonly) NSUserDefaults *defaults;
-@property (nonatomic, readonly) NSString *key;
+@property (nonatomic) NSString *key;
 
 @end
 
 @implementation FLEXDefaultEditorViewController
 
-+ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)(void))onCommit {
-    FLEXDefaultEditorViewController *editor = [self target:defaults data:key commitHandler:onCommit];
-    editor.title = @"Edit Default";
-    return editor;
+- (id)initWithDefaults:(NSUserDefaults *)defaults key:(NSString *)key {
+    self = [super initWithTarget:defaults];
+    if (self) {
+        self.key = key;
+        self.title = @"Edit Default";
+    }
+    return self;
 }
 
 - (NSUserDefaults *)defaults {
-    return [_target isKindOfClass:[NSUserDefaults class]] ? _target : nil;
-}
-
-- (NSString *)key {
-    return _data;
+    return [self.target isKindOfClass:[NSUserDefaults class]] ? self.target : nil;
 }
 
 - (void)viewDidLoad {
@@ -51,6 +50,8 @@
 }
 
 - (void)actionButtonPressed:(id)sender {
+    [super actionButtonPressed:sender];
+    
     id value = self.firstInputView.inputValue;
     if (value) {
         [self.defaults setObject:value forKey:self.key];
@@ -58,16 +59,14 @@
         [self.defaults removeObjectForKey:self.key];
     }
     [self.defaults synchronize];
-    
-    // Dismiss keyboard and handle committed changes
-    [super actionButtonPressed:sender];
-    
-    // Go back after setting, but not for switches.
-    if (sender) {
-        [self.navigationController popViewControllerAnimated:YES];
-    } else {
-        self.firstInputView.inputValue = [self.defaults objectForKey:self.key];
-    }
+
+    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 {

Classes/Editing/FLEXFieldEditorView.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Classes/Editing/FLEXFieldEditorView.m

@@ -3,13 +3,12 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXFieldEditorView.h"
 #import "FLEXArgumentInputView.h"
 #import "FLEXUtility.h"
-#import "FLEXColor.h"
 
 @interface FLEXFieldEditorView ()
 
@@ -123,7 +122,7 @@
 }
 
 + (UIColor *)dividerColor {
-    return FLEXColor.tertiaryBackgroundColor;
+    return UIColor.lightGrayColor;
 }
 
 + (CGFloat)horizontalPadding {

Classes/Editing/FLEXFieldEditorViewController.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 11/22/18.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2018 Flipboard. All rights reserved.
 //
 
 #import "FLEXVariableEditorViewController.h"
@@ -15,9 +15,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FLEXFieldEditorViewController : FLEXVariableEditorViewController
 
 /// @return nil if the property is readonly or if the type is unsupported
-+ (nullable instancetype)target:(id)target property:(FLEXProperty *)property commitHandler:(void(^_Nullable)(void))onCommit;
++ (nullable instancetype)target:(id)target property:(FLEXProperty *)property;
 /// @return nil if the ivar type is unsupported
-+ (nullable instancetype)target:(id)target ivar:(FLEXIvar *)ivar commitHandler:(void(^_Nullable)(void))onCommit;
++ (nullable instancetype)target:(id)target ivar:(FLEXIvar *)ivar;
 
 /// Subclasses can change the button title via the \c title property
 @property (nonatomic, readonly) UIBarButtonItem *getterButton;

Classes/Editing/FLEXFieldEditorViewController.m

@@ -3,22 +3,19 @@
 //  FLEX
 //
 //  Created by Tanner on 11/22/18.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2018 Flipboard. All rights reserved.
 //
 
 #import "FLEXFieldEditorViewController.h"
 #import "FLEXFieldEditorView.h"
 #import "FLEXArgumentInputViewFactory.h"
 #import "FLEXPropertyAttributes.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXMetadataExtras.h"
 #import "FLEXUtility.h"
 #import "FLEXColor.h"
 #import "UIBarButtonItem+FLEX.h"
 
 @interface FLEXFieldEditorViewController () <FLEXArgumentInputViewDelegate>
 
-@property (nonatomic, readonly) id<FLEXMetadataAuxiliaryInfo> auxiliaryInfoProvider;
 @property (nonatomic) FLEXProperty *property;
 @property (nonatomic) FLEXIvar *ivar;
 
@@ -32,16 +29,21 @@
 
 #pragma mark - Initialization
 
-+ (instancetype)target:(id)target property:(nonnull FLEXProperty *)property commitHandler:(void(^)(void))onCommit {
-    FLEXFieldEditorViewController *editor = [self target:target data:property commitHandler:onCommit];
-    editor.title = [@"Property: " stringByAppendingString:property.name];
++ (instancetype)target:(id)target property:(FLEXProperty *)property {
+    id value = [property getValue:target];
+    if (![self canEditProperty:property onObject:target currentValue:value]) {
+        return nil;
+    }
+
+    FLEXFieldEditorViewController *editor = [self target:target];
+    editor.title = @"Property";
     editor.property = property;
     return editor;
 }
 
-+ (instancetype)target:(id)target ivar:(nonnull FLEXIvar *)ivar commitHandler:(void(^)(void))onCommit {
-    FLEXFieldEditorViewController *editor = [self target:target data:ivar commitHandler:onCommit];
-    editor.title = [@"Ivar: " stringByAppendingString:ivar.name];
++ (instancetype)target:(id)target ivar:(nonnull FLEXIvar *)ivar {
+    FLEXFieldEditorViewController *editor = [self target:target];
+    editor.title = @"Instance Variable";
     editor.ivar = ivar;
     return editor;
 }
@@ -51,7 +53,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    self.view.backgroundColor = FLEXColor.groupedBackgroundColor;
+    self.view.backgroundColor = [FLEXColor groupedBackgroundColor];
 
     // Create getter button
     _getterButton = [[UIBarButtonItem alloc]
@@ -61,10 +63,8 @@
         action:@selector(getterButtonPressed:)
     ];
     self.toolbarItems = @[
-        UIBarButtonItem.flex_flexibleSpace, self.getterButton, self.actionButton
+        UIBarButtonItem.flex_flexibleSpace, self.getterButton, self.setterButton
     ];
-    
-    [self registerAuxiliaryInfo];
 
     // Configure input view
     self.fieldEditorView.fieldDescription = self.fieldDescription;
@@ -75,16 +75,18 @@
 
     // 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";
+        self.setterButton.enabled = NO;
+        self.setterButton.title = @"Flip the switch to call the setter";
         // Put getter button before setter button 
         self.toolbarItems = @[
-            UIBarButtonItem.flex_flexibleSpace, self.actionButton, self.getterButton
+            UIBarButtonItem.flex_flexibleSpace, self.setterButton, self.getterButton
         ];
     }
 }
 
 - (void)actionButtonPressed:(id)sender {
+    [super actionButtonPressed:sender];
+
     if (self.property) {
         id userInputObject = self.firstInputView.inputValue;
         NSArray *arguments = userInputObject ? @[userInputObject] : nil;
@@ -100,9 +102,6 @@
         // this currently could and would assign NSArray to NSMutableArray
         [self.ivar setValue:self.firstInputView.inputValue onObject:self.target];
     }
-    
-    // Dismiss keyboard and handle committed changes
-    [super actionButtonPressed:sender];
 
     // Go back after setting, but not for switches.
     if (sender) {
@@ -126,17 +125,6 @@
 
 #pragma mark - Private
 
-- (void)registerAuxiliaryInfo {
-    // This is how Reflex will get Swift struct field names into the editor at runtime
-    NSDictionary<NSString *, NSArray *> *labels = [self.auxiliaryInfoProvider
-        auxiliaryInfoForKey:FLEXAuxiliarynfoKeyFieldLabels
-    ];
-    
-    for (NSString *type in labels) {
-        [FLEXArgumentInputViewFactory registerFieldNames:labels[type] forTypeEncoding:type];
-    }
-}
-
 - (id)currentValue {
     if (self.property) {
         return [self.property getValue:self.target];
@@ -145,10 +133,6 @@
     }
 }
 
-- (id<FLEXMetadataAuxiliaryInfo>)auxiliaryInfoProvider {
-    return self.ivar ?: self.property;
-}
-
 - (const FLEXTypeEncoding *)typeEncoding {
     if (self.property) {
         return self.property.attributes.typeEncoding.UTF8String;
@@ -165,4 +149,14 @@
     }
 }
 
++ (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/FLEXMethodCallingViewController.h

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

Classes/Editing/FLEXMethodCallingViewController.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/23/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXMethodCallingViewController.h"
@@ -16,7 +16,7 @@
 #import "FLEXUtility.h"
 
 @interface FLEXMethodCallingViewController ()
-@property (nonatomic, readonly) FLEXMethod *method;
+@property (nonatomic) FLEXMethod *method;
 @end
 
 @implementation FLEXMethodCallingViewController
@@ -28,10 +28,10 @@
 - (id)initWithTarget:(id)target method:(FLEXMethod *)method {
     NSParameterAssert(method.isInstanceMethod == !object_isClass(target));
 
-    self = [super initWithTarget:target data:method commitHandler:nil];
+    self = [super initWithTarget:target];
     if (self) {
-        self.title = method.isInstanceMethod ? @"Method: " : @"Class Method: ";
-        self.title = [self.title stringByAppendingString:method.selectorString];
+        self.method = method;
+        self.title = method.isInstanceMethod ? @"Method" : @"Class Method";
     }
 
     return self;
@@ -40,7 +40,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    self.actionButton.title = @"Call";
+    self.setterButton.title = @"Call";
 
     // Configure field editor view
     self.fieldEditorView.argumentInputViews = [self argumentInputViews];
@@ -53,7 +53,7 @@
 - (NSArray<FLEXArgumentInputView *> *)argumentInputViews {
     Method method = self.method.objc_method;
     NSArray *methodComponents = [FLEXRuntimeUtility prettyArgumentComponentsForMethod:method];
-    NSMutableArray<FLEXArgumentInputView *> *argumentInputViews = [NSMutableArray new];
+    NSMutableArray<FLEXArgumentInputView *> *argumentInputViews = [NSMutableArray array];
     unsigned int argumentIndex = kFLEXNumberOfImplicitArgs;
 
     for (NSString *methodComponent in methodComponents) {
@@ -71,11 +71,13 @@
 }
 
 - (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];
+        [arguments addObject:inputView.inputValue ?: [NSNull null]];
     }
 
     // Call method
@@ -86,9 +88,6 @@
         withArguments:arguments
         error:&error
     ];
-    
-    // Dismiss keyboard and handle committed changes
-    [super actionButtonPressed:sender];
 
     // Display return value or error
     if (error) {
@@ -103,8 +102,4 @@
     }
 }
 
-- (FLEXMethod *)method {
-    return _data;
-}
-
 @end

Classes/Editing/FLEXVariableEditorViewController.h

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
@@ -11,45 +11,25 @@
 @class FLEXFieldEditorView;
 @class FLEXArgumentInputView;
 
-NS_ASSUME_NONNULL_BEGIN
+/// Provides a screen for editing or configuring one or more variables.
+@interface FLEXVariableEditorViewController : UIViewController
 
-/// An abstract screen for editing or configuring one or more variables.
-/// "Target" is the target of the edit operation, and "data" is the data
-/// you want to mutate or pass to the target when the action is performed.
-/// The action may be something like calling a method, setting an ivar, etc.
-@interface FLEXVariableEditorViewController : UIViewController {
-    @protected
-    id _target;
-    _Nullable id _data;
-    void (^_Nullable _commitHandler)(void);
-}
++ (instancetype)target:(id)target;
+- (id)initWithTarget:(id)target;
 
-/// @param target The target of the operation
-/// @param data The data associated with the operation
-/// @param onCommit An action to perform when the data changes 
-+ (instancetype)target:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit;
-/// @param target The target of the operation
-/// @param data The data associated with the operation
-/// @param onCommit An action to perform when the data changes 
-- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit;
+// Convenience accessor since many subclasses only use one input view
+@property (nonatomic, readonly) FLEXArgumentInputView *firstInputView;
 
+// For subclass use only.
 @property (nonatomic, readonly) id target;
-
-/// Convenience accessor since many subclasses only use one input view
-@property (nonatomic, readonly, nullable) FLEXArgumentInputView *firstInputView;
-
 @property (nonatomic, readonly) FLEXFieldEditorView *fieldEditorView;
 /// Subclasses can change the button title via the button's \c title property
-@property (nonatomic, readonly) UIBarButtonItem *actionButton;
+@property (nonatomic, readonly) UIBarButtonItem *setterButton;
 
-/// Subclasses should override to provide "set" functionality.
-/// The commit handler--if present--is called here.
-- (void)actionButtonPressed:(nullable id)sender;
+- (void)actionButtonPressed:(id)sender;
 
 /// Pushes an explorer view controller for the given object
 /// or pops the current view controller.
-- (void)exploreObjectOrPopViewController:(nullable id)objectOrNil;
+- (void)exploreObjectOrPopViewController:(id)objectOrNil;
 
 @end
-
-NS_ASSUME_NONNULL_END

Classes/Editing/FLEXVariableEditorViewController.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXColor.h"
@@ -19,22 +19,21 @@
 
 @interface FLEXVariableEditorViewController () <UIScrollViewDelegate>
 @property (nonatomic) UIScrollView *scrollView;
+@property (nonatomic) id target;
 @end
 
 @implementation FLEXVariableEditorViewController
 
 #pragma mark - Initialization
 
-+ (instancetype)target:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit {
-    return [[self alloc] initWithTarget:target data:data commitHandler:onCommit];
++ (instancetype)target:(id)target {
+    return [[self alloc] initWithTarget:target];
 }
 
-- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit {
+- (id)initWithTarget:(id)target {
     self = [super init];
     if (self) {
-        _target = target;
-        _data = data;
-        _commitHandler = onCommit;
+        self.target = target;
         [NSNotificationCenter.defaultCenter
             addObserver:self selector:@selector(keyboardDidShow:)
             name:UIKeyboardDidShowNotification object:nil
@@ -94,7 +93,7 @@
     self.fieldEditorView.targetDescription = [NSString stringWithFormat:@"%@ %p", [self.target class], self.target];
     [self.scrollView addSubview:self.fieldEditorView];
     
-    _actionButton = [[UIBarButtonItem alloc]
+    _setterButton = [[UIBarButtonItem alloc]
         initWithTitle:@"Set"
         style:UIBarButtonItemStyleDone
         target:self
@@ -102,7 +101,7 @@
     ];
     
     self.navigationController.toolbarHidden = NO;
-    self.toolbarItems = @[UIBarButtonItem.flex_flexibleSpace, self.actionButton];
+    self.toolbarItems = @[UIBarButtonItem.flex_flexibleSpace, self.setterButton];
 }
 
 - (void)viewWillLayoutSubviews {
@@ -121,9 +120,6 @@
 - (void)actionButtonPressed:(id)sender {
     // Subclasses can override
     [self.fieldEditorView endEditing:YES];
-    if (_commitHandler) {
-        _commitHandler();
-    }
 }
 
 - (void)exploreObjectOrPopViewController:(id)objectOrNil {

Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 2/6/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 2/6/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXBookmarkManager.h"

Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 2/6/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXTableViewController.h"

Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 2/6/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXBookmarksViewController.h"
@@ -68,10 +68,10 @@
 - (void)setupEditingBarItems {
     self.navigationItem.rightBarButtonItem = nil;
     self.toolbarItems = @[
-        [UIBarButtonItem flex_itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed:)],
+        [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 flex_doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
+        [UIBarButtonItem doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
     ];
     
     self.toolbarItems.firstObject.tintColor = FLEXColor.destructiveColor;
@@ -149,7 +149,7 @@
     }
 }
 
-- (void)closeAllButtonPressed:(UIBarButtonItem *)sender {
+- (void)closeAllButtonPressed {
     [FLEXAlert makeSheet:^(FLEXAlert *make) {
         NSInteger count = self.bookmarks.count;
         NSString *title = FLEXPluralFormatString(count, @"Remove %@ bookmarks", @"Remove %@ bookmark");
@@ -158,7 +158,7 @@
             [self toggleEditing];
         });
         make.button(@"Cancel").cancelStyle();
-    } showFrom:self source:sender];
+    } showFrom:self];
 }
 
 - (void)closeAll {

Classes/ExplorerInterface/FLEXExplorerViewController.h

@@ -3,10 +3,10 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 4/4/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
-#import "FLEXExplorerToolbar.h"
+#import <UIKit/UIKit.h>
 
 @class FLEXWindow;
 @protocol FLEXExplorerViewControllerDelegate;
@@ -17,25 +17,13 @@
 @property (nonatomic, weak) id <FLEXExplorerViewControllerDelegate> delegate;
 @property (nonatomic, readonly) BOOL wantsWindowToBecomeKey;
 
-@property (nonatomic, readonly) FLEXExplorerToolbar *explorerToolbar;
-
 - (BOOL)shouldReceiveTouchAtWindowPoint:(CGPoint)pointInWindowCoordinates;
 
-/// @brief Used to present (or dismiss) a modal view controller ("tool"),
-/// typically triggered by pressing a button in the toolbar.
+/// @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;
-
-/// @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 dismisses it and presents the given tool.
-/// The completion block is called once the tool has been presented.
-- (void)presentTool:(UINavigationController *(^)(void))future
-         completion:(void (^)(void))completion;
+- (void)toggleToolWithViewControllerProvider:(UINavigationController *(^)(void))future completion:(void(^)(void))completion;
 
 // Keyboard shortcut helpers
 

Classes/ExplorerInterface/FLEXExplorerViewController.m

@@ -3,11 +3,12 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 4/4/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXExplorerViewController.h"
-#import "FLEXExplorerToolbarItem.h"
+#import "FLEXExplorerToolbar.h"
+#import "FLEXToolbarItem.h"
 #import "FLEXUtility.h"
 #import "FLEXWindow.h"
 #import "FLEXTabList.h"
@@ -19,8 +20,8 @@
 #import "FLEXNetworkMITMViewController.h"
 #import "FLEXTabsViewController.h"
 #import "FLEXWindowManagerController.h"
-#import "FLEXViewControllersViewController.h"
-#import "NSUserDefaults+FLEX.h"
+
+static NSString *const kFLEXToolbarTopMarginDefaultsKey = @"com.flex.FLEXToolbar.topMargin";
 
 typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     FLEXExplorerModeDefault,
@@ -30,6 +31,8 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 
 @interface FLEXExplorerViewController () <FLEXHierarchyDelegate, UIAdaptivePresentationControllerDelegate>
 
+@property (nonatomic) FLEXExplorerToolbar *explorerToolbar;
+
 /// Tracks the currently active tool/mode
 @property (nonatomic) FLEXExplorerMode currentMode;
 
@@ -45,9 +48,6 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 /// Only valid while a toolbar drag pan gesture is in progress.
 @property (nonatomic) CGRect toolbarFrameBeforeDragging;
 
-/// Only valid while a selected view pan gesture is in progress.
-@property (nonatomic) CGFloat selectedViewLastPanX;
-
 /// Borders of all the visible views in the hierarchy at the selection point.
 /// The keys are NSValues with the corresponding view (nonretained).
 @property (nonatomic) NSDictionary<NSValue *, UIView *> *outlineViewsForVisibleViews;
@@ -61,9 +61,6 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 /// A colored transparent overlay to indicate that the view is selected.
 @property (nonatomic) UIView *selectedViewOverlay;
 
-/// Used to actuate changes in view selection on iOS 10+
-@property (nonatomic, readonly) UISelectionFeedbackGenerator *selectionFBG API_AVAILABLE(ios(10.0));
-
 /// self.view.window as a \c FLEXWindow
 @property (nonatomic, readonly) FLEXWindow *window;
 
@@ -80,7 +77,7 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
-        self.observedViews = [NSMutableSet new];
+        self.observedViews = [NSMutableSet set];
     }
     return self;
 }
@@ -95,10 +92,11 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     [super viewDidLoad];
 
     // Toolbar
-    _explorerToolbar = [FLEXExplorerToolbar new];
+    self.explorerToolbar = [FLEXExplorerToolbar new];
 
     // Start the toolbar off below any bars that may be at the top of the view.
-    CGFloat toolbarOriginY = NSUserDefaults.standardUserDefaults.flex_toolbarTopMargin;
+    id toolbarOriginYDefault = [[NSUserDefaults standardUserDefaults] objectForKey:kFLEXToolbarTopMarginDefaultsKey];
+    CGFloat toolbarOriginY = toolbarOriginYDefault ? [toolbarOriginYDefault doubleValue] : 100;
 
     CGRect safeArea = [self viewSafeArea];
     CGSize toolbarSize = [self.explorerToolbar sizeThatFits:CGSizeMake(
@@ -124,11 +122,6 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     self.movePanGR = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handleMovePan:)];
     self.movePanGR.enabled = self.currentMode == FLEXExplorerModeMove;
     [self.view addGestureRecognizer:self.movePanGR];
-    
-    // Feedback
-    if (@available(iOS 10.0, *)) {
-        _selectionFBG = [UISelectionFeedbackGenerator new];
-    }
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -155,13 +148,8 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 }
 
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
-    // Commenting this out until I can figure out a better way to solve this
-//    if (self.window.isKeyWindow) {
-//        [self.window resignKeyWindow];
-//    }
-    
     UIViewController *viewControllerToAsk = [self viewControllerForRotationAndOrientation];
-    UIInterfaceOrientationMask supportedOrientations = FLEXUtility.infoPlistSupportedInterfaceOrientationsMask;
+    UIInterfaceOrientationMask supportedOrientations = [FLEXUtility infoPlistSupportedInterfaceOrientationsMask];
     if (viewControllerToAsk && ![viewControllerToAsk isKindOfClass:[self class]]) {
         supportedOrientations = [viewControllerToAsk supportedInterfaceOrientations];
     }
@@ -380,25 +368,24 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 
 - (void)setupToolbarActions {
     FLEXExplorerToolbar *toolbar = self.explorerToolbar;
-    NSDictionary<NSString *, FLEXExplorerToolbarItem *> *actionsToItems = @{
+    NSDictionary<NSString *, FLEXToolbarItem *> *actionsToItems = @{
         NSStringFromSelector(@selector(selectButtonTapped:)):        toolbar.selectItem,
         NSStringFromSelector(@selector(hierarchyButtonTapped:)):     toolbar.hierarchyItem,
-        NSStringFromSelector(@selector(recentButtonTapped:)):        toolbar.recentItem,
         NSStringFromSelector(@selector(moveButtonTapped:)):          toolbar.moveItem,
         NSStringFromSelector(@selector(globalsButtonTapped:)):       toolbar.globalsItem,
         NSStringFromSelector(@selector(closeButtonTapped:)):         toolbar.closeItem,
     };
     
-    [actionsToItems enumerateKeysAndObjectsUsingBlock:^(NSString *sel, FLEXExplorerToolbarItem *item, BOOL *stop) {
+    [actionsToItems enumerateKeysAndObjectsUsingBlock:^(NSString *sel, FLEXToolbarItem *item, BOOL *stop) {
         [item addTarget:self action:NSSelectorFromString(sel) forControlEvents:UIControlEventTouchUpInside];
     }];
 }
 
-- (void)selectButtonTapped:(FLEXExplorerToolbarItem *)sender {
+- (void)selectButtonTapped:(FLEXToolbarItem *)sender {
     [self toggleSelectTool];
 }
 
-- (void)hierarchyButtonTapped:(FLEXExplorerToolbarItem *)sender {
+- (void)hierarchyButtonTapped:(FLEXToolbarItem *)sender {
     [self toggleViewsTool];
 }
 
@@ -407,36 +394,25 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     return [UIApplication.sharedApplication valueForKey:statusBarString];
 }
 
-- (void)recentButtonTapped:(FLEXExplorerToolbarItem *)sender {
-    NSAssert(FLEXTabList.sharedList.activeTab, @"Must have active tab");
-    [self presentViewController:FLEXTabList.sharedList.activeTab animated:YES completion:nil];
-}
-
-- (void)moveButtonTapped:(FLEXExplorerToolbarItem *)sender {
+- (void)moveButtonTapped:(FLEXToolbarItem *)sender {
     [self toggleMoveTool];
 }
 
-- (void)globalsButtonTapped:(FLEXExplorerToolbarItem *)sender {
+- (void)globalsButtonTapped:(FLEXToolbarItem *)sender {
     [self toggleMenuTool];
 }
 
-- (void)closeButtonTapped:(FLEXExplorerToolbarItem *)sender {
+- (void)closeButtonTapped:(FLEXToolbarItem *)sender {
     self.currentMode = FLEXExplorerModeDefault;
     [self.delegate explorerViewControllerDidFinish:self];
 }
 
 - (void)updateButtonStates {
-    FLEXExplorerToolbar *toolbar = self.explorerToolbar;
-    
-    toolbar.selectItem.selected = self.currentMode == FLEXExplorerModeSelect;
-    
-    // Move only enabled when an object is selected.
+    // Move and details only active when an object is selected.
     BOOL hasSelectedObject = self.selectedView != nil;
-    toolbar.moveItem.enabled = hasSelectedObject;
-    toolbar.moveItem.selected = self.currentMode == FLEXExplorerModeMove;
-    
-    // Recent only enabled when we have a last active tab
-    toolbar.recentItem.enabled = FLEXTabList.sharedList.activeTab != nil;
+    self.explorerToolbar.moveItem.enabled = hasSelectedObject;
+    self.explorerToolbar.selectItem.selected = self.currentMode == FLEXExplorerModeSelect;
+    self.explorerToolbar.moveItem.selected = self.currentMode == FLEXExplorerModeMove;
 }
 
 
@@ -461,12 +437,6 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     ];
     [toolbar.selectedViewDescriptionContainer addGestureRecognizer:self.detailsTapGR];
     
-    // Swipe gestures for selecting deeper / higher views at a point
-    UIPanGestureRecognizer *panGesture = [[UIPanGestureRecognizer alloc]
-        initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
-    ];
-    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:panGesture];
-    
     // Long press gesture to present tabs manager
     [toolbar.globalsItem addGestureRecognizer:[[UILongPressGestureRecognizer alloc]
         initWithTarget:self action:@selector(handleToolbarShowTabsGesture:)
@@ -476,11 +446,6 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     [toolbar.selectItem addGestureRecognizer:[[UILongPressGestureRecognizer alloc]
         initWithTarget:self action:@selector(handleToolbarWindowManagerGesture:)
     ]];
-    
-    // Long press gesture to present view controllers at tap
-    [toolbar.hierarchyItem addGestureRecognizer:[[UILongPressGestureRecognizer alloc]
-        initWithTarget:self action:@selector(handleToolbarShowViewControllersGesture:)
-    ]];
 }
 
 - (void)handleToolbarPanGesture:(UIPanGestureRecognizer *)panGR {
@@ -521,7 +486,10 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     }
 
     self.explorerToolbar.frame = unconstrainedFrame;
-    NSUserDefaults.standardUserDefaults.flex_toolbarTopMargin = unconstrainedFrame.origin.y;
+
+    [NSUserDefaults.standardUserDefaults
+        setDouble:unconstrainedFrame.origin.y forKey:kFLEXToolbarTopMarginDefaultsKey
+    ];
 }
 
 - (void)handleToolbarHintTapGesture:(UITapGestureRecognizer *)tapGR {
@@ -553,40 +521,21 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 }
 
 - (void)handleToolbarShowTabsGesture:(UILongPressGestureRecognizer *)sender {
-    if (sender.state == UIGestureRecognizerStateBegan) {
-        // Back up the UIMenuController items since dismissViewController: will attempt to replace them
-        self.appMenuItems = UIMenuController.sharedMenuController.menuItems;
-        
-        // Don't use FLEXNavigationController because the tab viewer itself is not a tab
-        [super presentViewController:[[UINavigationController alloc]
-            initWithRootViewController:[FLEXTabsViewController new]
-        ] animated:YES completion:nil];
-    }
+    // Back up the UIMenuController items since dismissViewController: will attempt to replace them
+    self.appMenuItems = UIMenuController.sharedMenuController.menuItems;
+    
+    [super presentViewController:[[UINavigationController alloc]
+        initWithRootViewController:[FLEXTabsViewController new]
+    ] animated:YES completion:nil];
 }
 
 - (void)handleToolbarWindowManagerGesture:(UILongPressGestureRecognizer *)sender {
-    if (sender.state == UIGestureRecognizerStateBegan) {
-        // Back up the UIMenuController items since dismissViewController: will attempt to replace them
-        self.appMenuItems = UIMenuController.sharedMenuController.menuItems;
-        
-        [super presentViewController:[FLEXNavigationController
-            withRootViewController:[FLEXWindowManagerController new]
-        ] animated:YES completion:nil];
-    }
-}
-
-- (void)handleToolbarShowViewControllersGesture:(UILongPressGestureRecognizer *)sender {
-    if (sender.state == UIGestureRecognizerStateBegan && self.viewsAtTapPoint.count) {
-        // Back up the UIMenuController items since dismissViewController: will attempt to replace them
-        self.appMenuItems = UIMenuController.sharedMenuController.menuItems;
-        
-        UIViewController *list = [FLEXViewControllersViewController
-            controllersForViews:self.viewsAtTapPoint
-        ];
-        [self presentViewController:
-            [FLEXNavigationController withRootViewController:list
-        ] animated:YES completion:nil];
-    }
+    // Back up the UIMenuController items since dismissViewController: will attempt to replace them
+    self.appMenuItems = UIMenuController.sharedMenuController.menuItems;
+    
+    [super presentViewController:[[UINavigationController alloc]
+        initWithRootViewController:[FLEXWindowManagerController new]
+    ] animated:YES completion:nil];
 }
 
 
@@ -604,57 +553,6 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     }
 }
 
-- (void)handleChangeViewAtPointGesture:(UIPanGestureRecognizer *)sender {
-    NSInteger max = self.viewsAtTapPoint.count - 1;
-    NSInteger currentIdx = [self.viewsAtTapPoint indexOfObject:self.selectedView];
-    CGFloat locationX = [sender locationInView:self.view].x;
-    
-    // Track the pan gesture: every N points we move along the X axis,
-    // actuate some haptic feedback and move up or down the hierarchy.
-    // We only store the "last" location when we've met the threshold.
-    // We only change the view and actuate feedback if the view selection
-    // changes; that is, as long as we don't go outside or under the array.
-    switch (sender.state) {
-        case UIGestureRecognizerStateBegan: {
-            self.selectedViewLastPanX = locationX;
-            break;
-        }
-        case UIGestureRecognizerStateChanged: {
-            static CGFloat kNextLevelThreshold = 20.f;
-            CGFloat lastX = self.selectedViewLastPanX;
-            NSInteger newSelection = currentIdx;
-            
-            // Left, go down the hierarchy
-            if (locationX < lastX && (lastX - locationX) >= kNextLevelThreshold) {
-                // Choose a new view index up to the max index
-                newSelection = MIN(max, currentIdx + 1);
-                self.selectedViewLastPanX = locationX;
-            }
-            // Right, go up the hierarchy
-            else if (lastX < locationX && (locationX - lastX) >= kNextLevelThreshold) {
-                // Choose a new view index down to the min index
-                newSelection = MAX(0, currentIdx - 1);
-                self.selectedViewLastPanX = locationX;
-            }
-            
-            if (currentIdx != newSelection) {
-                self.selectedView = self.viewsAtTapPoint[newSelection];
-                [self actuateSelectionChangedFeedback];
-            }
-            
-            break;
-        }
-            
-        default: break;
-    }
-}
-
-- (void)actuateSelectionChangedFeedback {
-    if (@available(iOS 10.0, *)) {
-        [self.selectionFBG selectionChanged];
-    }
-}
-
 - (void)updateOutlineViewsForSelectionPoint:(CGPoint)selectionPointInWindow {
     [self removeAndClearOutlineViews];
     
@@ -698,8 +596,8 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 }
 
 - (NSArray<UIView *> *)viewsAtPoint:(CGPoint)tapPointInWindow skipHiddenViews:(BOOL)skipHidden {
-    NSMutableArray<UIView *> *views = [NSMutableArray new];
-    for (UIWindow *window in FLEXUtility.allWindows) {
+    NSMutableArray<UIView *> *views = [NSMutableArray array];
+    for (UIWindow *window in [FLEXUtility allWindows]) {
         // Don't include the explorer's own window or subviews.
         if (window != self.view.window && [window pointInside:tapPointInWindow withEvent:nil]) {
             [views addObject:window];
@@ -715,8 +613,8 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     // Select in the window that would handle the touch, but don't just use the result of
     // hitTest:withEvent: so we can still select views with interaction disabled.
     // Default to the the application's key window if none of the windows want the touch.
-    UIWindow *windowForSelection = UIApplication.sharedApplication.keyWindow;
-    for (UIWindow *window in FLEXUtility.allWindows.reverseObjectEnumerator) {
+    UIWindow *windowForSelection = [UIApplication.sharedApplication keyWindow];
+    for (UIWindow *window in [FLEXUtility allWindows].reverseObjectEnumerator) {
         // Ignore the explorer's own window.
         if (window != self.view.window) {
             if ([window hitTest:tapPointInWindow withEvent:nil]) {
@@ -733,7 +631,7 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 - (NSArray<UIView *> *)recursiveSubviewsAtPoint:(CGPoint)pointInView
                                          inView:(UIView *)view
                                 skipHiddenViews:(BOOL)skipHidden {
-    NSMutableArray<UIView *> *subviewsAtPoint = [NSMutableArray new];
+    NSMutableArray<UIView *> *subviewsAtPoint = [NSMutableArray array];
     for (UIView *subview in view.subviews) {
         BOOL isHidden = subview.hidden || subview.alpha < 0.01;
         if (skipHidden && isHidden) {
@@ -884,11 +782,16 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     }
     
     // Back up and replace the UIMenuController items
-    // Edit: no longer replacing the items, but still backing them
-    // up in case we start replacing them again in the future
     self.appMenuItems = UIMenuController.sharedMenuController.menuItems;
+    // Initialize custom menu items for explorer screen
+    UIMenuItem *copyObjectAddress = [[UIMenuItem alloc]
+        initWithTitle:@"Copy Address"
+        action:NSSelectorFromString(@"copyObjectAddress:")
+    ];
+    UIMenuController.sharedMenuController.menuItems = @[copyObjectAddress];
+    [UIMenuController.sharedMenuController update];
     
-    // Show the view controller
+    // Show the view controller.
     [super presentViewController:toPresent animated:animated completion:completion];
 }
 
@@ -908,38 +811,23 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     // scroll to top, but below FLEX otherwise for exploration.
     [self statusWindow].windowLevel = UIWindowLevelStatusBar;
     
-    [self updateButtonStates];
-    
     [super dismissViewControllerAnimated:animated completion:completion];
 }
 
-- (BOOL)wantsWindowToBecomeKey {
+- (BOOL)wantsWindowToBecomeKey
+{
     return self.window.previousKeyWindow != nil;
 }
 
 - (void)toggleToolWithViewControllerProvider:(UINavigationController *(^)(void))future
-                                  completion:(void (^)(void))completion {
+                                  completion:(void(^)(void))completion {
     if (self.presentedViewController) {
-        // We do NOT want to present the future; this is
-        // a convenience method for toggling the SAME TOOL
         [self dismissViewControllerAnimated:YES completion:completion];
     } else if (future) {
         [self presentViewController:future() animated:YES completion:completion];
     }
 }
 
-- (void)presentTool:(UINavigationController *(^)(void))future
-         completion:(void (^)(void))completion {
-    if (self.presentedViewController) {
-        // If a tool is already presented, dismiss it first
-        [self dismissViewControllerAnimated:YES completion:^{
-            [self presentViewController:future() animated:YES completion:completion];
-        }];
-    } else if (future) {
-        [self presentViewController:future() animated:YES completion:completion];
-    }
-}
-
 - (FLEXWindow *)window {
     return (id)self.view.window;
 }
@@ -957,8 +845,8 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 
 - (void)toggleMoveTool {
     if (self.currentMode == FLEXExplorerModeMove) {
-        self.currentMode = FLEXExplorerModeSelect;
-    } else if (self.currentMode == FLEXExplorerModeSelect && self.selectedView) {
+        self.currentMode = FLEXExplorerModeDefault;
+    } else {
         self.currentMode = FLEXExplorerModeMove;
     }
 }
@@ -978,7 +866,11 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
         } else {
             return [FLEXHierarchyViewController delegate:self];
         }
-    } completion:completion];
+    } completion:^{
+        if (completion) {
+            completion();
+        }
+    }];
 }
 
 - (void)toggleMenuTool {

Classes/ExplorerInterface/FLEXViewControllersViewController.h

@@ -1,19 +0,0 @@
-//
-//  FLEXViewControllersViewController.h
-//  FLEX
-//
-//  Created by Tanner Bennett on 2/13/20.
-//  Copyright © 2020 FLEX Team. 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 FLEX Team. 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,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 4/13/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Classes/ExplorerInterface/FLEXWindow.m

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 4/13/14.
-//  Copyright (c) 2020 FLEX Team. All rights reserved.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
 //
 
 #import "FLEXWindow.h"

Classes/ExplorerInterface/FLEXWindowManagerController.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 2/6/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXTableViewController.h"

Classes/ExplorerInterface/FLEXWindowManagerController.m

@@ -3,13 +3,12 @@
 //  FLEX
 //
 //  Created by Tanner on 2/6/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  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;
@@ -18,7 +17,6 @@
 @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
@@ -38,6 +36,10 @@
     }
     
     [self disableToolbar];
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]
+        initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(dismissAnimated)
+    ];
+    
     [self reloadData];
 }
 
@@ -47,32 +49,25 @@
 - (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
         ];
     }];
-    
+    self.keyWindowSubtitle = self.windowSubtitles[[self.windows indexOfObject:self.keyWindow]];
     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(^)(void))revertBlock {
+- (void)showRevertOrDismissAlert:(void(^)())revertBlock {
     [self.tableView deselectRowAtIndexPath:self.tableView.indexPathForSelectedRow animated:YES];
     [self reloadData];
     [self.tableView reloadData];
@@ -142,11 +137,27 @@
 #pragma mark - Table View Data Source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return self.sections.count;
+    if (@available(iOS 13, *)) {
+        return 3;
+    }
+    
+    return 2;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return self.sections[section].count;
+    switch (section) {
+        case 0:
+            return 1;
+        case 1:
+            return self.windows.count;
+        case 2:
+            if (@available(iOS 13, *)) {
+                return self.scenes.count;
+            }
+    }
+    
+    @throw NSInternalInconsistencyException;
+    return 0;
 }
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
@@ -161,9 +172,6 @@
 
 - (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;
     
@@ -187,8 +195,7 @@
     
     cell.textLabel.text = window.description;
     cell.detailTextLabel.text = [NSString
-        stringWithFormat:@"Level: %@ — Root: %@",
-        @((NSInteger)window.windowLevel), window.rootViewController.class
+        stringWithFormat:@"Level: %@ — Root: %@", @(window.windowLevel), window.rootViewController
     ];
     
     return cell;
@@ -293,10 +300,4 @@
     } 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

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 2/1/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Classes/ExplorerInterface/Tabs/FLEXTabList.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 2/1/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXTabList.h"
@@ -80,10 +80,10 @@
 
 - (void)closeTab:(UINavigationController *)tab {
     NSParameterAssert(tab);
+    NSParameterAssert([self.openTabs containsObject:tab]);
     NSInteger idx = [self.openTabs indexOfObject:tab];
-    if (idx != NSNotFound) {
-        [self closeTabAtIndex:idx];
-    }
+    
+    [self closeTabAtIndex:idx];
 }
 
 - (void)closeTabAtIndex:(NSInteger)idx {

Classes/ExplorerInterface/Tabs/FLEXTabsViewController.h

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 2/4/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXTableViewController.h"

Classes/ExplorerInterface/Tabs/FLEXTabsViewController.m

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 2/4/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
+//  Copyright © 2020 Flipboard. All rights reserved.
 //
 
 #import "FLEXTabsViewController.h"
@@ -42,6 +42,7 @@
     self.navigationController.hidesBarsOnSwipe = NO;
     self.tableView.allowsMultipleSelectionDuringEditing = YES;
     
+    [FLEXTabList.sharedList updateSnapshotForActiveTab];
     [self reloadData:NO];
 }
 
@@ -50,19 +51,6 @@
     [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
@@ -78,10 +66,6 @@
         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;
         }
     }
     
@@ -109,7 +93,7 @@
     self.toolbarItems = @[
         UIBarButtonItem.flex_fixedSpace,
         UIBarButtonItem.flex_flexibleSpace,
-        FLEXBarButtonItemSystem(Add, self, @selector(addTabButtonPressed:)),
+        FLEXBarButtonItemSystem(Add, self, @selector(addTabButtonPressed)),
         UIBarButtonItem.flex_flexibleSpace,
         FLEXBarButtonItemSystem(Edit, self, @selector(toggleEditing)),
     ];
@@ -121,12 +105,12 @@
 - (void)setupEditingBarItems {
     self.navigationItem.rightBarButtonItem = nil;
     self.toolbarItems = @[
-        [UIBarButtonItem flex_itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed:)],
+        [UIBarButtonItem itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed)],
         UIBarButtonItem.flex_flexibleSpace,
-        [UIBarButtonItem flex_disabledSystemItem:UIBarButtonSystemItemAdd],
+        [UIBarButtonItem disabledSystemItem:UIBarButtonSystemItemAdd],
         UIBarButtonItem.flex_flexibleSpace,
         // We use a non-system done item because we change its title dynamically
-        [UIBarButtonItem flex_doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
+        [UIBarButtonItem doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
     ];
     
     self.toolbarItems.firstObject.tintColor = FLEXColor.destructiveColor;
@@ -144,7 +128,6 @@
     return presenter;
 }
 
-
 #pragma mark Button Actions
 
 - (void)dismissAnimated {
@@ -193,7 +176,7 @@
     }
 }
 
-- (void)addTabButtonPressed:(UIBarButtonItem *)sender {
+- (void)addTabButtonPressed {
     if (FLEXBookmarkManager.bookmarks.count) {
         [FLEXAlert makeSheet:^(FLEXAlert *make) {
             make.title(@"New Tab");
@@ -208,7 +191,7 @@
                 ] animated:YES completion:nil];
             });
             make.button(@"Cancel").cancelStyle();
-        } showFrom:self source:sender];
+        } showFrom:self];
     } else {
         // No bookmarks, just open the main menu
         [self addTabAndDismiss:[FLEXNavigationController
@@ -224,7 +207,7 @@
     }];
 }
 
-- (void)closeAllButtonPressed:(UIBarButtonItem *)sender {
+- (void)closeAllButtonPressed {
     [FLEXAlert makeSheet:^(FLEXAlert *make) {
         NSInteger count = self.openTabs.count;
         NSString *title = FLEXPluralFormatString(count, @"Close %@ tabs", @"Close %@ tab");
@@ -233,7 +216,7 @@
             [self toggleEditing];
         });
         make.button(@"Cancel").cancelStyle();
-    } showFrom:self source:sender];
+    } showFrom:self];
 }
 
 - (void)closeAll {
@@ -250,7 +233,6 @@
     [self.tableView deleteRowsAtIndexPaths:allRows withRowAnimation:UITableViewRowAnimationAutomatic];
 }
 
-
 #pragma mark - Table View Data Source
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
@@ -266,7 +248,6 @@
     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;
@@ -281,7 +262,6 @@
     return cell;
 }
 
-
 #pragma mark - Table View Delegate
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {

Classes/FLEX-Categories.h

@@ -1,20 +0,0 @@
-//
-//  FLEX-Categories.h
-//  FLEX
-//
-//  Created by Tanner on 3/12/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
-//
-
-#import "UIBarButtonItem+FLEX.h"
-#import "CALayer+FLEX.h"
-#import "UIFont+FLEX.h"
-#import "UIGestureRecognizer+Blocks.h"
-#import "UIPasteboard+FLEX.h"
-#import "UIMenu+FLEX.h"
-#import "UITextField+Range.h"
-
-#import "NSObject+FLEX_Reflection.h"
-#import "NSArray+FLEX.h"
-#import "NSUserDefaults+FLEX.h"
-#import "NSTimer+FLEX.h"

Classes/FLEX-Core.h

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

Classes/FLEX-ObjectExploring.h

@@ -1,22 +0,0 @@
-//
-//  FLEX-ObjectExploring.h
-//  FLEX
-//
-//  Created by Tanner on 3/11/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
-//
-
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXObjectExplorerViewController.h"
-
-#import "FLEXObjectExplorer.h"
-
-#import "FLEXShortcut.h"
-#import "FLEXShortcutsSection.h"
-
-#import "FLEXCollectionContentSection.h"
-#import "FLEXColorPreviewSection.h"
-#import "FLEXDefaultsContentSection.h"
-#import "FLEXMetadataSection.h"
-#import "FLEXMutableListSection.h"
-#import "FLEXObjectInfoSection.h"

Classes/FLEX-Runtime.h

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

Classes/FLEX.h

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

Classes/FLEXManager.h

@@ -0,0 +1,38 @@
+//
+//  FLEXManager.h
+//  Flipboard
+//
+//  Created by Ryan Olson on 4/4/14.
+//  Copyright (c) 2014 Flipboard. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#if !FLEX_AT_LEAST_IOS13_SDK
+@class UIWindowScene;
+#endif
+
+@interface FLEXManager : NSObject
+
+@property (nonatomic, readonly, class) FLEXManager *sharedManager;
+
+@property (nonatomic, readonly) BOOL isHidden;
+
+- (void)showExplorer;
+- (void)hideExplorer;
+- (void)toggleExplorer;
+
+/// Use this to present the explorer in a specific scene when the one
+/// it chooses by default is not the one you wish to display it in.
+- (void)showExplorerFromScene:(UIWindowScene *)scene API_AVAILABLE(ios(13.0));
+
+#pragma mark - Misc
+
+/// 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;
+
+@end
+
+
+typedef UIViewController *(^FLEXCustomContentViewerFuture)(NSData *data);

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.h

@@ -1,28 +0,0 @@
-//
-//  FLEXDBQueryRowCell.h
-//  FLEX
-//
-//  Created by Peng Tao on 15/11/24.
-//  Copyright © 2015年 f. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@class FLEXDBQueryRowCell;
-
-extern NSString * const kFLEXDBQueryRowCellReuse;
-
-@protocol FLEXDBQueryRowCellLayoutSource <NSObject>
-
-- (CGFloat)dbQueryRowCell:(FLEXDBQueryRowCell *)dbQueryRowCell minXForColumn:(NSUInteger)column;
-- (CGFloat)dbQueryRowCell:(FLEXDBQueryRowCell *)dbQueryRowCell widthForColumn:(NSUInteger)column;
-
-@end
-
-@interface FLEXDBQueryRowCell : UITableViewCell
-
-/// An array of NSString, NSNumber, or NSData objects
-@property (nonatomic) NSArray *data;
-@property (nonatomic, weak) id<FLEXDBQueryRowCellLayoutSource> layoutSource;
-
-@end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.m

@@ -1,75 +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 height = self.contentView.frame.size.height;
-    
-    [self.labels flex_forEach:^(UILabel *label, NSUInteger i) {
-        CGFloat width = [self.layoutSource dbQueryRowCell:self widthForColumn:i];
-        CGFloat minX = [self.layoutSource dbQueryRowCell:self minXForColumn:i];
-        label.frame = CGRectMake(minX + 5, 0, (width - 10), height);
-    }];
-}
-
-@end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDatabaseManager.h

@@ -12,24 +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
-
-- (NSArray<NSString *> *)queryRowIDsInTable:(NSString *)tableName;
-- (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,11 +25,12 @@
 
 - (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 minWidthForContentCellInColumn:(NSInteger)column;
+- (CGFloat)multiColumnTableView:(FLEXMultiColumnTableView *)tableView widthForContentCellInColumn:(NSInteger)column;
 - (CGFloat)multiColumnTableView:(FLEXMultiColumnTableView *)tableView heightForContentCellInRow:(NSInteger)row;
 - (CGFloat)heightForTopHeaderInTableView:(FLEXMultiColumnTableView *)tableView;
 - (CGFloat)widthForLeftHeaderInTableView:(FLEXMultiColumnTableView *)tableView;
@@ -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,15 +7,11 @@
 //
 
 #import "FLEXMultiColumnTableView.h"
-#import "FLEXDBQueryRowCell.h"
+#import "FLEXTableContentCell.h"
 #import "FLEXTableLeftCell.h"
-#import "NSArray+FLEX.h"
-#import "FLEXColor.h"
 
-@interface FLEXMultiColumnTableView () <
-    UITableViewDataSource, UITableViewDelegate,
-    UIScrollViewDelegate, FLEXDBQueryRowCellLayoutSource
->
+@interface FLEXMultiColumnTableView ()
+<UITableViewDataSource, UITableViewDelegate,UIScrollViewDelegate, FLEXTableContentCellDelegate>
 
 @property (nonatomic) UIScrollView *contentScrollView;
 @property (nonatomic) UIScrollView *headerScrollView;
@@ -23,49 +19,35 @@
 @property (nonatomic) UITableView  *contentTableView;
 @property (nonatomic) UIView       *leftHeader;
 
-@property (nonatomic) NSArray<UIView *> *headerViews;
-
-/// \c NSNotFound if no column selected
-@property (nonatomic) NSInteger sortColumn;
-@property (nonatomic) FLEXTableColumnHeaderSortType sortType;
-
-@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) NSDictionary<NSString *, NSNumber *> *sortStatusDict;
+@property (nonatomic) NSArray *rowData;
 @end
 
 static const CGFloat kColumnMargin = 1;
 
 @implementation FLEXMultiColumnTableView
 
-#pragma mark - Initialization
 
 - (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)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 topheaderHeight = [self topHeaderHeight];
+    CGFloat leftHeaderWidth = [self leftHeaderWidth];
     CGFloat topInsets = 0.f;
 
     if (@available (iOS 11.0, *)) {
@@ -73,45 +55,46 @@ static const CGFloat kColumnMargin = 1;
     }
     
     CGFloat contentWidth = 0.0;
-    NSInteger columnsCount = self.numberOfColumns;
-    for (int i = 0; i < columnsCount; i++) {
-        contentWidth += CGRectGetWidth(self.headerViews[i].bounds);
+    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 + topInsets, leftHeaderWidth, height - topheaderHeight - topInsets);
+    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] , height - topheaderHeight - topInsets);
+    self.contentScrollView.frame       = CGRectMake(leftHeaderWidth, topheaderHeight + topInsets, width - leftHeaderWidth, height - topheaderHeight - topInsets);
     self.contentScrollView.contentSize = self.contentTableView.frame.size;
+    self.leftHeader.frame              = CGRectMake(0, topInsets, [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;
+    UIScrollView *headerScrollView = [UIScrollView new];
+    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];
     scrollView.bounces       = NO;
     scrollView.delegate      = self;
@@ -120,94 +103,82 @@ static const CGFloat kColumnMargin = 1;
     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];
+    UITableView *leftTableView = [UITableView new];
     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 new];
+    leftHeader.backgroundColor = [UIColor colorWithWhite:0.950 alpha:0.668];
     self.leftHeader            = leftHeader;
     [self addSubview:leftHeader];
+    
 }
 
 
 #pragma mark - Data
 
-- (void)reloadData {
-    [self loadHeaderData];
-    [self loadLeftViewData];
-    [self loadContentData];
-}
-
 - (void)loadHeaderData {
-    // Remove existing headers, if any
-    for (UIView *subview in self.headerViews) {
+    NSArray<UIView *> *subviews = self.headerScrollView.subviews;
+    
+    for (UIView *subview in subviews) {
         [subview removeFromSuperview];
     }
-    
-    __block CGFloat xOffset = 0;
-    
-    self.headerViews = [NSArray flex_forEachUpTo:self.numberOfColumns map:^id(NSUInteger column) {
-        FLEXTableColumnHeader *header = [FLEXTableColumnHeader new];
-        header.titleLabel.text = [self columnTitle:column];
+    CGFloat x = 0.0;
+    CGFloat w = 0.0;
+    for (int i = 0; i < [self numberOfColumns] ; i++) {
+        w = [self contentWidthForColumn:i] + [self columnMargin];
         
-        CGSize fittingSize = CGSizeMake(CGFLOAT_MAX, self.topHeaderHeight - 1);
-        CGFloat width = self.columnMargin + MAX(
-            [self minContentWidthForColumn:column],
-            [header sizeThatFits:fittingSize].width
-        );
-        header.frame = CGRectMake(xOffset, 0, width, self.topHeaderHeight - 1);
-
-        if (column == self.sortColumn) {
-            header.sortType = self.sortType;
-        }
+        FLEXTableColumnHeader *cell = [[FLEXTableColumnHeader alloc] initWithFrame:CGRectMake(x, 0, w, [self topHeaderHeight] - 1)];
+        cell.label.text = [self columnTitleForColumn:i];
+        [self.headerScrollView addSubview:cell];
         
-        // Header tap gesture
-        UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc]
-            initWithTarget:self action:@selector(contentHeaderTap:)
-        ];
-        [header addGestureRecognizer:gesture];
-        header.userInteractionEnabled = YES;
+        FLEXTableColumnHeaderSortType type = [self.sortStatusDict[[self columnTitleForColumn:i]] integerValue];
+        [cell changeSortStatusWithType:type];
         
-        xOffset += width;
-        [self.headerScrollView addSubview:header];
-        return header;
-    }];
+        UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc] initWithTarget:self
+                                                                                  action:@selector(contentHeaderTap:)];
+        [cell addGestureRecognizer:gesture];
+        cell.userInteractionEnabled = YES;
+        
+        x = x + w;
+    }
 }
 
 - (void)contentHeaderTap:(UIGestureRecognizer *)gesture {
-    NSInteger newSortColumn = [self.headerViews indexOfObject:gesture.view];
-    FLEXTableColumnHeaderSortType newType = FLEXNextTableColumnHeaderSortType(self.sortType);
+    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.headerViews[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.headerViews[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 {
@@ -218,30 +189,39 @@ static const CGFloat kColumnMargin = 1;
     [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 {
-        FLEXDBQueryRowCell *cell = [tableView
-            dequeueReusableCellWithIdentifier:kFLEXDBQueryRowCellReuse forIndexPath:indexPath
-        ];
-        
+        FLEXTableLeftCell *cell          = [FLEXTableLeftCell cellWithTableView:tableView];
         cell.contentView.backgroundColor = backgroundColor;
-        cell.data = [self.dataSource contentForRow:indexPath.row];
-        cell.layoutSource = self;
-        NSAssert(cell.data.count == self.numberOfColumns, @"Count of data provided was incorrect");
+        cell.titlelabel.text             = [self rowTitleForRow:indexPath.row];
         return cell;
     }
 }
@@ -250,11 +230,12 @@ static const CGFloat kColumnMargin = 1;
     return [self.dataSource numberOfRowsInTableView:self];
 }
 
+
 - (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 {
     if (scrollView == self.contentScrollView) {
         self.headerScrollView.contentOffset = scrollView.contentOffset;
@@ -270,34 +251,23 @@ static const CGFloat kColumnMargin = 1;
     }
 }
 
-
+#pragma mark -
 #pragma mark UITableView Delegate
 
 - (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 FLEXDBQueryRowCellLayoutSource
-
-- (CGFloat)dbQueryRowCell:(FLEXDBQueryRowCell *)dbQueryRowCell minXForColumn:(NSUInteger)column {
-    return CGRectGetMinX(self.headerViews[column].frame);
-}
-
-- (CGFloat)dbQueryRowCell:(FLEXDBQueryRowCell *)dbQueryRowCell widthForColumn:(NSUInteger)column {
-    return CGRectGetWidth(self.headerViews[column].bounds);
-}
-
-
+#pragma mark -
 #pragma mark DataSource Accessor
 
 - (NSInteger)numberOfRows {
@@ -308,16 +278,20 @@ static const CGFloat kColumnMargin = 1;
     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)minContentWidthForColumn:(NSInteger)column {
-    return [self.dataSource multiColumnTableView:self minWidthForContentCellInColumn: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 {
@@ -336,4 +310,9 @@ static const CGFloat kColumnMargin = 1;
     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,92 @@
 @interface FLEXRealmDatabaseManager ()
 
 @property (nonatomic, copy) NSString *path;
-@property (nonatomic) RLMRealm *realm;
+@property (nonatomic) 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 {
+    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];
     [(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 FLEX Team. 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

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.m

@@ -1,53 +0,0 @@
-//
-//  FLEXSQLResult.m
-//  FLEX
-//
-//  Created by Tanner on 3/3/20.
-//  Copyright © 2020 FLEX Team. All rights reserved.
-//
-
-#import "FLEXSQLResult.h"
-#import "NSArray+FLEX.h"
-
-@implementation FLEXSQLResult
-@synthesize keyedRows = _keyedRows;
-
-+ (instancetype)message:(NSString *)message {
-    return [[self alloc] initWithMessage:message columns:nil rows:nil];
-}
-
-+ (instancetype)error:(NSString *)message {
-    FLEXSQLResult *result = [self message:message];
-    result->_isError = YES;
-    return result;
-}
-
-+ (instancetype)columns:(NSArray<NSString *> *)columnNames rows:(NSArray<NSArray<NSString *> *> *)rowData {
-    return [[self alloc] initWithMessage:nil columns:columnNames rows:rowData];
-}
-
-- (instancetype)initWithMessage:(NSString *)message columns:(NSArray<NSString *> *)columns rows:(NSArray<NSArray<NSString *> *> *)rows {
-    NSParameterAssert(message || (columns && rows));
-    NSParameterAssert(rows.count == 0 || columns.count == rows.firstObject.count);
-    
-    self = [super init];
-    if (self) {
-        _message = message;
-        _columns = columns;
-        _rows = rows;
-    }
-    
-    return self;
-}
-
-- (NSArray<NSDictionary<NSString *,id> *> *)keyedRows {
-    if (!_keyedRows) {
-        _keyedRows = [self.rows flex_mapped:^id(NSArray<NSString *> *row, NSUInteger idx) {
-            return [NSDictionary dictionaryWithObjects:row forKeys:self.columns];
-        }];
-    }
-    
-    return _keyedRows;
-}
-
-@end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.h

@@ -13,20 +13,7 @@
 
 #import <Foundation/Foundation.h>
 #import "FLEXDatabaseManager.h"
-#import "FLEXSQLResult.h"
 
 @interface FLEXSQLiteDatabaseManager : NSObject <FLEXDatabaseManager>
 
-/// Contains the result of the last operation, which may be an error
-@property (nonatomic, readonly) FLEXSQLResult *lastResult;
-/// Calls into \c sqlite3_last_insert_rowid()
-@property (nonatomic, readonly) NSInteger lastRowID;
-
-/// Given a statement like 'SELECT * from @table where @col = @val' and arguments
-/// like { @"table": @"Album", @"col": @"year", @"val" @1 } this method will
-/// invoke the statement and properly bind the given arguments to the statement.
-///
-/// You may pass NSStrings, NSData, NSNumbers, or NSNulls as values.
-- (FLEXSQLResult *)executeStatement:(NSString *)statement arguments:(NSDictionary<NSString *, id> *)args;
-
 @end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m

@@ -8,74 +8,60 @@
 
 #import "FLEXSQLiteDatabaseManager.h"
 #import "FLEXManager.h"
-#import "NSArray+FLEX.h"
-#import "FLEXRuntimeConstants.h"
 #import <sqlite3.h>
 
-#define kQuery(name, str) static NSString * const QUERY_##name = str
 
-kQuery(TABLENAMES, @"SELECT name FROM sqlite_master WHERE type='table' ORDER BY name");
-kQuery(ROWIDS, @"SELECT rowid FROM \"%@\" ORDER BY rowid ASC");
+static NSString *const QUERY_TABLENAMES_SQL = @"SELECT name FROM sqlite_master WHERE type='table' ORDER BY name";
 
-@interface FLEXSQLiteDatabaseManager ()
-@property (nonatomic) sqlite3 *db;
-@property (nonatomic, copy) NSString *path;
-@end
-
-@implementation FLEXSQLiteDatabaseManager
-
-#pragma mark - FLEXDatabaseManager
-
-+ (instancetype)managerForDatabase:(NSString *)path {
-    return [[self alloc] initWithPath:path];
+@implementation FLEXSQLiteDatabaseManager {
+    sqlite3* _db;
+    NSString* _databasePath;
 }
 
-- (instancetype)initWithPath:(NSString *)path {
+- (instancetype)initWithPath:(NSString*)aPath {
     self = [super init];
-    if (self) {
-        self.path = path;
-    }
     
+    if (self) {
+        _databasePath = [aPath copy];
+    }
     return self;
 }
 
-- (void)dealloc {
-    [self close];
-}
-
 - (BOOL)open {
-    if (self.db) {
+    if (_db) {
         return YES;
     }
-    
-    int err = sqlite3_open(self.path.UTF8String, &_db);
+    int err = sqlite3_open(_databasePath.UTF8String, &_db);
 
 #if SQLITE_HAS_CODEC
-    NSString *defaultSqliteDatabasePassword = FLEXManager.sharedManager.defaultSqliteDatabasePassword;
+    NSString *defaultSqliteDatabasePassword = [FLEXManager sharedManager].defaultSqliteDatabasePassword;
+
     if (defaultSqliteDatabasePassword) {
         const char *key = defaultSqliteDatabasePassword.UTF8String;
+
         sqlite3_key(_db, key, (int)strlen(key));
     }
 #endif
 
-    if (err != SQLITE_OK) {
-        return [self storeErrorForLastTask:@"Open"];
+    if(err != SQLITE_OK) {
+        NSLog(@"error opening!: %d", err);
+        return NO;
     }
-    
     return YES;
 }
-    
+
 - (BOOL)close {
-    if (!self.db) {
+    if (!_db) {
         return YES;
     }
     
     int  rc;
-    BOOL retry, triedFinalizingOpenStatements = NO;
+    BOOL retry;
+    BOOL triedFinalizingOpenStatements = NO;
     
     do {
-        retry = NO;
-        rc    = sqlite3_close(_db);
+        retry   = NO;
+        rc      = sqlite3_close(_db);
         if (SQLITE_BUSY == rc || SQLITE_LOCKED == rc) {
             if (!triedFinalizingOpenStatements) {
                 triedFinalizingOpenStatements = YES;
@@ -86,244 +72,126 @@ kQuery(ROWIDS, @"SELECT rowid FROM \"%@\" ORDER BY rowid ASC");
                     retry = YES;
                 }
             }
-        } else if (SQLITE_OK != rc) {
-            [self storeErrorForLastTask:@"Close"];
-            self.db = nil;
-            return NO;
         }
-    } while (retry);
+        else if (SQLITE_OK != rc) {
+            NSLog(@"error closing!: %d", rc);
+        }
+    }
+    while (retry);
     
-    self.db = nil;
+    _db = nil;
     return YES;
 }
 
-- (NSInteger)lastRowID {
-    return (NSInteger)sqlite3_last_insert_rowid(self.db);
+
+- (NSArray<NSDictionary<NSString *, id> *> *)queryAllTables {
+    return [self executeQuery:QUERY_TABLENAMES_SQL];
 }
 
-- (NSArray<NSString *> *)queryAllTables {
-    return [[self executeStatement:QUERY_TABLENAMES].rows flex_mapped:^id(NSArray *table, NSUInteger idx) {
-        return table.firstObject;
-    }] ?: @[];
-}
-
-- (NSArray<NSString *> *)queryAllColumnsOfTable:(NSString *)tableName {
+- (NSArray<NSString *> *)queryAllColumnsWithTableName:(NSString *)tableName {
     NSString *sql = [NSString stringWithFormat:@"PRAGMA table_info('%@')",tableName];
-    FLEXSQLResult *results = [self executeStatement:sql];
-    
-    // https://github.com/FLEXTool/FLEX/issues/554
-    if (!results.keyedRows.count) {
-        sql = [NSString stringWithFormat:@"SELECT * FROM pragma_table_info('%@')", tableName];
-        results = [self executeStatement:sql];
-        
-        // Fallback to empty query
-        if (!results.keyedRows.count) {
-            sql = [NSString stringWithFormat:@"SELECT * FROM \"%@\" where 0=1", tableName];
-            return [self executeStatement:sql].columns ?: @[];
-        }
+    NSArray<NSDictionary<NSString *, id> *> *resultArray =  [self executeQuery:sql];
+    NSMutableArray<NSString *> *array = [NSMutableArray array];
+    for (NSDictionary<NSString *, id> *dict in resultArray) {
+        NSString *columnName = (NSString *)dict[@"name"] ?: @"";
+        [array addObject:columnName];
     }
-    
-    return [results.keyedRows flex_mapped:^id(NSDictionary *column, NSUInteger idx) {
-        return column[@"name"];
-    }] ?: @[];
+    return array;
 }
 
-- (NSArray<NSArray *> *)queryAllDataInTable:(NSString *)tableName {
-    NSString *command = [NSString stringWithFormat:@"SELECT * FROM \"%@\"", tableName];
-    return [self executeStatement:command].rows ?: @[];
+- (NSArray<NSDictionary<NSString *, id> *> *)queryAllDataWithTableName:(NSString *)tableName {
+    NSString *sql = [NSString stringWithFormat:@"SELECT * FROM %@",tableName];
+    return [self executeQuery:sql];
 }
 
-- (NSArray<NSString *> *)queryRowIDsInTable:(NSString *)tableName {
-    NSString *command = [NSString stringWithFormat:QUERY_ROWIDS, tableName];
-    NSArray<NSArray<NSString *> *> *data = [self executeStatement:command].rows ?: @[];
-    
-    return [data flex_mapped:^id(NSArray<NSString *> *obj, NSUInteger idx) {
-        return obj.firstObject;
-    }];
-}
-
-- (FLEXSQLResult *)executeStatement:(NSString *)sql {
-    return [self executeStatement:sql arguments:nil];
-}
-
-- (FLEXSQLResult *)executeStatement:(NSString *)sql arguments:(NSDictionary *)args {
-    [self open];
-    
-    FLEXSQLResult *result = nil;
-    
-    sqlite3_stmt *pstmt;
-    int status;
-    if ((status = sqlite3_prepare_v2(_db, sql.UTF8String, -1, &pstmt, 0)) == SQLITE_OK) {
-        NSMutableArray<NSArray *> *rows = [NSMutableArray new];
-        
-        // Bind parameters, if any
-        if (![self bindParameters:args toStatement:pstmt]) {
-            return self.lastResult;
-        }
-        
-        // Grab columns (columnCount will be 0 for insert/update/delete) 
-        int columnCount = sqlite3_column_count(pstmt);
-        NSArray<NSString *> *columns = [NSArray flex_forEachUpTo:columnCount map:^id(NSUInteger i) {
-            return @(sqlite3_column_name(pstmt, (int)i));
-        }];
-        
-        // Execute statement
-        while ((status = sqlite3_step(pstmt)) == SQLITE_ROW) {
-            // Grab rows if this is a selection query
-            int dataCount = sqlite3_data_count(pstmt);
-            if (dataCount > 0) {
-                [rows addObject:[NSArray flex_forEachUpTo:columnCount map:^id(NSUInteger i) {
-                    return [self objectForColumnIndex:(int)i stmt:pstmt];
-                }]];
-            }
-        }
-        
-        if (status == SQLITE_DONE) {
-            // columnCount will be 0 for insert/update/delete
-            if (rows.count || columnCount > 0) {
-                // We executed a SELECT query
-                result = _lastResult = [FLEXSQLResult columns:columns rows:rows];
-            } else {
-                // We executed a query like INSERT, UDPATE, or DELETE
-                int rowsAffected = sqlite3_changes(_db);
-                NSString *message = [NSString stringWithFormat:@"%d row(s) affected", rowsAffected];
-                result = _lastResult = [FLEXSQLResult message:message];
-            }
-        } else {
-            // An error occured executing the query
-            result = _lastResult = [self errorResult:@"Execution"];
-        }
-    } else {
-        // An error occurred creating the prepared statement
-        result = _lastResult = [self errorResult:@"Prepared statement"];
-    }
-    
-    sqlite3_finalize(pstmt);
-    return result;
-}
-
-
+#pragma mark -
 #pragma mark - Private
 
-/// @return YES on success, NO if an error was encountered and stored in \c lastResult
-- (BOOL)bindParameters:(NSDictionary *)args toStatement:(sqlite3_stmt *)pstmt {
-    for (NSString *param in args.allKeys) {
-        int status = SQLITE_OK, idx = sqlite3_bind_parameter_index(pstmt, param.UTF8String);
-        id value = args[param];
-        
-        if (idx == 0) {
-            // No parameter matching that arg
-            @throw NSInternalInconsistencyException;
-        }
-        
-        // Null
-        if ([value isKindOfClass:[NSNull class]]) {
-            status = sqlite3_bind_null(pstmt, idx);
-        }
-        // String params
-        else if ([value isKindOfClass:[NSString class]]) {
-            const char *str = [value UTF8String];
-            status = sqlite3_bind_text(pstmt, idx, str, (int)strlen(str), SQLITE_TRANSIENT);
-        }
-        // Data params
-        else if ([value isKindOfClass:[NSData class]]) {
-            const void *blob = [value bytes];
-            status = sqlite3_bind_blob64(pstmt, idx, blob, [value length], SQLITE_TRANSIENT);
-        }
-        // Primitive params
-        else if ([value isKindOfClass:[NSNumber class]]) {
-            FLEXTypeEncoding type = [value objCType][0];
-            switch (type) {
-                case FLEXTypeEncodingCBool:
-                case FLEXTypeEncodingChar:
-                case FLEXTypeEncodingUnsignedChar:
-                case FLEXTypeEncodingShort:
-                case FLEXTypeEncodingUnsignedShort:
-                case FLEXTypeEncodingInt:
-                case FLEXTypeEncodingUnsignedInt:
-                case FLEXTypeEncodingLong:
-                case FLEXTypeEncodingUnsignedLong:
-                case FLEXTypeEncodingLongLong:
-                case FLEXTypeEncodingUnsignedLongLong:
-                    status = sqlite3_bind_int64(pstmt, idx, (sqlite3_int64)[value longValue]);
-                    break;
+- (NSArray<NSDictionary<NSString *, id> *> *)executeQuery:(NSString *)sql {
+    [self open];
+    NSMutableArray<NSDictionary<NSString *, id> *> *resultArray = [NSMutableArray array];
+    sqlite3_stmt *pstmt;
+    if (sqlite3_prepare_v2(_db, sql.UTF8String, -1, &pstmt, 0) == SQLITE_OK) {
+        while (sqlite3_step(pstmt) == SQLITE_ROW) {
+            NSUInteger num_cols = (NSUInteger)sqlite3_data_count(pstmt);
+            if (num_cols > 0) {
+                NSMutableDictionary<NSString *, id> *dict = [NSMutableDictionary dictionaryWithCapacity:num_cols];
                 
-                case FLEXTypeEncodingFloat:
-                case FLEXTypeEncodingDouble:
-                    status = sqlite3_bind_double(pstmt, idx, [value doubleValue]);
-                    break;
+                int columnCount = sqlite3_column_count(pstmt);
+                
+                int columnIdx = 0;
+                for (columnIdx = 0; columnIdx < columnCount; columnIdx++) {
                     
-                default:
-                    @throw NSInternalInconsistencyException;
-                    break;
+                    NSString *columnName = [NSString stringWithUTF8String:sqlite3_column_name(pstmt, columnIdx)];
+                    id objectValue = [self objectForColumnIndex:columnIdx stmt:pstmt];
+                    [dict setObject:objectValue forKey:columnName];
+                }
+                [resultArray addObject:dict];
             }
         }
-        // Unsupported type
-        else {
-            @throw NSInternalInconsistencyException;
-        }
-        
-        if (status != SQLITE_OK) {
-            return [self storeErrorForLastTask:
-                [NSString stringWithFormat:@"Binding param named '%@'", param]
-            ];
-        }
     }
-    
-    return YES;
+    [self close];
+    return resultArray;
 }
 
-- (BOOL)storeErrorForLastTask:(NSString *)action {
-    _lastResult = [self errorResult:action];
-    return NO;
-}
-
-- (FLEXSQLResult *)errorResult:(NSString *)description {
-    const char *error = sqlite3_errmsg(_db);
-    NSString *message = error ? @(error) : [NSString
-        stringWithFormat:@"(%@: empty error)", description
-    ];
-    
-    return [FLEXSQLResult error:message];
-}
 
 - (id)objectForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt*)stmt {
     int columnType = sqlite3_column_type(stmt, columnIdx);
     
-    switch (columnType) {
-        case SQLITE_INTEGER:
-            return @(sqlite3_column_int64(stmt, columnIdx)).stringValue;
-        case SQLITE_FLOAT:
-            return  @(sqlite3_column_double(stmt, columnIdx)).stringValue;
-        case SQLITE_BLOB:
-            return [NSString stringWithFormat:@"Data (%@ bytes)",
-                @([self dataForColumnIndex:columnIdx stmt:stmt].length)
-            ];
-            
-        default:
-            // Default to a string for everything else
-            return [self stringForColumnIndex:columnIdx stmt:stmt] ?: NSNull.null;
+    id returnValue = nil;
+    
+    if (columnType == SQLITE_INTEGER) {
+        returnValue =  [NSNumber numberWithLongLong:sqlite3_column_int64(stmt, columnIdx)];
     }
-}
-                
-- (NSString *)stringForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt *)stmt {
-    if (sqlite3_column_type(stmt, columnIdx) == SQLITE_NULL || columnIdx < 0) {
-        return nil;
+    else if (columnType == SQLITE_FLOAT) {
+        returnValue = [NSNumber numberWithDouble:sqlite3_column_double(stmt, columnIdx)];
+    }
+    else if (columnType == SQLITE_BLOB) {
+        returnValue = [self dataForColumnIndex:columnIdx stmt:stmt];
+    }
+    else {
+        //default to a string for everything else
+        returnValue = [self stringForColumnIndex:columnIdx stmt:stmt];
     }
     
-    const char *text = (const char *)sqlite3_column_text(stmt, columnIdx);
-    return text ? @(text) : nil;
+    if (returnValue == nil) {
+        returnValue = [NSNull null];
+    }
+    
+    return returnValue;
 }
 
-- (NSData *)dataForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt *)stmt {
+- (NSString *)stringForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt *)stmt {
+    
     if (sqlite3_column_type(stmt, columnIdx) == SQLITE_NULL || (columnIdx < 0)) {
         return nil;
     }
     
-    const void *blob = sqlite3_column_blob(stmt, columnIdx);
-    NSInteger size = (NSInteger)sqlite3_column_bytes(stmt, columnIdx);
+    const char *c = (const char *)sqlite3_column_text(stmt, columnIdx);
     
-    return blob ? [NSData dataWithBytes:blob length:size] : nil;
+    if (!c) {
+        // null row.
+        return nil;
+    }
+    
+    return [NSString stringWithUTF8String:c];
 }
 
+- (NSData *)dataForColumnIndex:(int)columnIdx stmt:(sqlite3_stmt *)stmt{
+    
+    if (sqlite3_column_type(stmt, columnIdx) == SQLITE_NULL || (columnIdx < 0)) {
+        return nil;
+    }
+    
+    const char *dataBuffer = sqlite3_column_blob(stmt, columnIdx);
+    int dataSize = sqlite3_column_bytes(stmt, columnIdx);
+    
+    if (dataBuffer == NULL) {
+        return nil;
+    }
+    
+    return [NSData dataWithBytes:(const void *)dataBuffer length:(NSUInteger)dataSize];
+}
+
+
 @end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableColumnHeader.h

@@ -14,25 +14,11 @@ typedef NS_ENUM(NSUInteger, FLEXTableColumnHeaderSortType) {
     FLEXTableColumnHeaderSortTypeDesc,
 };
 
-NS_INLINE FLEXTableColumnHeaderSortType FLEXNextTableColumnHeaderSortType(
-    FLEXTableColumnHeaderSortType current) {
-    switch (current) {
-        case FLEXTableColumnHeaderSortTypeAsc:
-            return FLEXTableColumnHeaderSortTypeDesc;
-        case FLEXTableColumnHeaderSortTypeNone:
-        case FLEXTableColumnHeaderSortTypeDesc:
-            return FLEXTableColumnHeaderSortTypeAsc;
-    }
-    
-    return FLEXTableColumnHeaderSortTypeNone;
-}
-
 @interface FLEXTableColumnHeader : UIView
 
-@property (nonatomic) NSInteger index;
-@property (nonatomic, readonly) UILabel *titleLabel;
+@property (nonatomic) UILabel *label;
 
-@property (nonatomic) FLEXTableColumnHeaderSortType sortType;
+- (void)changeSortStatusWithType:(FLEXTableColumnHeaderSortType)type;
 
 @end
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableColumnHeader.m

@@ -7,44 +7,36 @@
 //
 
 #import "FLEXTableColumnHeader.h"
-#import "FLEXColor.h"
-#import "UIFont+FLEX.h"
-#import "FLEXUtility.h"
 
-static const CGFloat kMargin = 5;
-static const CGFloat kArrowWidth = 20;
+@implementation FLEXTableColumnHeader {
+    UILabel *_arrowLabel;
+}
 
-@interface FLEXTableColumnHeader ()
-@property (nonatomic, readonly) UILabel *arrowLabel;
-@property (nonatomic, readonly) UIView *lineView;
-@end
-
-@implementation FLEXTableColumnHeader
 
 - (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        self.backgroundColor = FLEXColor.secondaryBackgroundColor;
+        self.backgroundColor = UIColor.whiteColor;
         
-        _titleLabel = [UILabel new];
-        _titleLabel.font = UIFont.flex_defaultTableCellFont;
-        [self addSubview:_titleLabel];
+        UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(5, 0, frame.size.width - 25, frame.size.height)];
+        label.font = [UIFont systemFontOfSize:13.0];
+        [self addSubview:label];
+        self.label = label;
         
-        _arrowLabel = [UILabel new];
-        _arrowLabel.font = UIFont.flex_defaultTableCellFont;
+        
+        _arrowLabel = [[UILabel alloc] initWithFrame:CGRectMake(frame.size.width - 20, 0, 20, frame.size.height)];
+        _arrowLabel.font = [UIFont systemFontOfSize:13.0];
         [self addSubview:_arrowLabel];
         
-        _lineView = [UIView new];
-        _lineView.backgroundColor = FLEXColor.hairlineColor;
-        [self addSubview:_lineView];
+        UIView *line = [[UIView alloc] initWithFrame:CGRectMake(frame.size.width - 1, 2, 1, frame.size.height - 4)];
+        line.backgroundColor = [UIColor colorWithWhite:0.803 alpha:0.850];
+        [self addSubview:line];
         
     }
     return self;
 }
 
-- (void)setSortType:(FLEXTableColumnHeaderSortType)type {
-    _sortType = type;
-    
+- (void)changeSortStatusWithType:(FLEXTableColumnHeaderSortType)type {
     switch (type) {
         case FLEXTableColumnHeaderSortTypeNone:
             _arrowLabel.text = @"";
@@ -58,21 +50,8 @@ static const CGFloat kArrowWidth = 20;
     }
 }
 
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    
-    CGSize size = self.frame.size;
-    
-    self.titleLabel.frame = CGRectMake(kMargin, 0, size.width - kArrowWidth - kMargin, size.height);
-    self.arrowLabel.frame = CGRectMake(size.width - kArrowWidth, 0, kArrowWidth, size.height);
-    self.lineView.frame = CGRectMake(size.width - 1, 2, FLEXPointsToPixels(1), size.height - 4);
-}
 
-- (CGSize)sizeThatFits:(CGSize)size {
-    CGFloat margins = kArrowWidth - 2 * kMargin;
-    size = CGSizeMake(size.width - margins, size.height);
-    CGFloat width = [_titleLabel sizeThatFits:size].width + margins;
-    return CGSizeMake(width, size.height);
-}
+
+
 
 @end

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentCell.h

@@ -0,0 +1,27 @@
+//
+//  FLEXTableContentCell.h
+//  FLEX
+//
+//  Created by Peng Tao on 15/11/24.
+//  Copyright © 2015年 f. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class FLEXTableContentCell;
+@protocol FLEXTableContentCellDelegate <NSObject>
+
+@optional
+- (void)tableContentCell:(FLEXTableContentCell *)tableView labelDidTapWithText:(NSString *)text;
+
+@end
+
+@interface FLEXTableContentCell : UITableViewCell
+
+@property (nonatomic) NSArray<UILabel *> *labels;
+
+@property (nonatomic, weak) id<FLEXTableContentCellDelegate> delegate;
+
++ (instancetype)cellWithTableView:(UITableView *)tableView columnNumber:(NSInteger)number;
+
+@end