From 156441759ea718fe166c4926aa77a8febbdc09d3 Mon Sep 17 00:00:00 2001
From: Abhishek Banthia <8280282+n0shake@users.noreply.github.com>
Date: Tue, 29 Mar 2022 19:13:01 -0400
Subject: [PATCH] Removing Add Image highlighted icon.

---
 Clocker/Clocker/en.lproj/Panel.xib         | 9 ++++-----
 Clocker/ClockerUnitTests/ThemerTests.swift | 7 -------
 Clocker/Overall App/Themer.swift           | 4 ----
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/Clocker/Clocker/en.lproj/Panel.xib b/Clocker/Clocker/en.lproj/Panel.xib
index faa34c1..8f797bf 100755
--- a/Clocker/Clocker/en.lproj/Panel.xib
+++ b/Clocker/Clocker/en.lproj/Panel.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -43,7 +43,7 @@
             <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES" ignoresCycle="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="1000" y="379" width="350" height="460"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
             <view key="contentView" focusRingType="none" id="6" customClass="BackgroundPanelView" customModule="Clocker" customModuleProvider="target">
                 <rect key="frame" x="0.0" y="0.0" width="370" height="450"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -222,7 +222,7 @@
                                                                         <constraint firstAttribute="height" constant="80" id="bRv-Of-5l3"/>
                                                                         <constraint firstAttribute="width" constant="80" id="cRC-Fx-WLR"/>
                                                                     </constraints>
-                                                                    <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Add Icon" imagePosition="only" alignment="center" alternateImage="Add Highlighted" imageScaling="proportionallyUpOrDown" inset="2" id="rwH-VF-f2V">
+                                                                    <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Add Icon" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="rwH-VF-f2V">
                                                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                         <font key="font" metaFont="system"/>
                                                                     </buttonCell>
@@ -674,7 +674,6 @@
         <userDefaultsController representsSharedInstance="YES" id="O3B-kK-4vm"/>
     </objects>
     <resources>
-        <image name="Add Highlighted" width="700" height="700"/>
         <image name="Add Icon" width="700" height="700"/>
         <image name="CurrentLocation" width="350" height="350"/>
         <image name="Extra" width="700" height="700"/>
diff --git a/Clocker/ClockerUnitTests/ThemerTests.swift b/Clocker/ClockerUnitTests/ThemerTests.swift
index 81c1d65..b295f4d 100644
--- a/Clocker/ClockerUnitTests/ThemerTests.swift
+++ b/Clocker/ClockerUnitTests/ThemerTests.swift
@@ -27,7 +27,6 @@ class ThemerTests: XCTestCase {
         let expectedSharingImage: String
         let expectedCurrentLocationImage: String
         let expectedAddImage: String
-        let expectedAddImageHighlighted: String
         let expectedPrivacyTabImage: String
         let expectedAppearanceTabImage: String
         let expectedCalendarTabImage: String
@@ -74,7 +73,6 @@ class ThemerTests: XCTestCase {
                                                       expectedSharingImage: "square.and.arrow.up.on.square.fill",
                                                       expectedCurrentLocationImage: "location.fill",
                                                       expectedAddImage: "plus",
-                                                      expectedAddImageHighlighted: "Add Highlighted",
                                                       expectedPrivacyTabImage: "lock",
                                                       expectedAppearanceTabImage: "eye",
                                                       expectedCalendarTabImage: "calendar",
@@ -108,7 +106,6 @@ class ThemerTests: XCTestCase {
                                                       expectedSharingImage: "square.and.arrow.up.on.square.fill",
                                                       expectedCurrentLocationImage: "location.fill",
                                                       expectedAddImage: "plus",
-                                                      expectedAddImageHighlighted: "Add White",
                                                       expectedPrivacyTabImage: "lock",
                                                       expectedAppearanceTabImage: "eye",
                                                       expectedCalendarTabImage: "calendar",
@@ -150,7 +147,6 @@ class ThemerTests: XCTestCase {
                                                       expectedSharingImage: "square.and.arrow.up.on.square.fill",
                                                       expectedCurrentLocationImage: "location.fill",
                                                       expectedAddImage: "plus",
-                                                      expectedAddImageHighlighted: "Add White",
                                                       expectedPrivacyTabImage: "lock",
                                                       expectedAppearanceTabImage: "eye",
                                                       expectedCalendarTabImage: "calendar",
@@ -185,7 +181,6 @@ class ThemerTests: XCTestCase {
                                                       expectedSharingImage: "square.and.arrow.up.on.square.fill",
                                                       expectedCurrentLocationImage: "location.fill",
                                                       expectedAddImage: "plus",
-                                                      expectedAddImageHighlighted: "Add White",
                                                       expectedPrivacyTabImage: "lock",
                                                       expectedAppearanceTabImage: "eye",
                                                       expectedCalendarTabImage: "calendar",
@@ -219,7 +214,6 @@ class ThemerTests: XCTestCase {
                                                       expectedSharingImage: "square.and.arrow.up.on.square.fill",
                                                       expectedCurrentLocationImage: "location.fill",
                                                       expectedAddImage: "plus",
-                                                      expectedAddImageHighlighted: "Add White",
                                                       expectedPrivacyTabImage: "lock",
                                                       expectedAppearanceTabImage: "eye",
                                                       expectedCalendarTabImage: "calendar",
@@ -252,7 +246,6 @@ class ThemerTests: XCTestCase {
         XCTAssertEqual(subject.currentLocationImage().accessibilityDescription, expectations.expectedCurrentLocationImage)
         XCTAssertEqual(subject.popoverAppearance(), expectations.expectedPopoverApperarance)
         XCTAssertEqual(subject.addImage().accessibilityDescription, expectations.expectedAddImage)
-        XCTAssertEqual(subject.addImageHighlighted().name(), expectations.expectedAddImageHighlighted)
         XCTAssertEqual(subject.privacyTabImage().accessibilityDescription, expectations.expectedPrivacyTabImage)
         XCTAssertEqual(subject.appearanceTabImage().accessibilityDescription, expectations.expectedAppearanceTabImage)
         XCTAssertEqual(subject.calendarTabImage().accessibilityDescription, expectations.expectedCalendarTabImage)
diff --git a/Clocker/Overall App/Themer.swift b/Clocker/Overall App/Themer.swift
index 26a403e..c478d53 100644
--- a/Clocker/Overall App/Themer.swift	
+++ b/Clocker/Overall App/Themer.swift	
@@ -329,10 +329,6 @@ extension Themer {
                                      NSImage(named: NSImage.Name("Add White"))!)
     }
 
-    func addImageHighlighted() -> NSImage {
-        return themeIndex == .light ? NSImage(named: NSImage.Name("Add Highlighted"))! : NSImage(named: NSImage.Name("Add White"))!
-    }
-
     func privacyTabImage() -> NSImage {
         if let privacyTabSFImage = symbolImage(for: "lock") {
             return privacyTabSFImage