Skip to content

Commit 107e44a

Browse files
NSExceptionalNSExceptional
committed
Fix #410, prefix all categories
1 parent e79a3db commit 107e44a

20 files changed

Lines changed: 65 additions & 63 deletions

‎Classes/Core/Controllers/FLEXTableViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@ - (void)loadView {
224224

225225
_shareToolbarItem = FLEXBarButtonItemSystem(Action, self, @selector(shareButtonPressed:));
226226
_bookmarksToolbarItem = [UIBarButtonItem
227-
itemWithImage:FLEXResources.bookmarksIcon target:self action:@selector(showBookmarks)
227+
flex_itemWithImage:FLEXResources.bookmarksIcon target:self action:@selector(showBookmarks)
228228
];
229229
_openTabsToolbarItem = [UIBarButtonItem
230-
itemWithImage:FLEXResources.openTabsIcon target:self action:@selector(showTabSwitcher)
230+
flex_itemWithImage:FLEXResources.openTabsIcon target:self action:@selector(showTabSwitcher)
231231
];
232232

233233
self.leftmostToolbarItem = UIBarButtonItem.flex_fixedSpace;

‎Classes/Core/FLEXTableViewSection.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ - (NSString *)menuSubtitleForRow:(NSInteger)row {
112112
}
113113

114114
UIMenu *copyMenu = [UIMenu
115-
inlineMenuWithTitle:@"Copy…"
115+
flex_inlineMenuWithTitle:@"Copy…"
116116
image:copyIcon
117117
children:actions
118118
];
119119

120120
if (collapseMenu) {
121-
return @[[copyMenu collapsed]];
121+
return @[[copyMenu flex_collapsed]];
122122
} else {
123123
return @[copyMenu];
124124
}

‎Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ - (void)setupDefaultBarItems {
6868
- (void)setupEditingBarItems {
6969
self.navigationItem.rightBarButtonItem = nil;
7070
self.toolbarItems = @[
71-
[UIBarButtonItem itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed:)],
71+
[UIBarButtonItem flex_itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed:)],
7272
UIBarButtonItem.flex_flexibleSpace,
7373
// We use a non-system done item because we change its title dynamically
74-
[UIBarButtonItem doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
74+
[UIBarButtonItem flex_doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
7575
];
7676

7777
self.toolbarItems.firstObject.tintColor = FLEXColor.destructiveColor;

‎Classes/ExplorerInterface/Tabs/FLEXTabsViewController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,12 @@ - (void)setupDefaultBarItems {
121121
- (void)setupEditingBarItems {
122122
self.navigationItem.rightBarButtonItem = nil;
123123
self.toolbarItems = @[
124-
[UIBarButtonItem itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed:)],
124+
[UIBarButtonItem flex_itemWithTitle:@"Close All" target:self action:@selector(closeAllButtonPressed:)],
125125
UIBarButtonItem.flex_flexibleSpace,
126-
[UIBarButtonItem disabledSystemItem:UIBarButtonSystemItemAdd],
126+
[UIBarButtonItem flex_disabledSystemItem:UIBarButtonSystemItemAdd],
127127
UIBarButtonItem.flex_flexibleSpace,
128128
// We use a non-system done item because we change its title dynamically
129-
[UIBarButtonItem doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
129+
[UIBarButtonItem flex_doneStyleitemWithTitle:@"Done" target:self action:@selector(toggleEditing)]
130130
];
131131

132132
self.toolbarItems.firstObject.tintColor = FLEXColor.destructiveColor;

‎Classes/GlobalStateExplorers/Globals/FLEXGlobalsViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ - (void)viewDidLoad {
165165
self.title = @"💪 FLEX";
166166
self.showsSearchBar = YES;
167167
self.searchBarDebounceInterval = kFLEXDebounceInstant;
168-
self.navigationItem.backBarButtonItem = [UIBarButtonItem backItemWithTitle:@"Back"];
168+
self.navigationItem.backBarButtonItem = [UIBarButtonItem flex_backItemWithTitle:@"Back"];
169169

170170
_manuallyDeselectOnAppear = NSProcessInfo.processInfo.operatingSystemVersion.majorVersion < 10;
171171
}

‎Classes/GlobalStateExplorers/Keychain/FLEXKeychainViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ - (void)viewDidLoad {
3131
[super viewDidLoad];
3232

3333
self.navigationItem.rightBarButtonItems = @[
34-
[UIBarButtonItem systemItem:UIBarButtonSystemItemTrash target:self action:@selector(trashPressed:)],
35-
[UIBarButtonItem systemItem:UIBarButtonSystemItemAdd target:self action:@selector(addPressed)],
34+
[UIBarButtonItem flex_systemItem:UIBarButtonSystemItemTrash target:self action:@selector(trashPressed:)],
35+
[UIBarButtonItem flex_systemItem:UIBarButtonSystemItemAdd target:self action:@selector(addPressed)],
3636
];
3737

3838
[self reloadData];

‎Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogViewController.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ - (void)viewDidLoad {
118118
// Toolbar buttons //
119119

120120
UIBarButtonItem *scrollDown = [UIBarButtonItem
121-
itemWithImage:FLEXResources.scrollToBottomIcon
121+
flex_itemWithImage:FLEXResources.scrollToBottomIcon
122122
target:self
123123
action:@selector(scrollToLastRow)
124124
];
125125
UIBarButtonItem *settings = [UIBarButtonItem
126-
itemWithImage:FLEXResources.gearIcon
126+
flex_itemWithImage:FLEXResources.gearIcon
127127
target:self
128128
action:@selector(showLogSettings)
129129
];
@@ -220,11 +220,11 @@ - (void)showLogSettings {
220220
[FLEXAlert makeAlert:^(FLEXAlert *make) {
221221
make.title(title).message(body);
222222
make.button(aslToggle).destructiveStyle().handler(^(NSArray<NSString *> *strings) {
223-
[defaults toggleBoolForKey:kFLEXDefaultsDisableOSLogForceASLKey];
223+
[defaults flex_toggleBoolForKey:kFLEXDefaultsDisableOSLogForceASLKey];
224224
});
225225

226226
make.button(persistence).handler(^(NSArray<NSString *> *strings) {
227-
[defaults toggleBoolForKey:kFLEXDefaultsiOSPersistentOSLogKey];
227+
[defaults flex_toggleBoolForKey:kFLEXDefaultsiOSPersistentOSLogKey];
228228
logController.persistent = !persistent;
229229
[logController.messages addObjectsFromArray:self.logMessages.list];
230230
});

‎Classes/Network/FLEXNetworkMITMViewController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ - (void)viewDidLoad {
4949

5050
[self addToolbarItems:@[
5151
[UIBarButtonItem
52-
itemWithImage:FLEXResources.gearIcon
52+
flex_itemWithImage:FLEXResources.gearIcon
5353
target:self
5454
action:@selector(settingsButtonTapped:)
5555
],
5656
[[UIBarButtonItem
57-
systemItem:UIBarButtonSystemItemTrash
57+
flex_systemItem:UIBarButtonSystemItemTrash
5858
target:self
5959
action:@selector(trashButtonTapped:)
60-
] withTintColor:UIColor.redColor]
60+
] flex_withTintColor:UIColor.redColor]
6161
]];
6262

6363
[self.tableView

‎Classes/Network/FLEXNetworkSettingsController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ - (void)cacheMediaResponsesToggled:(UISwitch *)sender {
9696
}
9797

9898
- (void)jsonViewerSettingToggled:(UISwitch *)sender {
99-
[NSUserDefaults.standardUserDefaults toggleBoolForKey:kFLEXDefaultsRegisterJSONExplorerKey];
99+
[NSUserDefaults.standardUserDefaults flex_toggleBoolForKey:kFLEXDefaultsRegisterJSONExplorerKey];
100100
}
101101

102102
- (void)cacheLimitAdjusted:(UISlider *)sender {

‎Classes/Network/FLEXNetworkTransactionDetailController.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ - (instancetype)initWithStyle:(UITableViewStyle)style {
6464
self.toolbarItems = @[
6565
UIBarButtonItem.flex_flexibleSpace,
6666
[UIBarButtonItem
67-
itemWithTitle:@"Copy curl" target:self action:@selector(copyButtonPressed:)
67+
flex_itemWithTitle:@"Copy curl"
68+
target:self
69+
action:@selector(copyButtonPressed:)
6870
]
6971
];
7072
}

0 commit comments

Comments
 (0)