Add custom window controller, settings menu, and about view; implement memorized words management with user-defined save location

Author: pycoder2000

VocabularyApp.xcodeproj/project.pbxproj

@@ -388,6 +388,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = VocabularyApp/VocabularyApp.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
@@ -396,6 +397,8 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_CFBundleDisplayName = DailyWordPro;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education";
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;
@@ -427,6 +430,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = VocabularyApp/VocabularyApp.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
@@ -435,6 +439,8 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_CFBundleDisplayName = DailyWordPro;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education";
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;

VocabularyApp/AboutView.swift

@@ -0,0 +1,44 @@
+import SwiftUI
+import AppKit
+
+struct AboutView: View {
+    var body: some View {
+        VStack(spacing: 16) {
+            Image("AppIcon")
+                .resizable()
+                .scaledToFit()
+                .frame(width: 64, height: 64)
+                .cornerRadius(16)
+            Text("DailyWordPro")
+                .font(.title)
+                .fontWeight(.bold)
+            Text("Version 1.0.0")
+                .font(.subheadline)
+                .foregroundColor(.secondary)
+            Divider()
+            Text("DailyWordPro is a sleek and minimalistic macOS menu bar app designed to help you expand your vocabulary, one word at a time.")
+                .multilineTextAlignment(.center)
+                .padding(.horizontal)
+            Divider()
+            VStack(spacing: 8) {
+                Text("Developed by Parth Desai")
+                    .font(.headline)
+
+                Link("Visit Website", destination: URL(string: "https://parthdesai.site")!)
+                    .foregroundColor(.blue)
+
+                Link("Support Email", destination: URL(string: "mailto:[email protected]")!)
+                    .foregroundColor(.blue)
+
+                Link("Follow on X", destination: URL(string: "https://twitter.com/pycoder2000")!)
+                    .foregroundColor(.blue)
+            }
+
+            Text("© 2025 Parth Desai")
+                .font(.footnote)
+                .foregroundColor(.secondary)
+        }
+        .padding()
+        .frame(width: 360, height: 400)
+    }
+}

VocabularyApp/Assets.xcassets/AppIcon.appiconset/1024-mac.png

@@ -1,85 +1 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "tinted"
-        }
-      ],
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
+{"images":[{"size":"1024x1024","filename":"1024-mac.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]}

VocabularyApp/Assets.xcassets/AppIcon.appiconset/128-mac.png

@@ -0,0 +1,18 @@
+{
+  "images": [
+    {
+      "filename": "128-mac.png",
+      "idiom": "universal",
+      "scale": "1x"
+    },
+    {
+      "filename": "256-mac.png",
+      "idiom": "universal",
+      "scale": "2x"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}

VocabularyApp/Assets.xcassets/AppIcon.appiconset/16-mac.png

@@ -1,22 +1,16 @@
-//
-//  ContentView.swift
-//  VocabularyApp
-//
-//  Created by Parth Desai on 1/10/25.
-//
-
 import SwiftUI
 import AppKit
-import UniformTypeIdentifiers
 
 struct ContentView: View {
     @State private var word: String = "Loading..."
     @State private var meaning: String = "Loading..."
     @State private var example: String = "Loading..."
-    @State private var memorizedWords: [String] = []
+    @ObservedObject private var memorizedWordsManager = MemorizedWordsManager()
     private var apiKey: String
     private var sheetID: String
 
+    @State private var aboutWindow: NSWindow?
+
     init() {
         if let path = Bundle.main.path(forResource: "Config", ofType: "plist"),
            let config = NSDictionary(contentsOfFile: path),
@@ -31,7 +25,6 @@ struct ContentView: View {
 
     var body: some View {
         VStack(spacing: 16) {
-
             Text(word)
                 .font(.system(size: 28, weight: .bold))
                 .foregroundColor(.primary)
@@ -50,7 +43,6 @@ struct ContentView: View {
                 }
                 .frame(maxWidth: .infinity, alignment: .center)
 
-
             VStack(alignment: .leading, spacing: 8) {
                 Text("Meaning:")
                     .font(.headline)
@@ -67,7 +59,6 @@ struct ContentView: View {
             .padding(.horizontal)
             .frame(maxWidth: .infinity, alignment: .leading)
 
-
             VStack(alignment: .leading, spacing: 8) {
                 Text("Example:")
                     .font(.headline)
@@ -87,10 +78,10 @@ struct ContentView: View {
 
             Divider()
 
-
             HStack {
                 Button("Memorized it") {
-                    markAsMemorized()
+                    memorizedWordsManager.markAsMemorized(word: word)
+                    loadRandomWord()
                 }
                 .buttonStyle(.borderedProminent)
                 .keyboardShortcut("m", modifiers: [])
@@ -108,8 +99,21 @@ struct ContentView: View {
         .background(Color(NSColor.windowBackgroundColor))
         .cornerRadius(12)
         .shadow(radius: 8)
+        .overlay(
+            VStack {
+                HStack {
+                    Spacer()
+                    SettingsMenu(
+                        resetSaveLocation: memorizedWordsManager.resetSaveLocation,
+                        showAbout: showAbout,
+                        exitApp: exitApp
+                    )
+                }
+                Spacer()
+            }
+            .padding()
+        )
         .onAppear {
-            loadMemorizedWords()
             loadRandomWord()
         }
     }
@@ -135,8 +139,7 @@ struct ContentView: View {
                 let decodedResponse = try JSONDecoder().decode(GoogleSheetResponse.self, from: data)
                 let rows = decodedResponse.values.dropFirst()
 
-
-                let unmemorizedRows = rows.filter { !memorizedWords.contains($0[0]) }
+                let unmemorizedRows = rows.filter { !memorizedWordsManager.memorizedWords.contains($0[0]) }
 
                 if let randomRow = unmemorizedRows.randomElement() {
                     DispatchQueue.main.async {
@@ -157,72 +160,24 @@ struct ContentView: View {
         }.resume()
     }
 
-    func markAsMemorized() {
-        guard !word.isEmpty, !memorizedWords.contains(word) else { return }
-
-        if UserDefaults.standard.string(forKey: "memorizedWordsPath") == nil {
-            promptUserForSaveLocation { selectedURL in
-                if let selectedURL = selectedURL {
-                    UserDefaults.standard.set(selectedURL.path, forKey: "memorizedWordsPath")
-                    saveMemorizedWords()
-                    loadRandomWord()
-                } else {
-                    print("User canceled the save location selection.")
-                }
-            }
-        } else {
-            memorizedWords.append(word)
-            saveMemorizedWords()
-            loadRandomWord()
-        }
-    }
-
-
-    func saveMemorizedWords() {
-        let fileURL = getFileURL()
-        do {
-            let data = try JSONEncoder().encode(memorizedWords)
-            try data.write(to: fileURL)
-            print("Memorized words saved to file.")
-        } catch {
-            print("Failed to save memorized words: \(error.localizedDescription)")
+    func showAbout() {
+        if aboutWindow == nil {
+            aboutWindow = NSWindow(
+                contentRect: NSRect(x: 0, y: 0, width: 360, height: 400),
+                styleMask: [.titled, .closable, .resizable],
+                backing: .buffered,
+                defer: false
+            )
+            aboutWindow?.center()
+            aboutWindow?.title = "About DailyWordPro"
+            aboutWindow?.contentView = NSHostingView(rootView: AboutView())
+            aboutWindow?.isReleasedWhenClosed = false
         }
+        aboutWindow?.makeKeyAndOrderFront(nil)
+        NSApp.activate(ignoringOtherApps: true)
     }
 
-    func loadMemorizedWords() {
-        let fileURL = getFileURL()
-        do {
-            let data = try Data(contentsOf: fileURL)
-            memorizedWords = try JSONDecoder().decode([String].self, from: data)
-            print("Loaded memorized words: \(memorizedWords)")
-        } catch {
-            print("No existing file found, starting fresh.")
-        }
-    }
-
-    func getFileURL() -> URL {
-        if let savedPath = UserDefaults.standard.string(forKey: "memorizedWordsPath"),
-        !savedPath.isEmpty {
-            return URL(fileURLWithPath: savedPath)
-        } else {
-            let fileManager = FileManager.default
-            let documentsURL = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
-            return documentsURL.appendingPathComponent("memorized_words.json")
-        }
-    }
-
-    func promptUserForSaveLocation(completion: @escaping (URL?) -> Void) {
-        let savePanel = NSSavePanel()
-        savePanel.title = "Select Location for Memorized Words"
-        savePanel.allowedContentTypes = [.json] // Use UTType.json
-        savePanel.nameFieldStringValue = "memorized_words.json"
-
-        savePanel.begin { response in
-            if response == .OK, let selectedURL = savePanel.url {
-                completion(selectedURL)
-            } else {
-                completion(nil)
-            }
-        }
+    func exitApp() {
+        NSApp.terminate(nil)
     }
-}
+}

VocabularyApp/Assets.xcassets/AppIcon.appiconset/256-mac.png

@@ -19,6 +19,5 @@ class CustomWindowController: NSWindowController, NSWindowDelegate {
     }
 
     func windowWillClose(_ notification: Notification) {
-        NSApp.terminate(nil)
     }
 }

VocabularyApp/Assets.xcassets/AppIcon.appiconset/32-mac.png

@@ -0,0 +1,11 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleIconName</key>
+    <string>AppIcon</string>
+    <key>LSUIElement</key>
+    <true/>
+    <key>XSAppIconAssets</key>
+    <string>Assets.xcassets/AppIcon.appiconset</string>
+</dict>
+</plist>