From 1ad0d731dceed9163f99eae31a0b7fb4a9482cf5 Mon Sep 17 00:00:00 2001
From: Janaki Patel <61637458+jan29patel@users.noreply.github.com>
Date: Mon, 23 Jan 2023 22:09:04 -0500
Subject: [PATCH 1/3] Update AppDelegate.swift

---
 PercentCalculator/AppDelegate.swift | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/PercentCalculator/AppDelegate.swift b/PercentCalculator/AppDelegate.swift
index 82d867d..4e8f262 100644
--- a/PercentCalculator/AppDelegate.swift
+++ b/PercentCalculator/AppDelegate.swift
@@ -79,7 +79,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
   }
 
   // MARK: Popover - Left click
+  func checkPopover(sender: AnyObject?){
+    showPopover(sender: sender)
+    if !popover.isShown {
+      return "error"
+    }
 
+  }
   func showPopover(sender: AnyObject?) {
     eventMonitor?.start()
     if let button = statusItem.view {
@@ -107,6 +113,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     rightMenu.addItem(NSMenuItem(title: "Quit", action: #selector(quitDidPress(sender:)), keyEquivalent: ""))
     statusItem.popUpMenu(rightMenu)
   }
+  
+  func quitMenu(){
+    NSMenuItem.shared().terminate(sender)
+  }
 
   func quitDidPress(sender: AnyObject?) {
     NSApplication.shared().terminate(sender)

From 4ecc2ce5ff842f01f0a5539a604b59e3c1d381bc Mon Sep 17 00:00:00 2001
From: Janaki Patel <61637458+jan29patel@users.noreply.github.com>
Date: Mon, 23 Jan 2023 22:27:23 -0500
Subject: [PATCH 2/3] Update ViewController.swift

---
 PercentCalculator/ViewController.swift | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/PercentCalculator/ViewController.swift b/PercentCalculator/ViewController.swift
index df1f299..4f9c0e0 100644
--- a/PercentCalculator/ViewController.swift
+++ b/PercentCalculator/ViewController.swift
@@ -12,6 +12,7 @@ enum PercentCalculator {
   case whatIsXpercentOfY
   case xIsYpercentOf
   case xIsWhatPercentOfY
+  case xpercentoflessofY
 
   func calculate(x: Double, y: Double) -> Double {
     switch self {
@@ -63,6 +64,7 @@ class ViewController: NSViewController {
   var viewModel1: PercentCalculatorViewModel!
   var viewModel2: PercentCalculatorViewModel!
   var viewModel3: PercentCalculatorViewModel!
+  var viewModel4: PercentCalculatorViewModel!
 
   @IBAction func quitButtonPressed(sender: NSButton) {
     NSApplication.shared().terminate(sender)
@@ -88,6 +90,12 @@ class ViewController: NSViewController {
       x: xTextField3,
       y: yTextField3,
       result: resultTextField3)
+    
+    viewModel4 = PercentCalculatorViewModel(
+      type: .xpercentoflessofY,
+      x: xTextField4,
+      y: yTextField4,
+      result: resultTextField4)
   }
 }
 

From dfd4f7d0377314ab489078cc98fee547d0d75634 Mon Sep 17 00:00:00 2001
From: Janaki Patel <61637458+jan29patel@users.noreply.github.com>
Date: Mon, 23 Jan 2023 22:45:43 -0500
Subject: [PATCH 3/3] Update ViewController.swift

---
 PercentCalculator/ViewController.swift | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/PercentCalculator/ViewController.swift b/PercentCalculator/ViewController.swift
index 4f9c0e0..3c62988 100644
--- a/PercentCalculator/ViewController.swift
+++ b/PercentCalculator/ViewController.swift
@@ -12,7 +12,7 @@ enum PercentCalculator {
   case whatIsXpercentOfY
   case xIsYpercentOf
   case xIsWhatPercentOfY
-  case xpercentoflessofY
+  case percentless
 
   func calculate(x: Double, y: Double) -> Double {
     switch self {
@@ -22,6 +22,8 @@ enum PercentCalculator {
       return x * 100.0 / y
     case .xIsYpercentOf:
       return 100.0 / y * x
+    case .percentless:
+      return (x - y) / 100.0
     }
   }
 }
@@ -92,7 +94,7 @@ class ViewController: NSViewController {
       result: resultTextField3)
     
     viewModel4 = PercentCalculatorViewModel(
-      type: .xpercentoflessofY,
+      type: .percentless,
       x: xTextField4,
       y: yTextField4,
       result: resultTextField4)