Gotta have this

Hope this works!
Fix imports
2023-01-17 03:16:52 -08:00 · 2023-01-17 03:16:52 -08:00 · 2023-01-17 03:16:46 -08:00 · 2023-01-17 02:41:17 -08:00 · 2022-12-09 03:33:07 -06:00 · 2022-12-05 18:09:13 -06:00
405 changed files with 7383 additions and 2019 deletions
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [NSExceptional]
@@ -20,3 +20,6 @@ DerivedData
 /Example/Pods
 Podfile.lock
 IDEWorkspaceChecks.plist
+*.xcworkspace
+.build
+bazel-*
@@ -0,0 +1,5 @@
+{
+    "search.exclude": {
+        "Classes/Headers": true
+    }
+}
@@ -0,0 +1,51 @@
+FLEX_PUBLIC_HDRS = glob([
+        "Classes/*.h",
+        "Classes/Manager/*.h",
+        "Classes/Toolbar/*.h",
+        "Classes/Core/**/*.h",
+        "Classes/Utility/Runtime/Objc/**/*.h",
+        "Classes/Utility/Runtime/Objc/*.h",
+        "Classes/ObjectExplorers/**/*.h",
+        "Classes/Editing/**/*.h",
+        "Classes/GlobalStateExplorers/**/*.h",
+        "Classes/Utility/Categories/*.h",
+    ], [
+        "**/FLEX.h"
+    ], allow_empty = False
+) + [
+    "Classes/Utility/FLEXMacros.h",
+    "Classes/Utility/FLEXAlert.h",
+    "Classes/Utility/FLEXResources.h",
+    "Classes/Utility/FLEXHeapEnumerator.h"
+]
+
+objc_library(
+    name = "FLEX",
+    module_name = "FLEX",
+    hdrs = FLEX_PUBLIC_HDRS,
+    srcs = glob([
+        "Classes/**/*.m",
+        "Classes/**/*.mm",
+        "Classes/**/*.c",
+        "Classes/**/*.h"
+    ], FLEX_PUBLIC_HDRS, allow_empty = False),
+    sdk_dylibs = [
+        "libz",
+        "libsqlite3"
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+        "CoreGraphics",
+        "ImageIO",
+        "QuartzCore",
+        "WebKit",
+        "Security",
+        "SceneKit"
+    ],
+    copts = [
+        "-Wno-deprecated-declarations",
+        "-Wno-unsupported-availability-guard"
+    ],
+    visibility = ["//visibility:public"]
+)
@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewController.h"
+#import "Classes/Headers/FLEXTableViewController.h"

 #pragma mark - FLEXTableViewFiltering
@protocol FLEXTableViewFiltering <FLEXSearchResultsUpdating>
@@ -6,9 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXFilteringTableViewController.h"
-#import "FLEXTableViewSection.h"
-#import "NSArray+FLEX.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
+#import "Classes/Headers/FLEXTableViewSection.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/FLEXMacros.h"

@interface FLEXFilteringTableViewController ()

@@ -73,7 +74,7 @@
 #pragma mark - Search

 - (void)updateSearchResults:(NSString *)newText {
-    NSArray *(^filter)() = ^NSArray *{
+    NSArray *(^filter)(void) = ^NSArray *{
        self.filterText = newText;

        // Sections will adjust data based on this property
@@ -187,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];
@@ -207,6 +206,4 @@
    return nil;
 }

-#endif
-
@end
@@ -16,4 +16,13 @@ NS_ASSUME_NONNULL_BEGIN

@end

+@interface UINavigationController (FLEXObjectExploring)
+
+/// Push an object explorer view controller onto the navigation stack
+- (void)pushExplorerForObject:(id)object;
+/// Push an object explorer view controller onto the navigation stack
+- (void)pushExplorerForObject:(id)object animated:(BOOL)animated;
+
+@end
+
 NS_ASSUME_NONNULL_END
@@ -6,9 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXNavigationController.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXTabList.h"
+#import "Classes/Headers/FLEXNavigationController.h"
+#import "Classes/ExplorerInterface/FLEXExplorerViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabList.h"

@interface UINavigationController (Private) <UIGestureRecognizerDelegate>
 - (void)_gestureRecognizedInteractiveHide:(UIGestureRecognizer *)sender;
@@ -28,7 +29,8 @@
@implementation FLEXNavigationController

 + (instancetype)withRootViewController:(UIViewController *)rootVC {
-    return [[self alloc] initWithRootViewController:rootVC];
+    FLEXNavigationController *nav = [[self alloc] initWithRootViewController:rootVC];
+    return nav;
 }

 - (void)viewDidLoad {
@@ -65,6 +67,17 @@
 - (void)viewWillAppear:(BOOL)animated {
    [super viewWillAppear:animated];
    
+    if (@available(iOS 15.0, *)) {
+        UISheetPresentationController *presenter = self.sheetPresentationController;
+        presenter.detents = @[
+            UISheetPresentationControllerDetent.mediumDetent,
+            UISheetPresentationControllerDetent.largeDetent,
+        ];
+        presenter.prefersScrollingExpandsWhenScrolledToEdge = NO;
+        presenter.selectedDetentIdentifier = UISheetPresentationControllerDetentIdentifierLarge;
+        presenter.largestUndimmedDetentIdentifier = UISheetPresentationControllerDetentIdentifierLarge;
+    }
+    
    if (self.beingPresented && !self.didSetupPendingDismissButtons) {
        for (UIViewController *vc in self.viewControllers) {
            [self addNavigationBarItemsToViewController:vc.navigationItem];
@@ -93,15 +106,25 @@
    [self addNavigationBarItemsToViewController:viewController.navigationItem];
 }

+- (void)dismissViewControllerAnimated:(BOOL)flag completion:(void (^)(void))completion {
+    // Workaround for UIActivityViewController trying to dismiss us for some reason
+    if (![self.viewControllers.lastObject.presentedViewController isKindOfClass:UIActivityViewController.self]) {
+        [super dismissViewControllerAnimated:flag completion:completion];
+    }
+}
+
 - (void)dismissAnimated {
    // Tabs are only closed if the done button is pressed; this
    // allows you to leave a tab open by dragging down to dismiss
-    [FLEXTabList.sharedList closeTab:self];
+    if ([self.presentingViewController isKindOfClass:[FLEXExplorerViewController class]]) {
+        [FLEXTabList.sharedList closeTab:self];        
+    }
+    
    [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
 }

 - (BOOL)canShowToolbar {
-    return self.topViewController.toolbarItems.count;
+    return self.topViewController.toolbarItems.count > 0;
 }

 - (void)addNavigationBarItemsToViewController:(UINavigationItem *)navigationItem {
@@ -191,3 +214,18 @@
 }

@end
+
+@implementation UINavigationController (FLEXObjectExploring)
+
+- (void)pushExplorerForObject:(id)object {
+    [self pushExplorerForObject:object animated:YES];
+}
+
+- (void)pushExplorerForObject:(id)object animated:(BOOL)animated {
+    UIViewController *explorer = [FLEXObjectExplorerFactory explorerViewControllerForObject:object];
+    if (explorer) {
+        [self pushViewController:explorer animated:animated];
+    }
+}
+
+@end
@@ -7,7 +7,7 @@
 //

 #import <UIKit/UIKit.h>
-#import "FLEXTableView.h"
+#import "Classes/Headers/FLEXTableView.h"
@class FLEXScopeCarousel, FLEXWindow, FLEXTableViewSection;

 typedef CGFloat FLEXDebounceInterval;
@@ -6,15 +6,15 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewController.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXBookmarksViewController.h"
-#import "FLEXTabsViewController.h"
-#import "FLEXScopeCarousel.h"
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "FLEXResources.h"
-#import "UIBarButtonItem+FLEX.h"
+#import "Classes/Headers/FLEXTableViewController.h"
+#import "Classes/ExplorerInterface/FLEXExplorerViewController.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabsViewController.h"
+#import "Classes/Core/Views/Carousel/FLEXScopeCarousel.h"
+#import "Classes/Headers/FLEXTableView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXResources.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
 #import <objc/runtime.h>

@interface Block : NSObject
@@ -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;
 }

@@ -69,9 +66,9 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
        _searchBarDebounceInterval = kFLEXDebounceFast;
        _showSearchBarInitially = YES;
        _style = style;
-        _manuallyDeactivateSearchOnDisappear = ({
-            NSProcessInfo.processInfo.operatingSystemVersion.majorVersion < 11;
-        });
+        _manuallyDeactivateSearchOnDisappear = (
+            NSProcessInfo.processInfo.operatingSystemVersion.majorVersion < 11
+        );
        
        // We will be our own search delegate if we implement this method
        if ([self respondsToSelector:@selector(updateSearchResults:)]) {
@@ -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 {
@@ -170,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;
 }
@@ -568,7 +559,7 @@ static UITextField *kDummyTextField = nil;
    [self.debounceTimer invalidate];
    NSString *text = searchController.searchBar.text;
    
-    void (^updateSearchResults)() = ^{
+    void (^updateSearchResults)(void) = ^{
        if (self.searchResultsUpdater) {
            [self.searchResultsUpdater updateSearchResults:text];
        } else {
@@ -6,7 +6,9 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewSection.h"
+#import "Classes/Headers/FLEXTableViewSection.h"
+
+NS_ASSUME_NONNULL_BEGIN

 /// A section providing a specific single row.
 ///
@@ -16,13 +18,15 @@
@interface FLEXSingleRowSection : FLEXTableViewSection

 /// @param reuseIdentifier if nil, kFLEXDefaultCell is used.
-+ (instancetype)title:(NSString *)sectionTitle
-                reuse:(NSString *)reuseIdentifier
+ (instancetype)title:(nullable NSString *)sectionTitle
+                reuse:(nullable NSString *)reuseIdentifier
                 cell:(void(^)(__kindof UITableViewCell *cell))cellConfiguration;

-@property (nonatomic) UIViewController *pushOnSelection;
-@property (nonatomic) void (^selectionAction)(UIViewController *host);
+@property (nullable, nonatomic) UIViewController *pushOnSelection;
+@property (nullable, nonatomic) void (^selectionAction)(UIViewController *host);
 /// Called to determine whether the single row should display itself or not.
@property (nonatomic) BOOL (^filterMatcher)(NSString *filterText);

@end
+
+NS_ASSUME_NONNULL_END
@@ -6,8 +6,8 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXSingleRowSection.h"
-#import "FLEXTableView.h"
+#import "Classes/Headers/FLEXSingleRowSection.h"
+#import "Classes/Headers/FLEXTableView.h"

@interface FLEXSingleRowSection ()
@property (nonatomic, readonly) NSString *reuseIdentifier;
@@ -30,6 +30,8 @@
 - (id)initWithTitle:(NSString *)sectionTitle
              reuse:(NSString *)reuseIdentifier
               cell:(void (^)(__kindof UITableViewCell *))cellConfiguration {
+    NSParameterAssert(cellConfiguration);
+    
    self = [super init];
    if (self) {
        _title = sectionTitle;
@@ -7,7 +7,7 @@
 //

 #import <UIKit/UIKit.h>
-#import "NSArray+FLEX.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
@class FLEXTableView;

 NS_ASSUME_NONNULL_BEGIN
@@ -100,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.
@@ -120,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

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewSection.h"
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "UIMenu+FLEX.h"
+#import "Classes/Headers/FLEXTableViewSection.h"
+#import "Classes/Headers/FLEXTableView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/Categories/UIMenu+FLEX.h"

 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wincomplete-implementation"
@@ -64,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];
@@ -81,7 +79,7 @@
    return @"";
 }

- (NSArray<UIMenuElement *> *)menuItemsForRow:(NSInteger)row sender:(UIViewController *)sender API_AVAILABLE(ios(13)) {
+- (NSArray<UIMenuElement *> *)menuItemsForRow:(NSInteger)row sender:(UIViewController *)sender API_AVAILABLE(ios(13.0)) {
    NSArray<NSString *> *copyItems = [self copyMenuItemsForRow:row];
    NSAssert(copyItems.count % 2 == 0, @"copyMenuItemsForRow: should return an even list");
    
@@ -127,8 +125,6 @@
    return @[];
 }

-#endif
-
 - (NSArray<NSString *> *)copyMenuItemsForRow:(NSInteger)row {
    return nil;
 }
@@ -6,9 +6,9 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXCarouselCell.h"
-#import "FLEXColor.h"
-#import "UIView+FLEX_Layout.h"
+#import "Classes/Core/Views/Carousel/FLEXCarouselCell.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/Categories/Private/UIView+FLEX_Layout.h"

@interface FLEXCarouselCell ()
@property (nonatomic, readonly) UILabel *titleLabel;
@@ -6,11 +6,11 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXScopeCarousel.h"
-#import "FLEXCarouselCell.h"
-#import "FLEXColor.h"
-#import "FLEXMacros.h"
-#import "UIView+FLEX_Layout.h"
+#import "Classes/Core/Views/Carousel/FLEXScopeCarousel.h"
+#import "Classes/Core/Views/Carousel/FLEXCarouselCell.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/FLEXMacros.h"
+#import "Classes/Utility/Categories/Private/UIView+FLEX_Layout.h"

 const CGFloat kCarouselItemSpacing = 0;
 NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";
@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXMultilineTableViewCell.h"
+#import "Classes/Headers/FLEXMultilineTableViewCell.h"

 NS_ASSUME_NONNULL_BEGIN

@@ -6,8 +6,8 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXCodeFontCell.h"
-#import "UIFont+FLEX.h"
+#import "Classes/Headers/FLEXCodeFontCell.h"
+#import "Classes/Utility/Categories/UIFont+FLEX.h"

@implementation FLEXCodeFontCell

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewCell.h"
+#import "Classes/Headers/FLEXTableViewCell.h"

@interface FLEXKeyValueTableViewCell : FLEXTableViewCell

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXKeyValueTableViewCell.h"
+#import "Classes/Headers/FLEXKeyValueTableViewCell.h"

@implementation FLEXKeyValueTableViewCell

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewCell.h"
+#import "Classes/Headers/FLEXTableViewCell.h"

 /// A cell with both labels set to be multi-line capable.
@interface FLEXMultilineTableViewCell : FLEXTableViewCell
@@ -6,9 +6,9 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXMultilineTableViewCell.h"
-#import "UIView+FLEX_Layout.h"
-#import "FLEXUtility.h"
+#import "Classes/Headers/FLEXMultilineTableViewCell.h"
+#import "Classes/Utility/Categories/Private/UIView+FLEX_Layout.h"
+#import "Classes/Utility/FLEXUtility.h"

@interface FLEXMultilineTableViewCell ()
@property (nonatomic, readonly) UILabel *_titleLabel;
@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewCell.h"
+#import "Classes/Headers/FLEXTableViewCell.h"

 /// A cell initialized with \c UITableViewCellStyleSubtitle
@interface FLEXSubtitleTableViewCell : FLEXTableViewCell
@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXSubtitleTableViewCell.h"
+#import "Classes/Headers/FLEXSubtitleTableViewCell.h"

@implementation FLEXSubtitleTableViewCell

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewCell.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
-#import "FLEXTableView.h"
+#import "Classes/Headers/FLEXTableViewCell.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Headers/FLEXTableView.h"

@interface UITableView (Internal)
 // Exists at least since iOS 5
@@ -6,12 +6,12 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "FLEXSubtitleTableViewCell.h"
-#import "FLEXMultilineTableViewCell.h"
-#import "FLEXKeyValueTableViewCell.h"
-#import "FLEXCodeFontCell.h"
+#import "Classes/Headers/FLEXTableView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Headers/FLEXSubtitleTableViewCell.h"
+#import "Classes/Headers/FLEXMultilineTableViewCell.h"
+#import "Classes/Headers/FLEXKeyValueTableViewCell.h"
+#import "Classes/Headers/FLEXCodeFontCell.h"

 FLEXTableViewCellReuseIdentifier const kFLEXDefaultCell = @"kFLEXDefaultCell";
 FLEXTableViewCellReuseIdentifier const kFLEXDetailCell = @"kFLEXDetailCell";
@@ -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 {
@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"

@interface FLEXArgumentInputColorView : FLEXArgumentInputView

@@ -6,9 +6,9 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputColorView.h"
-#import "FLEXUtility.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"

@protocol FLEXColorComponentInputViewDelegate;

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"

@interface FLEXArgumentInputDateView : FLEXArgumentInputView

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputDateView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputDateView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"

@interface FLEXArgumentInputDateView ()

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"

@interface FLEXArgumentInputFontView : FLEXArgumentInputView

@@ -6,10 +6,10 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputFontView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXArgumentInputFontsPickerView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.h"

@interface FLEXArgumentInputFontView ()

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 f. All rights reserved.
 //

-#import "FLEXArgumentInputTextView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"

@interface FLEXArgumentInputFontsPickerView : FLEXArgumentInputTextView <UIPickerViewDataSource, UIPickerViewDelegate>
@end
@@ -6,8 +6,8 @@
 //  Copyright (c) 2014年 f. All rights reserved.
 //

-#import "FLEXArgumentInputFontsPickerView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"

@interface FLEXArgumentInputFontsPickerView ()

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputTextView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"

@interface FLEXArgumentInputNotSupportedView : FLEXArgumentInputTextView

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputNotSupportedView.h"
-#import "FLEXColor.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.h"
+#import "Classes/Utility/FLEXColor.h"

@implementation FLEXArgumentInputNotSupportedView

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputTextView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"

@interface FLEXArgumentInputNumberView : FLEXArgumentInputTextView

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputNumberView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputNumberView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"

@implementation FLEXArgumentInputNumberView

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputTextView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"

@interface FLEXArgumentInputObjectView : FLEXArgumentInputTextView

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputObjectView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"

 static const CGFloat kSegmentInputMargin = 10;

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputTextView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"

@interface FLEXArgumentInputStringView : FLEXArgumentInputTextView

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputStringView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputStringView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"

@implementation FLEXArgumentInputStringView

@@ -6,8 +6,11 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"

@interface FLEXArgumentInputStructView : FLEXArgumentInputView

+/// Enable displaying ivar names for custom struct types
+ (void)registerFieldNames:(NSArray<NSString *> *)names forTypeEncoding:(NSString *)typeEncoding;
+
@end
@@ -6,10 +6,10 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputStructView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXTypeEncodingParser.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Utility/Runtime/Objc/FLEXTypeEncodingParser.h"

@interface FLEXArgumentInputStructView ()

@@ -19,6 +19,41 @@

@implementation FLEXArgumentInputStructView

+static NSMutableDictionary<NSString *, NSArray<NSString *> *> *structFieldNameRegistrar = nil;
+ (void)initialize {
+    if (self == [FLEXArgumentInputStructView class]) {
+        structFieldNameRegistrar = [NSMutableDictionary new];
+        [self registerDefaultFieldNames];
+    }
+}
+
+ (void)registerDefaultFieldNames {
+    NSDictionary *defaults = @{
+        @(@encode(CGRect)):             @[@"CGPoint origin", @"CGSize size"],
+        @(@encode(CGPoint)):            @[@"CGFloat x", @"CGFloat y"],
+        @(@encode(CGSize)):             @[@"CGFloat width", @"CGFloat height"],
+        @(@encode(CGVector)):           @[@"CGFloat dx", @"CGFloat dy"],
+        @(@encode(UIEdgeInsets)):       @[@"CGFloat top", @"CGFloat left", @"CGFloat bottom", @"CGFloat right"],
+        @(@encode(UIOffset)):           @[@"CGFloat horizontal", @"CGFloat vertical"],
+        @(@encode(NSRange)):            @[@"NSUInteger location", @"NSUInteger length"],
+        @(@encode(CATransform3D)):      @[@"CGFloat m11", @"CGFloat m12", @"CGFloat m13", @"CGFloat m14",
+                                          @"CGFloat m21", @"CGFloat m22", @"CGFloat m23", @"CGFloat m24",
+                                          @"CGFloat m31", @"CGFloat m32", @"CGFloat m33", @"CGFloat m34",
+                                          @"CGFloat m41", @"CGFloat m42", @"CGFloat m43", @"CGFloat m44"],
+        @(@encode(CGAffineTransform)):  @[@"CGFloat a", @"CGFloat b",
+                                          @"CGFloat c", @"CGFloat d",
+                                          @"CGFloat tx", @"CGFloat ty"],
+    };
+    
+    [structFieldNameRegistrar addEntriesFromDictionary:defaults];
+    
+    if (@available(iOS 11.0, *)) {
+        structFieldNameRegistrar[@(@encode(NSDirectionalEdgeInsets))] = @[
+            @"CGFloat top", @"CGFloat leading", @"CGFloat bottom", @"CGFloat trailing"
+        ];
+    }
+}
+
 - (instancetype)initWithArgumentTypeEncoding:(const char *)typeEncoding {
    self = [super initWithArgumentTypeEncoding:typeEncoding];
    if (self) {
@@ -181,40 +216,13 @@
    return NO;
 }

+ (void)registerFieldNames:(NSArray<NSString *> *)names forTypeEncoding:(NSString *)typeEncoding {
+    NSParameterAssert(typeEncoding); NSParameterAssert(names);
+    structFieldNameRegistrar[typeEncoding] = names;
+}
+
 + (NSArray<NSString *> *)customFieldTitlesForTypeEncoding:(const char *)typeEncoding {
-    NSArray<NSString *> *customTitles = nil;
-    if (strcmp(typeEncoding, @encode(CGRect)) == 0) {
-        customTitles = @[@"CGPoint origin", @"CGSize size"];
-    } else if (strcmp(typeEncoding, @encode(CGPoint)) == 0) {
-        customTitles = @[@"CGFloat x", @"CGFloat y"];
-    } else if (strcmp(typeEncoding, @encode(CGSize)) == 0) {
-        customTitles = @[@"CGFloat width", @"CGFloat height"];
-    } else if (strcmp(typeEncoding, @encode(CGVector)) == 0) {
-        customTitles = @[@"CGFloat dx", @"CGFloat dy"];
-    } else if (strcmp(typeEncoding, @encode(UIEdgeInsets)) == 0) {
-        customTitles = @[@"CGFloat top", @"CGFloat left", @"CGFloat bottom", @"CGFloat right"];
-    } else if (strcmp(typeEncoding, @encode(UIOffset)) == 0) {
-        customTitles = @[@"CGFloat horizontal", @"CGFloat vertical"];
-    } else if (strcmp(typeEncoding, @encode(NSRange)) == 0) {
-        customTitles = @[@"NSUInteger location", @"NSUInteger length"];
-    } else if (strcmp(typeEncoding, @encode(CATransform3D)) == 0) {
-        customTitles = @[@"CGFloat m11", @"CGFloat m12", @"CGFloat m13", @"CGFloat m14",
-                         @"CGFloat m21", @"CGFloat m22", @"CGFloat m23", @"CGFloat m24",
-                         @"CGFloat m31", @"CGFloat m32", @"CGFloat m33", @"CGFloat m34",
-                         @"CGFloat m41", @"CGFloat m42", @"CGFloat m43", @"CGFloat m44"];
-    } else if (strcmp(typeEncoding, @encode(CGAffineTransform)) == 0) {
-        customTitles = @[@"CGFloat a", @"CGFloat b",
-                         @"CGFloat c", @"CGFloat d",
-                         @"CGFloat tx", @"CGFloat ty"];
-    } else {
-        if (@available(iOS 11.0, *)) {
-            if (strcmp(typeEncoding, @encode(NSDirectionalEdgeInsets)) == 0) {
-                customTitles = @[@"CGFloat top", @"CGFloat leading",
-                                 @"CGFloat bottom", @"CGFloat trailing"];
-            }
-        }
-    }
-    return customTitles;
+    return structFieldNameRegistrar[@(typeEncoding)];
 }

@end
@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"

@interface FLEXArgumentInputSwitchView : FLEXArgumentInputView

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputSwitchView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.h"

@interface FLEXArgumentInputSwitchView ()

@@ -6,7 +6,7 @@
 //
 //

-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"

@interface FLEXArgumentInputTextView : FLEXArgumentInputView <UITextViewDelegate>

@@ -6,9 +6,9 @@
 //
 //

-#import "FLEXColor.h"
-#import "FLEXArgumentInputTextView.h"
-#import "FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"
+#import "Classes/Utility/FLEXUtility.h"

@interface FLEXArgumentInputTextView ()

@@ -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;
@@ -6,9 +6,9 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXArgumentInputView.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"

@interface FLEXArgumentInputView ()

@@ -7,7 +7,7 @@
 //

 #import <Foundation/Foundation.h>
-#import "FLEXArgumentInputSwitchView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.h"

@interface FLEXArgumentInputViewFactory : NSObject

@@ -21,4 +21,7 @@
 /// Useful when deciding whether to edit or explore a property, ivar, or NSUserDefaults value.
 + (BOOL)canEditFieldWithTypeEncoding:(const char *)typeEncoding currentValue:(id)currentValue;

+/// Enable displaying ivar names for custom struct types
+ (void)registerFieldNames:(NSArray<NSString *> *)names forTypeEncoding:(NSString *)typeEncoding;
+
@end
@@ -6,18 +6,18 @@
 //
 //

-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXArgumentInputObjectView.h"
-#import "FLEXArgumentInputNumberView.h"
-#import "FLEXArgumentInputSwitchView.h"
-#import "FLEXArgumentInputStructView.h"
-#import "FLEXArgumentInputNotSupportedView.h"
-#import "FLEXArgumentInputStringView.h"
-#import "FLEXArgumentInputFontView.h"
-#import "FLEXArgumentInputColorView.h"
-#import "FLEXArgumentInputDateView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputNumberView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputStringView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputDateView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"

@implementation FLEXArgumentInputViewFactory

@@ -67,4 +67,9 @@
    return [self argumentInputViewSubclassForTypeEncoding:typeEncoding currentValue:currentValue] != nil;
 }

+/// Enable displaying ivar names for custom struct types
+ (void)registerFieldNames:(NSArray<NSString *> *)names forTypeEncoding:(NSString *)typeEncoding {
+    [FLEXArgumentInputStructView registerFieldNames:names forTypeEncoding:typeEncoding];
+}
+
@end
@@ -6,13 +6,13 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXFieldEditorViewController.h"
+#import "Classes/Editing/FLEXFieldEditorViewController.h"

 NS_ASSUME_NONNULL_BEGIN

@interface FLEXDefaultEditorViewController : FLEXVariableEditorViewController

-+ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)())onCommit;
+ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)(void))onCommit;

 + (BOOL)canEditDefaultWithValue:(nullable id)currentValue;

@@ -6,11 +6,11 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXDefaultEditorViewController.h"
-#import "FLEXFieldEditorView.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXArgumentInputViewFactory.h"
+#import "Classes/Editing/FLEXDefaultEditorViewController.h"
+#import "Classes/Editing/FLEXFieldEditorView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"

@interface FLEXDefaultEditorViewController ()

@@ -21,7 +21,7 @@

@implementation FLEXDefaultEditorViewController

-+ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)())onCommit {
+ (instancetype)target:(NSUserDefaults *)defaults key:(NSString *)key commitHandler:(void(^_Nullable)(void))onCommit {
    FLEXDefaultEditorViewController *editor = [self target:defaults data:key commitHandler:onCommit];
    editor.title = @"Edit Default";
    return editor;
@@ -6,9 +6,10 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXFieldEditorView.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXUtility.h"
+#import "Classes/Editing/FLEXFieldEditorView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"

@interface FLEXFieldEditorView ()

@@ -122,7 +123,7 @@
 }

 + (UIColor *)dividerColor {
-    return UIColor.lightGrayColor;
+    return FLEXColor.tertiaryBackgroundColor;
 }

 + (CGFloat)horizontalPadding {
@@ -6,18 +6,18 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXVariableEditorViewController.h"
-#import "FLEXProperty.h"
-#import "FLEXIvar.h"
+#import "Classes/Editing/FLEXVariableEditorViewController.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXProperty.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXIvar.h"

 NS_ASSUME_NONNULL_BEGIN

@interface FLEXFieldEditorViewController : FLEXVariableEditorViewController

 /// @return nil if the property is readonly or if the type is unsupported
-+ (nullable instancetype)target:(id)target property:(FLEXProperty *)property commitHandler:(void(^_Nullable)())onCommit;
+ (nullable instancetype)target:(id)target property:(FLEXProperty *)property commitHandler:(void(^_Nullable)(void))onCommit;
 /// @return nil if the ivar type is unsupported
-+ (nullable instancetype)target:(id)target ivar:(FLEXIvar *)ivar commitHandler:(void(^_Nullable)())onCommit;
+ (nullable instancetype)target:(id)target ivar:(FLEXIvar *)ivar commitHandler:(void(^_Nullable)(void))onCommit;

 /// Subclasses can change the button title via the \c title property
@property (nonatomic, readonly) UIBarButtonItem *getterButton;
@@ -6,17 +6,19 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXFieldEditorViewController.h"
-#import "FLEXFieldEditorView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXPropertyAttributes.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
-#import "UIBarButtonItem+FLEX.h"
+#import "Classes/Editing/FLEXFieldEditorViewController.h"
+#import "Classes/Editing/FLEXFieldEditorView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXPropertyAttributes.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMetadataExtras.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"

@interface FLEXFieldEditorViewController () <FLEXArgumentInputViewDelegate>

+@property (nonatomic, readonly) id<FLEXMetadataAuxiliaryInfo> auxiliaryInfoProvider;
@property (nonatomic) FLEXProperty *property;
@property (nonatomic) FLEXIvar *ivar;

@@ -30,19 +32,14 @@

 #pragma mark - Initialization

-+ (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;
-    }
-
+ (instancetype)target:(id)target property:(nonnull FLEXProperty *)property commitHandler:(void(^)(void))onCommit {
    FLEXFieldEditorViewController *editor = [self target:target data:property commitHandler:onCommit];
    editor.title = [@"Property: " stringByAppendingString:property.name];
    editor.property = property;
    return editor;
 }

-+ (instancetype)target:(id)target ivar:(nonnull FLEXIvar *)ivar commitHandler:(void(^_Nullable)())onCommit {
+ (instancetype)target:(id)target ivar:(nonnull FLEXIvar *)ivar commitHandler:(void(^)(void))onCommit {
    FLEXFieldEditorViewController *editor = [self target:target data:ivar commitHandler:onCommit];
    editor.title = [@"Ivar: " stringByAppendingString:ivar.name];
    editor.ivar = ivar;
@@ -66,6 +63,8 @@
    self.toolbarItems = @[
        UIBarButtonItem.flex_flexibleSpace, self.getterButton, self.actionButton
    ];
+    
+    [self registerAuxiliaryInfo];

    // Configure input view
    self.fieldEditorView.fieldDescription = self.fieldDescription;
@@ -127,6 +126,17 @@

 #pragma mark - Private

+- (void)registerAuxiliaryInfo {
+    // This is how Reflex will get Swift struct field names into the editor at runtime
+    NSDictionary<NSString *, NSArray *> *labels = [self.auxiliaryInfoProvider
+        auxiliaryInfoForKey:FLEXAuxiliarynfoKeyFieldLabels
+    ];
+    
+    for (NSString *type in labels) {
+        [FLEXArgumentInputViewFactory registerFieldNames:labels[type] forTypeEncoding:type];
+    }
+}
+
 - (id)currentValue {
    if (self.property) {
        return [self.property getValue:self.target];
@@ -135,6 +145,10 @@
    }
 }

+- (id<FLEXMetadataAuxiliaryInfo>)auxiliaryInfoProvider {
+    return self.ivar ?: self.property;
+}
+
 - (const FLEXTypeEncoding *)typeEncoding {
    if (self.property) {
        return self.property.attributes.typeEncoding.UTF8String;
@@ -151,14 +165,4 @@
    }
 }

-+ (BOOL)canEditProperty:(FLEXProperty *)property onObject:(id)object currentValue:(id)value {
-    const FLEXTypeEncoding *typeEncoding = property.attributes.typeEncoding.UTF8String;
-    BOOL canEditType = [FLEXArgumentInputViewFactory canEditFieldWithTypeEncoding:typeEncoding currentValue:value];
-    return canEditType && [object respondsToSelector:property.likelySetter];
-}
-
-+ (BOOL)canEditIvar:(Ivar)ivar currentValue:(id)value {
-    return [FLEXArgumentInputViewFactory canEditFieldWithTypeEncoding:ivar_getTypeEncoding(ivar) currentValue:value];
-}
-
@end
@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXVariableEditorViewController.h"
-#import "FLEXMethod.h"
+#import "Classes/Editing/FLEXVariableEditorViewController.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMethod.h"

@interface FLEXMethodCallingViewController : FLEXVariableEditorViewController

@@ -6,14 +6,14 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXMethodCallingViewController.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXFieldEditorView.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXObjectExplorerViewController.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXUtility.h"
+#import "Classes/Editing/FLEXMethodCallingViewController.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Editing/FLEXFieldEditorView.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXObjectExplorerViewController.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Utility/FLEXUtility.h"

@interface FLEXMethodCallingViewController ()
@property (nonatomic, readonly) FLEXMethod *method;
@@ -21,17 +21,17 @@ NS_ASSUME_NONNULL_BEGIN
    @protected
    id _target;
    _Nullable id _data;
-    void (^_Nullable _commitHandler)();
+    void (^_Nullable _commitHandler)(void);
 }

 /// @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;
+ (instancetype)target:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit;
 /// @param target The target of the operation
 /// @param data The data associated with the operation
 /// @param onCommit An action to perform when the data changes 
- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)())onCommit;
+- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit;

@property (nonatomic, readonly) id target;

@@ -6,16 +6,16 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXColor.h"
-#import "FLEXVariableEditorViewController.h"
-#import "FLEXFieldEditorView.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXUtility.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXObjectExplorerViewController.h"
-#import "UIBarButtonItem+FLEX.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Editing/FLEXVariableEditorViewController.h"
+#import "Classes/Editing/FLEXFieldEditorView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Headers/FLEXObjectExplorerViewController.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"

@interface FLEXVariableEditorViewController () <UIScrollViewDelegate>
@property (nonatomic) UIScrollView *scrollView;
@@ -25,11 +25,11 @@

 #pragma mark - Initialization

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

- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)())onCommit {
+- (id)initWithTarget:(id)target data:(nullable id)data commitHandler:(void(^_Nullable)(void))onCommit {
    self = [super init];
    if (self) {
        _target = target;
@@ -37,7 +37,7 @@
        _commitHandler = onCommit;
        [NSNotificationCenter.defaultCenter
            addObserver:self selector:@selector(keyboardDidShow:)
-            name:UIKeyboardDidShowNotification object:nil
+            name:UIKeyboardWillShowNotification object:nil
        ];
        [NSNotificationCenter.defaultCenter
            addObserver:self selector:@selector(keyboardWillHide:)
@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXBookmarkManager.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.h"

 static NSMutableArray *kFLEXBookmarkManagerBookmarks = nil;

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewController.h"
+#import "Classes/Headers/FLEXTableViewController.h"

 NS_ASSUME_NONNULL_BEGIN

@@ -6,16 +6,16 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXBookmarksViewController.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXNavigationController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXBookmarkManager.h"
-#import "UIBarButtonItem+FLEX.h"
-#import "FLEXColor.h"
-#import "FLEXUtility.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXTableView.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.h"
+#import "Classes/ExplorerInterface/FLEXExplorerViewController.h"
+#import "Classes/Headers/FLEXNavigationController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Headers/FLEXTableView.h"

@interface FLEXBookmarksViewController ()
@property (nonatomic, copy) NSArray *bookmarks;
@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXExplorerToolbar.h"
+#import "Classes/Headers/FLEXExplorerToolbar.h"

@class FLEXWindow;
@protocol FLEXExplorerViewControllerDelegate;
@@ -21,13 +21,22 @@

 - (BOOL)shouldReceiveTouchAtWindowPoint:(CGPoint)pointInWindowCoordinates;

-/// @brief Used to present (or dismiss) a modal view controller ("tool"), typically triggered by pressing a button in the toolbar.
+/// @brief Used to present (or dismiss) a modal view controller ("tool"),
+/// typically triggered by pressing a button in the toolbar.
 ///
 /// If a tool is already presented, this method simply dismisses it and calls the completion block.
 /// If no tool is presented, @code future() @endcode is presented and the completion block is called.
 - (void)toggleToolWithViewControllerProvider:(UINavigationController *(^)(void))future
                                  completion:(void (^)(void))completion;

+/// @brief Used to present (or dismiss) a modal view controller ("tool"),
+/// typically triggered by pressing a button in the toolbar.
+///
+/// If a tool is already presented, this method dismisses it and presents the given tool.
+/// The completion block is called once the tool has been presented.
+- (void)presentTool:(UINavigationController *(^)(void))future
+         completion:(void (^)(void))completion;
+
 // Keyboard shortcut helpers

 - (void)toggleSelectTool;
@@ -6,21 +6,21 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXExplorerViewController.h"
-#import "FLEXExplorerToolbarItem.h"
-#import "FLEXUtility.h"
-#import "FLEXWindow.h"
-#import "FLEXTabList.h"
-#import "FLEXNavigationController.h"
-#import "FLEXHierarchyViewController.h"
-#import "FLEXGlobalsViewController.h"
-#import "FLEXObjectExplorerViewController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXNetworkMITMViewController.h"
-#import "FLEXTabsViewController.h"
-#import "FLEXWindowManagerController.h"
-#import "FLEXViewControllersViewController.h"
-#import "NSUserDefaults+FLEX.h"
+#import "Classes/ExplorerInterface/FLEXExplorerViewController.h"
+#import "Classes/Headers/FLEXExplorerToolbarItem.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/ExplorerInterface/FLEXWindow.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabList.h"
+#import "Classes/Headers/FLEXNavigationController.h"
+#import "Classes/ViewHierarchy/FLEXHierarchyViewController.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Network/FLEXNetworkMITMViewController.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabsViewController.h"
+#import "Classes/ExplorerInterface/FLEXWindowManagerController.h"
+#import "Classes/ExplorerInterface/FLEXViewControllersViewController.h"
+#import "Classes/Utility/Categories/NSUserDefaults+FLEX.h"

 typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    FLEXExplorerModeDefault,
@@ -129,6 +129,14 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    if (@available(iOS 10.0, *)) {
        _selectionFBG = [UISelectionFeedbackGenerator new];
    }
+    
+    // Observe keyboard to move self out of the way
+    [NSNotificationCenter.defaultCenter
+        addObserver:self
+        selector:@selector(keyboardShown:)
+        name:UIKeyboardWillShowNotification
+        object:nil
+    ];
 }

 - (void)viewWillAppear:(BOOL)animated {
@@ -162,7 +170,10 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    
    UIViewController *viewControllerToAsk = [self viewControllerForRotationAndOrientation];
    UIInterfaceOrientationMask supportedOrientations = FLEXUtility.infoPlistSupportedInterfaceOrientationsMask;
-    if (viewControllerToAsk && ![viewControllerToAsk isKindOfClass:[self class]]) {
+    // We check its class by name because using isKindOfClass will fail for the same class defined
+    // twice in the runtime; and the goal here is to avoid calling -supportedInterfaceOrientations
+    // recursively when I'm inspecting FLEX with itself from a tweak dylib
+    if (viewControllerToAsk && ![NSStringFromClass([viewControllerToAsk class]) hasPrefix:@"FLEX"]) {
        supportedOrientations = [viewControllerToAsk supportedInterfaceOrientations];
    }
    
@@ -375,6 +386,21 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    return [self.view convertRect:frameInWindow fromView:nil];
 }

+- (void)keyboardShown:(NSNotification *)notif {
+    CGRect keyboardFrame = [notif.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    CGRect toolbarFrame = self.explorerToolbar.frame;
+    
+    if (CGRectGetMinY(keyboardFrame) < CGRectGetMaxY(toolbarFrame)) {
+        toolbarFrame.origin.y = keyboardFrame.origin.y - toolbarFrame.size.height;
+        // Subtract a little more, to ignore accessory input views
+        toolbarFrame.origin.y -= 50;
+        
+        [UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:1 initialSpringVelocity:0.5
+                            options:UIViewAnimationOptionCurveEaseOut animations:^{
+            [self updateToolbarPositionWithUnconstrainedFrame:toolbarFrame];
+        } completion:nil];
+    }
+}

 #pragma mark - Toolbar Buttons

@@ -403,8 +429,12 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 }

 - (UIWindow *)statusWindow {
-    NSString *statusBarString = [NSString stringWithFormat:@"%@arWindow", @"_statusB"];
-    return [UIApplication.sharedApplication valueForKey:statusBarString];
+    if (!@available(iOS 16, *)) {
+        NSString *statusBarString = [NSString stringWithFormat:@"%@arWindow", @"_statusB"];
+        return [UIApplication.sharedApplication valueForKey:statusBarString];
+    }
+    
+    return nil;
 }

 - (void)recentButtonTapped:(FLEXExplorerToolbarItem *)sender {
@@ -436,7 +466,11 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    toolbar.moveItem.selected = self.currentMode == FLEXExplorerModeMove;
    
    // Recent only enabled when we have a last active tab
-    toolbar.recentItem.enabled = FLEXTabList.sharedList.activeTab != nil;
+    if (!self.presentedViewController) {
+        toolbar.recentItem.enabled = FLEXTabList.sharedList.activeTab != nil;
+    } else {
+        toolbar.recentItem.enabled = NO;
+    }
 }


@@ -460,17 +494,12 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
        initWithTarget:self action:@selector(handleToolbarDetailsTapGesture:)
    ];
    [toolbar.selectedViewDescriptionContainer addGestureRecognizer:self.detailsTapGR];
+    
    // Swipe gestures for selecting deeper / higher views at a point
-    UIPanGestureRecognizer *leftSwipe = [[UIPanGestureRecognizer alloc]
+    UIPanGestureRecognizer *panGesture = [[UIPanGestureRecognizer alloc]
        initWithTarget:self action:@selector(handleChangeViewAtPointGesture:)
    ];
-//    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:panGesture];
    
    // Long press gesture to present tabs manager
    [toolbar.globalsItem addGestureRecognizer:[[UILongPressGestureRecognizer alloc]
@@ -823,31 +852,34 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 #pragma mark - Touch Handling

 - (BOOL)shouldReceiveTouchAtWindowPoint:(CGPoint)pointInWindowCoordinates {
-    BOOL shouldReceiveTouch = NO;
-    
    CGPoint pointInLocalCoordinates = [self.view convertPoint:pointInWindowCoordinates fromView:nil];
    
-    // Always if it's on the toolbar
-    if (CGRectContainsPoint(self.explorerToolbar.frame, pointInLocalCoordinates)) {
-        shouldReceiveTouch = YES;
+    // If we have a modal presented, is it in the modal?
+    if (self.presentedViewController) {
+        UIView *presentedView = self.presentedViewController.view;
+        CGPoint pipvc = [presentedView convertPoint:pointInLocalCoordinates fromView:self.view];
+        UIView *hit = [presentedView hitTest:pipvc withEvent:nil];
+        if (hit != nil) {
+            return YES;
+        }
    }
    
    // Always if we're in selection mode
-    if (!shouldReceiveTouch && self.currentMode == FLEXExplorerModeSelect) {
-        shouldReceiveTouch = YES;
+    if (self.currentMode == FLEXExplorerModeSelect) {
+        return YES;
    }
    
    // Always in move mode too
-    if (!shouldReceiveTouch && self.currentMode == FLEXExplorerModeMove) {
-        shouldReceiveTouch = YES;
+    if (self.currentMode == FLEXExplorerModeMove) {
+        return YES;
    }
    
-    // Always if we have a modal presented
-    if (!shouldReceiveTouch && self.presentedViewController) {
-        shouldReceiveTouch = YES;
+    // Always if it's on the toolbar
+    if (CGRectContainsPoint(self.explorerToolbar.frame, pointInLocalCoordinates)) {
+        return YES;
    }
    
-    return shouldReceiveTouch;
+    return NO;
 }


@@ -893,8 +925,14 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    // up in case we start replacing them again in the future
    self.appMenuItems = UIMenuController.sharedMenuController.menuItems;
    
+    [self updateButtonStates];
+    
    // Show the view controller
-    [super presentViewController:toPresent animated:animated completion:completion];
+    [super presentViewController:toPresent animated:animated completion:^{
+        [self updateButtonStates];
+        
+        if (completion) completion();
+    }];
 }

 - (void)dismissViewControllerAnimated:(BOOL)animated completion:(void (^)(void))completion {    
@@ -915,7 +953,11 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    
    [self updateButtonStates];
    
-    [super dismissViewControllerAnimated:animated completion:completion];
+    [super dismissViewControllerAnimated:animated completion:^{
+        [self updateButtonStates];
+        
+        if (completion) completion();
+    }];
 }

 - (BOOL)wantsWindowToBecomeKey {
@@ -925,12 +967,26 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 - (void)toggleToolWithViewControllerProvider:(UINavigationController *(^)(void))future
                                  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;
 }
@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXFilteringTableViewController.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"

 NS_ASSUME_NONNULL_BEGIN

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXViewControllersViewController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXMutableListSection.h"
-#import "FLEXUtility.h"
+#import "Classes/ExplorerInterface/FLEXViewControllersViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Utility/FLEXUtility.h"

@interface FLEXViewControllersViewController ()
@property (nonatomic, readonly) FLEXMutableListSection *section;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXWindow.h"
-#import "FLEXUtility.h"
+#import "Classes/ExplorerInterface/FLEXWindow.h"
+#import "Classes/Utility/FLEXUtility.h"
 #import <objc/runtime.h>

@implementation FLEXWindow
@@ -18,18 +18,13 @@
        // Some apps have windows at UIWindowLevelStatusBar + n.
        // If we make the window level too high, we block out UIAlertViews.
        // There's a balance between staying above the app's windows and staying below alerts.
-        // UIWindowLevelStatusBar + 100 seems to hit that balance.
-        self.windowLevel = UIWindowLevelStatusBar + 100.0;
+        self.windowLevel = UIWindowLevelAlert - 1;
    }
    return self;
 }

 - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event {
-    BOOL pointInside = NO;
-    if ([self.eventDelegate shouldHandleTouchAtPoint:point]) {
-        pointInside = [super pointInside:point withEvent:event];
-    }
-    return pointInside;
+    return [self.eventDelegate shouldHandleTouchAtPoint:point];
 }

 - (BOOL)shouldAffectStatusBarAppearance {
@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewController.h"
+#import "Classes/Headers/FLEXTableViewController.h"

 NS_ASSUME_NONNULL_BEGIN

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXWindowManagerController.h"
-#import "FLEXManager+Private.h"
-#import "FLEXUtility.h"
-#import "FLEXObjectExplorerFactory.h"
+#import "Classes/ExplorerInterface/FLEXWindowManagerController.h"
+#import "Classes/Manager/Private/FLEXManager+Private.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"

@interface FLEXWindowManagerController ()
@property (nonatomic) UIWindow *keyWindow;
@@ -72,7 +72,7 @@
    [self dismissViewControllerAnimated:YES completion:nil];
 }

- (void)showRevertOrDismissAlert:(void(^)())revertBlock {
+- (void)showRevertOrDismissAlert:(void(^)(void))revertBlock {
    [self.tableView deselectRowAtIndexPath:self.tableView.indexPathForSelectedRow animated:YES];
    [self reloadData];
    [self.tableView reloadData];
@@ -6,8 +6,8 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTabList.h"
-#import "FLEXUtility.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabList.h"
+#import "Classes/Utility/FLEXUtility.h"

@interface FLEXTabList () {
    NSMutableArray *_openTabs;
@@ -80,10 +80,20 @@

 - (void)closeTab:(UINavigationController *)tab {
    NSParameterAssert(tab);
-    NSParameterAssert([self.openTabs containsObject:tab]);
    NSInteger idx = [self.openTabs indexOfObject:tab];
+    if (idx != NSNotFound) {
+        [self closeTabAtIndex:idx];
+    }
    
-    [self closeTabAtIndex:idx];
+    // Not sure how this is possible, but it happens sometimes
+    if (self.activeTab == tab) {
+        [self chooseNewActiveTab];
+    }
+    
+    // It is possible for an object explorer to form a retain cycle
+    // with its own navigation controller; clearing the view controllers
+    // manually when closing a tab breaks the cycle
+    tab.viewControllers = @[];
 }

 - (void)closeTabAtIndex:(NSInteger)idx {
@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTableViewController.h"
+#import "Classes/Headers/FLEXTableViewController.h"

@interface FLEXTabsViewController : FLEXTableViewController

@@ -6,17 +6,17 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXTabsViewController.h"
-#import "FLEXNavigationController.h"
-#import "FLEXTabList.h"
-#import "FLEXBookmarkManager.h"
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
-#import "UIBarButtonItem+FLEX.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXGlobalsViewController.h"
-#import "FLEXBookmarksViewController.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabsViewController.h"
+#import "Classes/Headers/FLEXNavigationController.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabList.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.h"
+#import "Classes/Headers/FLEXTableView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
+#import "Classes/ExplorerInterface/FLEXExplorerViewController.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsViewController.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.h"

@interface FLEXTabsViewController ()
@property (nonatomic, copy) NSArray<UINavigationController *> *openTabs;
@@ -6,17 +6,16 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
+#import "Classes/Utility/Categories/CALayer+FLEX.h"
+#import "Classes/Utility/Categories/UIFont+FLEX.h"
+#import "Classes/Utility/Categories/UIGestureRecognizer+Blocks.h"
+#import "Classes/Utility/Categories/UIPasteboard+FLEX.h"
+#import "Classes/Utility/Categories/UIMenu+FLEX.h"
+#import "Classes/Utility/Categories/UITextField+Range.h"

-
-#import <FLEX/UIBarButtonItem+FLEX.h>
-#import <FLEX/CALayer+FLEX.h>
-#import <FLEX/UIFont+FLEX.h>
-#import <FLEX/UIGestureRecognizer+Blocks.h>
-#import <FLEX/UIPasteboard+FLEX.h>
-#import <FLEX/UIMenu+FLEX.h>
-#import <FLEX/UITextField+Range.h>
-
-#import <FLEX/NSObject+FLEX_Reflection.h>
-#import <FLEX/NSArray+FLEX.h>
-#import <FLEX/NSUserDefaults+FLEX.h>
-#import <FLEX/NSTimer+FLEX.h>
+#import "Classes/Utility/Categories/NSObject+FLEX_Reflection.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/Categories/NSUserDefaults+FLEX.h"
+#import "Classes/Utility/Categories/NSTimer+FLEX.h"
+#import "Classes/Utility/Categories/NSDateFormatter+FLEX.h"
@@ -6,18 +6,17 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import <FLEX/FLEXFilteringTableViewController.h>
-#import <FLEX/FLEXNavigationController.h>
-#import <FLEX/FLEXTableViewController.h>
-#import <FLEX/FLEXTableView.h>
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
+#import "Classes/Headers/FLEXNavigationController.h"
+#import "Classes/Headers/FLEXTableViewController.h"
+#import "Classes/Headers/FLEXTableView.h"

-#import <FLEX/FLEXSingleRowSection.h>
-#import <FLEX/FLEXTableViewSection.h>
+#import "Classes/Headers/FLEXSingleRowSection.h"
+#import "Classes/Headers/FLEXTableViewSection.h"

-#import <FLEX/FLEXCodeFontCell.h>
-#import <FLEX/FLEXSubtitleTableViewCell.h>
-#import <FLEX/FLEXTableViewCell.h>
-#import <FLEX/FLEXMultilineTableViewCell.h>
-#import <FLEX/FLEXKeyValueTableViewCell.h>
+#import "Classes/Headers/FLEXCodeFontCell.h"
+#import "Classes/Headers/FLEXSubtitleTableViewCell.h"
+#import "Classes/Headers/FLEXTableViewCell.h"
+#import "Classes/Headers/FLEXMultilineTableViewCell.h"
+#import "Classes/Headers/FLEXKeyValueTableViewCell.h"

-#import <FLEX/FLEXScopeCarousel.h>
@@ -6,25 +6,17 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import <FLEX/FLEXObjectExplorerFactory.h>
-#import <FLEX/FLEXObjectExplorerViewController.h>
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXObjectExplorerViewController.h"

-#import <FLEX/FLEXObjectExplorer.h>
+#import "Classes/Headers/FLEXObjectExplorer.h"

-#import <FLEX/FLEXShortcut.h>
-#import <FLEX/FLEXShortcutsFactory+Defaults.h>
-#import <FLEX/FLEXShortcutsSection.h>
-#import <FLEX/FLEXBlockShortcuts.h>
-#import <FLEX/FLEXBundleShortcuts.h>
-#import <FLEX/FLEXClassShortcuts.h>
-#import <FLEX/FLEXImageShortcuts.h>
-#import <FLEX/FLEXLayerShortcuts.h>
-#import <FLEX/FLEXViewControllerShortcuts.h>
-#import <FLEX/FLEXViewShortcuts.h>
+#import "Classes/Headers/FLEXShortcut.h"
+#import "Classes/Headers/FLEXShortcutsSection.h"

-#import <FLEX/FLEXCollectionContentSection.h>
-#import <FLEX/FLEXColorPreviewSection.h>
-#import <FLEX/FLEXDefaultsContentSection.h>
-#import <FLEX/FLEXMetadataSection.h>
-#import <FLEX/FLEXMutableListSection.h>
-#import <FLEX/FLEXObjectInfoSection.h>
+#import "Classes/Headers/FLEXCollectionContentSection.h"
+#import "Classes/Headers/FLEXColorPreviewSection.h"
+#import "Classes/Headers/FLEXDefaultsContentSection.h"
+#import "Classes/Headers/FLEXMetadataSection.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Headers/FLEXObjectInfoSection.h"
@@ -6,20 +6,22 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import <FLEX/FLEXObjcInternal.h>
-#import <FLEX/FLEXRuntimeSafety.h>
-#import <FLEX/FLEXBlockDescription.h>
-#import <FLEX/FLEXTypeEncodingParser.h>
+#import "Classes/Utility/Runtime/Objc/FLEXObjcInternal.h"
+#import "Classes/Utility/Runtime/Objc/FLEXSwiftInternal.h"
+#import "Classes/Utility/Runtime/Objc/FLEXRuntimeSafety.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXBlockDescription.h"
+#import "Classes/Utility/Runtime/Objc/FLEXTypeEncodingParser.h"

-#import <FLEX/FLEXMirror.h>
-#import <FLEX/FLEXProtocol.h>
-#import <FLEX/FLEXProperty.h>
-#import <FLEX/FLEXIvar.h>
-#import <FLEX/FLEXMethodBase.h>
-#import <FLEX/FLEXMethod.h>
-#import <FLEX/FLEXPropertyAttributes.h>
-#import <FLEX/FLEXRuntime+Compare.h>
-#import <FLEX/FLEXRuntime+UIKitHelpers.h>
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMirror.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXProtocol.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXProperty.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXIvar.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMethodBase.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMethod.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXPropertyAttributes.h"
+#import "Classes/Utility/Categories/FLEXRuntime+Compare.h"
+#import "Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMetadataExtras.h"

-#import <FLEX/FLEXProtocolBuilder.h>
-#import <FLEX/FLEXClassBuilder.h>
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXProtocolBuilder.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXClassBuilder.h"
@@ -7,18 +7,20 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#import <FLEX/FLEXManager.h>
-#import <FLEX/FLEXManager+Extensibility.h>
-#import <FLEX/FLEXManager+Networking.h>
+#import "Classes/Headers/FLEXManager.h"
+#import "Classes/Headers/FLEXManager+Extensibility.h"
+#import "Classes/Headers/FLEXManager+Networking.h"

-#import <FLEX/FLEXExplorerToolbar.h>
-#import <FLEX/FLEXExplorerToolbarItem.h>
-#import <FLEX/FLEXGlobalsEntry.h>
+#import "Classes/Headers/FLEXExplorerToolbar.h"
+#import "Classes/Headers/FLEXExplorerToolbarItem.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"

-#import <FLEX/FLEX-Core.h>
-#import <FLEX/FLEX-Runtime.h>
-#import <FLEX/FLEX-Categories.h>
-#import <FLEX/FLEX-ObjectExploring.h>
+#import "Classes/Headers/FLEX-Core.h"
+#import "Classes/Headers/FLEX-Runtime.h"
+#import "Classes/Headers/FLEX-Categories.h"
+#import "Classes/Headers/FLEX-ObjectExploring.h"

-#import <FLEX/FLEXAlert.h>
-#import <FLEX/FLEXResources.h>
+#import "Classes/Utility/FLEXMacros.h"
+#import "Classes/Utility/FLEXAlert.h"
+#import "Classes/Utility/FLEXResources.h"
+#import "Classes/Utility/FLEXHeapEnumerator.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
@@ -6,11 +6,11 @@
 //  Copyright © 2015年 f. All rights reserved.
 //

-#import "FLEXDBQueryRowCell.h"
-#import "FLEXMultiColumnTableView.h"
-#import "NSArray+FLEX.h"
-#import "UIFont+FLEX.h"
-#import "FLEXColor.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/Categories/UIFont+FLEX.h"
+#import "Classes/Utility/FLEXColor.h"

 NSString * const kFLEXDBQueryRowCellReuse = @"kFLEXDBQueryRowCellReuse";

@@ -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);
    }];
 }

@@ -12,7 +12,7 @@
 //  which Flying Meat Inc. licenses this file to you.

 #import <Foundation/Foundation.h>
-#import "FLEXSQLResult.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.h"

 /// Conformers should automatically open and close the database
@protocol FLEXDatabaseManager <NSObject>
@@ -29,6 +29,7 @@

@optional

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

@end
@@ -7,7 +7,7 @@
 //

 #import <UIKit/UIKit.h>
-#import "FLEXTableColumnHeader.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableColumnHeader.h"

@class FLEXMultiColumnTableView;

@@ -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;
@@ -6,13 +6,15 @@
 //  Copyright © 2015年 Peng Tao. All rights reserved.
 //

-#import "FLEXMultiColumnTableView.h"
-#import "FLEXDBQueryRowCell.h"
-#import "FLEXTableLeftCell.h"
-#import "FLEXColor.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableLeftCell.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/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 <Foundation/Foundation.h>
-#import "FLEXDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDatabaseManager.h"

@interface FLEXRealmDatabaseManager : NSObject <FLEXDatabaseManager>

@@ -6,15 +6,15 @@
 //  Copyright © 2016 Realm. All rights reserved.
 //

-#import "FLEXRealmDatabaseManager.h"
-#import "NSArray+FLEX.h"
-#import "FLEXSQLResult.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.h"

 #if __has_include(<Realm/Realm.h>)
 #import <Realm/Realm.h>
 #import <Realm/RLMRealm_Dynamic.h>
 #else
-#import "FLEXRealmDefines.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDefines.h"
 #endif

@interface FLEXRealmDatabaseManager ()
@@ -6,14 +6,14 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXSQLResult.h"
-#import "NSArray+FLEX.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"

@implementation FLEXSQLResult
@synthesize keyedRows = _keyedRows;

 + (instancetype)message:(NSString *)message {
-    return [[self alloc] initWithmessage:message columns:nil rows:nil];
+    return [[self alloc] initWithMessage:message columns:nil rows:nil];
 }

 + (instancetype)error:(NSString *)message {
@@ -23,12 +23,12 @@
 }

 + (instancetype)columns:(NSArray<NSString *> *)columnNames rows:(NSArray<NSArray<NSString *> *> *)rowData {
-    return [[self alloc] initWithmessage:nil columns:columnNames rows:rowData];
+    return [[self alloc] initWithMessage:nil columns:columnNames rows:rowData];
 }

- (id)initWithmessage:(NSString *)message columns:(NSArray *)columns rows:(NSArray<NSArray *> *)rows {
+- (instancetype)initWithMessage:(NSString *)message columns:(NSArray<NSString *> *)columns rows:(NSArray<NSArray<NSString *> *> *)rows {
    NSParameterAssert(message || (columns && rows));
-    NSParameterAssert(columns.count == rows.firstObject.count);
+    NSParameterAssert(rows.count == 0 || columns.count == rows.firstObject.count);
    
    self = [super init];
    if (self) {
@@ -12,8 +12,8 @@
 //  which Flying Meat Inc. licenses this file to you.

 #import <Foundation/Foundation.h>
-#import "FLEXDatabaseManager.h"
-#import "FLEXSQLResult.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.h"

@interface FLEXSQLiteDatabaseManager : NSObject <FLEXDatabaseManager>

@@ -6,13 +6,16 @@
 //  Copyright © 2015年 Peng Tao. All rights reserved.
 //

-#import "FLEXSQLiteDatabaseManager.h"
-#import "FLEXManager.h"
-#import "NSArray+FLEX.h"
-#import "FLEXRuntimeConstants.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.h"
+#import "Classes/Headers/FLEXManager.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/Runtime/Objc/FLEXRuntimeConstants.h"
 #import <sqlite3.h>

-static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHERE type='table' ORDER BY name";
+#define kQuery(name, str) static NSString * const QUERY_##name = str
+
+kQuery(TABLENAMES, @"SELECT name FROM sqlite_master WHERE type='table' ORDER BY name");
+kQuery(ROWIDS, @"SELECT rowid FROM \"%@\" ORDER BY rowid ASC");

@interface FLEXSQLiteDatabaseManager ()
@property (nonatomic) sqlite3 *db;
@@ -30,7 +33,7 @@ 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;
@@ -107,16 +110,36 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
 - (NSArray<NSString *> *)queryAllColumnsOfTable:(NSString *)tableName {
    NSString *sql = [NSString stringWithFormat:@"PRAGMA table_info('%@')",tableName];
    FLEXSQLResult *results = [self executeStatement:sql];
-
+    
+    // https://github.com/FLEXTool/FLEX/issues/554
+    if (!results.keyedRows.count) {
+        sql = [NSString stringWithFormat:@"SELECT * FROM pragma_table_info('%@')", tableName];
+        results = [self executeStatement:sql];
+        
+        // Fallback to empty query
+        if (!results.keyedRows.count) {
+            sql = [NSString stringWithFormat:@"SELECT * FROM \"%@\" where 0=1", tableName];
+            return [self executeStatement:sql].columns ?: @[];
+        }
+    }
+    
    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:QUERY_ROWIDS, tableName];
+    NSArray<NSArray<NSString *> *> *data = [self executeStatement:command].rows ?: @[];
+    
+    return [data flex_mapped:^id(NSArray<NSString *> *obj, NSUInteger idx) {
+        return obj.firstObject;
+    }];
 }

 - (FLEXSQLResult *)executeStatement:(NSString *)sql {
@@ -138,7 +161,7 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
            return self.lastResult;
        }
        
-        // Grab columns
+        // Grab columns (columnCount will be 0 for insert/update/delete) 
        int columnCount = sqlite3_column_count(pstmt);
        NSArray<NSString *> *columns = [NSArray flex_forEachUpTo:columnCount map:^id(NSUInteger i) {
            return @(sqlite3_column_name(pstmt, (int)i));
@@ -156,8 +179,9 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
        }
        
        if (status == SQLITE_DONE) {
-            if (rows.count) {
-                // We selected some rows
+            // columnCount will be 0 for insert/update/delete
+            if (rows.count || columnCount > 0) {
+                // We executed a SELECT query
                result = _lastResult = [FLEXSQLResult columns:columns rows:rows];
            } else {
                // We executed a query like INSERT, UDPATE, or DELETE
@@ -257,7 +281,7 @@ static NSString * const QUERY_TABLENAMES = @"SELECT name FROM sqlite_master WHER
 - (FLEXSQLResult *)errorResult:(NSString *)description {
    const char *error = sqlite3_errmsg(_db);
    NSString *message = error ? @(error) : [NSString
-        stringWithFormat:@"(%@: empty error", description
+        stringWithFormat:@"(%@: empty error)", description
    ];
    
    return [FLEXSQLResult error:message];
@@ -6,10 +6,13 @@
 //  Copyright © 2015年 f. All rights reserved.
 //

-#import "FLEXTableColumnHeader.h"
-#import "FLEXColor.h"
-#import "UIFont+FLEX.h"
-#import "FLEXUtility.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableColumnHeader.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/Categories/UIFont+FLEX.h"
+#import "Classes/Utility/FLEXUtility.h"
+
+static const CGFloat kMargin = 5;
+static const CGFloat kArrowWidth = 20;

@interface FLEXTableColumnHeader ()
@property (nonatomic, readonly) UILabel *arrowLabel;
@@ -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,30 @@
 //

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

@interface FLEXTableContentViewController : UIViewController

+/// Display a mutable table with the given columns, rows, and name.
+///
+/// @param columnNames self explanatory.
+/// @param rowData an array of rows, where each row is an array of column data.
+/// @param rowIDs an array of stringy row IDs. Required for deleting rows.
+/// @param tableName an optional name of the table being viewed, if any. Enables adding rows.
+/// @param databaseManager an optional manager to allow modifying the table.
+///        Required for deleting rows. Required for adding rows if \c tableName is supplied.
+ (instancetype)columns:(NSArray<NSString *> *)columnNames
+                   rows:(NSArray<NSArray<NSString *> *> *)rowData
+                 rowIDs:(NSArray<NSString *> *)rowIDs
+              tableName:(NSString *)tableName
+               database:(id<FLEXDatabaseManager>)databaseManager;
+
+/// Display an immutable table with the given columns and rows.
 + (instancetype)columns:(NSArray<NSString *> *)columnNames
                   rows:(NSArray<NSArray<NSString *> *> *)rowData;

@end
+
+NS_ASSUME_NONNULL_END
@@ -6,16 +6,23 @@
 //  Copyright © 2015年 Peng Tao. All rights reserved.
 //

-#import "FLEXTableContentViewController.h"
-#import "FLEXMultiColumnTableView.h"
-#import "FLEXWebViewController.h"
-#import "FLEXUtility.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentViewController.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableRowDataViewController.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.h"
+#import "Classes/GlobalStateExplorers/FLEXWebViewController.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/Categories/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, readonly) BOOL canRefresh;

@property (nonatomic) FLEXMultiColumnTableView *multiColumnView;
@end
@@ -23,11 +30,44 @@
@implementation FLEXTableContentViewController

 + (instancetype)columns:(NSArray<NSString *> *)columnNames
+                   rows:(NSArray<NSArray<NSString *> *> *)rowData
+                 rowIDs:(NSArray<NSString *> *)rowIDs
+              tableName:(NSString *)tableName
+               database:(id<FLEXDatabaseManager>)databaseManager {
+    return [[self alloc]
+        initWithColumns:columnNames
+        rows:rowData
+        rowIDs:rowIDs
+        tableName:tableName
+        database:databaseManager
+    ];
+}
+
+ (instancetype)columns:(NSArray<NSString *> *)cols
                   rows:(NSArray<NSArray<NSString *> *> *)rowData {
-    FLEXTableContentViewController *controller = [self new];
-    controller->_columns = columnNames;
-    controller->_rows = rowData;
-    return controller;
+    return [[self alloc] initWithColumns:cols rows:rowData rowIDs:nil tableName:nil database:nil];
+}
+
+- (instancetype)initWithColumns:(NSArray<NSString *> *)columnNames
+                           rows:(NSArray<NSArray<NSString *> *> *)rowData
+                         rowIDs:(nullable NSArray<NSString *> *)rowIDs
+                      tableName:(nullable NSString *)tableName
+                       database:(nullable id<FLEXDatabaseManager>)databaseManager {
+    // Must supply all optional parameters as one, or none
+    BOOL all = rowIDs && tableName && databaseManager;
+    BOOL none = !rowIDs && !tableName && !databaseManager;
+    NSParameterAssert(all || none);
+
+    self = [super init];
+    if (self) {
+        self->_columns = columnNames.copy;
+        self->_rows = rowData.mutableCopy;
+        self->_rowIDs = rowIDs.mutableCopy;
+        self->_tableName = tableName.copy;
+        self->_databaseManager = databaseManager;
+    }
+
+    return self;
 }

 - (void)loadView {
@@ -38,9 +78,9 @@

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

 - (FLEXMultiColumnTableView *)multiColumnView {
@@ -56,6 +96,10 @@
    return _multiColumnView;
 }

+- (BOOL)canRefresh {
+    return self.databaseManager && self.tableName;
+}
+
 #pragma mark MultiColumnTableView DataSource

 - (NSInteger)numberOfColumnsInTableView:(FLEXMultiColumnTableView *)tableView {
@@ -84,8 +128,8 @@
 }

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

 - (CGFloat)heightForTopHeaderInTableView:(FLEXMultiColumnTableView *)tableView {
@@ -111,6 +155,10 @@
        return [NSString stringWithFormat:@"%@:\n%@", self.columns[idx], field];
    }];
    
+    NSArray<NSString *> *values = [self.rows[row] flex_mapped:^id(NSString *value, NSUInteger idx) {
+        return [NSString stringWithFormat:@"'%@'", value];
+    }];
+    
    [FLEXAlert makeAlert:^(FLEXAlert *make) {
        make.title([@"Row " stringByAppendingString:@(row).stringValue]);
        NSString *message = [fields componentsJoinedByString:@"\n\n"];
@@ -118,6 +166,34 @@
        make.button(@"Copy").handler(^(NSArray<NSString *> *strings) {
            UIPasteboard.generalPasteboard.string = message;
        });
+        make.button(@"Copy as CSV").handler(^(NSArray<NSString *> *strings) {
+            UIPasteboard.generalPasteboard.string = [values componentsJoinedByString:@", "];
+        });
+        make.button(@"Focus on Row").handler(^(NSArray<NSString *> *strings) {
+            UIViewController *focusedRow = [FLEXTableRowDataViewController
+                rows:[NSDictionary dictionaryWithObjects:self.rows[row] forKeys:self.columns]
+            ];
+            [self.navigationController pushViewController:focusedRow animated:YES];
+        });
+        
+        // Option to delete row
+        BOOL hasRowID = self.rows.count && row < self.rows.count;
+        if (hasRowID && self.canRefresh) {
+            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 reloadTableDataFromDB];
+                    }
+                }];
+            });
+        }
+        
        make.button(@"Dismiss").cancelStyle();
    } showFrom:self];
 }
@@ -127,7 +203,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;
@@ -135,6 +212,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];
@@ -148,12 +230,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 {
@@ -171,4 +252,108 @@
    } 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));
+    UIBarButtonItem *addButton = FLEXBarButtonItemSystem(Add, self, @selector(addPressed));
+
+    // Only allow adding rows or deleting rows if we have a table name
+    trashButton.enabled = self.canRefresh;
+    addButton.enabled = self.canRefresh;
+    
+    self.toolbarItems = @[
+        UIBarButtonItem.flex_flexibleSpace,
+        addButton,
+        UIBarButtonItem.flex_flexibleSpace,
+        [trashButton flex_withTintColor:UIColor.redColor],
+    ];
+}
+
+- (void)trashPressed {
+    NSParameterAssert(self.tableName);
+
+    [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];
+}
+
+- (void)addPressed {
+    NSParameterAssert(self.tableName);
+
+    [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        make.title(@"Add a New Row");
+        make.message(@"Comma separate values to use in an INSERT statement.\n\n");
+        make.message(@"INSERT INTO [table] VALUES (your_input)");
+        make.textField(@"5, 'John Smith', 14,...");
+        make.button(@"Insert").handler(^(NSArray<NSString *> *strings) {
+            NSString *statement = [NSString stringWithFormat:
+                @"INSERT INTO %@ VALUES (%@)", self.tableName, strings[0]
+            ];
+
+            [self executeStatementAndShowResult:statement completion:^(BOOL success) {
+                if (success) {
+                    [self reloadTableDataFromDB];
+                }
+            }];
+        });
+        make.button(@"Cancel").cancelStyle();
+    } showFrom:self];
+}
+
+#pragma mark - Helpers
+
+- (void)executeStatementAndShowResult:(NSString *)statement
+                           completion:(void (^_Nullable)(BOOL success))completion {
+    NSParameterAssert(self.databaseManager);
+
+    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];
+}
+
+- (void)reloadTableDataFromDB {
+    if (!self.canRefresh) {
+        return;
+    }
+
+    NSArray<NSArray *> *rows = [self.databaseManager queryAllDataInTable:self.tableName];
+    NSArray<NSString *> *rowIDs = nil;
+    if ([self.databaseManager respondsToSelector:@selector(queryRowIDsInTable:)]) {
+        rowIDs = [self.databaseManager queryRowIDsInTable:self.tableName];
+    }
+
+    self.rows = rows.mutableCopy;
+    self.rowIDs = rowIDs.mutableCopy;
+    [self.multiColumnView reloadData];
+}
+
@end
@@ -6,7 +6,7 @@
 //  Copyright © 2015年 f. All rights reserved.
 //

-#import "FLEXTableLeftCell.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableLeftCell.h"

@implementation FLEXTableLeftCell

@@ -6,7 +6,7 @@
 //  Copyright © 2015年 Peng Tao. All rights reserved.
 //

-#import "FLEXFilteringTableViewController.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"

@interface FLEXTableListViewController : FLEXFilteringTableViewController

@@ -6,14 +6,15 @@
 //  Copyright © 2015年 Peng Tao. All rights reserved.
 //

-#import "FLEXTableListViewController.h"
-#import "FLEXDatabaseManager.h"
-#import "FLEXSQLiteDatabaseManager.h"
-#import "FLEXRealmDatabaseManager.h"
-#import "FLEXTableContentViewController.h"
-#import "FLEXMutableListSection.h"
-#import "NSArray+FLEX.h"
-#import "FLEXAlert.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentViewController.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/FLEXAlert.h"
+#import "Classes/Utility/FLEXMacros.h"

@interface FLEXTableListViewController ()
@property (nonatomic, readonly) id<FLEXDatabaseManager> dbm;
@@ -70,9 +71,13 @@
    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 = nil;
+        if ([host.dbm respondsToSelector:@selector(queryRowIDsInTable:)]) {        
+            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];
    };
    
@@ -88,16 +93,37 @@
 }
    
 - (void)queryButtonPressed {
+    [self showQueryInput:nil];
+}
+
+- (void)showQueryInput:(NSString *)prefillQuery {
    FLEXSQLiteDatabaseManager *database = self.dbm;
    
    [FLEXAlert makeAlert:^(FLEXAlert *make) {
        make.title(@"Execute an SQL query");
-        make.textField(nil);
+        make.configuredTextField(^(UITextField *textField) {
+            textField.text = prefillQuery;
+        });
+        
        make.button(@"Run").handler(^(NSArray<NSString *> *strings) {
-            FLEXSQLResult *result = [database executeStatement:strings[0]];
+            NSString *query = strings[0];
+            FLEXSQLResult *result = [database executeStatement:query];
            
            if (result.message) {
-                [FLEXAlert showAlert:@"Message" message:result.message from:self];
+                // Allow users to edit their last query if it had an error
+                if ([result.message containsString:@"error"]) {
+                    [FLEXAlert makeAlert:^(FLEXAlert *make) {
+                        make.title(@"Error").message(result.message);
+                        make.button(@"Edit Query").preferred().handler(^(NSArray<NSString *> *_) {
+                            // Show query editor again with our last input
+                            [self showQueryInput:query];
+                        });
+                        
+                        make.button(@"Cancel").cancelStyle();
+                    } showFrom:self];
+                } else {
+                    [FLEXAlert showAlert:@"Message" message:result.message from:self];
+                }
            } else {
                UIViewController *resultsScreen = [FLEXTableContentViewController
                    columns:result.columns rows:result.rows
@@ -0,0 +1,14 @@
+//
+//  FLEXTableRowDataViewController.h
+//  FLEX
+//
+//  Created by Chaoshuai Lu on 7/8/20.
+//
+
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
+
+@interface FLEXTableRowDataViewController : FLEXFilteringTableViewController
+
+ (instancetype)rows:(NSDictionary<NSString *, id> *)rowData;
+
+@end
@@ -0,0 +1,54 @@
+//
+//  FLEXTableRowDataViewController.m
+//  FLEX
+//
+//  Created by Chaoshuai Lu on 7/8/20.
+//
+
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableRowDataViewController.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Utility/FLEXAlert.h"
+
+@interface FLEXTableRowDataViewController ()
+@property (nonatomic) NSDictionary<NSString *, NSString *> *rowsByColumn;
+@end
+
+@implementation FLEXTableRowDataViewController
+
+#pragma mark - Initialization
+
+ (instancetype)rows:(NSDictionary<NSString *, id> *)rowData {
+    FLEXTableRowDataViewController *controller = [self new];
+    controller.rowsByColumn = rowData;
+    return controller;
+}
+
+#pragma mark - Overrides
+
+- (NSArray<FLEXTableViewSection *> *)makeSections {
+    NSDictionary<NSString *, NSString *> *rowsByColumn = self.rowsByColumn;
+    
+    FLEXMutableListSection<NSString *> *section = [FLEXMutableListSection list:self.rowsByColumn.allKeys
+        cellConfiguration:^(UITableViewCell *cell, NSString *column, NSInteger row) {
+            cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+            cell.textLabel.text = column;
+            cell.detailTextLabel.text = rowsByColumn[column].description;
+        } filterMatcher:^BOOL(NSString *filterText, NSString *column) {
+            return [column localizedCaseInsensitiveContainsString:filterText] ||
+                [rowsByColumn[column] localizedCaseInsensitiveContainsString:filterText];
+        }
+    ];
+    
+    section.selectionHandler = ^(UIViewController *host, NSString *column) {
+        UIPasteboard.generalPasteboard.string = rowsByColumn[column].description;
+        [FLEXAlert makeAlert:^(FLEXAlert *make) {
+            make.title(@"Column Copied to Clipboard");
+            make.message(rowsByColumn[column].description);
+            make.button(@"Dismiss").cancelStyle();
+        } showFrom:host];
+    };
+
+    return @[section];
+}
+
+@end
@@ -0,0 +1,14 @@
+//
+//  FLEXAPNSViewController.h
+//  FLEX
+//
+//  Created by Tanner Bennett on 6/28/22.
+//  Copyright © 2022 FLEX Team. All rights reserved.
+//
+
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
+
+@interface FLEXAPNSViewController : FLEXFilteringTableViewController <FLEXGlobalsEntry>
+
+@end
@@ -0,0 +1,372 @@
+//
+//  FLEXAPNSViewController.m
+//  FLEX
+//
+//  Created by Tanner Bennett on 6/28/22.
+//  Copyright © 2022 FLEX Team. All rights reserved.
+//
+
+#import "Classes/GlobalStateExplorers/FLEXAPNSViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Headers/FLEXSingleRowSection.h"
+#import "Classes/Utility/Categories/NSUserDefaults+FLEX.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
+#import "Classes/Utility/Categories/NSDateFormatter+FLEX.h"
+#import "Classes/Utility/FLEXResources.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Utility/Runtime/flex_fishhook.h"
+#import <dlfcn.h>
+#import <UserNotifications/UserNotifications.h>
+
+#define orig(method, ...) if (orig_##method) { orig_##method(__VA_ARGS__); }
+#define method_lookup(__selector, __cls, __return, ...) \
+    ([__cls instancesRespondToSelector:__selector] ? \
+        (__return(*)(__VA_ARGS__))class_getMethodImplementation(__cls, __selector) : nil)
+
+@interface FLEXAPNSViewController ()
+@property (nonatomic, readonly, class) Class appDelegateClass;
+@property (nonatomic, class) NSData *deviceToken;
+@property (nonatomic, class) NSError *registrationError;
+@property (nonatomic, readonly, class) NSString *deviceTokenString;
+@property (nonatomic, readonly, class) NSMutableArray<NSDictionary *> *remoteNotifications;
+@property (nonatomic, readonly, class) NSMutableArray<UNNotification *> *userNotifications API_AVAILABLE(ios(10.0));
+
+@property (nonatomic) FLEXSingleRowSection *deviceToken;
+@property (nonatomic) FLEXMutableListSection<NSDictionary *> *remoteNotifications;
+@property (nonatomic) FLEXMutableListSection<UNNotification *> *userNotifications API_AVAILABLE(ios(10.0));
+@end
+
+@implementation FLEXAPNSViewController
+
+#pragma mark Swizzles
+
+/// Hook User Notifications related methods on the app delegate
+/// and UNUserNotificationCenter delegate classes
+ (void)load { FLEX_EXIT_IF_NO_CTORS()
+    if (!NSUserDefaults.standardUserDefaults.flex_enableAPNSCapture) {
+        return;
+    }
+    
+    //──────────────────────//
+    //     App Delegate     //
+    //──────────────────────//
+
+    // Hook UIApplication to intercept app delegate
+    Class uiapp = UIApplication.self;
+    auto orig_uiapp_setDelegate = (void(*)(id, SEL, id))class_getMethodImplementation(
+        uiapp, @selector(setDelegate:)
+    );
+    
+    IMP uiapp_setDelegate = imp_implementationWithBlock(^(id _, id delegate) {
+        [self hookAppDelegateClass:[delegate class]];
+        orig_uiapp_setDelegate(_, @selector(setDelegate:), delegate);
+    });
+    
+    class_replaceMethod(
+        uiapp,
+        @selector(setDelegate:),
+        uiapp_setDelegate,
+        "v@:@"
+    );
+    
+    //───────────────────────────────────────────//
+    //     UNUserNotificationCenter Delegate     //
+    //───────────────────────────────────────────//
+    
+    if (@available(iOS 10.0, *)) {
+        Class unusernc = UNUserNotificationCenter.self;
+        auto orig_unusernc_setDelegate = (void(*)(id, SEL, id))class_getMethodImplementation(
+            unusernc, @selector(setDelegate:)
+        );
+        
+        IMP unusernc_setDelegate = imp_implementationWithBlock(^(id _, id delegate) {
+            [self hookUNUserNotificationCenterDelegateClass:[delegate class]];
+            orig_unusernc_setDelegate(_, @selector(setDelegate:), delegate);
+        });
+        
+        class_replaceMethod(
+            unusernc,
+            @selector(setDelegate:),
+            unusernc_setDelegate,
+            "v@:@"
+        );
+    }
+}
+
+ (void)hookAppDelegateClass:(Class)appDelegate {
+    // Abort if we already hooked something
+    if (_appDelegateClass) {
+        return;
+    }
+    
+    _appDelegateClass = appDelegate;
+    
+    // Better documentation for what's happening is in hookUNUserNotificationCenterDelegateClass: below
+    
+    auto types_didRegisterForRemoteNotificationsWithDeviceToken = "v@:@@";
+    auto types_didFailToRegisterForRemoteNotificationsWithError = "v@:@@";
+    auto types_didReceiveRemoteNotification = "v@:@@@?";
+    
+    auto sel_didRegisterForRemoteNotifications = @selector(application:didRegisterForRemoteNotificationsWithDeviceToken:);
+    auto sel_didFailToRegisterForRemoteNotifs = @selector(application:didFailToRegisterForRemoteNotificationsWithError:);
+    auto sel_didReceiveRemoteNotification = @selector(application:didReceiveRemoteNotification:fetchCompletionHandler:);
+    
+    auto orig_didRegisterForRemoteNotificationsWithDeviceToken = method_lookup(
+        sel_didRegisterForRemoteNotifications, appDelegate, void, id, SEL, id, id);
+    auto orig_didFailToRegisterForRemoteNotificationsWithError = method_lookup(
+        sel_didFailToRegisterForRemoteNotifs, appDelegate, void, id, SEL, id, id);
+    auto orig_didReceiveRemoteNotification = method_lookup(
+        sel_didReceiveRemoteNotification, appDelegate, void, id, SEL, id, id, id);
+    
+    IMP didRegisterForRemoteNotificationsWithDeviceToken = imp_implementationWithBlock(^(id _, id app, NSData *token) {
+        self.deviceToken = token;
+        orig(didRegisterForRemoteNotificationsWithDeviceToken, _, nil, app, token);
+    });
+    IMP didFailToRegisterForRemoteNotificationsWithError = imp_implementationWithBlock(^(id _, id app, NSError *error) {
+        self.registrationError = error;
+        orig(didFailToRegisterForRemoteNotificationsWithError, _, nil, app, error);
+    });
+    IMP didReceiveRemoteNotification = imp_implementationWithBlock(^(id _, id app, NSDictionary *payload, id handler) {
+        // TODO: notify when new notifications are added
+        [self.remoteNotifications addObject:payload];
+        orig(didReceiveRemoteNotification, _, nil, app, payload, handler);
+    });
+    
+    class_replaceMethod(
+        appDelegate,
+        sel_didRegisterForRemoteNotifications,
+        didRegisterForRemoteNotificationsWithDeviceToken,
+        types_didRegisterForRemoteNotificationsWithDeviceToken
+    );
+    class_replaceMethod(
+        appDelegate,
+        sel_didFailToRegisterForRemoteNotifs,
+        didFailToRegisterForRemoteNotificationsWithError,
+        types_didFailToRegisterForRemoteNotificationsWithError
+    );
+    class_replaceMethod(
+        appDelegate,
+        sel_didReceiveRemoteNotification,
+        didReceiveRemoteNotification,
+        types_didReceiveRemoteNotification
+    );
+}
+
+ (void)hookUNUserNotificationCenterDelegateClass:(Class)delegate API_AVAILABLE(ios(10.0)) {
+    // Selector
+    auto sel_didReceiveNotification =
+        @selector(userNotificationCenter:willPresentNotification:withCompletionHandler:);
+    // Original implementation (or nil if unimplemented)
+    auto orig_didReceiveNotification = method_lookup(
+        sel_didReceiveNotification, delegate, void, id, SEL, id, id, id);
+    // Our hook (ignores self and other unneeded parameters)
+    IMP didReceiveNotification = imp_implementationWithBlock(^(id _, id __, UNNotification *notification, id ___) {
+        [self.userNotifications addObject:notification];
+        // This macro is a no-op if there is no original implementation
+        orig(didReceiveNotification, _, nil, __, notification, ___);
+    });
+    
+    // Set the hook
+    class_replaceMethod(
+        delegate,
+        sel_didReceiveNotification,
+        didReceiveNotification,
+        "v@:@@@?"
+    );
+}
+
+#pragma mark Class Properties
+
+static Class _appDelegateClass = nil;
+ (Class)appDelegateClass {
+    return _appDelegateClass;
+}
+
+static NSData *_apnsDeviceToken = nil;
+ (NSData *)deviceToken {
+    return _apnsDeviceToken;
+}
+
+ (void)setDeviceToken:(NSData *)deviceToken {
+    _apnsDeviceToken = deviceToken;
+}
+
+ (NSString *)deviceTokenString {
+    static NSString *_deviceTokenString = nil;
+    
+    if (!_deviceTokenString && self.deviceToken) {
+        NSData *token = self.deviceToken;
+        NSUInteger capacity = token.length * 2;
+        NSMutableString *tokenString = [NSMutableString stringWithCapacity:capacity];
+        
+        const UInt8 *tokenData = token.bytes;
+        for (NSUInteger idx = 0; idx < token.length; ++idx) {
+            [tokenString appendFormat:@"%02X", (int)tokenData[idx]];
+        }
+        
+        _deviceTokenString = tokenString;
+    }
+    
+    return _deviceTokenString;
+}
+
+static NSError *_apnsRegistrationError = nil;
+ (NSError *)registrationError {
+    return _apnsRegistrationError;
+}
+
+ (void)setRegistrationError:(NSError *)error {
+    _apnsRegistrationError = error;
+}
+
+ (NSMutableArray<NSDictionary *> *)userNotifications {
+    static NSMutableArray *_userNotifications = nil;
+    if (!_userNotifications) {
+        _userNotifications = [NSMutableArray new];
+    }
+    
+    return _userNotifications;
+}
+
+ (NSMutableArray<NSDictionary *> *)remoteNotifications {
+    static NSMutableArray *_remoteNotifications = nil;
+    if (!_remoteNotifications) {
+        _remoteNotifications = [NSMutableArray new];
+    }
+    
+    return _remoteNotifications;
+}
+
+#pragma mark Instance stuff
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.title = @"Push Notifications";
+    
+    self.refreshControl = [UIRefreshControl new];
+    [self.refreshControl addTarget:self action:@selector(reloadData) forControlEvents:UIControlEventValueChanged];
+    
+    [self addToolbarItems:@[
+        [UIBarButtonItem
+            flex_itemWithImage:FLEXResources.gearIcon
+            target:self
+            action:@selector(settingsButtonTapped)
+        ],
+    ]];
+}
+
+- (NSArray<FLEXTableViewSection *> *)makeSections {
+    self.deviceToken = [FLEXSingleRowSection title:@"APNS Device Token" reuse:nil cell:^(UITableViewCell *cell) {
+        NSString *tokenString = FLEXAPNSViewController.deviceTokenString;
+        if (tokenString) {
+            cell.textLabel.text = tokenString;
+            cell.textLabel.numberOfLines = 0;
+        }
+        else if (!NSUserDefaults.standardUserDefaults.flex_enableAPNSCapture) {
+            cell.textLabel.text = @"APNS capture disabled";
+        }
+        else {
+            cell.textLabel.text = @"Not yet registered";
+        }
+    }];
+    self.deviceToken.selectionAction = ^(UIViewController *host) {
+        UIPasteboard.generalPasteboard.string = FLEXAPNSViewController.deviceTokenString;
+        [FLEXAlert showQuickAlert:@"Copied to Clipboard" from:host];
+    };
+    
+    // Remote Notifications //
+    
+    self.remoteNotifications = [FLEXMutableListSection list:FLEXAPNSViewController.remoteNotifications
+        cellConfiguration:^(UITableViewCell *cell, NSDictionary *notif, NSInteger row) {
+            cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+            // TODO: date received
+            cell.detailTextLabel.text = [FLEXRuntimeUtility summaryForObject:notif];
+        }
+        filterMatcher:^BOOL(NSString *filterText, NSDictionary *notif) {
+            return [notif.description localizedCaseInsensitiveContainsString:filterText];
+        }
+    ];
+    
+    self.remoteNotifications.customTitle = @"Remote Notifications";
+    self.remoteNotifications.selectionHandler = ^(UIViewController *host, NSDictionary *notif) {
+        [host.navigationController pushViewController:[
+            FLEXObjectExplorerFactory explorerViewControllerForObject:notif
+        ] animated:YES];
+    };
+    
+    // User Notifications //
+    
+    if (@available(iOS 10.0, *)) {
+        self.userNotifications = [FLEXMutableListSection list:FLEXAPNSViewController.userNotifications
+            cellConfiguration:^(UITableViewCell *cell, UNNotification *notif, NSInteger row) {
+                cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+                
+                // Subtitle is 'subtitle \n date'
+                NSString *dateString = [NSDateFormatter flex_stringFrom:notif.date format:FLEXDateFormatPreciseClock];
+                NSString *subtitle = notif.request.content.subtitle;
+                subtitle = subtitle ? [NSString stringWithFormat:@"%@\n%@", subtitle, dateString] : dateString;
+            
+                cell.textLabel.text = notif.request.content.title;
+                cell.detailTextLabel.text = subtitle;
+            }
+            filterMatcher:^BOOL(NSString *filterText, NSDictionary *notif) {
+                return [notif.description localizedCaseInsensitiveContainsString:filterText];
+            }
+        ];
+        
+        self.userNotifications.customTitle = @"Push Notifications";
+        self.userNotifications.selectionHandler = ^(UIViewController *host, UNNotification *notif) {
+            [host.navigationController pushViewController:[
+                FLEXObjectExplorerFactory explorerViewControllerForObject:notif.request
+            ] animated:YES];
+        };
+        
+        return @[self.deviceToken, self.remoteNotifications, self.userNotifications];
+    }
+    else {
+        return @[self.deviceToken, self.remoteNotifications];
+    }
+}
+
+- (void)reloadData {
+    [self.refreshControl endRefreshing];
+    
+    self.remoteNotifications.customTitle = [NSString stringWithFormat:
+        @"%@ notifications", @(self.remoteNotifications.filteredList.count)
+    ];
+    [super reloadData];
+}
+
+- (void)settingsButtonTapped {
+    NSUserDefaults *defaults = NSUserDefaults.standardUserDefaults;
+    BOOL enabled = defaults.flex_enableAPNSCapture;
+
+    NSString *apnsToggle = enabled ? @"Disable Capture" : @"Enable Capture";
+    
+    [FLEXAlert makeAlert:^(FLEXAlert *make) {
+        make.title(@"Settings")
+            .message(@"Enable or disable the capture of push notifications.\n\n")
+            .message(@"This will hook UIApplicationMain on launch until it is disabled, ")
+            .message(@"and swizzle some app delegate methods. Restart the app for changes to take effect.");
+        
+        make.button(apnsToggle).destructiveStyle().handler(^(NSArray<NSString *> *strings) {
+            [defaults flex_toggleBoolForKey:kFLEXDefaultsAPNSCaptureEnabledKey];
+        });
+        make.button(@"Dismiss").cancelStyle();
+    } showFrom:self];
+}
+
+#pragma mark - FLEXGlobalsEntry
+
+ (NSString *)globalsEntryTitle:(FLEXGlobalsRow)row {
+    return @"📌  Push Notifications";
+}
+
+ (UIViewController *)globalsEntryViewController:(FLEXGlobalsRow)row {
+    return [self new];
+}
+
+@end
@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXGlobalsEntry.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"

@interface FLEXAddressExplorerCoordinator : NSObject <FLEXGlobalsEntry>

@@ -6,12 +6,12 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#import "FLEXAddressExplorerCoordinator.h"
-#import "FLEXGlobalsViewController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXObjectExplorerViewController.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXUtility.h"
+#import "Classes/GlobalStateExplorers/FLEXAddressExplorerCoordinator.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXObjectExplorerViewController.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Utility/FLEXUtility.h"

@interface UITableViewController (FLEXAddressExploration)
 - (void)deselectSelectedRow;
--- a/Show More
+++ b/Show More