Enhance ContentView layout and styling; add CustomWindow and AppDelegate for improved app structure

Author: pycoder2000

VocabularyApp/ContentView.swift

@@ -1,10 +1,3 @@
-//
-//  ContentView.swift
-//  VocabularyApp
-//
-//  Created by Parth Desai on 1/10/25.
-//
-
 import SwiftUI
 import AppKit
 
@@ -18,8 +11,11 @@ struct ContentView: View {
         VStack(spacing: 16) {
             // Word Section
             Text(word)
-                .font(.system(size: 24, weight: .bold))
+                .font(.system(size: 28, weight: .bold))
                 .foregroundColor(.primary)
+                .padding()
+                .background(Color.blue.opacity(0.1))
+                .cornerRadius(8)
                 .onTapGesture {
                     openGoogleSearch(for: word)
                 }
@@ -41,8 +37,13 @@ struct ContentView: View {
                     .font(.body)
                     .foregroundColor(.primary)
                     .multilineTextAlignment(.leading)
+                    .fixedSize(horizontal: false, vertical: true) // Add this
+                    .padding()
+                    .background(Color.gray.opacity(0.1))
+                    .cornerRadius(8)
             }
             .padding(.horizontal)
+            .frame(maxWidth: .infinity, alignment: .leading)
 
             // Example Section
             VStack(alignment: .leading, spacing: 8) {
@@ -54,18 +55,23 @@ struct ContentView: View {
                     .italic()
                     .foregroundColor(.primary)
                     .multilineTextAlignment(.leading)
+                    .fixedSize(horizontal: false, vertical: true) // Add this
+                    .padding()
+                    .background(Color.gray.opacity(0.1))
+                    .cornerRadius(8)
             }
             .padding(.horizontal)
+            .frame(maxWidth: .infinity, alignment: .leading)
 
-            Divider() // Separator for buttons
+            Divider()
 
             // Buttons Section
             HStack {
                 Button("Memorized it") {
                     markAsMemorized()
                 }
                 .buttonStyle(.borderedProminent)
-                .keyboardShortcut("m", modifiers: []) // Keyboard shortcut for convenience
+                .keyboardShortcut("m", modifiers: [])
 
                 Button("Next Word") {
                     loadRandomWord()
@@ -76,7 +82,7 @@ struct ContentView: View {
             .frame(maxWidth: .infinity, alignment: .center)
         }
         .padding()
-        .frame(width: 360, height: 260)
+        .frame(width: 360)
         .background(Color(NSColor.windowBackgroundColor))
         .cornerRadius(12)
         .shadow(radius: 8)
@@ -85,13 +91,11 @@ struct ContentView: View {
         }
     }
 
-    // Open Google search for the word
     func openGoogleSearch(for query: String) {
         guard let url = URL(string: "https://www.google.com/search?q=\(query)") else { return }
         NSWorkspace.shared.open(url)
     }
 
-    // Fetch a random word from Google Sheets
     func loadRandomWord() {
         let sheetID = "1U66wi1O42CeuC_7QuMTbF2hlewJinCAmgTOJpZFbV1k"
         let apiKey = "AIzaSyBjNi7cYMOO_RL_qPqI4wuVP71UZPs72Jg"
@@ -129,7 +133,6 @@ struct ContentView: View {
         }.resume()
     }
 
-    // Mark the current word as memorized
     func markAsMemorized() {
         guard let wordID = wordID else { return }
 
@@ -164,4 +167,4 @@ struct ContentView: View {
             }
         }.resume()
     }
-}
+}

VocabularyApp/CustomWindow.swift

@@ -0,0 +1,24 @@
+import SwiftUI
+import AppKit
+
+class CustomWindow: NSWindow {
+    override var canBecomeKey: Bool {
+        return true
+    }
+}
+
+class CustomWindowController: NSWindowController, NSWindowDelegate {
+    convenience init(contentView: NSView) {
+        let window = CustomWindow(
+            contentRect: NSRect(x: 0, y: 0, width: 360, height: 400),
+            styleMask: [.titled, .closable, .resizable],
+            backing: .buffered, defer: false)
+        window.contentView = contentView
+        self.init(window: window)
+        window.delegate = self
+    }
+
+    func windowWillClose(_ notification: Notification) {
+        NSApp.terminate(nil)
+    }
+}

VocabularyApp/VocabularyAppApp.swift

@@ -9,14 +9,92 @@ import SwiftUI
 
 @main
 struct VocabularyApp: App {
-    @State private var isMenuOpen = true // Track whether the menu is open
+    @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
 
     var body: some Scene {
-        MenuBarExtra("GRE Word", systemImage: "book", isInserted: $isMenuOpen) {
-            ContentView()
-                .onDisappear {
-                    isMenuOpen = true // Reopen the menu after disappearing
-                }
+        Settings {
+            EmptyView()
+        }
+    }
+}
+
+class AppDelegate: NSObject, NSApplicationDelegate {
+    var statusItem: NSStatusItem?
+    var popover: NSPopover?
+    var eventMonitor: EventMonitor?
+
+    func applicationDidFinishLaunching(_ notification: Notification) {
+        let contentView = ContentView()
+
+        popover = NSPopover()
+        popover?.contentSize = NSSize(width: 360, height: 0)
+        popover?.behavior = .transient
+
+        let hostingController = NSHostingController(rootView: contentView)
+        hostingController.view.setFrameSize(NSSize(width: 360, height: 1))
+
+        hostingController.view.autoresizingMask = [.height]
+
+        popover?.contentViewController = hostingController
+
+        statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+        if let button = statusItem?.button {
+            button.image = NSImage(systemSymbolName: "book", accessibilityDescription: "Vocabulary App")
+            button.action = #selector(togglePopover(_:))
+        }
+
+        eventMonitor = EventMonitor(mask: [.leftMouseDown, .rightMouseDown]) { [weak self] event in
+            if let strongSelf = self, strongSelf.popover?.isShown == true {
+                strongSelf.closePopover(event)
+            }
+        }
+    }
+
+    @objc func togglePopover(_ sender: Any?) {
+        if let popover = popover {
+            if popover.isShown {
+                closePopover(sender)
+            } else {
+                showPopover(sender)
+            }
+        }
+    }
+
+    func showPopover(_ sender: Any?) {
+        if let button = statusItem?.button {
+            popover?.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
+            eventMonitor?.start()
+        }
+    }
+
+    func closePopover(_ sender: Any?) {
+        popover?.performClose(sender)
+        eventMonitor?.stop()
+    }
+}
+
+class EventMonitor {
+    private var monitor: Any?
+    private let mask: NSEvent.EventTypeMask
+    private let handler: (NSEvent?) -> Void
+
+    init(mask: NSEvent.EventTypeMask, handler: @escaping (NSEvent?) -> Void) {
+        self.mask = mask
+        self.handler = handler
+    }
+
+    deinit {
+        stop()
+    }
+
+    func start() {
+        monitor = NSEvent.addGlobalMonitorForEvents(matching: mask, handler: handler)
+    }
+
+    func stop() {
+        if monitor != nil {
+            NSEvent.removeMonitor(monitor!)
+            monitor = nil
         }
     }
 }