New icons

Classes/Core/Controllers/FLEXTableViewController.m

@@ -13,6 +13,7 @@
 #import "FLEXScopeCarousel.h"
 #import "FLEXTableView.h"
 #import "FLEXUtility.h"
+#import "FLEXResources.h"
 #import "UIBarButtonItem+FLEX.h"
 #import <objc/runtime.h>
 
@@ -219,12 +220,12 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
     self.tableView.delegate = self;
     
     _shareToolbarItem = FLEXBarButtonItemSystem(Action, self, @selector(shareButtonPressed));
-    _bookmarksToolbarItem = FLEXBarButtonItemSystem(Bookmarks, self, @selector(showBookmarks));
-    _openTabsToolbarItem = FLEXBarButtonItemSystem(Organize, self, @selector(showTabSwitcher));
-    
-    for (UIBarButtonItem *item in @[_shareToolbarItem, _bookmarksToolbarItem, _openTabsToolbarItem]) {
-        item.width = 60;
-    }
+    _bookmarksToolbarItem = [UIBarButtonItem
+        itemWithImage:FLEXResources.bookmarksIcon target:self action:@selector(showBookmarks)
+    ];
+    _openTabsToolbarItem = [UIBarButtonItem
+        itemWithImage:FLEXResources.openTabsIcon target:self action:@selector(showTabSwitcher)
+    ];
     
     self.leftmostToolbarItem = UIBarButtonItem.flex_fixedSpace;
     self.middleLeftToolbarItem = UIBarButtonItem.flex_fixedSpace;
@@ -315,13 +316,19 @@ CGFloat const kFLEXDebounceForExpensiveIO = 0.5;
         UIBarButtonItem.flex_flexibleSpace,
         self.middleLeftToolbarItem,
         UIBarButtonItem.flex_flexibleSpace,
-        self.middleLeftToolbarItem,
+        self.middleToolbarItem,
         UIBarButtonItem.flex_flexibleSpace,
         self.bookmarksToolbarItem,
         UIBarButtonItem.flex_flexibleSpace,
         self.openTabsToolbarItem,
     ];
     
+    for (UIBarButtonItem *item in self.toolbarItems) {
+        [item _setWidth:60];
+        // This does not work for anything but fixed spaces for some reason
+        // item.width = 60;
+    }
+    
     // Disable tabs entirely when not presented by FLEXExplorerViewController
     UIViewController *presenter = self.navigationController.presentingViewController;
     if (![presenter isKindOfClass:[FLEXExplorerViewController class]]) {

Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogViewController.m

@@ -7,11 +7,13 @@
 //
 
 #import "FLEXSystemLogViewController.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
 #import "FLEXASLLogController.h"
 #import "FLEXOSLogController.h"
 #import "FLEXSystemLogCell.h"
+#import "FLEXUtility.h"
+#import "FLEXColor.h"
+#import "FLEXResources.h"
+#import "UIBarButtonItem+FLEX.h"
 #import "fishhook.h"
 #import <dlfcn.h>
 
@@ -103,18 +105,23 @@ BOOL my_os_log_shim_enabled() {
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.title = @"Loading...";
     
-    UIBarButtonItem *scrollDown = [[UIBarButtonItem alloc] initWithTitle:@" ⬇︎ "
-                                                                   style:UIBarButtonItemStylePlain
-                                                                  target:self
-                                                                  action:@selector(scrollToLastRow)];
-    UIBarButtonItem *settings = [[UIBarButtonItem alloc] initWithTitle:@"Settings"
-                                                                 style:UIBarButtonItemStylePlain
-                                                                target:self
-                                                                action:@selector(showLogSettings)];
-    if (FLEXOSLogAvailable()) {
-        self.navigationItem.rightBarButtonItems = @[scrollDown, settings];
+    // Toolbar buttons //
+    
+    UIBarButtonItem *scrollDown = [UIBarButtonItem
+        itemWithImage:FLEXResources.scrollToBottomIcon
+        target:self
+        action:@selector(scrollToLastRow)
+    ];
+    UIBarButtonItem *settings = [UIBarButtonItem
+        itemWithImage:FLEXResources.gearIcon
+        target:self
+        action:@selector(showLogSettings)
+    ];
+    
+    if (FLEXOSLogAvailable() && !FLEXNSLogHookWorks) {
+        [self addToolbarItems:@[scrollDown, settings]];
     } else {
-        self.navigationItem.rightBarButtonItem = scrollDown;
+        [self addToolbarItems:@[scrollDown]];
     }
 }
 

Classes/Network/FLEXNetworkMITMViewController.m

@@ -16,6 +16,7 @@
 #import "FLEXNetworkTransactionDetailTableViewController.h"
 #import "FLEXNetworkSettingsTableViewController.h"
 #import "UIBarButtonItem+FLEX.h"
+#import "FLEXResources.h"
 
 @interface FLEXNetworkMITMViewController ()
 
@@ -39,6 +40,12 @@
     [super viewDidLoad];
 
     self.showsSearchBar = YES;
+    
+    [self addToolbarItems:@[[UIBarButtonItem
+        itemWithImage:FLEXResources.gearIcon
+        target:self
+        action:@selector(settingsButtonTapped:)
+    ]]];
 
     [self.tableView
         registerClass:[FLEXNetworkTransactionTableViewCell class]

Classes/Utility/Categories/UIBarButtonItem+FLEX.h

@@ -23,13 +23,12 @@
 + (instancetype)itemWithTitle:(NSString *)title target:(id)target action:(SEL)action;
 + (instancetype)doneStyleitemWithTitle:(NSString *)title target:(id)target action:(SEL)action;
 
-+ (instancetype)itemWithImage:(UIImage *)image
-                        style:(UIBarButtonItemStyle)style
-                       target:(id)target
-                       action:(SEL)action;
++ (instancetype)itemWithImage:(UIImage *)image target:(id)target action:(SEL)action;
 
 + (instancetype)disabledSystemItem:(UIBarButtonSystemItem)item;
 + (instancetype)disabledItemWithTitle:(NSString *)title style:(UIBarButtonItemStyle)style;
-+ (instancetype)disabledItemWithImage:(UIImage *)image style:(UIBarButtonItemStyle)style;
++ (instancetype)disabledItemWithImage:(UIImage *)image;
+
+- (void)_setWidth:(CGFloat)width;
 
 @end

Classes/Utility/Categories/UIBarButtonItem+FLEX.m

@@ -38,11 +38,8 @@
     return [[self alloc] initWithTitle:title style:UIBarButtonItemStyleDone target:target action:action];
 }
 
-+ (instancetype)itemWithImage:(UIImage *)image
-                        style:(UIBarButtonItemStyle)style
-                       target:(id)target
-                       action:(SEL)action {
-    return [[self alloc] initWithImage:image style:style target:target action:action];
++ (instancetype)itemWithImage:(UIImage *)image target:(id)target action:(SEL)action {
+    return [[self alloc] initWithImage:image style:UIBarButtonItemStylePlain target:target action:action];
 }
 
 + (instancetype)disabledSystemItem:(UIBarButtonSystemItem)system {
@@ -57,8 +54,8 @@
     return item;
 }
 
-+ (instancetype)disabledItemWithImage:(UIImage *)image style:(UIBarButtonItemStyle)style {
-    UIBarButtonItem *item = [self itemWithImage:image style:style target:nil action:nil];
++ (instancetype)disabledItemWithImage:(UIImage *)image {
+    UIBarButtonItem *item = [self itemWithImage:image target:nil action:nil];
     item.enabled = NO;
     return item;
 }

Classes/Utility/FLEXResources.h

@@ -10,15 +10,25 @@
 
 @interface FLEXResources : NSObject
 
+#pragma mark - FLEX Toolbar Icons
+
 @property (readonly, class) UIImage *closeIcon;
 @property (readonly, class) UIImage *dragHandle;
 @property (readonly, class) UIImage *globalsIcon;
-@property (readonly, class) UIImage *hierarchyIndentPattern;
 @property (readonly, class) UIImage *hierarchyIcon;
 @property (readonly, class) UIImage *recentIcon;
 @property (readonly, class) UIImage *moveIcon;
 @property (readonly, class) UIImage *selectIcon;
-@property (readonly, class) UIImage *checkerPattern;
+
+#pragma mark - Toolbar Icons
+
+@property (readonly, class) UIImage *bookmarksIcon;
+@property (readonly, class) UIImage *openTabsIcon;
+@property (readonly, class) UIImage *moreIcon;
+@property (readonly, class) UIImage *gearIcon;
+@property (readonly, class) UIImage *scrollToBottomIcon;
+
+#pragma mark - Content Type Icons
 
 @property (readonly, class) UIImage *jsonIcon;
 @property (readonly, class) UIImage *textPlainIcon;
@@ -31,9 +41,18 @@
 @property (readonly, class) UIImage *xmlIcon;
 @property (readonly, class) UIImage *binaryIcon;
 
+#pragma mark - 3D Explorer Icons
+
+@property (readonly, class) UIImage *toggle2DIcon;
+@property (readonly, class) UIImage *toggle3DIcon;
 @property (readonly, class) UIImage *rangeSliderLeftHandle;
 @property (readonly, class) UIImage *rangeSliderRightHandle;
 @property (readonly, class) UIImage *rangeSliderTrack;
 @property (readonly, class) UIImage *rangeSliderFill;
 
+#pragma mark - Misc Icons
+
+@property(readonly, class) UIImage *checkerPattern;
+@property(readonly, class) UIImage *hierarchyIndentPattern;
+
 @end

Classes/ViewHierarchy/FLEXHierarchyViewController.m

@@ -11,6 +11,8 @@
 #import "FHSViewController.h"
 #import "FLEXUtility.h"
 #import "FLEXTabList.h"
+#import "FLEXResources.h"
+#import "UIBarButtonItem+FLEX.h"
 
 typedef NS_ENUM(NSUInteger, FLEXHierarchyViewMode) {
     FLEXHierarchyViewModeTree = 1,
@@ -69,8 +71,8 @@ typedef NS_ENUM(NSUInteger, FLEXHierarchyViewMode) {
     [super viewDidLoad];
 
     // 3D toggle button
-    self.treeViewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc]
-        initWithTitle:@"3D" style:UIBarButtonItemStylePlain target:self action:@selector(toggleHierarchyMode)
+    self.treeViewController.navigationItem.leftBarButtonItem = [UIBarButtonItem
+        itemWithImage:FLEXResources.toggle3DIcon target:self action:@selector(toggleHierarchyMode)
     ];
 
     // Dismiss when tree view row is selected

Classes/ViewHierarchy/SnapshotExplorer/FHSViewController.m

@@ -8,11 +8,13 @@
 
 #import "FHSViewController.h"
 #import "FHSSnapshotView.h"
+#import "FLEXHierarchyViewController.h"
 #import "FLEXColor.h"
 #import "FLEXAlert.h"
-#import "NSArray+Functional.h"
 #import "FLEXWindow.h"
-#import "FLEXHierarchyViewController.h"
+#import "FLEXResources.h"
+#import "NSArray+Functional.h"
+#import "UIBarButtonItem+FLEX.h"
 
 BOOL const kFHSViewControllerExcludeFLEXWindows = YES;
 
@@ -117,8 +119,8 @@ 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 alloc]
-        initWithTitle:@"2D" style:UIBarButtonItemStylePlain
+    self.navigationItem.leftBarButtonItem = [UIBarButtonItem
+        itemWithImage:FLEXResources.toggle2DIcon
         target:self.navigationController
         action:@selector(toggleHierarchyMode)
     ];
@@ -156,24 +158,14 @@ BOOL const kFHSViewControllerExcludeFLEXWindows = YES;
 
     // Initialize our toolbar items
     self.toolbarItems = @[
-        [[UIBarButtonItem alloc]
-            initWithCustomView:snapshotView.spacingSlider
-        ],
-        [[UIBarButtonItem alloc]
-            initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
-            target:nil action:nil
-        ],
-        [[UIBarButtonItem alloc]
-            initWithBarButtonSystemItem:UIBarButtonSystemItemOrganize
+        [UIBarButtonItem itemWithCustomView:snapshotView.spacingSlider],
+        UIBarButtonItem.flex_flexibleSpace,
+        [UIBarButtonItem
+            itemWithImage:FLEXResources.moreIcon
             target:self action:@selector(didPressOptionsButton)
         ],
-        [[UIBarButtonItem alloc]
-            initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
-            target:nil action:nil
-        ],
-        [[UIBarButtonItem alloc]
-            initWithCustomView:snapshotView.depthSlider
-        ],
+        UIBarButtonItem.flex_flexibleSpace,
+        [UIBarButtonItem itemWithCustomView:snapshotView.depthSlider]
     ];
     [self resizeToolbarItems:self.view.frame.size];