Fix #410, prefix all categories

Classes/Core/Controllers/FLEXTableViewController.m

@@ -224,10 +224,10 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
     
     _shareToolbarItem = FLEXBarButtonItemSystem(Action, self, @selector(shareButtonPressed:));
     _bookmarksToolbarItem = [UIBarButtonItem
-        itemWithImage:FLEXResources.bookmarksIcon target:self action:@selector(showBookmarks)
+        flex_itemWithImage:FLEXResources.bookmarksIcon target:self action:@selector(showBookmarks)
     ];
     _openTabsToolbarItem = [UIBarButtonItem
-        itemWithImage:FLEXResources.openTabsIcon target:self action:@selector(showTabSwitcher)
+        flex_itemWithImage:FLEXResources.openTabsIcon target:self action:@selector(showTabSwitcher)
     ];
     
     self.leftmostToolbarItem = UIBarButtonItem.flex_fixedSpace;

Classes/Core/FLEXTableViewSection.m

@@ -112,13 +112,13 @@
         }
         
         UIMenu *copyMenu = [UIMenu
-            inlineMenuWithTitle:@"Copy…" 
+            flex_inlineMenuWithTitle:@"Copy…" 
             image:copyIcon
             children:actions
         ];
         
         if (collapseMenu) {
-            return @[[copyMenu collapsed]];
+            return @[[copyMenu flex_collapsed]];
         } else {
             return @[copyMenu];
         }

Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.m

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

Classes/ExplorerInterface/Tabs/FLEXTabsViewController.m

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

Classes/GlobalStateExplorers/Globals/FLEXGlobalsViewController.m

@@ -165,7 +165,7 @@
     self.title = @"💪  FLEX";
     self.showsSearchBar = YES;
     self.searchBarDebounceInterval = kFLEXDebounceInstant;
-    self.navigationItem.backBarButtonItem = [UIBarButtonItem backItemWithTitle:@"Back"];
+    self.navigationItem.backBarButtonItem = [UIBarButtonItem flex_backItemWithTitle:@"Back"];
     
     _manuallyDeselectOnAppear = NSProcessInfo.processInfo.operatingSystemVersion.majorVersion < 10;
 }

Classes/GlobalStateExplorers/Keychain/FLEXKeychainViewController.m

@@ -31,8 +31,8 @@
     [super viewDidLoad];
     
     self.navigationItem.rightBarButtonItems = @[
-        [UIBarButtonItem systemItem:UIBarButtonSystemItemTrash target:self action:@selector(trashPressed:)],
-        [UIBarButtonItem systemItem:UIBarButtonSystemItemAdd target:self action:@selector(addPressed)],
+        [UIBarButtonItem flex_systemItem:UIBarButtonSystemItemTrash target:self action:@selector(trashPressed:)],
+        [UIBarButtonItem flex_systemItem:UIBarButtonSystemItemAdd target:self action:@selector(addPressed)],
     ];
 
     [self reloadData];

Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogViewController.m

@@ -118,12 +118,12 @@ static BOOL my_os_log_shim_enabled(void *addr) {
     // Toolbar buttons //
 
     UIBarButtonItem *scrollDown = [UIBarButtonItem
-        itemWithImage:FLEXResources.scrollToBottomIcon
+        flex_itemWithImage:FLEXResources.scrollToBottomIcon
         target:self
         action:@selector(scrollToLastRow)
     ];
     UIBarButtonItem *settings = [UIBarButtonItem
-        itemWithImage:FLEXResources.gearIcon
+        flex_itemWithImage:FLEXResources.gearIcon
         target:self
         action:@selector(showLogSettings)
     ];
@@ -220,11 +220,11 @@ static BOOL my_os_log_shim_enabled(void *addr) {
     [FLEXAlert makeAlert:^(FLEXAlert *make) {
         make.title(title).message(body);
         make.button(aslToggle).destructiveStyle().handler(^(NSArray<NSString *> *strings) {
-            [defaults toggleBoolForKey:kFLEXDefaultsDisableOSLogForceASLKey];
+            [defaults flex_toggleBoolForKey:kFLEXDefaultsDisableOSLogForceASLKey];
         });
 
         make.button(persistence).handler(^(NSArray<NSString *> *strings) {
-            [defaults toggleBoolForKey:kFLEXDefaultsiOSPersistentOSLogKey];
+            [defaults flex_toggleBoolForKey:kFLEXDefaultsiOSPersistentOSLogKey];
             logController.persistent = !persistent;
             [logController.messages addObjectsFromArray:self.logMessages.list];
         });

Classes/Network/FLEXNetworkMITMViewController.m

@@ -49,15 +49,15 @@
     
     [self addToolbarItems:@[
         [UIBarButtonItem
-            itemWithImage:FLEXResources.gearIcon
+            flex_itemWithImage:FLEXResources.gearIcon
             target:self
             action:@selector(settingsButtonTapped:)
         ],
         [[UIBarButtonItem
-          systemItem:UIBarButtonSystemItemTrash
+          flex_systemItem:UIBarButtonSystemItemTrash
           target:self
           action:@selector(trashButtonTapped:)
-        ] withTintColor:UIColor.redColor]
+        ] flex_withTintColor:UIColor.redColor]
     ]];
 
     [self.tableView

Classes/Network/FLEXNetworkSettingsController.m

@@ -96,7 +96,7 @@
 }
 
 - (void)jsonViewerSettingToggled:(UISwitch *)sender {
-    [NSUserDefaults.standardUserDefaults toggleBoolForKey:kFLEXDefaultsRegisterJSONExplorerKey];
+    [NSUserDefaults.standardUserDefaults flex_toggleBoolForKey:kFLEXDefaultsRegisterJSONExplorerKey];
 }
 
 - (void)cacheLimitAdjusted:(UISlider *)sender {

Classes/Network/FLEXNetworkTransactionDetailController.m

@@ -64,7 +64,9 @@ typedef UIViewController *(^FLEXNetworkDetailRowSelectionFuture)(void);
         self.toolbarItems = @[
             UIBarButtonItem.flex_flexibleSpace,
             [UIBarButtonItem
-                itemWithTitle:@"Copy curl" target:self action:@selector(copyButtonPressed:)
+                flex_itemWithTitle:@"Copy curl"
+                target:self
+                action:@selector(copyButtonPressed:)
             ]
         ];
     }

Classes/ObjectExplorers/FLEXObjectExplorerViewController.m

@@ -102,7 +102,7 @@
     
     // ... button for extra options
     [self addToolbarItems:@[[UIBarButtonItem
-        itemWithImage:FLEXResources.moreIcon target:self action:@selector(moreButtonPressed:)
+        flex_itemWithImage:FLEXResources.moreIcon target:self action:@selector(moreButtonPressed:)
     ]]];
 
     // Swipe gestures to swipe between classes in the hierarchy
@@ -315,7 +315,7 @@
                 stringByAppendingString:explorerToggles[option]
             ];
             make.button(title).handler(^(NSArray<NSString *> *strings) {
-                [NSUserDefaults.standardUserDefaults toggleBoolForKey:option];
+                [NSUserDefaults.standardUserDefaults flex_toggleBoolForKey:option];
                 [self fullyReloadData];
             });
         }

Classes/Utility/Categories/NSUserDefaults+FLEX.h

@@ -22,7 +22,7 @@ extern NSString * const kFLEXDefaultsRegisterJSONExplorerKey;
 /// All BOOL preferences are NO by default
 @interface NSUserDefaults (FLEX)
 
-- (void)toggleBoolForKey:(NSString *)key;
+- (void)flex_toggleBoolForKey:(NSString *)key;
 
 @property (nonatomic) double flex_toolbarTopMargin;
 

Classes/Utility/Categories/NSUserDefaults+FLEX.m

@@ -42,7 +42,7 @@ NSString * const kFLEXDefaultsRegisterJSONExplorerKey = @"com.flipboard.FLEX.vie
 
 #pragma mark Helper
 
-- (void)toggleBoolForKey:(NSString *)key {
+- (void)flex_toggleBoolForKey:(NSString *)key {
     [self setBool:![self boolForKey:key] forKey:key];
     [NSNotificationCenter.defaultCenter postNotificationName:key object:nil];
 }

Classes/Utility/Categories/UIBarButtonItem+FLEX.h

@@ -9,29 +9,29 @@
 #import <UIKit/UIKit.h>
 
 #define FLEXBarButtonItemSystem(item, tgt, sel) \
-    [UIBarButtonItem systemItem:UIBarButtonSystemItem##item target:tgt action:sel]
+    [UIBarButtonItem flex_systemItem:UIBarButtonSystemItem##item target:tgt action:sel]
 
 @interface UIBarButtonItem (FLEX)
 
 @property (nonatomic, readonly, class) UIBarButtonItem *flex_flexibleSpace;
 @property (nonatomic, readonly, class) UIBarButtonItem *flex_fixedSpace;
 
-+ (instancetype)itemWithCustomView:(UIView *)customView;
-+ (instancetype)backItemWithTitle:(NSString *)title;
++ (instancetype)flex_itemWithCustomView:(UIView *)customView;
++ (instancetype)flex_backItemWithTitle:(NSString *)title;
 
-+ (instancetype)systemItem:(UIBarButtonSystemItem)item target:(id)target action:(SEL)action;
++ (instancetype)flex_systemItem:(UIBarButtonSystemItem)item target:(id)target action:(SEL)action;
 
-+ (instancetype)itemWithTitle:(NSString *)title target:(id)target action:(SEL)action;
-+ (instancetype)doneStyleitemWithTitle:(NSString *)title target:(id)target action:(SEL)action;
++ (instancetype)flex_itemWithTitle:(NSString *)title target:(id)target action:(SEL)action;
++ (instancetype)flex_doneStyleitemWithTitle:(NSString *)title target:(id)target action:(SEL)action;
 
-+ (instancetype)itemWithImage:(UIImage *)image target:(id)target action:(SEL)action;
++ (instancetype)flex_itemWithImage:(UIImage *)image target:(id)target action:(SEL)action;
 
-+ (instancetype)disabledSystemItem:(UIBarButtonSystemItem)item;
-+ (instancetype)disabledItemWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style;
-+ (instancetype)disabledItemWithImage:(UIImage *)image;
++ (instancetype)flex_disabledSystemItem:(UIBarButtonSystemItem)item;
++ (instancetype)flex_disabledItemWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style;
++ (instancetype)flex_disabledItemWithImage:(UIImage *)image;
 
 /// @return the receiver
-- (UIBarButtonItem *)withTintColor:(UIColor *)tint;
+- (UIBarButtonItem *)flex_withTintColor:(UIColor *)tint;
 
 - (void)_setWidth:(CGFloat)width;
 

Classes/Utility/Categories/UIBarButtonItem+FLEX.m

@@ -13,53 +13,53 @@
 @implementation UIBarButtonItem (FLEX)
 
 + (UIBarButtonItem *)flex_flexibleSpace {
-    return [self systemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
+    return [self flex_systemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
 }
 
 + (UIBarButtonItem *)flex_fixedSpace {
-    UIBarButtonItem *fixed = [self systemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+    UIBarButtonItem *fixed = [self flex_systemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
     fixed.width = 60;
     return fixed;
 }
 
-+ (instancetype)systemItem:(UIBarButtonSystemItem)item target:(id)target action:(SEL)action {
++ (instancetype)flex_systemItem:(UIBarButtonSystemItem)item target:(id)target action:(SEL)action {
     return [[self alloc] initWithBarButtonSystemItem:item target:target action:action];
 }
 
-+ (instancetype)itemWithCustomView:(UIView *)customView {
++ (instancetype)flex_itemWithCustomView:(UIView *)customView {
     return [[self alloc] initWithCustomView:customView];
 }
 
-+ (instancetype)backItemWithTitle:(NSString *)title {
-    return [self itemWithTitle:title target:nil action:nil];
++ (instancetype)flex_backItemWithTitle:(NSString *)title {
+    return [self flex_itemWithTitle:title target:nil action:nil];
 }
 
-+ (instancetype)itemWithTitle:(NSString *)title target:(id)target action:(SEL)action {
++ (instancetype)flex_itemWithTitle:(NSString *)title target:(id)target action:(SEL)action {
     return [[self alloc] initWithTitle:title style:UIBarButtonItemStylePlain target:target action:action];
 }
 
-+ (instancetype)doneStyleitemWithTitle:(NSString *)title target:(id)target action:(SEL)action {
++ (instancetype)flex_doneStyleitemWithTitle:(NSString *)title target:(id)target action:(SEL)action {
     return [[self alloc] initWithTitle:title style:UIBarButtonItemStyleDone target:target action:action];
 }
 
-+ (instancetype)itemWithImage:(UIImage *)image target:(id)target action:(SEL)action {
++ (instancetype)flex_itemWithImage:(UIImage *)image target:(id)target action:(SEL)action {
     return [[self alloc] initWithImage:image style:UIBarButtonItemStylePlain target:target action:action];
 }
 
-+ (instancetype)disabledSystemItem:(UIBarButtonSystemItem)system {
-    UIBarButtonItem *item = [self systemItem:system target:nil action:nil];
++ (instancetype)flex_disabledSystemItem:(UIBarButtonSystemItem)system {
+    UIBarButtonItem *item = [self flex_systemItem:system target:nil action:nil];
     item.enabled = NO;
     return item;
 }
 
-+ (instancetype)disabledItemWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style {
-    UIBarButtonItem *item = [self itemWithTitle:title target:nil action:nil];
++ (instancetype)flex_disabledItemWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style {
+    UIBarButtonItem *item = [self flex_itemWithTitle:title target:nil action:nil];
     item.enabled = NO;
     return item;
 }
 
-+ (instancetype)disabledItemWithImage:(UIImage *)image {
-    UIBarButtonItem *item = [self itemWithImage:image target:nil action:nil];
++ (instancetype)flex_disabledItemWithImage:(UIImage *)image {
+    UIBarButtonItem *item = [self flex_itemWithImage:image target:nil action:nil];
     item.enabled = NO;
     return item;
 }

Classes/Utility/Categories/UIMenu+FLEX.h

@@ -10,10 +10,10 @@
 
 @interface UIMenu (FLEX)
 
-+ (instancetype)inlineMenuWithTitle:(NSString *)title
-                              image:(UIImage *)image
-                           children:(NSArray<UIMenuElement *> *)children;
++ (instancetype)flex_inlineMenuWithTitle:(NSString *)title
+                                   image:(UIImage *)image
+                                children:(NSArray<UIMenuElement *> *)children;
 
-- (instancetype)collapsed;
+- (instancetype)flex_collapsed;
 
 @end

Classes/Utility/Categories/UIMenu+FLEX.m

@@ -10,7 +10,7 @@
 
 @implementation UIMenu (FLEX)
 
-+ (instancetype)inlineMenuWithTitle:(NSString *)title image:(UIImage *)image children:(NSArray<UIMenuElement *> *)children {
++ (instancetype)flex_inlineMenuWithTitle:(NSString *)title image:(UIImage *)image children:(NSArray *)children {
     return [UIMenu
         menuWithTitle:title
         image:image
@@ -20,7 +20,7 @@
     ];
 }
 
-- (instancetype)collapsed {
+- (instancetype)flex_collapsed {
     return [UIMenu
         menuWithTitle:@""
         image:nil

Classes/ViewHierarchy/FLEXHierarchyViewController.m

@@ -72,7 +72,7 @@ typedef NS_ENUM(NSUInteger, FLEXHierarchyViewMode) {
 
     // 3D toggle button
     self.treeViewController.navigationItem.leftBarButtonItem = [UIBarButtonItem
-        itemWithImage:FLEXResources.toggle3DIcon target:self action:@selector(toggleHierarchyMode)
+        flex_itemWithImage:FLEXResources.toggle3DIcon target:self action:@selector(toggleHierarchyMode)
     ];
 
     // Dismiss when tree view row is selected

Classes/ViewHierarchy/SnapshotExplorer/FHSViewController.m

@@ -120,7 +120,7 @@ BOOL const kFHSViewControllerExcludeFLEXWindows = YES;
     // Initialize back bar button item for 3D view to look like a button
     self.navigationItem.hidesBackButton = YES;
     self.navigationItem.leftBarButtonItem = [UIBarButtonItem
-        itemWithImage:FLEXResources.toggle2DIcon
+        flex_itemWithImage:FLEXResources.toggle2DIcon
         target:self.navigationController
         action:@selector(toggleHierarchyMode)
     ];
@@ -158,14 +158,14 @@ BOOL const kFHSViewControllerExcludeFLEXWindows = YES;
 
     // Initialize our toolbar items
     self.toolbarItems = @[
-        [UIBarButtonItem itemWithCustomView:snapshotView.spacingSlider],
+        [UIBarButtonItem flex_itemWithCustomView:snapshotView.spacingSlider],
         UIBarButtonItem.flex_flexibleSpace,
         [UIBarButtonItem
-            itemWithImage:FLEXResources.moreIcon
+            flex_itemWithImage:FLEXResources.moreIcon
             target:self action:@selector(didPressOptionsButton:)
         ],
         UIBarButtonItem.flex_flexibleSpace,
-        [UIBarButtonItem itemWithCustomView:snapshotView.depthSlider]
+        [UIBarButtonItem flex_itemWithCustomView:snapshotView.depthSlider]
     ];
     [self resizeToolbarItems:self.view.frame.size];
 

Example/FLEXample/App/CommitListViewController.m

@@ -30,7 +30,7 @@
     self.title = @"FLEX Commit History";
     self.showsSearchBar = YES;
     self.navigationItem.rightBarButtonItem = [UIBarButtonItem
-        itemWithTitle:@"FLEX" target:FLEXManager.sharedManager action:@selector(toggleExplorer)
+        flex_itemWithTitle:@"FLEX" target:FLEXManager.sharedManager action:@selector(toggleExplorer)
     ];
     
     // Load and process commits