Fix bug in new FLEXMirror usage

Fix annoying divider color in editor screens
Update SPM example deps
2022-04-27 12:34:56 -05:00 · 2022-04-27 11:53:57 -05:00 · 2022-04-27 11:53:57 -05:00 · 2022-04-27 11:53:57 -05:00 · 2022-04-26 19:48:49 -05:00 · 2022-04-26 19:48:49 -05:00
311 changed files with 1101 additions and 2209 deletions
@@ -21,5 +21,3 @@ DerivedData
 Podfile.lock
 IDEWorkspaceChecks.plist
 *.xcworkspace
-.build
-bazel-*
@@ -1,51 +0,0 @@
-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 "Classes/Headers/FLEXTableViewController.h"
+#import "FLEXTableViewController.h"

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

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

@interface FLEXFilteringTableViewController ()

@@ -16,13 +16,4 @@ 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,10 +6,9 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

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

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

 - (void)viewDidLoad {
@@ -67,17 +65,6 @@
 - (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];
@@ -106,13 +93,6 @@
    [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
@@ -214,18 +194,3 @@
 }

@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 "Classes/Headers/FLEXTableView.h"
+#import "FLEXTableView.h"
@class FLEXScopeCarousel, FLEXWindow, FLEXTableViewSection;

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

-#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 "FLEXTableViewController.h"
+#import "FLEXExplorerViewController.h"
+#import "FLEXBookmarksViewController.h"
+#import "FLEXTabsViewController.h"
+#import "FLEXScopeCarousel.h"
+#import "FLEXTableView.h"
+#import "FLEXUtility.h"
+#import "FLEXResources.h"
+#import "UIBarButtonItem+FLEX.h"
 #import <objc/runtime.h>

@interface Block : NSObject
@@ -6,9 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

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

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

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

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

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

@interface FLEXSingleRowSection ()
@property (nonatomic, readonly) NSString *reuseIdentifier;
@@ -30,8 +30,6 @@
 - (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 "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "NSArray+FLEX.h"
@class FLEXTableView;

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

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

 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wincomplete-implementation"
@@ -79,7 +79,7 @@
    return @"";
 }

- (NSArray<UIMenuElement *> *)menuItemsForRow:(NSInteger)row sender:(UIViewController *)sender API_AVAILABLE(ios(13.0)) {
+- (NSArray<UIMenuElement *> *)menuItemsForRow:(NSInteger)row sender:(UIViewController *)sender API_AVAILABLE(ios(13)) {
    NSArray<NSString *> *copyItems = [self copyMenuItemsForRow:row];
    NSAssert(copyItems.count % 2 == 0, @"copyMenuItemsForRow: should return an even list");
    
@@ -6,9 +6,9 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

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

-#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"
+#import "FLEXScopeCarousel.h"
+#import "FLEXCarouselCell.h"
+#import "FLEXColor.h"
+#import "FLEXMacros.h"
+#import "UIView+FLEX_Layout.h"

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

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

 NS_ASSUME_NONNULL_BEGIN

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

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

@implementation FLEXCodeFontCell

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

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

@interface FLEXKeyValueTableViewCell : FLEXTableViewCell

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

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

@implementation FLEXKeyValueTableViewCell

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

-#import "Classes/Headers/FLEXTableViewCell.h"
+#import "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 "Classes/Headers/FLEXMultilineTableViewCell.h"
-#import "Classes/Utility/Categories/Private/UIView+FLEX_Layout.h"
-#import "Classes/Utility/FLEXUtility.h"
+#import "FLEXMultilineTableViewCell.h"
+#import "UIView+FLEX_Layout.h"
+#import "FLEXUtility.h"

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

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

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

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

@implementation FLEXSubtitleTableViewCell

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

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

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

-#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"
+#import "FLEXTableView.h"
+#import "FLEXUtility.h"
+#import "FLEXSubtitleTableViewCell.h"
+#import "FLEXMultilineTableViewCell.h"
+#import "FLEXKeyValueTableViewCell.h"
+#import "FLEXCodeFontCell.h"

 FLEXTableViewCellReuseIdentifier const kFLEXDefaultCell = @"kFLEXDefaultCell";
 FLEXTableViewCellReuseIdentifier const kFLEXDetailCell = @"kFLEXDetailCell";
@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

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

@interface FLEXArgumentInputColorView : FLEXArgumentInputView

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

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

@protocol FLEXColorComponentInputViewDelegate;

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

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

@interface FLEXArgumentInputDateView : FLEXArgumentInputView

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

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

@interface FLEXArgumentInputDateView ()

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

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

@interface FLEXArgumentInputFontView : FLEXArgumentInputView

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

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

@interface FLEXArgumentInputFontView ()

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

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

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

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

@interface FLEXArgumentInputFontsPickerView ()

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

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

@interface FLEXArgumentInputNotSupportedView : FLEXArgumentInputTextView

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

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

@implementation FLEXArgumentInputNotSupportedView

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

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

@interface FLEXArgumentInputNumberView : FLEXArgumentInputTextView

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

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

@implementation FLEXArgumentInputNumberView

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

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

@interface FLEXArgumentInputObjectView : FLEXArgumentInputTextView

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

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

 static const CGFloat kSegmentInputMargin = 10;

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

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

@interface FLEXArgumentInputStringView : FLEXArgumentInputTextView

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

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

@implementation FLEXArgumentInputStringView

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

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

@interface FLEXArgumentInputStructView : FLEXArgumentInputView

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

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

@interface FLEXArgumentInputStructView ()

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

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

@interface FLEXArgumentInputSwitchView : FLEXArgumentInputView

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

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

@interface FLEXArgumentInputSwitchView ()

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

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

@interface FLEXArgumentInputTextView : FLEXArgumentInputView <UITextViewDelegate>

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

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

@interface FLEXArgumentInputTextView ()

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

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

@interface FLEXArgumentInputView ()

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

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

@interface FLEXArgumentInputViewFactory : NSObject

@@ -6,18 +6,18 @@
 //
 //

-#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"
+#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"

@implementation FLEXArgumentInputViewFactory

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

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

 NS_ASSUME_NONNULL_BEGIN

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

-#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"
+#import "FLEXDefaultEditorViewController.h"
+#import "FLEXFieldEditorView.h"
+#import "FLEXRuntimeUtility.h"
+#import "FLEXArgumentInputView.h"
+#import "FLEXArgumentInputViewFactory.h"

@interface FLEXDefaultEditorViewController ()

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

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

@interface FLEXFieldEditorView ()

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

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

 NS_ASSUME_NONNULL_BEGIN

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

-#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"
+#import "FLEXFieldEditorViewController.h"
+#import "FLEXFieldEditorView.h"
+#import "FLEXArgumentInputViewFactory.h"
+#import "FLEXPropertyAttributes.h"
+#import "FLEXRuntimeUtility.h"
+#import "FLEXMetadataExtras.h"
+#import "FLEXUtility.h"
+#import "FLEXColor.h"
+#import "UIBarButtonItem+FLEX.h"

@interface FLEXFieldEditorViewController () <FLEXArgumentInputViewDelegate>

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

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

@interface FLEXMethodCallingViewController : FLEXVariableEditorViewController

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

-#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"
+#import "FLEXMethodCallingViewController.h"
+#import "FLEXRuntimeUtility.h"
+#import "FLEXFieldEditorView.h"
+#import "FLEXObjectExplorerFactory.h"
+#import "FLEXObjectExplorerViewController.h"
+#import "FLEXArgumentInputView.h"
+#import "FLEXArgumentInputViewFactory.h"
+#import "FLEXUtility.h"

@interface FLEXMethodCallingViewController ()
@property (nonatomic, readonly) FLEXMethod *method;
@@ -6,16 +6,16 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#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"
+#import "FLEXColor.h"
+#import "FLEXVariableEditorViewController.h"
+#import "FLEXFieldEditorView.h"
+#import "FLEXRuntimeUtility.h"
+#import "FLEXUtility.h"
+#import "FLEXObjectExplorerFactory.h"
+#import "FLEXArgumentInputView.h"
+#import "FLEXArgumentInputViewFactory.h"
+#import "FLEXObjectExplorerViewController.h"
+#import "UIBarButtonItem+FLEX.h"

@interface FLEXVariableEditorViewController () <UIScrollViewDelegate>
@property (nonatomic) UIScrollView *scrollView;
@@ -37,7 +37,7 @@
        _commitHandler = onCommit;
        [NSNotificationCenter.defaultCenter
            addObserver:self selector:@selector(keyboardDidShow:)
-            name:UIKeyboardWillShowNotification object:nil
+            name:UIKeyboardDidShowNotification object:nil
        ];
        [NSNotificationCenter.defaultCenter
            addObserver:self selector:@selector(keyboardWillHide:)
@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

 static NSMutableArray *kFLEXBookmarkManagerBookmarks = nil;

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

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

 NS_ASSUME_NONNULL_BEGIN

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

-#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"
+#import "FLEXBookmarksViewController.h"
+#import "FLEXExplorerViewController.h"
+#import "FLEXNavigationController.h"
+#import "FLEXObjectExplorerFactory.h"
+#import "FLEXBookmarkManager.h"
+#import "UIBarButtonItem+FLEX.h"
+#import "FLEXColor.h"
+#import "FLEXUtility.h"
+#import "FLEXRuntimeUtility.h"
+#import "FLEXTableView.h"

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

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

@class FLEXWindow;
@protocol FLEXExplorerViewControllerDelegate;
@@ -6,21 +6,21 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

-#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"
+#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"

 typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    FLEXExplorerModeDefault,
@@ -129,14 +129,6 @@ 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 {
@@ -170,10 +162,7 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
    
    UIViewController *viewControllerToAsk = [self viewControllerForRotationAndOrientation];
    UIInterfaceOrientationMask supportedOrientations = FLEXUtility.infoPlistSupportedInterfaceOrientationsMask;
-    // 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"]) {
+    if (viewControllerToAsk && ![viewControllerToAsk isKindOfClass:[self class]]) {
        supportedOrientations = [viewControllerToAsk supportedInterfaceOrientations];
    }
    
@@ -386,21 +375,6 @@ 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

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

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

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


@@ -852,34 +818,31 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 #pragma mark - Touch Handling

 - (BOOL)shouldReceiveTouchAtWindowPoint:(CGPoint)pointInWindowCoordinates {
+    BOOL shouldReceiveTouch = NO;
+    
    CGPoint pointInLocalCoordinates = [self.view convertPoint:pointInWindowCoordinates fromView:nil];
    
-    // 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 (self.currentMode == FLEXExplorerModeSelect) {
-        return YES;
-    }
-    
-    // Always in move mode too
-    if (self.currentMode == FLEXExplorerModeMove) {
-        return YES;
-    }
-    
    // Always if it's on the toolbar
    if (CGRectContainsPoint(self.explorerToolbar.frame, pointInLocalCoordinates)) {
-        return YES;
+        shouldReceiveTouch = YES;
    }
    
-    return NO;
+    // Always if we're in selection mode
+    if (!shouldReceiveTouch && self.currentMode == FLEXExplorerModeSelect) {
+        shouldReceiveTouch = YES;
+    }
+    
+    // Always in move mode too
+    if (!shouldReceiveTouch && self.currentMode == FLEXExplorerModeMove) {
+        shouldReceiveTouch = YES;
+    }
+    
+    // Always if we have a modal presented
+    if (!shouldReceiveTouch && self.presentedViewController) {
+        shouldReceiveTouch = YES;
+    }
+    
+    return shouldReceiveTouch;
 }


@@ -925,14 +888,8 @@ 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:^{
-        [self updateButtonStates];
-        
-        if (completion) completion();
-    }];
+    [super presentViewController:toPresent animated:animated completion:completion];
 }

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

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

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

 NS_ASSUME_NONNULL_BEGIN

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

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

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

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

@implementation FLEXWindow
@@ -18,13 +18,18 @@
        // 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.
-        self.windowLevel = UIWindowLevelAlert - 1;
+        // UIWindowLevelStatusBar + 100 seems to hit that balance.
+        self.windowLevel = UIWindowLevelStatusBar + 100.0;
    }
    return self;
 }

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

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

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

 NS_ASSUME_NONNULL_BEGIN

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

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

@interface FLEXWindowManagerController ()
@property (nonatomic) UIWindow *keyWindow;
@@ -6,8 +6,8 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

@interface FLEXTabList () {
    NSMutableArray *_openTabs;
@@ -84,16 +84,6 @@
    if (idx != NSNotFound) {
        [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 "Classes/Headers/FLEXTableViewController.h"
+#import "FLEXTableViewController.h"

@interface FLEXTabsViewController : FLEXTableViewController

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

-#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"
+#import "FLEXTabsViewController.h"
+#import "FLEXNavigationController.h"
+#import "FLEXTabList.h"
+#import "FLEXBookmarkManager.h"
+#import "FLEXTableView.h"
+#import "FLEXUtility.h"
+#import "FLEXColor.h"
+#import "UIBarButtonItem+FLEX.h"
+#import "FLEXExplorerViewController.h"
+#import "FLEXGlobalsViewController.h"
+#import "FLEXBookmarksViewController.h"

@interface FLEXTabsViewController ()
@property (nonatomic, copy) NSArray<UINavigationController *> *openTabs;
@@ -6,16 +6,15 @@
 //  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 "UIBarButtonItem+FLEX.h"
+#import "CALayer+FLEX.h"
+#import "UIFont+FLEX.h"
+#import "UIGestureRecognizer+Blocks.h"
+#import "UIPasteboard+FLEX.h"
+#import "UIMenu+FLEX.h"
+#import "UITextField+Range.h"

-#import "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"
+#import "NSObject+FLEX_Reflection.h"
+#import "NSArray+FLEX.h"
+#import "NSUserDefaults+FLEX.h"
+#import "NSTimer+FLEX.h"
@@ -6,17 +6,17 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

-#import "Classes/Headers/FLEXSingleRowSection.h"
-#import "Classes/Headers/FLEXTableViewSection.h"
+#import "FLEXSingleRowSection.h"
+#import "FLEXTableViewSection.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 "FLEXCodeFontCell.h"
+#import "FLEXSubtitleTableViewCell.h"
+#import "FLEXTableViewCell.h"
+#import "FLEXMultilineTableViewCell.h"
+#import "FLEXKeyValueTableViewCell.h"

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

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

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

-#import "Classes/Headers/FLEXShortcut.h"
-#import "Classes/Headers/FLEXShortcutsSection.h"
+#import "FLEXShortcut.h"
+#import "FLEXShortcutsSection.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"
+#import "FLEXCollectionContentSection.h"
+#import "FLEXColorPreviewSection.h"
+#import "FLEXDefaultsContentSection.h"
+#import "FLEXMetadataSection.h"
+#import "FLEXMutableListSection.h"
+#import "FLEXObjectInfoSection.h"
@@ -6,22 +6,22 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

-#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 "FLEXObjcInternal.h"
+#import "FLEXSwiftInternal.h"
+#import "FLEXRuntimeSafety.h"
+#import "FLEXBlockDescription.h"
+#import "FLEXTypeEncodingParser.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 "FLEXMirror.h"
+#import "FLEXProtocol.h"
+#import "FLEXProperty.h"
+#import "FLEXIvar.h"
+#import "FLEXMethodBase.h"
+#import "FLEXMethod.h"
+#import "FLEXPropertyAttributes.h"
+#import "FLEXRuntime+Compare.h"
+#import "FLEXRuntime+UIKitHelpers.h"
+#import "FLEXMetadataExtras.h"

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

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

-#import "Classes/Headers/FLEXExplorerToolbar.h"
-#import "Classes/Headers/FLEXExplorerToolbarItem.h"
-#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"
+#import "FLEXExplorerToolbar.h"
+#import "FLEXExplorerToolbarItem.h"
+#import "FLEXGlobalsEntry.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-Core.h"
+#import "FLEX-Runtime.h"
+#import "FLEX-Categories.h"
+#import "FLEX-ObjectExploring.h"

-#import "Classes/Utility/FLEXMacros.h"
-#import "Classes/Utility/FLEXAlert.h"
-#import "Classes/Utility/FLEXResources.h"
-#import "Classes/Utility/FLEXHeapEnumerator.h"
+#import "FLEXMacros.h"
+#import "FLEXAlert.h"
+#import "FLEXResources.h"
@@ -6,11 +6,11 @@
 //  Copyright © 2015年 f. All rights reserved.
 //

-#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"
+#import "FLEXDBQueryRowCell.h"
+#import "FLEXMultiColumnTableView.h"
+#import "NSArray+FLEX.h"
+#import "UIFont+FLEX.h"
+#import "FLEXColor.h"

 NSString * const kFLEXDBQueryRowCellReuse = @"kFLEXDBQueryRowCellReuse";

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

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

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

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

@class FLEXMultiColumnTableView;

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

-#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"
+#import "FLEXMultiColumnTableView.h"
+#import "FLEXDBQueryRowCell.h"
+#import "FLEXTableLeftCell.h"
+#import "NSArray+FLEX.h"
+#import "FLEXColor.h"

@interface FLEXMultiColumnTableView () <
    UITableViewDataSource, UITableViewDelegate,
@@ -7,7 +7,7 @@
 //

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

@interface FLEXRealmDatabaseManager : NSObject <FLEXDatabaseManager>

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

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

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

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

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

@implementation FLEXSQLResult
@synthesize keyedRows = _keyedRows;
@@ -12,8 +12,8 @@
 //  which Flying Meat Inc. licenses this file to you.

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

@interface FLEXSQLiteDatabaseManager : NSObject <FLEXDatabaseManager>

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

-#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 "FLEXSQLiteDatabaseManager.h"
+#import "FLEXManager.h"
+#import "NSArray+FLEX.h"
+#import "FLEXRuntimeConstants.h"
 #import <sqlite3.h>

 #define kQuery(name, str) static NSString * const QUERY_##name = str
@@ -6,10 +6,10 @@
 //  Copyright © 2015年 f. All rights reserved.
 //

-#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableColumnHeader.h"
-#import "Classes/Utility/FLEXColor.h"
-#import "Classes/Utility/Categories/UIFont+FLEX.h"
-#import "Classes/Utility/FLEXUtility.h"
+#import "FLEXTableColumnHeader.h"
+#import "FLEXColor.h"
+#import "UIFont+FLEX.h"
+#import "FLEXUtility.h"

 static const CGFloat kMargin = 5;
 static const CGFloat kArrowWidth = 20;
@@ -7,7 +7,7 @@
 //

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

 NS_ASSUME_NONNULL_BEGIN

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

-#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"
+#import "FLEXTableContentViewController.h"
+#import "FLEXTableRowDataViewController.h"
+#import "FLEXMultiColumnTableView.h"
+#import "FLEXWebViewController.h"
+#import "FLEXUtility.h"
+#import "UIBarButtonItem+FLEX.h"

@interface FLEXTableContentViewController () <
    FLEXMultiColumnTableViewDataSource, FLEXMultiColumnTableViewDelegate
@@ -6,7 +6,7 @@
 //  Copyright © 2015年 f. All rights reserved.
 //

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

@implementation FLEXTableLeftCell

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

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

@interface FLEXTableListViewController : FLEXFilteringTableViewController

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

-#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"
+#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 "FLEXMacros.h"

@interface FLEXTableListViewController ()
@property (nonatomic, readonly) id<FLEXDatabaseManager> dbm;
@@ -93,37 +93,16 @@
 }
    
 - (void)queryButtonPressed {
-    [self showQueryInput:nil];
-}
-
- (void)showQueryInput:(NSString *)prefillQuery {
    FLEXSQLiteDatabaseManager *database = self.dbm;
    
    [FLEXAlert makeAlert:^(FLEXAlert *make) {
        make.title(@"Execute an SQL query");
-        make.configuredTextField(^(UITextField *textField) {
-            textField.text = prefillQuery;
-        });
-        
+        make.textField(nil);
        make.button(@"Run").handler(^(NSArray<NSString *> *strings) {
-            NSString *query = strings[0];
-            FLEXSQLResult *result = [database executeStatement:query];
+            FLEXSQLResult *result = [database executeStatement:strings[0]];
            
            if (result.message) {
-                // 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];
-                }
+                [FLEXAlert showAlert:@"Message" message:result.message from:self];
            } else {
                UIViewController *resultsScreen = [FLEXTableContentViewController
                    columns:result.columns rows:result.rows
@@ -5,7 +5,7 @@
 //  Created by Chaoshuai Lu on 7/8/20.
 //

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

@interface FLEXTableRowDataViewController : FLEXFilteringTableViewController

@@ -5,9 +5,9 @@
 //  Created by Chaoshuai Lu on 7/8/20.
 //

-#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableRowDataViewController.h"
-#import "Classes/Headers/FLEXMutableListSection.h"
-#import "Classes/Utility/FLEXAlert.h"
+#import "FLEXTableRowDataViewController.h"
+#import "FLEXMutableListSection.h"
+#import "FLEXAlert.h"

@interface FLEXTableRowDataViewController ()
@property (nonatomic) NSDictionary<NSString *, NSString *> *rowsByColumn;
@@ -1,14 +0,0 @@
-//
-//  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
@@ -1,372 +0,0 @@
-//
-//  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 "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"
+#import "FLEXGlobalsEntry.h"

@interface FLEXAddressExplorerCoordinator : NSObject <FLEXGlobalsEntry>

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

-#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"
+#import "FLEXAddressExplorerCoordinator.h"
+#import "FLEXGlobalsViewController.h"
+#import "FLEXObjectExplorerFactory.h"
+#import "FLEXObjectExplorerViewController.h"
+#import "FLEXRuntimeUtility.h"
+#import "FLEXUtility.h"

@interface UITableViewController (FLEXAddressExploration)
 - (void)deselectSelectedRow;
@@ -6,8 +6,8 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //

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

@interface FLEXCookiesViewController : FLEXFilteringTableViewController <FLEXGlobalsEntry>

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

-#import "Classes/GlobalStateExplorers/FLEXCookiesViewController.h"
-#import "Classes/Headers/FLEXObjectExplorerFactory.h"
-#import "Classes/Headers/FLEXMutableListSection.h"
-#import "Classes/Utility/FLEXUtility.h"
+#import "FLEXCookiesViewController.h"
+#import "FLEXObjectExplorerFactory.h"
+#import "FLEXMutableListSection.h"
+#import "FLEXUtility.h"

@interface FLEXCookiesViewController ()
@property (nonatomic, readonly) FLEXMutableListSection<NSHTTPCookie *> *cookies;
@@ -26,14 +26,6 @@
    self.title = @"Cookies";
 }

- (NSString *)headerTitle {
-    return self.cookies.title;
-}
-
- (void)setHeaderTitle:(NSString *)headerTitle {
-    self.cookies.customTitle = headerTitle;
-}
-
 - (NSArray<FLEXTableViewSection *> *)makeSections {
    NSSortDescriptor *nameSortDescriptor = [[NSSortDescriptor alloc]
        initWithKey:@"name" ascending:YES selector:@selector(caseInsensitiveCompare:)
@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //

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

@interface FLEXLiveObjectsController : FLEXTableViewController <FLEXGlobalsEntry>

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

-#import "Classes/GlobalStateExplorers/FLEXLiveObjectsController.h"
-#import "Classes/Utility/FLEXHeapEnumerator.h"
-#import "Classes/GlobalStateExplorers/FLEXObjectListViewController.h"
-#import "Classes/Utility/FLEXUtility.h"
-#import "Classes/Core/Views/Carousel/FLEXScopeCarousel.h"
-#import "Classes/Headers/FLEXTableView.h"
+#import "FLEXLiveObjectsController.h"
+#import "FLEXHeapEnumerator.h"
+#import "FLEXObjectListViewController.h"
+#import "FLEXUtility.h"
+#import "FLEXScopeCarousel.h"
+#import "FLEXTableView.h"
 #import <objc/runtime.h>

 static const NSInteger kFLEXLiveObjectsSortAlphabeticallyIndex = 0;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tanner Bennett	0c0e936143	Fix bug in new FLEXMirror usage	2022-04-27 12:34:56 -05:00
Tanner Bennett	5ab4f8d2a6	Fix annoying divider color in editor screens	2022-04-27 11:53:57 -05:00
Tanner Bennett	ade5f81bc6	Update SPM example deps	2022-04-27 11:53:57 -05:00
Tanner Bennett	1cd3a90809	Enable displaying ivar names for custom struct types FLEXMetadataExtras.h	2022-04-27 11:53:57 -05:00
Tanner Bennett	29f3c3d3cd	Make CommitDetails a struct to demo Reflex	2022-04-26 19:48:49 -05:00
Tanner Bennett	a4d49c0ca9	Podspec: gnu++11	2022-04-26 19:48:49 -05:00
Tanner Bennett	f4bcfe708c	Delete modulemap	2022-04-26 19:46:20 -05:00
Tanner Bennett	1523bf0e4d	Use Reflex instead of FLEX in SPM project	2022-04-24 19:06:14 -05:00
Tanner Bennett	ee18360f89	Initialize FLEXObjectExplorer.reflexAvailable	2022-04-24 19:06:14 -05:00
Tanner Bennett	19df6d0f0a	Use Reflex and FLEXMirror	2022-04-24 19:06:14 -05:00
Tanner Bennett	e6e38dfba5	Add FLEXSwiftInternal to check if object from Swift	2022-04-24 19:06:14 -05:00
Tanner Bennett	d2a7ba388e	Modernize FLEXMirror Differentiate between class and instance props/methods	2022-04-24 19:05:45 -05:00
Tanner Bennett	33873531d2	Add (unused) libflex modulemap file For my own use case, I dynamically link FLEX, so I need to build Reflex using libflex.tbd as well as this modulemap file.	2022-04-24 19:05:45 -05:00