Bump version and update URLs

Fix crash for unsupported property type encodings
Add FLEXMITMDataSource, refactor MITMVC
2021-10-06 19:11:01 -05:00 · 2021-10-06 19:11:01 -05:00 · 2021-10-06 18:18:54 -05:00 · 2021-10-06 18:18:54 -05:00 · 2021-10-06 18:18:54 -05:00 · 2021-10-06 18:18:54 -05:00
337 changed files with 6561 additions and 2161 deletions
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [NSExceptional]
@@ -0,0 +1,27 @@
+---
+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.
@@ -0,0 +1,10 @@
+---
+name: Feature request
+about: Suggest a new feature for FLEX
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 3/9/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

 #import "FLEXTableViewController.h"
@@ -25,7 +25,7 @@
@property (nonatomic, copy) NSArray<FLEXTableViewSection *> *allSections;

 /// This computed property should filter \c allSections for assignment to \c sections
-@property (nonatomic, readonly) NSArray<FLEXTableViewSection *> *nonemptySections;
+@property (nonatomic, readonly, copy) NSArray<FLEXTableViewSection *> *nonemptySections;

 /// This should be able to re-initialize \c allSections
 - (NSArray<FLEXTableViewSection *> *)makeSections;
@@ -80,7 +80,7 @@
 /// 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) NSArray<FLEXTableViewSection *> *nonemptySections;
+@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.
@@ -3,12 +3,13 @@
 //  FLEX
 //
 //  Created by Tanner on 3/9/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

 #import "FLEXFilteringTableViewController.h"
 #import "FLEXTableViewSection.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
+#import "FLEXMacros.h"

@interface FLEXFilteringTableViewController ()

@@ -111,9 +112,18 @@

 - (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

@@ -178,8 +188,6 @@
    [self.filterDelegate.sections[indexPath.section] didPressInfoButtonAction:indexPath.row](self);
 }

-#if FLEX_AT_LEAST_IOS13_SDK
-
 - (UIContextMenuConfiguration *)tableView:(UITableView *)tableView contextMenuConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath point:(CGPoint)point __IOS_AVAILABLE(13.0) {
    FLEXTableViewSection *section = self.filterDelegate.sections[indexPath.section];
    NSString *title = [section menuTitleForRow:indexPath.row];
@@ -198,6 +206,4 @@
    return nil;
 }

-#endif
-
@end
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 1/30/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

 #import "FLEXNavigationController.h"
@@ -20,6 +20,7 @@
@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
@@ -36,10 +37,13 @@
    self.waitingToAddTab = YES;
    
    // Add gesture to reveal toolbar if hidden
-    self.navigationBar.userInteractionEnabled = YES;
-    [self.navigationBar addGestureRecognizer:[[UITapGestureRecognizer alloc]
+    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, *)) {
@@ -96,6 +100,10 @@
    [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
 }

+- (BOOL)canShowToolbar {
+    return self.topViewController.toolbarItems.count;
+}
+
 - (void)addNavigationBarItemsToViewController:(UINavigationItem *)navigationItem {
    if (!self.presentingViewController) {
        return;
@@ -145,8 +153,15 @@
 }
     
 - (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) {
+        if (self.toolbarHidden && self.canShowToolbar) {
            [self setToolbarHidden:NO animated:YES];
        }
    }
@@ -162,7 +177,7 @@

 - (void)_gestureRecognizedInteractiveHide:(UIPanGestureRecognizer *)sender {
    if (sender.state == UIGestureRecognizerStateRecognized) {
-        BOOL show = self.topViewController.toolbarItems.count;
+        BOOL show = self.canShowToolbar;
        CGFloat yTranslation = [sender translationInView:self.view].y;
        CGFloat yVelocity = [sender velocityInView:self.view].y;
        if (yVelocity > 2000) {
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 7/5/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

 #import <UIKit/UIKit.h>
@@ -67,6 +67,10 @@ 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.
 ///
@@ -89,7 +93,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
@@ -102,11 +106,11 @@ 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) NSString *searchText;
+@property (nonatomic, readonly, copy) NSString *searchText;

 /// A totally optional delegate to forward search results updater calls to.
-/// If a delegate is set, updateSearchResults: is not called on this view controller. 
-@property (nonatomic, weak    ) id<FLEXSearchResultsUpdating> searchResultsUpdater;
+/// 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;
@@ -140,7 +144,7 @@ extern CGFloat const kFLEXDebounceForExpensiveIO;
@property (nonatomic) BOOL showsShareToolbarItem;
 /// Called when the share button is pressed.
 /// Default implementation does nothign. Subclasses may override.
- (void)shareButtonPressed;
+- (void)shareButtonPressed:(UIBarButtonItem *)sender;

 /// Subclasses may call this to opt-out of all toolbar related behavior.
 /// This is necessary if you want to disable the gesture which reveals the toolbar.
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 7/5/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

 #import "FLEXTableViewController.h"
@@ -50,15 +50,12 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
 #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;
 }

@@ -106,11 +103,9 @@ 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 {
@@ -124,18 +119,15 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
    _showsCarousel = showsCarousel;
    
    if (showsCarousel) {
-        _carousel = ({
-            __weak __typeof(self) weakSelf = self;
-
+        _carousel = ({ weakify(self)
+            
            FLEXScopeCarousel *carousel = [FLEXScopeCarousel new];
-            carousel.selectedIndexChangedAction = ^(NSInteger idx) {
-                __typeof(self) self = weakSelf;
+            carousel.selectedIndexChangedAction = ^(NSInteger idx) { strongify(self);
                [self.searchDelegate updateSearchResults:self.searchText];
            };

            // UITableView won't update the header size unless you reset the header view
-            [carousel registerBlockForDynamicTypeChanges:^(FLEXScopeCarousel *carousel) {
-                __typeof(self) self = weakSelf;
+            [carousel registerBlockForDynamicTypeChanges:^(FLEXScopeCarousel *_) { strongify(self);
                [self layoutTableHeaderIfNeeded];
            }];

@@ -173,21 +165,17 @@ 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;
 }
@@ -222,12 +210,12 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
    self.tableView.dataSource = self;
    self.tableView.delegate = self;
    
-    _shareToolbarItem = FLEXBarButtonItemSystem(Action, self, @selector(shareButtonPressed));
+    _shareToolbarItem = FLEXBarButtonItemSystem(Action, self, @selector(shareButtonPressed:));
    _bookmarksToolbarItem = [UIBarButtonItem
-        itemWithImage:FLEXResources.bookmarksIcon target:self action:@selector(showBookmarks)
+        flex_itemWithImage:FLEXResources.bookmarksIcon target:self action:@selector(showBookmarks)
    ];
    _openTabsToolbarItem = [UIBarButtonItem
-        itemWithImage:FLEXResources.openTabsIcon target:self action:@selector(showTabSwitcher)
+        flex_itemWithImage:FLEXResources.openTabsIcon target:self action:@selector(showTabSwitcher)
    ];
    
    self.leftmostToolbarItem = UIBarButtonItem.flex_fixedSpace;
@@ -241,7 +229,7 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
    self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeOnDrag;
    
    // Toolbar
-    self.navigationController.toolbarHidden = NO;
+    self.navigationController.toolbarHidden = self.toolbarItems.count > 0;
    self.navigationController.hidesBarsOnSwipe = YES;

    // On iOS 13, the root view controller shows it's search bar no matter what.
@@ -259,12 +247,17 @@ 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];
 }
@@ -286,6 +279,17 @@ 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;
@@ -386,7 +390,7 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
    [self setupToolbarItems];
 }

- (void)shareButtonPressed {
+- (void)shareButtonPressed:(UIBarButtonItem *)sender {

 }

@@ -525,6 +529,30 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;

 #pragma mark - Search Bar

+#pragma mark Faster keyboard
+
+static UITextField *kDummyTextField = nil;
+
+/// Make the keyboard appear instantly. We use this to make the
+/// keyboard appear faster when the search bar is set to appear initially.
+/// You must call \c -removeDummyTextField before your search bar is to appear.
+- (void)makeKeyboardAppearNow {
+    if (!kDummyTextField) {
+        kDummyTextField = [UITextField new];
+        kDummyTextField.autocorrectionType = UITextAutocorrectionTypeNo;
+    }
+    
+    kDummyTextField.inputAccessoryView = self.searchController.searchBar.inputAccessoryView;
+    [UIApplication.sharedApplication.keyWindow addSubview:kDummyTextField];
+    [kDummyTextField becomeFirstResponder];
+}
+
+- (void)removeDummyTextField {
+    if (kDummyTextField.superview) {
+        [kDummyTextField removeFromSuperview];
+    }
+}
+
 #pragma mark UISearchResultsUpdating

 - (void)updateSearchResultsForSearchController:(UISearchController *)searchController {
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 9/25/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

 #import "FLEXSingleRowSection.h"
@@ -3,12 +3,11 @@
 //  FLEX
 //
 //  Created by Tanner on 1/29/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

 NS_ASSUME_NONNULL_BEGIN
@@ -24,13 +23,17 @@ 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) NSString *title;
+@property (nonatomic, readonly, nullable, copy) NSString *title;
 /// The number of rows in this section. Subclasses must override.
 /// This should not change until \c filterText is changed or \c reloadData is called.
@property (nonatomic, readonly) NSInteger numberOfRows;
@@ -57,6 +60,17 @@ 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
@@ -86,7 +100,6 @@ 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.
@@ -106,7 +119,6 @@ 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

@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 1/29/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

 #import "FLEXTableViewSection.h"
@@ -22,6 +22,19 @@

 - (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;
 }
@@ -51,8 +64,6 @@
    return kFLEXDefaultCell;
 }

-#if FLEX_AT_LEAST_IOS13_SDK
-
 - (NSString *)menuTitleForRow:(NSInteger)row {
    NSString *title = [self titleForRow:row];
    NSString *subtitle = [self menuSubtitleForRow:row];
@@ -99,13 +110,13 @@
        }
        
        UIMenu *copyMenu = [UIMenu
-            inlineMenuWithTitle:@"Copy…" 
+            flex_inlineMenuWithTitle:@"Copy…" 
            image:copyIcon
            children:actions
        ];
        
        if (collapseMenu) {
-            return @[[copyMenu collapsed]];
+            return @[[copyMenu flex_collapsed]];
        } else {
            return @[copyMenu];
        }
@@ -114,8 +125,6 @@
    return @[];
 }

-#endif
-
 - (NSArray<NSString *> *)copyMenuItemsForRow:(NSInteger)row {
    return nil;
 }
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 7/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

 #import "FLEXCarouselCell.h"
@@ -77,7 +77,7 @@
    self.selectionIndicatorStripe.translatesAutoresizingMaskIntoConstraints = NO;

    UIView *superview = self.contentView;
-    [self.titleLabel pinEdgesToSuperviewWithInsets:UIEdgeInsetsMake(10, 15, 8 + stripeHeight, 15)];
+    [self.titleLabel flex_pinEdgesToSuperviewWithInsets:UIEdgeInsetsMake(10, 15, 8 + stripeHeight, 15)];

    [self.selectionIndicatorStripe.leadingAnchor constraintEqualToAnchor:superview.leadingAnchor].active = YES;
    [self.selectionIndicatorStripe.bottomAnchor constraintEqualToAnchor:superview.bottomAnchor].active = YES;
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 7/17/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

 #import "FLEXScopeCarousel.h"
 #import "FLEXCarouselCell.h"
 #import "FLEXColor.h"
+#import "FLEXMacros.h"
 #import "UIView+FLEX_Layout.h"

 const CGFloat kCarouselItemSpacing = 0;
@@ -72,15 +73,14 @@ NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
        self.sizingCell.title = @"NSObject";

        // Dynamic type
-        __weak __typeof(self) weakSelf = self;
+        weakify(self);
        _dynamicTypeObserver = [NSNotificationCenter.defaultCenter
            addObserverForName:UIContentSizeCategoryDidChangeNotification
-            object:nil queue:nil usingBlock:^(NSNotification *note) {
+            object:nil queue:nil usingBlock:^(NSNotification *note) { strongify(self)
                [self.collectionView setNeedsLayout];
                [self setNeedsUpdateConstraints];

                // Notify observers
-                __typeof(self) self = weakSelf;
                for (void (^block)(FLEXScopeCarousel *) in self.dynamicTypeHandlers) {
                    block(self);
                }
@@ -118,7 +118,7 @@ NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
 - (void)updateConstraints {
    if (!self.constraintsInstalled) {
        self.collectionView.translatesAutoresizingMaskIntoConstraints = NO;
-        [self.collectionView pinEdgesToSuperview];
+        [self.collectionView flex_pinEdgesToSuperview];
        
        self.constraintsInstalled = YES;
    }
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 12/27/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

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

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

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

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

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

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

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

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

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

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

 #import "FLEXTableView.h"
@@ -30,29 +30,21 @@ 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
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #import "FLEXFieldEditorViewController.h"

-@interface FLEXDefaultEditorViewController : FLEXFieldEditorViewController
+NS_ASSUME_NONNULL_BEGIN

- (id)initWithDefaults:(NSUserDefaults *)defaults key:(NSString *)key;
+@interface FLEXDefaultEditorViewController : FLEXVariableEditorViewController

-+ (BOOL)canEditDefaultWithValue:(id)currentValue;
+ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)())onCommit;
+
+ (BOOL)canEditDefaultWithValue:(nullable id)currentValue;

@end
+
+NS_ASSUME_NONNULL_END
@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/23/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

 #import "FLEXDefaultEditorViewController.h"
@@ -15,23 +15,24 @@
@interface FLEXDefaultEditorViewController ()

@property (nonatomic, readonly) NSUserDefaults *defaults;
-@property (nonatomic) NSString *key;
+@property (nonatomic, readonly) NSString *key;

@end

@implementation FLEXDefaultEditorViewController

- (id)initWithDefaults:(NSUserDefaults *)defaults key:(NSString *)key {
-    self = [super initWithTarget:defaults];
-    if (self) {
-        self.key = key;
-        self.title = @"Edit Default";
-    }
-    return self;
+ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)())onCommit {
+    FLEXDefaultEditorViewController *editor = [self target:defaults data:key commitHandler:onCommit];
+    editor.title = @"Edit Default";
+    return editor;
 }

 - (NSUserDefaults *)defaults {
-    return [self.target isKindOfClass:[NSUserDefaults class]] ? self.target : nil;
+    return [_target isKindOfClass:[NSUserDefaults class]] ? _target : nil;
+}
+
+- (NSString *)key {
+    return _data;
 }

 - (void)viewDidLoad {
@@ -50,8 +51,6 @@
 }

 - (void)actionButtonPressed:(id)sender {
-    [super actionButtonPressed:sender];
-    
    id value = self.firstInputView.inputValue;
    if (value) {
        [self.defaults setObject:value forKey:self.key];
@@ -59,14 +58,16 @@
        [self.defaults removeObjectForKey:self.key];
    }
    [self.defaults synchronize];
-
-    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];
+    
+    // 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];
+    }
 }

 + (BOOL)canEditDefaultWithValue:(id)currentValue {
@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

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

 #import "FLEXFieldEditorView.h"
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 11/22/18.
-//  Copyright © 2018 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. 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;
+ (nullable instancetype)target:(id)target property:(FLEXProperty *)property commitHandler:(void(^_Nullable)())onCommit;
 /// @return nil if the ivar type is unsupported
-+ (nullable instancetype)target:(id)target ivar:(FLEXIvar *)ivar;
+ (nullable instancetype)target:(id)target ivar:(FLEXIvar *)ivar commitHandler:(void(^_Nullable)())onCommit;

 /// Subclasses can change the button title via the \c title property
@property (nonatomic, readonly) UIBarButtonItem *getterButton;
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 11/22/18.
-//  Copyright © 2018 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

 #import "FLEXFieldEditorViewController.h"
@@ -30,20 +30,20 @@

 #pragma mark - Initialization

-+ (instancetype)target:(id)target property:(FLEXProperty *)property {
+ (instancetype)target:(id)target property:(nonnull FLEXProperty *)property commitHandler:(void(^_Nullable)())onCommit {
    id value = [property getValue:target];
    if (![self canEditProperty:property onObject:target currentValue:value]) {
        return nil;
    }

-    FLEXFieldEditorViewController *editor = [self target:target];
+    FLEXFieldEditorViewController *editor = [self target:target data:property commitHandler:onCommit];
    editor.title = [@"Property: " stringByAppendingString:property.name];
    editor.property = property;
    return editor;
 }

-+ (instancetype)target:(id)target ivar:(nonnull FLEXIvar *)ivar {
-    FLEXFieldEditorViewController *editor = [self target:target];
+ (instancetype)target:(id)target ivar:(nonnull FLEXIvar *)ivar commitHandler:(void(^_Nullable)())onCommit {
+    FLEXFieldEditorViewController *editor = [self target:target data:ivar commitHandler:onCommit];
    editor.title = [@"Ivar: " stringByAppendingString:ivar.name];
    editor.ivar = ivar;
    return editor;
@@ -86,8 +86,6 @@
 }

 - (void)actionButtonPressed:(id)sender {
-    [super actionButtonPressed:sender];
-
    if (self.property) {
        id userInputObject = self.firstInputView.inputValue;
        NSArray *arguments = userInputObject ? @[userInputObject] : nil;
@@ -103,6 +101,9 @@
        // 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) {
@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/23/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

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

 #import "FLEXMethodCallingViewController.h"
@@ -16,7 +16,7 @@
 #import "FLEXUtility.h"

@interface FLEXMethodCallingViewController ()
-@property (nonatomic) FLEXMethod *method;
+@property (nonatomic, readonly) FLEXMethod *method;
@end

@implementation FLEXMethodCallingViewController
@@ -28,9 +28,8 @@
 - (id)initWithTarget:(id)target method:(FLEXMethod *)method {
    NSParameterAssert(method.isInstanceMethod == !object_isClass(target));

-    self = [super initWithTarget:target];
+    self = [super initWithTarget:target data:method commitHandler:nil];
    if (self) {
-        self.method = method;
        self.title = method.isInstanceMethod ? @"Method: " : @"Class Method: ";
        self.title = [self.title stringByAppendingString:method.selectorString];
    }
@@ -72,8 +71,6 @@
 }

 - (void)actionButtonPressed:(id)sender {
-    [super actionButtonPressed:sender];
-
    // Gather arguments
    NSMutableArray *arguments = [NSMutableArray new];
    for (FLEXArgumentInputView *inputView in self.fieldEditorView.argumentInputViews) {
@@ -89,6 +86,9 @@
        withArguments:arguments
        error:&error
    ];
+    
+    // Dismiss keyboard and handle committed changes
+    [super actionButtonPressed:sender];

    // Display return value or error
    if (error) {
@@ -103,4 +103,8 @@
    }
 }

+- (FLEXMethod *)method {
+    return _data;
+}
+
@end
@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

 #import <UIKit/UIKit.h>
@@ -11,25 +11,45 @@
@class FLEXFieldEditorView;
@class FLEXArgumentInputView;

-/// Provides a screen for editing or configuring one or more variables.
-@interface FLEXVariableEditorViewController : UIViewController
+NS_ASSUME_NONNULL_BEGIN

-+ (instancetype)target:(id)target;
- (id)initWithTarget:(id)target;
+/// 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)();
+}

-// Convenience accessor since many subclasses only use one input view
-@property (nonatomic, readonly) FLEXArgumentInputView *firstInputView;
+/// @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)())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)())onCommit;

-// 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;

- (void)actionButtonPressed:(id)sender;
+/// Subclasses should override to provide "set" functionality.
+/// The commit handler--if present--is called here.
+- (void)actionButtonPressed:(nullable id)sender;

 /// Pushes an explorer view controller for the given object
 /// or pops the current view controller.
- (void)exploreObjectOrPopViewController:(id)objectOrNil;
+- (void)exploreObjectOrPopViewController:(nullable id)objectOrNil;

@end
+
+NS_ASSUME_NONNULL_END
@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 5/16/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

 #import "FLEXColor.h"
@@ -19,21 +19,22 @@

@interface FLEXVariableEditorViewController () <UIScrollViewDelegate>
@property (nonatomic) UIScrollView *scrollView;
-@property (nonatomic) id target;
@end

@implementation FLEXVariableEditorViewController

 #pragma mark - Initialization

-+ (instancetype)target:(id)target {
-    return [[self alloc] initWithTarget:target];
+ (instancetype)target:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)())onCommit {
+    return [[self alloc] initWithTarget:target data:data commitHandler:onCommit];
 }

- (id)initWithTarget:(id)target {
+- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)())onCommit {
    self = [super init];
    if (self) {
-        self.target = target;
+        _target = target;
+        _data = data;
+        _commitHandler = onCommit;
        [NSNotificationCenter.defaultCenter
            addObserver:self selector:@selector(keyboardDidShow:)
            name:UIKeyboardDidShowNotification object:nil
@@ -120,6 +121,9 @@
 - (void)actionButtonPressed:(id)sender {
    // Subclasses can override
    [self.fieldEditorView endEditing:YES];
+    if (_commitHandler) {
+        _commitHandler();
+    }
 }

 - (void)exploreObjectOrPopViewController:(id)objectOrNil {
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 2/6/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

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

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

 #import "FLEXBookmarksViewController.h"
@@ -68,10 +68,10 @@
 - (void)setupEditingBarItems {
    self.navigationItem.rightBarButtonItem = nil;
    self.toolbarItems = @[
-        [UIBarButtonItem itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed)],
+        [UIBarButtonItem flex_itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed:)],
        UIBarButtonItem.flex_flexibleSpace,
        // We use a non-system done item because we change its title dynamically
-        [UIBarButtonItem doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
+        [UIBarButtonItem flex_doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
    ];
    
    self.toolbarItems.firstObject.tintColor = FLEXColor.destructiveColor;
@@ -149,7 +149,7 @@
    }
 }

- (void)closeAllButtonPressed {
+- (void)closeAllButtonPressed:(UIBarButtonItem *)sender {
    [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];
+    } showFrom:self source:sender];
 }

 - (void)closeAll {
@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 4/4/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

 #import "FLEXExplorerToolbar.h"
@@ -21,11 +21,21 @@

 - (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;
+- (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;

 // Keyboard shortcut helpers

@@ -3,7 +3,7 @@
 //  Flipboard
 //
 //  Created by Ryan Olson on 4/4/14.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

 #import "FLEXExplorerViewController.h"
@@ -45,6 +45,9 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 /// Only valid while a toolbar drag pan gesture is in progress.
@property (nonatomic) CGRect toolbarFrameBeforeDragging;

+/// Only valid while a selected view pan gesture is in progress.
+@property (nonatomic) CGFloat selectedViewLastPanX;
+
 /// Borders of all the visible views in the hierarchy at the selection point.
 /// The keys are NSValues with the corresponding view (nonretained).
@property (nonatomic) NSDictionary<NSValue *, UIView *> *outlineViewsForVisibleViews;
@@ -58,6 +61,9 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 /// A colored transparent overlay to indicate that the view is selected.
@property (nonatomic) UIView *selectedViewOverlay;

+/// Used to actuate changes in view selection on iOS 10+
+@property (nonatomic, readonly) UISelectionFeedbackGenerator *selectionFBG API_AVAILABLE(ios(10.0));
+
 /// self.view.window as a \c FLEXWindow
@property (nonatomic, readonly) FLEXWindow *window;

@@ -118,6 +124,11 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    self.movePanGR = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handleMovePan:)];
    self.movePanGR.enabled = self.currentMode == FLEXExplorerModeMove;
    [self.view addGestureRecognizer:self.movePanGR];
+    
+    // Feedback
+    if (@available(iOS 10.0, *)) {
+        _selectionFBG = [UISelectionFeedbackGenerator new];
+    }
 }

 - (void)viewWillAppear:(BOOL)animated {
@@ -450,16 +461,16 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    ];
    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:self.detailsTapGR];
    // Swipe gestures for selecting deeper / higher views at a point
-    UISwipeGestureRecognizer *leftSwipe = [[UISwipeGestureRecognizer alloc]
+    UIPanGestureRecognizer *leftSwipe = [[UIPanGestureRecognizer alloc]
        initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
    ];
-    UISwipeGestureRecognizer *rightSwipe = [[UISwipeGestureRecognizer alloc]
-        initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
-    ];
-    leftSwipe.direction = UISwipeGestureRecognizerDirectionLeft;
-    rightSwipe.direction = UISwipeGestureRecognizerDirectionRight;
+//    UIPanGestureRecognizer *rightSwipe = [[UIPanGestureRecognizer alloc]
+//        initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
+//    ];
+//    leftSwipe.direction = UISwipeGestureRecognizerDirectionLeft;
+//    rightSwipe.direction = UISwipeGestureRecognizerDirectionRight;
    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:leftSwipe];
-    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:rightSwipe];
+//    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:rightSwipe];
    
    // Long press gesture to present tabs manager
    [toolbar.globalsItem addGestureRecognizer:[[UILongPressGestureRecognizer alloc]
@@ -598,19 +609,54 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    }
 }

- (void)handleChangeViewAtPointGesture:(UISwipeGestureRecognizer *)sender {
+- (void)handleChangeViewAtPointGesture:(UIPanGestureRecognizer *)sender {
    NSInteger max = self.viewsAtTapPoint.count - 1;
    NSInteger currentIdx = [self.viewsAtTapPoint indexOfObject:self.selectedView];
-    switch (sender.direction) {
-        case UISwipeGestureRecognizerDirectionLeft:
-            self.selectedView = self.viewsAtTapPoint[MIN(max, currentIdx + 1)];
-            break;
-        case UISwipeGestureRecognizerDirectionRight:
-            self.selectedView = self.viewsAtTapPoint[MAX(0, currentIdx - 1)];
+    CGFloat locationX = [sender locationInView:self.view].x;
+    
+    // Track the pan gesture: every N points we move along the X axis,
+    // actuate some haptic feedback and move up or down the hierarchy.
+    // We only store the "last" location when we've met the threshold.
+    // We only change the view and actuate feedback if the view selection
+    // changes; that is, as long as we don't go outside or under the array.
+    switch (sender.state) {
+        case UIGestureRecognizerStateBegan: {
+            self.selectedViewLastPanX = locationX;
            break;
+        }
+        case UIGestureRecognizerStateChanged: {
+            static CGFloat kNextLevelThreshold = 20.f;
+            CGFloat lastX = self.selectedViewLastPanX;
+            NSInteger newSelection = currentIdx;
+            
+            // Left, go down the hierarchy
+            if (locationX < lastX && (lastX - locationX) >= kNextLevelThreshold) {
+                // Choose a new view index up to the max index
+                newSelection = MIN(max, currentIdx + 1);
+                self.selectedViewLastPanX = locationX;
+            }
+            // Right, go up the hierarchy
+            else if (lastX < locationX && (locationX - lastX) >= kNextLevelThreshold) {
+                // Choose a new view index down to the min index
+                newSelection = MAX(0, currentIdx - 1);
+                self.selectedViewLastPanX = locationX;
+            }
+            
+            if (currentIdx != newSelection) {
+                self.selectedView = self.viewsAtTapPoint[newSelection];
+                [self actuateSelectionChangedFeedback];
+            }
            
-        default:
            break;
+        }
+            
+        default: break;
+    }
+}
+
+- (void)actuateSelectionChangedFeedback {
+    if (@available(iOS 10.0, *)) {
+        [self.selectionFBG selectionChanged];
    }
 }

@@ -872,20 +918,33 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    [super dismissViewControllerAnimated:animated completion:completion];
 }

- (BOOL)wantsWindowToBecomeKey
-{
+- (BOOL)wantsWindowToBecomeKey {
    return self.window.previousKeyWindow != nil;
 }

 - (void)toggleToolWithViewControllerProvider:(UINavigationController *(^)(void))future
-                                  completion:(void(^)(void))completion {
+                                  completion:(void (^)(void))completion {
    if (self.presentedViewController) {
+        // 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;
 }
@@ -924,11 +983,7 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
        } else {
            return [FLEXHierarchyViewController delegate:self];
        }
-    } completion:^{
-        if (completion) {
-            completion();
-        }
-    }];
+    } completion:completion];
 }

 - (void)toggleMenuTool {
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 2/13/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

 #import "FLEXViewControllersViewController.h"
@@ -42,6 +42,7 @@
    [super viewDidLoad];
    
    self.title = @"View Controllers at Tap";
+    self.showsSearchBar = YES;
    [self disableToolbar];
 }

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

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

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

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

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

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

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

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

 #import "FLEXTabsViewController.h"
@@ -109,7 +109,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 +121,12 @@
 - (void)setupEditingBarItems {
    self.navigationItem.rightBarButtonItem = nil;
    self.toolbarItems = @[
-        [UIBarButtonItem itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed)],
+        [UIBarButtonItem flex_itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed:)],
        UIBarButtonItem.flex_flexibleSpace,
-        [UIBarButtonItem disabledSystemItem:UIBarButtonSystemItemAdd],
+        [UIBarButtonItem flex_disabledSystemItem:UIBarButtonSystemItemAdd],
        UIBarButtonItem.flex_flexibleSpace,
        // We use a non-system done item because we change its title dynamically
-        [UIBarButtonItem doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
+        [UIBarButtonItem flex_doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
    ];
    
    self.toolbarItems.firstObject.tintColor = FLEXColor.destructiveColor;
@@ -193,7 +193,7 @@
    }
 }

- (void)addTabButtonPressed {
+- (void)addTabButtonPressed:(UIBarButtonItem *)sender {
    if (FLEXBookmarkManager.bookmarks.count) {
        [FLEXAlert makeSheet:^(FLEXAlert *make) {
            make.title(@"New Tab");
@@ -208,7 +208,7 @@
                ] animated:YES completion:nil];
            });
            make.button(@"Cancel").cancelStyle();
-        } showFrom:self];
+        } showFrom:self source:sender];
    } else {
        // No bookmarks, just open the main menu
        [self addTabAndDismiss:[FLEXNavigationController
@@ -224,7 +224,7 @@
    }];
 }

- (void)closeAllButtonPressed {
+- (void)closeAllButtonPressed:(UIBarButtonItem *)sender {
    [FLEXAlert makeSheet:^(FLEXAlert *make) {
        NSInteger count = self.openTabs.count;
        NSString *title = FLEXPluralFormatString(count, @"Close %@ tabs", @"Close %@ tab");
@@ -233,7 +233,7 @@
            [self toggleEditing];
        });
        make.button(@"Cancel").cancelStyle();
-    } showFrom:self];
+    } showFrom:self source:sender];
 }

 - (void)closeAll {
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 3/12/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //


@@ -12,16 +12,11 @@
 #import <FLEX/CALayer+FLEX.h>
 #import <FLEX/UIFont+FLEX.h>
 #import <FLEX/UIGestureRecognizer+Blocks.h>
-#import <FLEX/UIView+FLEX_Layout.h>
 #import <FLEX/UIPasteboard+FLEX.h>
 #import <FLEX/UIMenu+FLEX.h>
 #import <FLEX/UITextField+Range.h>

-#import <FLEX/NSObject+Reflection.h>
-#import <FLEX/NSArray+Functional.h>
-#import <FLEX/NSDictionary+ObjcRuntime.h>
-#import <FLEX/NSString+ObjcRuntime.h>
-#import <FLEX/NSString+FLEX.h>
+#import <FLEX/NSObject+FLEX_Reflection.h>
+#import <FLEX/NSArray+FLEX.h>
 #import <FLEX/NSUserDefaults+FLEX.h>
-#import <FLEX/NSMapTable+FLEX_Subscripting.h>
-#import <FLEX/NSTimer+Blocks.h>
+#import <FLEX/NSTimer+FLEX.h>
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 3/11/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

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

 #import <FLEX/FLEXObjcInternal.h>
@@ -4,7 +4,7 @@
 //
 //  Created by Eric Horacek on 7/18/15.
 //  Modified by Tanner Bennett on 3/12/20.
-//  Copyright (c) 2020 Flipboard. All rights reserved.
+//  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

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

-#import <FLEX/FLEXMacros.h>
 #import <FLEX/FLEXAlert.h>
 #import <FLEX/FLEXResources.h>
@@ -8,12 +8,21 @@

 #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
@@ -8,7 +8,7 @@

 #import "FLEXDBQueryRowCell.h"
 #import "FLEXMultiColumnTableView.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "UIFont+FLEX.h"
 #import "FLEXColor.h"

@@ -63,11 +63,12 @@ NSString * const kFLEXDBQueryRowCellReuse = @"kFLEXDBQueryRowCellReuse";
 - (void)layoutSubviews {
    [super layoutSubviews];
    
-    CGFloat width  = self.contentView.frame.size.width / self.labels.count;
    CGFloat height = self.contentView.frame.size.height;
    
    [self.labels flex_forEach:^(UILabel *label, NSUInteger i) {
-        label.frame = CGRectMake(width * i + 5, 0, (width - 10), height);
+        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);
    }];
 }

@@ -14,14 +14,14 @@
 #import <Foundation/Foundation.h>
 #import "FLEXSQLResult.h"

+/// Conformers should automatically open and close the database
@protocol FLEXDatabaseManager <NSObject>

@required

+/// @return \c nil if the database couldn't be opened
 + (instancetype)managerForDatabase:(NSString *)path;

- (BOOL)open;
-
 /// @return a list of all table names
 - (NSArray<NSString *> *)queryAllTables;
 - (NSArray<NSString *> *)queryAllColumnsOfTable:(NSString *)tableName;
@@ -29,6 +29,7 @@

@optional

+- (NSArray<NSString *> *)queryRowIDsInTable:(NSString *)tableName;
 - (FLEXSQLResult *)executeStatement:(NSString *)SQLStatement;

@end
@@ -29,7 +29,7 @@
 - (NSString *)rowTitle:(NSInteger)row;
 - (NSArray<NSString *> *)contentForRow:(NSInteger)row;

- (CGFloat)multiColumnTableView:(FLEXMultiColumnTableView *)tableView widthForContentCellInColumn:(NSInteger)column;
+- (CGFloat)multiColumnTableView:(FLEXMultiColumnTableView *)tableView minWidthForContentCellInColumn:(NSInteger)column;
 - (CGFloat)multiColumnTableView:(FLEXMultiColumnTableView *)tableView heightForContentCellInRow:(NSInteger)row;
 - (CGFloat)heightForTopHeaderInTableView:(FLEXMultiColumnTableView *)tableView;
 - (CGFloat)widthForLeftHeaderInTableView:(FLEXMultiColumnTableView *)tableView;
@@ -9,10 +9,12 @@
 #import "FLEXMultiColumnTableView.h"
 #import "FLEXDBQueryRowCell.h"
 #import "FLEXTableLeftCell.h"
+#import "NSArray+FLEX.h"
 #import "FLEXColor.h"

@interface FLEXMultiColumnTableView () <
-    UITableViewDataSource, UITableViewDelegate, UIScrollViewDelegate
+    UITableViewDataSource, UITableViewDelegate,
+    UIScrollViewDelegate, FLEXDBQueryRowCellLayoutSource
 >

@property (nonatomic) UIScrollView *contentScrollView;
@@ -21,12 +23,12 @@
@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) NSArray *rowData;
-
@property (nonatomic, readonly) NSInteger numberOfColumns;
@property (nonatomic, readonly) NSInteger numberOfRows;
@property (nonatomic, readonly) CGFloat topHeaderHeight;
@@ -71,9 +73,9 @@ static const CGFloat kColumnMargin = 1;
    }
    
    CGFloat contentWidth = 0.0;
-    NSInteger rowsCount = self.numberOfColumns;
-    for (int i = 0; i < rowsCount; i++) {
-        contentWidth += [self contentWidthForColumn:i];
+    NSInteger columnsCount = self.numberOfColumns;
+    for (int i = 0; i < columnsCount; i++) {
+        contentWidth += CGRectGetWidth(self.headerViews[i].bounds);
    }
    
    CGFloat contentHeight = height - topheaderHeight - topInsets;
@@ -147,26 +149,30 @@ static const CGFloat kColumnMargin = 1;
 #pragma mark - Data

 - (void)reloadData {
+    [self loadHeaderData];
    [self loadLeftViewData];
    [self loadContentData];
-    [self loadHeaderData];
 }

 - (void)loadHeaderData {
    // Remove existing headers, if any
-    for (UIView *subview in self.headerScrollView.subviews) {
+    for (UIView *subview in self.headerViews) {
        [subview removeFromSuperview];
    }
    
-    CGFloat xOffset = 0.0;
-    for (NSInteger column = 0; column < self.numberOfColumns; column++) {
-        CGFloat width = [self contentWidthForColumn:column] + self.columnMargin;
-        
-        FLEXTableColumnHeader *header = [[FLEXTableColumnHeader alloc]
-            initWithFrame:CGRectMake(xOffset, 0, width, self.topHeaderHeight - 1)
-        ];
+    __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];
        
+        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;
        }
@@ -178,21 +184,22 @@ static const CGFloat kColumnMargin = 1;
        [header addGestureRecognizer:gesture];
        header.userInteractionEnabled = YES;
        
-        [self.headerScrollView addSubview:header];
        xOffset += width;
-    }
+        [self.headerScrollView addSubview:header];
+        return header;
+    }];
 }

 - (void)contentHeaderTap:(UIGestureRecognizer *)gesture {
-    NSInteger newSortColumn = [self.headerScrollView.subviews indexOfObject:gesture.view];
+    NSInteger newSortColumn = [self.headerViews indexOfObject:gesture.view];
    FLEXTableColumnHeaderSortType newType = FLEXNextTableColumnHeaderSortType(self.sortType);
    
    // Reset old header
-    FLEXTableColumnHeader *oldHeader = (id)self.headerScrollView.subviews[self.sortColumn];
+    FLEXTableColumnHeader *oldHeader = (id)self.headerViews[self.sortColumn];
    oldHeader.sortType = FLEXTableColumnHeaderSortTypeNone;
    
    // Update new header
-    FLEXTableColumnHeader *newHeader = (id)self.headerScrollView.subviews[newSortColumn];
+    FLEXTableColumnHeader *newHeader = (id)self.headerViews[newSortColumn];
    newHeader.sortType = newType;
    
    // Update self
@@ -227,13 +234,13 @@ static const CGFloat kColumnMargin = 1;
    }
    // Right side table view for data
    else {
-        self.rowData = [self.dataSource contentForRow:indexPath.row];
        FLEXDBQueryRowCell *cell = [tableView
            dequeueReusableCellWithIdentifier:kFLEXDBQueryRowCellReuse forIndexPath:indexPath
        ];
        
        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");
        return cell;
    }
@@ -280,6 +287,17 @@ static const CGFloat kColumnMargin = 1;
 }


+#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 DataSource Accessor

 - (NSInteger)numberOfRows {
@@ -298,8 +316,8 @@ static const CGFloat kColumnMargin = 1;
    return [self.dataSource rowTitle:row];
 }

- (CGFloat)contentWidthForColumn:(NSInteger)column {
-    return [self.dataSource multiColumnTableView:self widthForContentCellInColumn:column];
+- (CGFloat)minContentWidthForColumn:(NSInteger)column {
+    return [self.dataSource multiColumnTableView:self minWidthForContentCellInColumn:column];
 }

 - (CGFloat)contentHeightForRow:(NSInteger)row {
@@ -7,7 +7,7 @@
 //

 #import "FLEXRealmDatabaseManager.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXSQLResult.h"

 #if __has_include(<Realm/Realm.h>)
@@ -20,7 +20,7 @@
@interface FLEXRealmDatabaseManager ()

@property (nonatomic, copy) NSString *path;
-@property (nonatomic) RLMRealm * realm;
+@property (nonatomic) RLMRealm *realm;

@end

@@ -43,6 +43,10 @@ static Class RLMRealmClass = nil;
    self = [super init];
    if (self) {
        _path = path;
+        
+        if (![self open]) {
+            return nil;
+        }
    }
    
    return self;
@@ -64,9 +68,11 @@ static Class RLMRealmClass = nil;

 - (NSArray<NSString *> *)queryAllTables {
    // Map each schema to its name
-    return [self.realm.schema.objectSchema flex_mapped:^id(RLMObjectSchema *schema, NSUInteger idx) {
+    NSArray<NSString *> *tableNames = [self.realm.schema.objectSchema flex_mapped:^id(RLMObjectSchema *schema, NSUInteger idx) {
        return schema.className ?: nil;
    }];
+
+    return [tableNames sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
 }

 - (NSArray<NSString *> *)queryAllColumnsOfTable:(NSString *)tableName {
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner on 3/3/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

 #import <Foundation/Foundation.h>
@@ -14,6 +14,9 @@ NS_ASSUME_NONNULL_BEGIN

 /// 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
@@ -21,6 +24,10 @@ NS_ASSUME_NONNULL_BEGIN

@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
@@ -3,11 +3,11 @@
 //  FLEX
 //
 //  Created by Tanner on 3/3/20.
-//  Copyright © 2020 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

 #import "FLEXSQLResult.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"

@implementation FLEXSQLResult
@synthesize keyedRows = _keyedRows;
@@ -16,6 +16,12 @@
    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];
 }
@@ -13,7 +13,20 @@

 #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
@@ -8,8 +8,8 @@

 #import "FLEXSQLiteDatabaseManager.h"
 #import "FLEXManager.h"
-#import "NSArray+Functional.h"
-#import "FLEXSQLResult.h"
+#import "NSArray+FLEX.h"
+#import "FLEXRuntimeConstants.h"
 #import <sqlite3.h>

 static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHERE type='table' ORDER BY name";
@@ -30,12 +30,16 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
 - (instancetype)initWithPath:(NSString *)path {
    self = [super init];
    if (self) {
-        self.path = path;;
+        self.path = path;
    }
    
    return self;
 }

+- (void)dealloc {
+    [self close];
+}
+
 - (BOOL)open {
    if (self.db) {
        return YES;
@@ -52,8 +56,7 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
 #endif

    if (err != SQLITE_OK) {
-        NSLog(@"error opening!: %d", err);
-        return NO;
+        return [self storeErrorForLastTask:@"Open"];
    }
    
    return YES;
@@ -81,7 +84,9 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
                }
            }
        } else if (SQLITE_OK != rc) {
-            NSLog(@"error closing!: %d", rc);
+            [self storeErrorForLastTask:@"Close"];
+            self.db = nil;
+            return NO;
        }
    } while (retry);
    
@@ -89,36 +94,58 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
    return YES;
 }

+- (NSInteger)lastRowID {
+    return (NSInteger)sqlite3_last_insert_rowid(self.db);
+}
+
 - (NSArray<NSString *> *)queryAllTables {
    return [[self executeStatement:QUERY_TABLENAMES].rows flex_mapped:^id(NSArray *table, NSUInteger idx) {
        return table.firstObject;
-    }];
+    }] ?: @[];
 }

 - (NSArray<NSString *> *)queryAllColumnsOfTable:(NSString *)tableName {
    NSString *sql = [NSString stringWithFormat:@"PRAGMA table_info('%@')",tableName];
    FLEXSQLResult *results = [self executeStatement:sql];
-    
+
    return [results.keyedRows flex_mapped:^id(NSDictionary *column, NSUInteger idx) {
        return column[@"name"];
-    }];
+    }] ?: @[];
 }

 - (NSArray<NSArray *> *)queryAllDataInTable:(NSString *)tableName {
-    return [self executeStatement:[@"SELECT * FROM "
-        stringByAppendingString:tableName
-    ]].rows;
+    NSString *command = [NSString stringWithFormat:@"SELECT * FROM \"%@\"", tableName];
+    return [self executeStatement:command].rows ?: @[];
+}
+
+- (NSArray<NSString *> *)queryRowIDsInTable:(NSString *)tableName {
+    NSString *command = [NSString stringWithFormat:@"SELECT rowid FROM \"%@\"", 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;
-    if (sqlite3_prepare_v2(_db, sql.UTF8String, -1, &pstmt, 0) == SQLITE_OK) {
+    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
        int columnCount = sqlite3_column_count(pstmt);
        NSArray<NSString *> *columns = [NSArray flex_forEachUpTo:columnCount map:^id(NSUInteger i) {
@@ -126,7 +153,6 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
        }];
        
        // Execute statement
-        int status;
        while ((status = sqlite3_step(pstmt)) == SQLITE_ROW) {
            // Grab rows if this is a selection query
            int dataCount = sqlite3_data_count(pstmt);
@@ -140,30 +166,111 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
        if (status == SQLITE_DONE) {
            if (rows.count) {
                // We selected some rows
-                result = [FLEXSQLResult columns:columns rows:rows];
+                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 = [FLEXSQLResult message:message];
+                result = _lastResult = [FLEXSQLResult message:message];
            }
        } else {
            // An error occured executing the query
-            result = [FLEXSQLResult message:@(sqlite3_errmsg(_db) ?: "(Execution: empty error)")];
+            result = _lastResult = [self errorResult:@"Execution"];
        }
    } else {
        // An error occurred creating the prepared statement
-        result = [FLEXSQLResult message:@(sqlite3_errmsg(_db) ?: "(Prepared statement: empty error)")];
+        result = _lastResult = [self errorResult:@"Prepared statement"];
    }
    
    sqlite3_finalize(pstmt);
-    [self close];
    return result;
 }


 #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;
+                
+                case FLEXTypeEncodingFloat:
+                case FLEXTypeEncodingDouble:
+                    status = sqlite3_bind_double(pstmt, idx, [value doubleValue]);
+                    break;
+                    
+                default:
+                    @throw NSInternalInconsistencyException;
+                    break;
+            }
+        }
+        // Unsupported type
+        else {
+            @throw NSInternalInconsistencyException;
+        }
+        
+        if (status != SQLITE_OK) {
+            return [self storeErrorForLastTask:
+                [NSString stringWithFormat:@"Binding param named '%@'", param]
+            ];
+        }
+    }
+    
+    return YES;
+}
+
+- (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);
    
@@ -11,6 +11,9 @@
 #import "UIFont+FLEX.h"
 #import "FLEXUtility.h"

+static const CGFloat kMargin = 5;
+static const CGFloat kArrowWidth = 20;
+
@interface FLEXTableColumnHeader ()
@property (nonatomic, readonly) UILabel *arrowLabel;
@property (nonatomic, readonly) UIView *lineView;
@@ -60,9 +63,16 @@
    
    CGSize size = self.frame.size;
    
-    self.titleLabel.frame = CGRectMake(5, 0, size.width - 25, size.height);
-    self.arrowLabel.frame = CGRectMake(size.width - 20, 0, 20, size.height);
+    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
@@ -7,10 +7,20 @@
 //

 #import <UIKit/UIKit.h>
+#import "FLEXDatabaseManager.h"
+
+NS_ASSUME_NONNULL_BEGIN

@interface FLEXTableContentViewController : UIViewController

+/// Display a table with the given columns, rows, and name.
+/// @param databaseManager an optional manager to allow modifying the table.
 + (instancetype)columns:(NSArray<NSString *> *)columnNames
-                   rows:(NSArray<NSArray<NSString *> *> *)rowData;
+                   rows:(NSArray<NSArray<NSString *> *> *)rowData
+                 rowIDs:(nullable NSArray<NSString *> *)rowIds
+              tableName:(NSString *)tableName
+               database:(nullable id<FLEXDatabaseManager>)databaseManager;

@end
+
+NS_ASSUME_NONNULL_END
@@ -10,12 +10,16 @@
 #import "FLEXMultiColumnTableView.h"
 #import "FLEXWebViewController.h"
 #import "FLEXUtility.h"
+#import "UIBarButtonItem+FLEX.h"

@interface FLEXTableContentViewController () <
    FLEXMultiColumnTableViewDataSource, FLEXMultiColumnTableViewDelegate
 >
@property (nonatomic, readonly) NSArray<NSString *> *columns;
-@property (nonatomic, copy) NSArray<NSArray *> *rows;
+@property (nonatomic) NSMutableArray<NSArray *> *rows;
+@property (nonatomic, readonly) NSString *tableName;
+@property (nonatomic, nullable) NSMutableArray<NSString *> *rowIDs;
+@property (nonatomic, readonly, nullable) id<FLEXDatabaseManager> databaseManager;

@property (nonatomic) FLEXMultiColumnTableView *multiColumnView;
@end
@@ -23,10 +27,16 @@
@implementation FLEXTableContentViewController

 + (instancetype)columns:(NSArray<NSString *> *)columnNames
-                   rows:(NSArray<NSArray<NSString *> *> *)rowData {
+                   rows:(NSArray<NSArray<NSString *> *> *)rowData
+                 rowIDs:(nullable NSArray<NSString *> *)rowIDs
+              tableName:(NSString *)tableName
+               database:(nullable id<FLEXDatabaseManager>)databaseManager {
    FLEXTableContentViewController *controller = [self new];
-    controller->_columns = columnNames;
-    controller->_rows = rowData;
+    controller->_columns = columnNames.copy;
+    controller->_rows = rowData.mutableCopy;
+    controller->_rowIDs = rowIDs.mutableCopy;
+    controller->_tableName = tableName.copy;
+    controller->_databaseManager = databaseManager;
    return controller;
 }

@@ -38,9 +48,10 @@

 - (void)viewDidLoad {
    [super viewDidLoad];
-    
+    self.title = self.tableName;
    self.edgesForExtendedLayout = UIRectEdgeNone;
    [self.multiColumnView reloadData];
+    [self setupToolbarItems];
 }

 - (FLEXMultiColumnTableView *)multiColumnView {
@@ -84,8 +95,8 @@
 }

 - (CGFloat)multiColumnTableView:(FLEXMultiColumnTableView *)tableView
-    widthForContentCellInColumn:(NSInteger)column {
-    return 120;
+    minWidthForContentCellInColumn:(NSInteger)column {
+    return 100;
 }

 - (CGFloat)heightForTopHeaderInTableView:(FLEXMultiColumnTableView *)tableView {
@@ -113,7 +124,32 @@
    
    [FLEXAlert makeAlert:^(FLEXAlert *make) {
        make.title([@"Row " stringByAppendingString:@(row).stringValue]);
-        make.message([fields componentsJoinedByString:@"\n\n"]);
+        NSString *message = [fields componentsJoinedByString:@"\n\n"];
+        make.message(message);
+        make.button(@"Copy").handler(^(NSArray<NSString *> *strings) {
+            UIPasteboard.generalPasteboard.string = message;
+        });
+        
+        // Option to delete row
+        BOOL hasRowID = self.rows.count && row < self.rows.count;
+        if (hasRowID) {
+            make.button(@"Delete").destructiveStyle().handler(^(NSArray<NSString *> *strings) {
+                NSString *deleteRow = [NSString stringWithFormat:
+                    @"DELETE FROM %@ WHERE rowid = %@",
+                    self.tableName, self.rowIDs[row]
+                ];
+                
+                [self executeStatementAndShowResult:deleteRow completion:^(BOOL success) {
+                    // Remove deleted row and reload view
+                    if (success) {
+                        [self.rowIDs removeObjectAtIndex:row];
+                        [self.rows removeObjectAtIndex:row];
+                        [self.multiColumnView reloadData];
+                    }
+                }];
+            });
+        }
+        
        make.button(@"Dismiss").cancelStyle();
    } showFrom:self];
 }
@@ -123,7 +159,8 @@
                    sortType:(FLEXTableColumnHeaderSortType)sortType {
    
    NSArray<NSArray *> *sortContentData = [self.rows
-        sortedArrayUsingComparator:^NSComparisonResult(NSArray *obj1, NSArray *obj2) {
+        sortedArrayWithOptions:NSSortStable
+        usingComparator:^NSComparisonResult(NSArray *obj1, NSArray *obj2) {
            id a = obj1[column], b = obj2[column];
            if (a == NSNull.null) {
                return NSOrderedAscending;
@@ -131,6 +168,11 @@
            if (b == NSNull.null) {
                return NSOrderedDescending;
            }
+        
+            if ([a respondsToSelector:@selector(compare:options:)] &&
+                [b respondsToSelector:@selector(compare:options:)]) {
+                return [a compare:b options:NSNumericSearch];
+            }
            
            if ([a respondsToSelector:@selector(compare:)] && [b respondsToSelector:@selector(compare:)]) {
                return [a compare:b];
@@ -144,12 +186,11 @@
        sortContentData = sortContentData.reverseObjectEnumerator.allObjects.copy;
    }
    
-    self.rows = sortContentData;
+    self.rows = sortContentData.mutableCopy;
    [self.multiColumnView reloadData];
 }

-#pragma mark -
-#pragma mark About Transition
+#pragma mark - About Transition

 - (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection
              withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator {
@@ -167,4 +208,57 @@
    } completion:nil];
 }

+#pragma mark - Toolbar
+
+- (void)setupToolbarItems {
+    // We do not support modifying realm databases
+    if (![self.databaseManager respondsToSelector:@selector(executeStatement:)]) {
+        return;
+    }
+    
+    UIBarButtonItem *trashButton = [FLEXBarButtonItemSystem(Trash, self, @selector(trashPressed))
+        flex_withTintColor:UIColor.redColor
+    ];
+    trashButton.enabled = self.databaseManager && self.rows.count;
+    self.toolbarItems = @[UIBarButtonItem.flex_flexibleSpace, trashButton];
+}
+
+- (void)trashPressed {
+    [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        make.title(@"Delete All Rows");
+        make.message(@"All rows in this table will be permanently deleted.\nDo you want to proceed?");
+        
+        make.button(@"Yes, I'm sure").destructiveStyle().handler(^(NSArray<NSString *> *strings) {
+            NSString *deleteAll = [NSString stringWithFormat:@"DELETE FROM %@", self.tableName];
+            [self executeStatementAndShowResult:deleteAll completion:^(BOOL success) {
+                // Only dismiss on success
+                if (success) {
+                    [self.navigationController popViewControllerAnimated:YES];
+                }
+            }];
+        });
+        make.button(@"Cancel").cancelStyle();
+    } showFrom:self];
+}
+
+#pragma mark - Helpers
+
+- (void)executeStatementAndShowResult:(NSString *)statement completion:(void (^_Nullable)(BOOL success))completion {
+    FLEXSQLResult *result = [self.databaseManager executeStatement:statement];
+    
+    [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        if (result.isError) {
+            make.title(@"Error");
+        }
+        
+        make.message(result.message ?: @"<no output>");
+        make.button(@"Dismiss").cancelStyle().handler(^(NSArray<NSString *> *_) {
+            if (completion) {
+                completion(!result.isError);
+            }
+        });
+    } showFrom:self];
+}
+
+
@end
@@ -12,8 +12,9 @@
 #import "FLEXRealmDatabaseManager.h"
 #import "FLEXTableContentViewController.h"
 #import "FLEXMutableListSection.h"
-#import "NSArray+Functional.h"
+#import "NSArray+FLEX.h"
 #import "FLEXAlert.h"
+#import "FLEXMacros.h"

@interface FLEXTableListViewController ()
@property (nonatomic, readonly) id<FLEXDatabaseManager> dbm;
@@ -70,9 +71,10 @@
    self.tables.selectionHandler = ^(FLEXTableListViewController *host, NSString *tableName) {
        NSArray *rows = [host.dbm queryAllDataInTable:tableName];
        NSArray *columns = [host.dbm queryAllColumnsOfTable:tableName];
-        
-        UIViewController *resultsScreen = [FLEXTableContentViewController columns:columns rows:rows];
-        resultsScreen.title = tableName;
+        NSArray *rowIDs = [host.dbm queryRowIDsInTable:tableName];
+        UIViewController *resultsScreen = [FLEXTableContentViewController
+            columns:columns rows:rows rowIDs:rowIDs tableName:tableName database:host.dbm
+        ];
        [host.navigationController pushViewController:resultsScreen animated:YES];
    };
    
@@ -100,7 +102,7 @@
                [FLEXAlert showAlert:@"Message" message:result.message from:self];
            } else {
                UIViewController *resultsScreen = [FLEXTableContentViewController
-                    columns:result.columns rows:result.rows
+                    columns:result.columns rows:result.rows rowIDs:nil tableName:@"" database:nil
                ];
                
                [self.navigationController pushViewController:resultsScreen animated:YES];
@@ -3,7 +3,7 @@
 //  FLEX
 //
 //  Created by Tanner Bennett on 7/10/19.
-//  Copyright © 2019 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

 #import "FLEXAddressExplorerCoordinator.h"
@@ -1,14 +0,0 @@
-//
-//  FLEXCookiesTableViewController.h
-//  FLEX
-//
-//  Created by Rich Robinson on 19/10/2015.
-//  Copyright © 2015 Flipboard. All rights reserved.
-//
-
-#import "FLEXGlobalsEntry.h"
-#import "FLEXFilteringTableViewController.h"
-
-@interface FLEXCookiesTableViewController : FLEXFilteringTableViewController <FLEXGlobalsEntry>
-
-@end
@@ -0,0 +1,14 @@
+//
+//  FLEXCookiesViewController.h
+//  FLEX
+//
+//  Created by Rich Robinson on 19/10/2015.
+//  Copyright © 2020 FLEX Team. All rights reserved.
+//
+
+#import "FLEXGlobalsEntry.h"
+#import "FLEXFilteringTableViewController.h"
+
+@interface FLEXCookiesViewController : FLEXFilteringTableViewController <FLEXGlobalsEntry>
+
+@end
@@ -1,22 +1,22 @@
 //
-//  FLEXCookiesTableViewController.m
+//  FLEXCookiesViewController.m
 //  FLEX
 //
 //  Created by Rich Robinson on 19/10/2015.
-//  Copyright © 2015 Flipboard. All rights reserved.
+//  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXCookiesTableViewController.h"
+#import "FLEXCookiesViewController.h"
 #import "FLEXObjectExplorerFactory.h"
 #import "FLEXMutableListSection.h"
 #import "FLEXUtility.h"

-@interface FLEXCookiesTableViewController ()
+@interface FLEXCookiesViewController ()
@property (nonatomic, readonly) FLEXMutableListSection<NSHTTPCookie *> *cookies;
@property (nonatomic) NSString *headerTitle;
@end

-@implementation FLEXCookiesTableViewController
+@implementation FLEXCookiesViewController

 #pragma mark - Overrides

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tanner Bennett	f916174070	Bump version and update URLs	2021-10-06 19:11:01 -05:00
Tanner Bennett	60e23e126e	Fix crash for unsupported property type encodings	2021-10-06 19:11:01 -05:00
Tanner Bennett	afeff1b562	Add FLEXMITMDataSource, refactor MITMVC	2021-10-06 18:18:54 -05:00
Tanner Bennett	5acb33005b	Refactor HTTP transaction detail controller	2021-10-06 18:18:54 -05:00
Tanner Bennett	3446eff353	Hook and record websocket methods	2021-10-06 18:18:54 -05:00
Tanner Bennett	ad1f1f579e	Move network transaction model logic into model	2021-10-06 18:18:54 -05:00
Tanner Bennett	e03b5f7e5d	Send example websocket traffic	2021-10-06 18:18:54 -05:00
Tanner Bennett	d010c82dd0	Add OSCache for network caching	2021-10-06 18:18:54 -05:00
Tanner Bennett	652d03c39a	Add -[NSArray flex_firstWhere:]	2021-10-06 18:18:54 -05:00
Tanner Bennett	1d39669a52	Add button to dlopen a library in Runtime Browser	2021-10-06 18:18:54 -05:00
Iulian Onofrei	d558ca6852	Fix code style	2021-09-22 11:49:00 -07:00
Duraid Abdul	ad32ca0f05	Update project.pbxproj	2021-08-31 12:04:22 -07:00
Tanner Bennett	67097982ea	Bump version	2021-08-19 00:58:13 -05:00
matrush	1342d3029c	Add availability check for iOS 11+ only SFSafariViewController properities	2021-08-09 09:37:23 -07:00
Hossam Ghareeb	62dcef4644	Add ability to delete SQLite rows	2021-07-25 18:15:26 -05:00
Tanner Bennett	7ee296143e	Add button to clear SQLite table (@hossamghareeb)	2021-07-25 17:31:29 -05:00
Tanner Bennett	c6bac54597	Fix #544 ; utilize smartQuotesType = .no	2021-07-25 17:03:05 -05:00
Tanner Bennett	5f7bce64ed	Create FUNDING.yml	2021-07-25 16:52:59 -05:00
Tanner Bennett	d2dde55bb1	Lay groundwork for multiple shortcut sections	2021-05-25 17:47:29 -05:00
Tanner Bennett	f1a0a5c5e5	Add shortcuts for collections	2021-05-25 17:46:50 -05:00
Tanner Bennett	0db073459e	iOS 13 is now the minimum required SDK Remove FLEX_AT_LEAST_IOS13_SDK and usages. It was causing several issues being in a header that needed to be private but also included in public headers.	2021-05-25 15:30:46 -05:00
Tanner Bennett	7c7ed9286f	Fix code typos	2021-05-25 15:10:45 -05:00
Tanner Bennett	aac88dd6c8	Fix presentTool: presentTool	2021-05-07 14:01:57 -05:00
Tanner Bennett	d7376b75cd	Add flex_observers shortcut to NSNotificationCenter	2021-05-07 13:58:04 -05:00
Tanner Bennett	5b39b3ed03	Add UIPasteboard shortcuts	2021-05-07 13:58:04 -05:00
Tanner Bennett	bbaa85bdbf	Add WKWebView/SFVC shortcuts	2021-05-07 12:03:06 -05:00
Tanner Bennett	34e27bc5d9	Stable sort and sort integers numerically	2021-05-01 01:04:12 -05:00
Tanner Bennett	714307273e	Show full text for DB browser column headers	2021-05-01 01:04:12 -05:00
TekYin	5242d3c5a1	Fix crash when sharing single file on iPad	2021-04-30 23:28:32 -05:00
ray	cf2e94a1d2	Fix crash when viewing keychain item	2021-04-30 23:17:01 -05:00
canius	800acb4cad	Fix private header warnings and install path (#514 ) Co-authored-by: Canius Chu <canius.chu@farfetch.com>	2021-04-30 22:37:39 -05:00
Saafo	368ce64121	Fix iPad/multi-scene FLEX bar layout bugs (#534 ) Prior to this, FLEX could appear in the wrong scene or with the wrong width if the scene is not the full width of the screen, which is almost always the case in multi scene environments. Thanks @Saafo!	2021-04-25 14:54:23 -05:00
Bang Lee	05f03090a9	Display access group for keychain items (#532 )	2021-04-12 01:44:29 -05:00
Tanner Bennett	a8803781e8	Add missing files to xcodeproj; oops, thanks @BB9z	2021-04-08 16:41:54 -05:00
Tanner Bennett	170f74b297	Don't codesign FLEX.framework	2021-04-08 16:39:39 -05:00
Tanner Bennett	0d0f2a3073	Add FLEXAlert nullabilities for Swift	2021-04-08 16:39:39 -05:00
Michael Gray	d6bddf5199	Quote table names in SQL commands (#529 ) Sqlite is often smart enough to not need quotes for identifiers, unless you want to use a keyword as a name. Then you need to quote it https://www.sqlite.org/lang_keywords.html	2021-04-05 15:02:05 -05:00
Tanner Bennett	258ec8697b	Bump version	2021-03-30 14:20:02 -05:00
Tanner Bennett	8f9a6e88ec	Fix toolbar appearing when empty	2021-03-30 14:20:02 -05:00
Tanner Bennett	c37270e6ac	Add shortcuts for NSString and NSData	2021-03-30 14:20:02 -05:00
Tanner Bennett	ce10d45c29	Fix "hide likely private methods" behavior Hide relevant private properties too, also class properties and methods	2021-03-30 14:20:02 -05:00
Tanner Bennett	b2716c4b2e	Catch potential exceptions thrown from descriptions	2021-03-30 14:20:02 -05:00
Tanner Bennett	ab135ba94e	Remove uninclusive terms Blacklist → exclude[d] / denylist Whitelist → allow[ed] / unexcluded	2021-03-30 14:20:02 -05:00
Tanner Bennett	bcc04f4113	Make FLEXMacros.h private	2021-03-30 14:20:02 -05:00
Tanner Bennett	470b3fa3b3	Add tintColor as real property	2021-03-30 14:20:02 -05:00
Tanner Bennett	e84dfeae5c	Fix object explorer class pan gesture… again…	2021-03-30 14:20:02 -05:00
Tanner Bennett	44e86e59b7	Fix Xcode 12 compile errors	2021-03-30 14:20:02 -05:00
Tanner Bennett	ac6d9cfa3f	Misc refactoring	2021-03-30 14:20:02 -05:00
Tanner Bennett	1a59711760	Fix a crash, add some missing nullabilities	2021-03-30 14:20:01 -05:00
Tanner Bennett	b60ce7a057	Add UIAlertController shortcuts Fix alert controller	2021-03-30 14:20:01 -05:00
Tanner Bennett	b4ac210bef	Use likely ivar to determine matching property	2021-03-29 13:55:52 -05:00
Tanner Bennett	9360c58975	Add likely ivar data to FLEXProperty	2021-03-29 13:55:52 -05:00
Tanner Bennett	43d9a460ce	Make the keyboard seem to appear faster On screens where the keyboard is set to appear right away, make it appear faster—or at least, make it look like it appears faster… Also add a property to make the search bar appear initially instead of duplicating becomeFirstResponder code across several classes	2021-03-29 13:55:51 -05:00
ray	15fee5a8a5	Fix keychain viewer crash (#521 )	2021-03-23 10:36:29 -05:00
Alexey Salangin	fad038392b	Don't show toolbar when tapping on a nav bar button (#517 )	2021-03-11 13:45:23 -06:00
Tanner Bennett	558d65a0b0	Update license	2021-02-02 14:18:09 -06:00
Tanner Bennett	077fca36c0	Bump deployment targets (oops?)	2021-01-27 23:24:39 -06:00
Tanner Bennett	947769f6f9	Bump version	2021-01-27 17:10:26 -06:00
Tanner Bennett	7c480c5faf	Mention tvOS fork in README	2021-01-27 17:09:41 -06:00
Tanner Bennett	fa6c72cb08	Fix memory leak	2021-01-27 16:49:10 -06:00
Tanner Bennett	9af2926ec1	Use weakify/strongify throughout project	2021-01-26 12:46:53 -06:00
Tanner Bennett	366a8266bd	Add weakify/strongify macros	2021-01-26 12:46:53 -06:00
Tanner Bennett	713fbac54a	Move 't' simulator shortcut to the example project This demonstrates how to register a shortcut from a project with the new pubilc APIs for presenting tools. I put it in the commit list screen because I didn't feel like rewriting it in Swift.	2021-01-26 12:46:53 -06:00
Tanner Bennett	8198fba689	Add public API to dismiss/present FLEX tools This API will allow you to present a tool in front of the FLEX toolbar and will automatically dismiss any existing FLEX tool	2021-01-26 12:46:53 -06:00
Tanner Bennett	20e14a36c9	Add -[NSMutableArray flex_filter:]	2021-01-26 11:18:43 -06:00
Tanner Bennett	176e98518d	Add context menu item to view references to object	2021-01-20 17:00:37 -06:00
Tanner Bennett	31440056c1	Add option to hide potentially private methods	2021-01-20 17:00:10 -06:00
Tanner Bennett	6c7b39ed03	Fix object explorer swipe gesture precedence	2021-01-20 15:31:25 -06:00
Tanner Bennett	96989f7e0c	Refactor FLEXample's AppDelegate.swift	2021-01-20 15:08:06 -06:00
Tanner Bennett	22a23b3b12	Add the Person class back to the example project	2021-01-20 14:59:09 -06:00
Tanner Bennett	90a855a289	Allow registration of global entries with actions This was previously a private API	2021-01-20 14:37:44 -06:00
matrush	fd67373995	Revise object reference section titles logic	2021-01-20 14:37:13 -06:00
Tanner Bennett	3b5e095f74	Add some tests, fix some tests - Test safeClassNameForObject: - Test safeObject:respondsToSelector: - Fix testAssumptionsAboutClasses: which was incorrectly written	2020-12-30 20:06:49 -06:00
Tanner Bennett	c7850df186	Add safeClassNameForObject: and use it	2020-12-30 20:06:49 -06:00
Tanner Bennett	6bbcc55cf6	Improve safeObject:respondsToSelector: The old code assumes the object at least responds to respondsToSelector: which may not always be true. I also I think the old code was not quite correct for all cases anyway. Using the runtime functions ensures no methods are ever called on the object, and properly handles metaclass objects, in theory.	2020-12-30 20:06:49 -06:00
Tanner Bennett	e63ea4bbff	Group FLEX objects together in the object refs list	2020-12-30 20:06:49 -06:00
Tanner Bennett	5a760fb1ac	Update issue templates	2020-12-30 20:06:49 -06:00
Tanner Bennett	e63f2ee3ad	Prefix some categories, fix #496	2020-12-30 20:06:49 -06:00
Tanner Bennett	46c6dcb7e6	Fix bug introduced in `cb2e0789`	2020-12-30 17:31:37 -06:00
Alexey Salangin	bf42bbe27b	Fix bug with navbar tap gesture Tap gesture in FLEXNavigationController's navigation bar causes buttons to reportedly become unresponsive on iOS 11 and 12 unless `cancelsTouchesInView` is turned off	2020-12-30 15:27:04 -08:00
Tanner Bennett	e89fec4b2d	Bump version	2020-12-17 01:57:25 -06:00
Tanner Bennett	715bb92929	Add confirm dialog for clearing the keychain	2020-12-17 01:35:03 -06:00
Tanner Bennett	109074f98e	Show service AND account in keychain rows	2020-12-17 01:34:44 -06:00
Tanner Bennett	45fbdb7914	Move keychain buttons to toolbar	2020-12-17 01:34:33 -06:00
Tanner Bennett	cb2e0789d8	Fix several memory leaks, fix #483 Also move a bunch of globals related to FLEXShortcutsFactory into ivars of a FLEXShortcutsFactory singleton so that it is easier to trace the origin of the global storage of FLEX[Property\|Ivar\|Method] objects in a memory graph	2020-12-17 01:17:40 -06:00
vvveiii	de1ca783b6	Fix flex_copy: crash when object is nil	2020-12-16 22:30:11 -08:00
vvveiii	3a9c24b784	Add missing `else` for flex_copy method	2020-12-16 22:30:11 -08:00
Tanner Bennett	b57a333fc9	Fix #491 , close #473 Remove (most) uses of +[NSString stringWithCString:encoding:]	2020-12-17 00:20:17 -06:00
matrush	288bf1343e	Add ability to toggle bg color for image previews Also fix availability warning	2020-12-15 16:35:27 -08:00
matrush	a0b1caed54	Use UITableViewCellAccessoryNone instead of 0 in FLEX[Layer/View]Shortcuts	2020-12-14 18:38:04 -08:00
Tanner Bennett	9282c61183	Allow scrubbing between selected views Instead of a singular swipe gesture to navigate between views in the view hierarchy at the tap point, we can now pan or drag along that same area to "srub" the hierarchy.	2020-12-14 18:36:44 -06:00
Tanner Bennett	ee6677ee08	Add GUI shortcut for initializeWebKitLegacy We call initializeWebKitLegacy automatically before you search all bundles just to be safe (since touching some classes before WebKit is initialized will initialize it on a thread other than the main thread), but sometimes you can encounter this crash without searching through all bundles, of course. In this case, you can now long press on the navigation bar to call initializeWebKitLegacy	2020-12-14 17:10:48 -06:00
Tanner Bennett	3276eb3516	Automatically activate search bar in heap explorer `2f952c38` apparently didn't do this, oops	2020-12-14 17:10:48 -06:00
Chaoshuai Lü	a3fa7bbadc	Fix view/controller preview image issue (#493 )	2020-12-14 16:08:58 -06:00
matrush	637074b354	Use id<NSCopying> as key instead of Class<NSCopying> in FLEXObjectExplorerFactory	2020-12-01 16:56:08 -08:00
Tanner Bennett	547bfbaec0	Disallow preview of views with no rect	2020-11-02 20:42:10 -06:00
Tanner Bennett	4e1fcf4682	Bump version, 4.2.2	2020-11-02 19:36:15 -06:00
Tanner Bennett	4d50fd2020	Revert "Use NSString as key …" in `d7786449` We NEED to use the class as a key, because you cannot differentiate a class's name from the metaclass's name.	2020-11-02 19:36:15 -06:00
Tanner Bennett	2c510c8ca1	Fix log timer in example app not firing	2020-11-02 17:45:21 -06:00
Tanner Bennett	8283e2a8e7	Fix #415 , restore ability to copy log messages	2020-11-02 17:32:29 -06:00
Tanner Bennett	3f82631a95	Fix bug introduced in 4.2.0, unable to edit members Oopsie	2020-11-02 17:03:37 -06:00
matrush	d77864494d	Use NSString as key instead of Class<NSCopying> in FLEXObjectExplorerFactory	2020-11-02 16:58:59 -06:00
matrush	c5ed6d4ece	Add void to function definition of FLEXConstructorsShouldRun	2020-11-02 16:58:59 -06:00
matrush	9412f6eccf	Add a clear global entries method for FLEXManager	2020-11-02 16:58:59 -06:00
Tanner Bennett	d9aa102e77	Bump version	2020-10-23 16:42:44 -05:00
Oleg	6f80476135	Fix crash on `flex_withTintColor` (#476 )	2020-10-23 16:23:39 -05:00
Tanner Bennett	e18a854a9f	Bump version, close #465 #466	2020-10-22 18:18:26 -05:00
Tanner Bennett	0d676e2504	Add FLEX_DISABLE_CTORS, close #471	2020-10-22 18:16:18 -05:00
Tanner Bennett	fcca09e74a	Fix #428 , not scrolling to selected view	2020-10-22 17:57:25 -05:00
Tanner Bennett	107e44a399	Fix #410 , prefix all categories	2020-10-22 17:57:21 -05:00
Tanner Bennett	e79a3db255	Fix #426 Move explicit FLEXCollection protocol conformances to the .m file to prevent protocol methods from overriding the methods in their headers	2020-10-21 22:55:32 -05:00
Tanner Bennett	bec9ffd981	Allow inspecting non-NSObject classes	2020-10-21 21:02:49 -05:00
Tanner Bennett	d4070ed9b7	Reverse view snapshot slider ends, fix #429	2020-10-21 21:02:49 -05:00
Tanner Bennett	01e4af47e2	Fix #433 , refresh explorer after edits	2020-10-21 21:02:49 -05:00
Tanner Bennett	220af5c350	Table sections can update themselves	2020-10-21 21:02:49 -05:00
Tanner Bennett	15fd16d395	FLEXample project Xcode 12 update Fix warning in FLEXample	2020-10-21 21:02:49 -05:00
Tanner Bennett	af87ea14e0	Update copyright	2020-10-20 18:18:47 -05:00
Tanner Bennett	5c8b334a84	Fix #450 : broken search on NSUserDefaults	2020-10-18 17:44:04 -05:00
Tanner Bennett	d3c3c61ab1	FLEXMethod.imagePath should use the method's IMP We can already tell which image the class comes from, and that is usually the same as the original method implementation. What is more useful to know is the image of the _current_ implementation.	2020-10-18 17:17:06 -05:00
Tanner Bennett	c28952f6e9	Silence new weird documentation warning…	2020-10-18 17:17:06 -05:00
Tanner Bennett	aaf7ffec85	Commit FLEXTests scheme	2020-10-18 17:17:06 -05:00
Tanner Bennett	3ef55eac62	Xcode 12 upgrade check for main scheme	2020-10-18 17:17:06 -05:00
Tanner Bennett	515806e194	Add FLEX_EXIT_IF_NO_CTORS, fix #470	2020-10-18 17:17:06 -05:00
Justin Lam	d0d1632ca1	Add foundation header to ActivityStreamSPI. (#461 ) * Add C++ ifdefs around C++ code. The purpose of this change is to gate C++ code behind a cplusplus define so that FLEX can be made into a module for Swift code. Swift modules do not allow for C++ code. However this means if FLEX is used a Swift module, it will not have functionality of the excluded code. Ideally in the future, FLEX can be converted fully to support Swift without bridging headers. * Revert "Add C++ ifdefs around C++ code." This reverts commit `77c02207f9`. * Add include <Foundation/Foundation.h> to ActivityStreamSPI header We use a different build setup internally, and we need all headers to be able to stand on their own. This file is using NS_ENUM, which is defined in Foundation, without importing it, so we're adding the import to resolve that.	2020-10-13 14:31:31 -05:00
matrush	79e22cf828	Remove a retain cylce in FLEXSystemLogViewController	2020-10-13 14:31:31 -05:00
Iulian Onofrei	563cb514a1	Fix crash when opening Keychain item without a password	2020-10-13 14:31:31 -05:00
matrush	84131d8533	Return empty array when the rows are nil in FLEXSQLResult	2020-10-13 14:31:31 -05:00
Evan Emelga	55cb7ebf8f	Sort realm table names alphabetically (#453 )	2020-10-12 23:07:18 -05:00
Anıl Taşkıran	b9e2c1ebd9	fix baseResumeClass name for iOS14+	2020-10-12 23:07:18 -05:00
Maxime Ollivier	7377399673	Skip keyboard shortcut override when setting defaults	2020-10-12 23:07:18 -05:00
Tanner Bennett	21199b2a56	Add sharedApplication property at runtime for iOS 9	2020-10-12 23:07:18 -05:00
matrush	e72c6aa349	Add better debugging message for FLEXProperty and FLEXIvar	2020-10-12 23:06:55 -05:00
ph661	13c583d32b	Add SceneKit to podspec frameworks	2020-10-12 19:19:34 -05:00
Chaoshuai Lü	129c291469	Move custom additions to the top (#439 ) - Move custom additions to the top - Fix header	2020-10-12 19:19:34 -05:00
Chris Ellsworth	67609b28a4	Add sorting in File Browser	2020-10-12 19:17:58 -05:00
matrush	4dc206eaa6	Add copy action for database browser row selection alert	2020-10-12 19:17:57 -05:00
matrush	28e91507db	Remove retain cycles from selectionHandler in several files	2020-07-07 12:05:05 -05:00
matrush	5f74fb0d43	Remove redundant FLEXPointerIsTaggedPointer function	2020-07-07 12:04:34 -05:00
Tanner Bennett	09f5859feb	Add InAppViewDebugger thanks to README	2020-06-30 16:25:12 -05:00
Hao Nguyen	cee416889a	use __typeof instead of typeof to compile for Cxx instead of GNUxx	2020-06-19 01:39:48 -05:00
Tanner Bennett	e2a334384a	Misc cleanup and bug fixes	2020-05-25 17:23:18 -05:00
Tanner Bennett	a840e909a1	Add UIApplication shortcuts	2020-05-25 17:12:46 -05:00
Tanner Bennett	2f952c380f	Automatically activate search bar in heap explorer	2020-04-27 17:53:34 -05:00
Tanner Bennett	5d919eb329	Don't access ivars on tagged pointers	2020-04-25 00:51:58 -05:00
Tanner Bennett	1d5d825135	Fix class properties not showing previews	2020-04-25 00:51:36 -05:00
opa334	2a8cdbdb84	Fix heap enumeration on arm64e	2020-04-23 22:04:41 -05:00
Tanner Bennett	5e2081b8f9	Various performance improvements - Remove ARC from -[FLEXTypeEncodingParser canScanChar:] - Make FLEXMethod.imagePath lazy	2020-04-23 22:04:41 -05:00
Bas Broek	fbaeda1956	Remove parenthesis in Swift (#414 )	2020-04-16 10:34:27 -05:00
Tanner Bennett	c761865b9b	Namespace all fishhook functions, fix #408 I know not all of them needed to be namespaced as the private functions are static, but I did it anyway for consistency.	2020-04-06 17:47:47 -05:00
Tanner Bennett	700c50af5d	Bump version	2020-04-06 17:37:59 -05:00
Tanner Bennett	b38cca06b1	Fix ProtocolMember instance field The ProtocolMember instance field was not being populated in runtime exports	2020-04-06 17:32:43 -05:00
Tanner Bennett	6429573918	Rename some classes with excessively long names	2020-04-06 17:32:43 -05:00
Tanner Bennett	f77f5ccdc9	Push straight to single instances in heap explorer Take the user straight to the explorer itself if there is only one instance of the selected class	2020-04-06 17:32:43 -05:00
Tanner Bennett	7aeddcdb2c	Add search bar to view controllers list	2020-04-06 17:32:11 -05:00
Tanner Bennett	a25ef87a51	Make new JSON viewer and System Log behavior opt-in	2020-04-06 17:32:11 -05:00
Tanner Bennett	fbeb1beca0	Namespace some category filenames	2020-04-06 17:32:11 -05:00
Tanner Bennett	059bde9711	Fix crash in flex_all* methods	2020-04-06 17:32:11 -05:00
Tanner Bennett	2ca563f570	Bug fix: iPad support for FLEXAlert action sheets	2020-04-06 17:32:11 -05:00
Tanner Bennett	88c7ca9373	Add option to disable property/ivar previews	2020-03-31 12:16:57 -05:00
Tanner Bennett	83486641aa	Add < iOS 13 support to example project	2020-03-30 16:28:19 -05:00
Tanner Bennett	6bd0c87881	Fix import statement to work without modules	2020-03-30 16:28:19 -05:00
Tanner Bennett	1a64da70c9	Add FLEXRuntimeExporter Allows you to export the contents of a bundle's objc metadata as an SQLite database fix fix	2020-03-30 16:28:19 -05:00
Tanner Bennett	87ea2bb147	FLEXRuntimeClient additions - Move initializeWebKitLegacy to FLEXRuntimeClient - Add -copySafeClassList and -copyProtocolList	2020-03-27 19:59:32 -05:00
Tanner Bennett	d9e9be53d8	Various database browser related upgrades - All database managers automatically open and close connections to the underlying database - Allow getting last result and last rowid from FLEXSQLiteDatabaseManager - Execute statements with arguments with FLEXSQLiteDatabaseManager	2020-03-27 19:59:32 -05:00
Tanner Bennett	142f037497	Runtime wrapper upgrades - Make sure every object has an `imageName` property - Expose more fine-grained metadata through FLEXProtocol - Migrate flex_all* methods to top-level functions that the methods call into	2020-03-27 19:59:32 -05:00
Tanner Bennett	6cdb626d78	Various bug fixes	2020-03-27 19:59:32 -05:00
Tanner Bennett	6e81029b8b	Show HTTP status code in commit screen error	2020-03-27 19:16:09 -05:00
Tanner Bennett	1c7048e710	Dispatch JSON viewer registration to main queue	2020-03-25 15:12:34 -05:00