Refactor AppDelegate header and implementation for improved readability and organization

src/app/core/platform/app_delegate.h

@@ -8,16 +8,19 @@
 
 #if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
 /* iOS in Xcode simulator */
+#import <PencilKit/PencilKit.h>
 #import <UIKit/UIKit.h>
 
-#import <PencilKit/PencilKit.h>
+@interface AppDelegate : UIResponder <UIApplicationDelegate,
-
+                                      UIDocumentPickerDelegate,
-@interface AppDelegate : UIResponder <UIApplicationDelegate, UIDocumentPickerDelegate, UITabBarControllerDelegate, PKCanvasViewDelegate>
+                                      UITabBarControllerDelegate,
+                                      PKCanvasViewDelegate>
 @property(strong, nonatomic) UIWindow *window;
 
 @property UIDocumentPickerViewController *documentPicker;
 @property(nonatomic, copy) void (^completionHandler)(NSString *selectedFile);
-- (void)PresentDocumentPickerWithCompletionHandler:(void (^)(NSString *selectedFile))completionHandler;
+- (void)PresentDocumentPickerWithCompletionHandler:
+    (void (^)(NSString *selectedFile))completionHandler;
 
 // TODO: Setup a tab bar controller for multiple yaze instances
 @property(nonatomic) UITabBarController *tabBarController;
@@ -40,6 +43,14 @@
 extern "C" {
 #endif
 
+/**
+ * @brief Initialize the Cocoa application.
+ */
+void yaze_initialize_cocoa();
+
+/**
+ * @brief Run the Cocoa application delegate.
+ */
 void yaze_run_cocoa_app_delegate(const char *filename);
 
 #ifdef __cplusplus

src/app/core/platform/app_delegate.mm

@@ -40,21 +40,17 @@
   NSMenuItem *fileMenuItem = [mainMenu itemWithTitle:@"File"];
   if (!fileMenuItem) {
     NSMenu *fileMenu = [[NSMenu alloc] initWithTitle:@"File"];
-    fileMenuItem = [[NSMenuItem alloc] initWithTitle:@"File"
+    fileMenuItem = [[NSMenuItem alloc] initWithTitle:@"File" action:nil keyEquivalent:@""];
-                                              action:nil
-                                       keyEquivalent:@""];
     [fileMenuItem setSubmenu:fileMenu];
 
-    NSMenuItem *openItem =
+    NSMenuItem *openItem = [[NSMenuItem alloc] initWithTitle:@"Open"
-        [[NSMenuItem alloc] initWithTitle:@"Open"
                                                       action:@selector(openFileAction:)
                                                keyEquivalent:@"o"];
     [fileMenu addItem:openItem];
 
     // Open Recent
     NSMenu *openRecentMenu = [[NSMenu alloc] initWithTitle:@"Open Recent"];
-    NSMenuItem *openRecentMenuItem =
+    NSMenuItem *openRecentMenuItem = [[NSMenuItem alloc] initWithTitle:@"Open Recent"
-        [[NSMenuItem alloc] initWithTitle:@"Open Recent"
                                                                 action:nil
                                                          keyEquivalent:@""];
     [openRecentMenuItem setSubmenu:openRecentMenu];
@@ -64,9 +60,7 @@
     [fileMenu addItem:[NSMenuItem separatorItem]];
 
     // Save
-    NSMenuItem *saveItem = [[NSMenuItem alloc] initWithTitle:@"Save"
+    NSMenuItem *saveItem = [[NSMenuItem alloc] initWithTitle:@"Save" action:nil keyEquivalent:@"s"];
-                                                      action:nil
-                                               keyEquivalent:@"s"];
     [fileMenu addItem:saveItem];
 
     // Separator
@@ -80,8 +74,7 @@
     [optionsMenuItem setSubmenu:optionsMenu];
 
     // Flag checkmark field
-    NSMenuItem *flagItem =
+    NSMenuItem *flagItem = [[NSMenuItem alloc] initWithTitle:@"Flag"
-        [[NSMenuItem alloc] initWithTitle:@"Flag"
                                                       action:@selector(toggleFlagAction:)
                                                keyEquivalent:@""];
     [flagItem setTarget:self];
@@ -95,35 +88,26 @@
   NSMenuItem *editMenuItem = [mainMenu itemWithTitle:@"Edit"];
   if (!editMenuItem) {
     NSMenu *editMenu = [[NSMenu alloc] initWithTitle:@"Edit"];
-    editMenuItem = [[NSMenuItem alloc] initWithTitle:@"Edit"
+    editMenuItem = [[NSMenuItem alloc] initWithTitle:@"Edit" action:nil keyEquivalent:@""];
-                                              action:nil
-                                       keyEquivalent:@""];
     [editMenuItem setSubmenu:editMenu];
 
-    NSMenuItem *undoItem = [[NSMenuItem alloc] initWithTitle:@"Undo"
+    NSMenuItem *undoItem = [[NSMenuItem alloc] initWithTitle:@"Undo" action:nil keyEquivalent:@"z"];
-                                                      action:nil
-                                               keyEquivalent:@"z"];
 
     [editMenu addItem:undoItem];
 
-    NSMenuItem *redoItem = [[NSMenuItem alloc] initWithTitle:@"Redo"
+    NSMenuItem *redoItem = [[NSMenuItem alloc] initWithTitle:@"Redo" action:nil keyEquivalent:@"Z"];
-                                                      action:nil
-                                               keyEquivalent:@"Z"];
 
     [editMenu addItem:redoItem];
 
     // Add a separator
     [editMenu addItem:[NSMenuItem separatorItem]];
 
-    NSMenuItem *cutItem =
+    NSMenuItem *cutItem = [[NSMenuItem alloc] initWithTitle:@"Cut"
-        [[NSMenuItem alloc] initWithTitle:@"Cut"
                                                      action:@selector(cutAction:)
                                               keyEquivalent:@"x"];
     [editMenu addItem:cutItem];
 
-    NSMenuItem *copyItem = [[NSMenuItem alloc] initWithTitle:@"Copy"
+    NSMenuItem *copyItem = [[NSMenuItem alloc] initWithTitle:@"Copy" action:nil keyEquivalent:@"c"];
-                                                      action:nil
-                                               keyEquivalent:@"c"];
     [editMenu addItem:copyItem];
 
     NSMenuItem *pasteItem = [[NSMenuItem alloc] initWithTitle:@"Paste"
@@ -147,38 +131,32 @@
   NSMenuItem *viewMenuItem = [mainMenu itemWithTitle:@"View"];
   if (!viewMenuItem) {
     NSMenu *viewMenu = [[NSMenu alloc] initWithTitle:@"View"];
-    viewMenuItem = [[NSMenuItem alloc] initWithTitle:@"View"
+    viewMenuItem = [[NSMenuItem alloc] initWithTitle:@"View" action:nil keyEquivalent:@""];
-                                              action:nil
-                                       keyEquivalent:@""];
     [viewMenuItem setSubmenu:viewMenu];
 
     // Emulator view button
-    NSMenuItem *emulatorViewItem =
+    NSMenuItem *emulatorViewItem = [[NSMenuItem alloc] initWithTitle:@"Emulator View"
-        [[NSMenuItem alloc] initWithTitle:@"Emulator View"
                                                               action:nil
                                                        keyEquivalent:@"1"];
 
     [viewMenu addItem:emulatorViewItem];
 
     // Hex Editor View
-    NSMenuItem *hexEditorViewItem =
+    NSMenuItem *hexEditorViewItem = [[NSMenuItem alloc] initWithTitle:@"Hex Editor View"
-        [[NSMenuItem alloc] initWithTitle:@"Hex Editor View"
                                                                action:nil
                                                         keyEquivalent:@"2"];
 
     [viewMenu addItem:hexEditorViewItem];
 
     // Disassembly view button
-    NSMenuItem *disassemblyViewItem =
+    NSMenuItem *disassemblyViewItem = [[NSMenuItem alloc] initWithTitle:@"Disassembly View"
-        [[NSMenuItem alloc] initWithTitle:@"Disassembly View"
                                                                  action:nil
                                                           keyEquivalent:@"3"];
 
     [viewMenu addItem:disassemblyViewItem];
 
     // Memory view button
-    NSMenuItem *memoryViewItem =
+    NSMenuItem *memoryViewItem = [[NSMenuItem alloc] initWithTitle:@"Memory View"
-        [[NSMenuItem alloc] initWithTitle:@"Memory View"
                                                             action:nil
                                                      keyEquivalent:@"4"];
 
@@ -188,8 +166,7 @@
     [viewMenu addItem:[NSMenuItem separatorItem]];
 
     // Toggle fullscreen button
-    NSMenuItem *toggleFullscreenItem =
+    NSMenuItem *toggleFullscreenItem = [[NSMenuItem alloc] initWithTitle:@"Toggle Fullscreen"
-        [[NSMenuItem alloc] initWithTitle:@"Toggle Fullscreen"
                                                                   action:nil
                                                            keyEquivalent:@"f"];
 
@@ -201,14 +178,11 @@
   NSMenuItem *helpMenuItem = [mainMenu itemWithTitle:@"Help"];
   if (!helpMenuItem) {
     NSMenu *helpMenu = [[NSMenu alloc] initWithTitle:@"Help"];
-    helpMenuItem = [[NSMenuItem alloc] initWithTitle:@"Help"
+    helpMenuItem = [[NSMenuItem alloc] initWithTitle:@"Help" action:nil keyEquivalent:@""];
-                                              action:nil
-                                       keyEquivalent:@""];
     [helpMenuItem setSubmenu:helpMenu];
 
     // URL to online documentation
-    NSMenuItem *documentationItem =
+    NSMenuItem *documentationItem = [[NSMenuItem alloc] initWithTitle:@"Documentation"
-        [[NSMenuItem alloc] initWithTitle:@"Documentation"
                                                                action:nil
                                                         keyEquivalent:@"?"];
     [helpMenu addItem:documentationItem];
@@ -233,8 +207,7 @@
 
 - (void)openFileAction:(id)sender {
   if (!yaze::app::SharedRom::shared_rom_
-           ->LoadFromFile(
+           ->LoadFromFile(yaze::app::core::FileDialogWrapper::ShowOpenFileDialog())
-               yaze::app::core::FileDialogWrapper::ShowOpenFileDialog())
            .ok()) {
     NSAlert *alert = [[NSAlert alloc] init];
     [alert setMessageText:@"Error"];
@@ -252,14 +225,17 @@
   NSLog(@"Open Recent File action triggered");
 }
 
-extern "C" void yaze_run_cocoa_app_delegate(const char *filename) {
+extern "C" void yaze_initialize_cococa() {
   @autoreleasepool {
     AppDelegate *delegate = [[AppDelegate alloc] init];
     [NSApplication sharedApplication];
     [NSApp setDelegate:delegate];
     [NSApp finishLaunching];
   }
+}
 
+extern "C" void yaze_run_cocoa_app_delegate(const char *filename) {
+  yaze_initialize_cococa();
   yaze::app::core::Controller controller;
   RETURN_VOID_IF_ERROR(controller.OnEntry(filename));
   while (controller.IsActive()) {