Add settings menu options for changing data source and resetting save location; refactor ContentView to use user-defined sheet ID

Author: pycoder2000

README.md

@@ -12,6 +12,7 @@ Daily Word Pro is a sleek and minimalistic macOS menu bar app designed to improv
   - Click on the word to search for it on Google for further exploration.
 - **Beautiful UI**: Clean and minimal design with hover effects and customizable colors that adapt to macOS's light and dark modes.
 - **Custom Word Bank**: Integrates with your Google Sheet for easy customization of words.
+- **Settings Menu**: Configure your Google Sheet, reset save location, view about information, and exit the app.
 
 ---
 
@@ -57,11 +58,19 @@ Daily Word Pro is a sleek and minimalistic macOS menu bar app designed to improv
 
 3. **Configure Google Sheets API**:
    - Create a Google API key from the [Google Cloud Console](https://console.cloud.google.com/).
-   - Update your API key and Google Sheet ID in `ContentView.swift`:
-     ```swift
-     let sheetID = "YOUR_GOOGLE_SHEET_ID"
-     let apiKey = "YOUR_GOOGLE_API_KEY"
-     ```
+   - Update your API key and Google Sheet ID in `Config.plist`:
+    ```xml
+    <?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    <plist version="1.0">
+    <dict>
+        <key>API_KEY</key>
+        <string>YOUR_GOOGLE_API_KEY</string>
+        <key>SHEET_ID</key>
+        <string>YOUR_GOOGLE_SHEET_ID</string>
+    </dict>
+    </plist>
+    ```
 
 4. **Run the App**:
    - Select "My Mac" as the target device in Xcode.
@@ -84,18 +93,36 @@ Daily Word Pro is a sleek and minimalistic macOS menu bar app designed to improv
    - Update your Google Sheet with new words, meanings, and examples.
    - The app will fetch the updated data automatically.
 
+4. **Settings Menu**:
+   - **Change Data Source**: Configure your Google Sheet link.
+   - **Reset Save Location**: Reset the location where memorized words are saved.
+   - **About**: View information about the app.
+   - **Exit**: Close the app.
+
 ---
 
 ## Project Structure
 
 ```
 📦DailyWordPro
  ┣ 📂DailyWordPro
- ┃ ┣ 📜ContentView.swift       # Main UI and logic for the app
- ┃ ┣ 📜DailyWordProApp.swift       # App entry point
- ┃ ┗ 📂Assets.xcassets         # App icons and color assets
- ┣ 📂DailyWordPro.xcodeproj        # Xcode project configuration
- ┗ 📜README.md                 # Project documentation
+ ┃ ┣ 📜AboutView.swift           # About view for the app
+ ┃ ┣ 📜Assets.xcassets           # App icons and color assets
+ ┃ ┣ 📜Config.plist              # Configuration file for API key and sheet ID
+ ┃ ┣ 📜ContentView.swift         # Main UI and logic for the app
+ ┃ ┣ 📜CustomWindow.swift        # Custom window implementation
+ ┃ ┣ 📜GoogleSheetResponse.swift # Model for Google Sheet response
+ ┃ ┣ 📜Info.plist                # Info.plist for the app
+ ┃ ┣ 📜MemorizedWordsManager.swift # Manager for memorized words
+ ┃ ┣ 📜SettingsMenu.swift        # Settings menu for the app
+ ┃ ┣ 📜SheetConfigView.swift     # View for configuring Google Sheet
+ ┃ ┣ 📜VocabularyApp.entitlements # App entitlements
+ ┃ ┣ 📜VocabularyAppApp.swift    # App entry point
+ ┃ ┗ 📜WordView.swift            # View for displaying word details
+ ┣ 📂DailyWordPro.xcodeproj      # Xcode project configuration
+ ┣ 📂VocabularyAppTests          # Unit tests for the app
+ ┣ 📂VocabularyAppUITests        # UI tests for the app
+ ┗ 📜README.md                   # Project documentation
 ```
 
 ---

VocabularyApp/ContentView.swift

@@ -6,21 +6,15 @@ struct ContentView: View {
     @State private var meaning: String = "Loading..."
     @State private var example: String = "Loading..."
     @ObservedObject private var memorizedWordsManager = MemorizedWordsManager()
+    @AppStorage("sheetID") private var userSheetID: String = ""
     private var apiKey: String
-    private var sheetID: String
+    private var defaultSheetID: String
 
     @State private var aboutWindow: NSWindow?
 
-    init() {
-        if let path = Bundle.main.path(forResource: "Config", ofType: "plist"),
-           let config = NSDictionary(contentsOfFile: path),
-           let apiKey = config["API_KEY"] as? String,
-           let sheetID = config["SHEET_ID"] as? String {
-            self.apiKey = apiKey
-            self.sheetID = sheetID
-        } else {
-            fatalError("API_KEY or SHEET_ID not found in Config.plist")
-        }
+    init(apiKey: String, defaultSheetID: String) {
+        self.apiKey = apiKey
+        self.defaultSheetID = defaultSheetID
     }
 
     var body: some View {
@@ -124,6 +118,8 @@ struct ContentView: View {
     }
 
     func loadRandomWord() {
+        let sheetID = userSheetID.isEmpty ? defaultSheetID : userSheetID
+
         let url = URL(string: "https://sheets.googleapis.com/v4/spreadsheets/\(sheetID)/values/Sheet1?key=\(apiKey)")!
 
         var request = URLRequest(url: url)
@@ -151,7 +147,7 @@ struct ContentView: View {
                     DispatchQueue.main.async {
                         word = "No more words!"
                         meaning = "You have memorized all words."
-                        example = ""
+                        example = "Please add more words to your Google Sheet."
                     }
                 }
             } catch {

VocabularyApp/SettingsMenu.swift

@@ -4,9 +4,13 @@ struct SettingsMenu: View {
     var resetSaveLocation: () -> Void
     var showAbout: () -> Void
     var exitApp: () -> Void
+    @State private var showingSheetConfig = false
 
     var body: some View {
         Menu {
+            Button("Change Data Source") {
+                showingSheetConfig.toggle()
+            }
             Button("Reset Save Location") {
                 resetSaveLocation()
             }
@@ -23,5 +27,8 @@ struct SettingsMenu: View {
                 .foregroundColor(.primary)
         }
         .buttonStyle(PlainButtonStyle())
+        .sheet(isPresented: $showingSheetConfig) {
+            SheetConfigView()
+        }
     }
 }

VocabularyApp/SheetConfigView.swift

@@ -0,0 +1,126 @@
+import SwiftUI
+
+struct SheetConfigView: View {
+    @AppStorage("sheetID") private var userSheetID: String = ""
+    @Environment(\.dismiss) var dismiss
+    @State private var sheetLink: String = ""
+    @State private var isValid: Bool = false
+    @State private var errorMessage: String?
+
+    var body: some View {
+        VStack(spacing: 16) {
+            Text("Google Sheet Configuration")
+                .font(.headline)
+                .frame(maxWidth: .infinity, alignment: .leading)
+
+            Text("1. Create a copy of the template sheet")
+                .font(.subheadline)
+                .frame(maxWidth: .infinity, alignment: .leading)
+
+            Link("Open Template",
+                 destination: URL(string: "https://docs.google.com/spreadsheets/d/1U66wi1O42CeuC_7QuMTbF2hlewJinCAmgTOJpZFbV1k/copy")!)
+                 .frame(maxWidth: .infinity, alignment: .center)
+
+            Text("2. Change the sharing settings to 'Anyone with the link'")
+                .font(.subheadline)
+                .foregroundColor(.red)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .fixedSize(horizontal: false, vertical: true)
+
+            Text("3. Copy your Google Sheet link and paste below")
+                .font(.subheadline)
+                .frame(maxWidth: .infinity, alignment: .leading)
+
+            TextField("Google Sheet Link", text: $sheetLink)
+                .textFieldStyle(.roundedBorder)
+                .frame(width: 280)
+
+            if let errorMessage = errorMessage {
+                Text(errorMessage)
+                    .foregroundColor(.red)
+                    .font(.caption)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+            }
+
+            HStack {
+                Button("Save") {
+                    validateAndSave()
+                }
+                .disabled(sheetLink.isEmpty)
+
+                Button("Close") {
+                    dismiss()
+                }
+                .foregroundColor(.red)
+            }
+
+            Text("Sheet format: word | meaning | example")
+                .font(.caption)
+                .foregroundColor(.secondary)
+                .frame(maxWidth: .infinity, alignment: .center)
+        }
+        .padding()
+        .frame(width: 320)
+    }
+
+    private func validateAndSave() {
+        guard let path = Bundle.main.path(forResource: "Config", ofType: "plist"),
+            let config = NSDictionary(contentsOfFile: path),
+            let apiKey = config["API_KEY"] as? String else {
+            fatalError("API_KEY not found in Config.plist")
+        }
+
+        guard let extractedSheetID = extractSheetID(from: sheetLink) else {
+            errorMessage = "Invalid Google Sheet link. Please ensure the link is correct."
+            return
+        }
+
+        let url = URL(string: "https://sheets.googleapis.com/v4/spreadsheets/\(extractedSheetID)/values/Sheet1?key=\(apiKey)")!
+
+        var request = URLRequest(url: url)
+        request.httpMethod = "GET"
+
+        URLSession.shared.dataTask(with: request) { data, response, error in
+            guard let data = data, error == nil else {
+                DispatchQueue.main.async {
+                    self.errorMessage = "Failed to fetch data. Please check your Google Sheet link."
+                }
+                return
+            }
+
+            do {
+                let decodedResponse = try JSONDecoder().decode(GoogleSheetResponse.self, from: data)
+                let columns = decodedResponse.values.first ?? []
+
+                if columns.contains("Word") && columns.contains("Meaning") && columns.contains("Example") {
+                    DispatchQueue.main.async {
+                        self.userSheetID = extractedSheetID
+                        self.errorMessage = nil
+                        self.dismiss()
+                        if let appDelegate = NSApp.delegate as? AppDelegate {
+                            appDelegate.reloadContentView()
+                            appDelegate.contentView?.loadRandomWord()
+                        }
+                    }
+                } else {
+                    DispatchQueue.main.async {
+                        self.errorMessage = "Invalid sheet format. Please ensure the sheet contains 'Word', 'Meaning', and 'Example' columns."
+                    }
+                }
+            } catch {
+                DispatchQueue.main.async {
+                    self.errorMessage = "Error decoding data: \(error.localizedDescription)"
+                }
+            }
+        }.resume()
+    }
+
+    private func extractSheetID(from link: String) -> String? {
+        let pattern = "https://docs.google.com/spreadsheets/d/([a-zA-Z0-9-_]+)"
+        let regex = try? NSRegularExpression(pattern: pattern)
+        let nsString = link as NSString
+        let results = regex?.matches(in: link, range: NSRange(location: 0, length: nsString.length))
+        let sheetID = results?.first.map { nsString.substring(with: $0.range(at: 1)) }
+        return sheetID
+    }
+}

VocabularyApp/VocabularyAppApp.swift

@@ -23,20 +23,23 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     var popover: NSPopover?
     var eventMonitor: EventMonitor?
     var contentView: ContentView?
+    private var apiKey: String
+    private var defaultSheetID: String
+
+    override init() {
+        if let path = Bundle.main.path(forResource: "Config", ofType: "plist"),
+           let config = NSDictionary(contentsOfFile: path),
+           let apiKey = config["API_KEY"] as? String,
+           let sheetID = config["SHEET_ID"] as? String {
+            self.apiKey = apiKey
+            self.defaultSheetID = sheetID
+        } else {
+            fatalError("API_KEY or SHEET_ID not found in Config.plist")
+        }
+    }
 
     func applicationDidFinishLaunching(_ notification: Notification) {
-        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
+        loadContentView()
 
         statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
         if let button = statusItem?.button {
@@ -54,6 +57,21 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         loadNewWordIfNeeded()
     }
 
+    func loadContentView() {
+        contentView = ContentView(apiKey: apiKey, defaultSheetID: defaultSheetID)
+
+        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
+    }
+
     @objc func togglePopover(_ sender: Any?) {
         if let popover = popover {
             if popover.isShown {
@@ -92,6 +110,14 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             userDefaults.set(Date(), forKey: lastLoadedDateKey)
         }
     }
+
+    func reloadContentView() {
+        loadContentView()
+        if let popover = popover, popover.isShown {
+            popover.contentViewController = NSHostingController(rootView: contentView!)
+        }
+        contentView?.loadRandomWord()
+    }
 }
 
 class EventMonitor {