Преглед изворни кода

Fix typos in globals screen

- Don't use class names for app delegate or root vc
- Reorder some globals rows, also
Tanner Bennett пре 6 година
родитељ
комит
e30b1854fc

+ 8 - 13
Classes/GlobalStateExplorers/Globals/FLEXGlobalsTableViewController.m

@@ -74,15 +74,6 @@ static __weak UIWindow *s_applicationWindow = nil;
             return [FLEXSystemLogTableViewController flex_concreteGlobalsEntry:row];
         case FLEXGlobalsRowNetworkHistory:
             return [FLEXNetworkHistoryTableViewController flex_concreteGlobalsEntry:row];
-        case FLEXGlobalsRowRootViewController:
-            return [FLEXGlobalsEntry
-                entryWithNameFuture:^NSString *{
-                    return [NSString stringWithFormat:@"🌴  %@", [s_applicationWindow.rootViewController class]];
-                } viewControllerFuture:^UIViewController *{
-                    UIViewController *rootViewController = s_applicationWindow.rootViewController;
-                    return [FLEXObjectExplorerFactory explorerViewControllerForObject:rootViewController];
-                }
-            ];
         case FLEXGlobalsRowKeyWindow:
             return [FLEXGlobalsEntry
                 entryWithNameFuture:^NSString *{
@@ -91,6 +82,7 @@ static __weak UIWindow *s_applicationWindow = nil;
                     return [FLEXObjectExplorerFactory explorerViewControllerForObject:s_applicationWindow];
                 }
             ];
+        case FLEXGlobalsRowRootViewController:
         case FLEXGlobalsRowProcessInfo:
         case FLEXGlobalsRowAppDelegate:
         case FLEXGlobalsRowUserDefaults:
@@ -102,7 +94,10 @@ static __weak UIWindow *s_applicationWindow = nil;
             return [FLEXObjectExplorerFactory flex_concreteGlobalsEntry:row];
 
         default:
-            @throw NSInternalInconsistencyException;
+            @throw [NSException
+                exceptionWithName:NSInternalInconsistencyException
+                reason:@"Missing globals case in switch" userInfo:nil
+            ];
     }
 }
 
@@ -113,15 +108,17 @@ static __weak UIWindow *s_applicationWindow = nil;
     dispatch_once(&onceToken, ^{
         NSArray *rows = @[
             @[
-                [self globalsEntryForRow:FLEXGlobalsRowProcessInfo],
                 [self globalsEntryForRow:FLEXGlobalsRowNetworkHistory],
                 [self globalsEntryForRow:FLEXGlobalsRowSystemLog],
+                [self globalsEntryForRow:FLEXGlobalsRowProcessInfo],
                 [self globalsEntryForRow:FLEXGlobalsRowLiveObjects],
                 [self globalsEntryForRow:FLEXGlobalsRowAddressInspector],
                 [self globalsEntryForRow:FLEXGlobalsRowSystemLibraries],
                 [self globalsEntryForRow:FLEXGlobalsRowAppClasses],
             ],
             @[ // FLEXGlobalsSectionAppShortcuts
+                [self globalsEntryForRow:FLEXGlobalsRowBrowseBundle],
+                [self globalsEntryForRow:FLEXGlobalsRowBrowseContainer],
                 [self globalsEntryForRow:FLEXGlobalsRowMainBundle],
                 [self globalsEntryForRow:FLEXGlobalsRowUserDefaults],
                 [self globalsEntryForRow:FLEXGlobalsRowAppKeychainItems],
@@ -130,8 +127,6 @@ static __weak UIWindow *s_applicationWindow = nil;
                 [self globalsEntryForRow:FLEXGlobalsRowKeyWindow],
                 [self globalsEntryForRow:FLEXGlobalsRowRootViewController],
                 [self globalsEntryForRow:FLEXGlobalsRowCookies],
-                [self globalsEntryForRow:FLEXGlobalsRowBrowseBundle],
-                [self globalsEntryForRow:FLEXGlobalsRowBrowseContainer],
             ],
             @[ // FLEXGlobalsSectionMisc
                 [self globalsEntryForRow:FLEXGlobalsRowPasteboard],

+ 14 - 14
Classes/ObjectExplorers/FLEXObjectExplorerFactory.m

@@ -72,24 +72,24 @@
 + (NSString *)globalsEntryTitle:(FLEXGlobalsRow)row 
 {
     switch (row) {
-        case FLEXGlobalsRowAppDelegate: {
-            Class cls = [UIApplication.sharedApplication.delegate class];
-            return [NSString stringWithFormat:@"👉  %@", cls];
-        }
+        case FLEXGlobalsRowAppDelegate:
+            return @"👉  App delegate";
+        case FLEXGlobalsRowRootViewController:
+            return @"🌴  Root view controller";
         case FLEXGlobalsRowProcessInfo:
-            return @"🚦  +NSProcessInfo.processInfo";
+            return @"🚦  NSProcessInfo.processInfo";
         case FLEXGlobalsRowUserDefaults:
-            return @"💾  +[NSUserDefaults standardUserDefaults]";
+            return @"💾  Preferences (NSUserDefaults)";
         case FLEXGlobalsRowMainBundle:
-            return @"📦  +[NSBundle mainBundle]";
+            return @"📦  NSBundle.mainBundle";
         case FLEXGlobalsRowApplication:
-            return @"🚀  +UIApplication.sharedApplication";
+            return @"🚀  UIApplication.sharedApplication";
         case FLEXGlobalsRowMainScreen:
-            return @"💻  +UIScreen.mainScreen";
+            return @"💻  UIScreen.mainScreen";
         case FLEXGlobalsRowCurrentDevice:
-            return @"📱  +[UIDevice currentDevice]";
+            return @"📱  UIDevice.currentDevice";
         case FLEXGlobalsRowPasteboard:
-            return @"📋  +UIPasteboard.generalPastboard";
+            return @"📋  UIPasteboard.generalPastboard";
         default: return nil;
     }
 }
@@ -102,9 +102,9 @@
             return [self explorerViewControllerForObject:appDelegate];
         }
         case FLEXGlobalsRowProcessInfo:
-            return [self explorerViewControllerForObject:NSProcessInfo.processInfo];;
+            return [self explorerViewControllerForObject:NSProcessInfo.processInfo];
         case FLEXGlobalsRowUserDefaults:
-            return [self explorerViewControllerForObject:[NSUserDefaults standardUserDefaults]];
+            return [self explorerViewControllerForObject:NSUserDefaults.standardUserDefaults];
         case FLEXGlobalsRowMainBundle:
             return [self explorerViewControllerForObject:NSBundle.mainBundle];
         case FLEXGlobalsRowApplication:
@@ -112,7 +112,7 @@
         case FLEXGlobalsRowMainScreen:
             return [self explorerViewControllerForObject:UIScreen.mainScreen];
         case FLEXGlobalsRowCurrentDevice:
-            return [self explorerViewControllerForObject:[UIDevice currentDevice]];
+            return [self explorerViewControllerForObject:UIDevice.currentDevice];
         case FLEXGlobalsRowPasteboard:
             return [self explorerViewControllerForObject:UIPasteboard.generalPasteboard];
         default: return nil;