Changed a colored icon to remove blue accent in Safari 14, for #319

alpheios-project · Jan 28, 2021 · cf8b99c · cf8b99c
1 parent ba15778
commit cf8b99c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/safari-app-extension/AlpheiosReadingTools/Info.plist b/src/safari-app-extension/AlpheiosReadingTools/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.3.3</string>
 	<key>CFBundleVersion</key>
-	<string>incr-3.3.x.20210127570</string>
+	<string>i319-safari-toolbar-icon.20210128527</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.education</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/safari-app-extension/AlpheiosSafari/BackgroundProcess.swift b/src/safari-app-extension/AlpheiosSafari/BackgroundProcess.swift
@@ -10,8 +10,8 @@ import os.log
 
 class BackgroundProcess {
     static let browserIcons: [String: NSImage] = [
-        "active": NSImage.init(named: "alpheios.pdf")!,
-        "nonactive": NSImage.init(named: "alpheios.pdf")!
+        "active": NSImage.init(named: "alpheios_safari14.pdf")!,
+        "nonactive": NSImage.init(named: "alpheios_safari14.pdf")!
     ]
 
     static var tabs: [Int: TabScript] = [:]

diff --git a/src/safari-app-extension/AlpheiosSafari/Info.plist b/src/safari-app-extension/AlpheiosSafari/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.3.3</string>
 	<key>CFBundleVersion</key>
-	<string>incr-3.3.x.20210127570</string>
+	<string>i319-safari-toolbar-icon.20210128527</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>
@@ -74,7 +74,7 @@
 			<key>Identifier</key>
 			<string>Button</string>
 			<key>Image</key>
-			<string>alpheios.pdf</string>
+			<string>alpheios_safari14.pdf</string>
 			<key>Label</key>
 			<string>Activate Alpheios Reading Tools</string>
 		</dict>

diff --git a/src/safari-app-extension/AlpheiosSafari/alpheios_safari14.pdf b/src/safari-app-extension/AlpheiosSafari/alpheios_safari14.pdf
diff --git a/src/safari-app-extension/AlpheiosSafariExtension.xcodeproj/project.pbxproj b/src/safari-app-extension/AlpheiosSafariExtension.xcodeproj/project.pbxproj
@@ -29,6 +29,7 @@
 		BF568EED230A794400B5D073 /* NSCustomPersistantContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF568EEB230A794400B5D073 /* NSCustomPersistantContainer.swift */; };
 		BF9D4CB1216E0D4E00E03D0C /* BackgroundProcess.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF9D4CB0216E0D4E00E03D0C /* BackgroundProcess.swift */; };
 		BFC1180023295BC4008D28A3 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7832F88C2147A4CC00CD96CB /* MainMenu.xib */; };
+		BFDD7A7825C2F359006D07B7 /* alpheios_safari14.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BFDD7A7725C2F359006D07B7 /* alpheios_safari14.pdf */; };
 		BFE3A1B0231ADEAF008261CA /* LoginNtfyMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE3A1AF231ADEAF008261CA /* LoginNtfyMessage.swift */; };
 		BFE3A1B2231ADF0D008261CA /* LogoutNtfyMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE3A1B1231ADF0D008261CA /* LogoutNtfyMessage.swift */; };
 		BFEDB3FB231123F9005FDA7B /* Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFEDB3FA231123F9005FDA7B /* Shared.swift */; };
@@ -88,6 +89,7 @@
 		BF568EE823070F6B00B5D073 /* StateMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StateMessage.swift; sourceTree = "<group>"; };
 		BF568EEB230A794400B5D073 /* NSCustomPersistantContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSCustomPersistantContainer.swift; sourceTree = "<group>"; };
 		BF9D4CB0216E0D4E00E03D0C /* BackgroundProcess.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackgroundProcess.swift; sourceTree = "<group>"; };
+		BFDD7A7725C2F359006D07B7 /* alpheios_safari14.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = alpheios_safari14.pdf; sourceTree = "<group>"; };
 		BFE3A1AF231ADEAF008261CA /* LoginNtfyMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginNtfyMessage.swift; sourceTree = "<group>"; };
 		BFE3A1B1231ADF0D008261CA /* LogoutNtfyMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoutNtfyMessage.swift; sourceTree = "<group>"; };
 		BFEDB3FA231123F9005FDA7B /* Shared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shared.swift; sourceTree = "<group>"; };
@@ -159,6 +161,7 @@
 		7832F89E2147A4E400CD96CB /* AlpheiosSafari */ = {
 			isa = PBXGroup;
 			children = (
+				BFDD7A7725C2F359006D07B7 /* alpheios_safari14.pdf */,
 				7832F8B32147A50A00CD96CB /* lib */,
 				BF9D4CB0216E0D4E00E03D0C /* BackgroundProcess.swift */,
 				BF10BF832359FD2C00F96E46 /* AuthData.swift */,
@@ -309,6 +312,7 @@
 				BF3927F9216F565E00213E05 /* alpheios.pdf in Resources */,
 				7832F8A52147A4E400CD96CB /* SafariExtensionViewController.xib in Resources */,
 				7832F8A82147A4E400CD96CB /* content-safari.js in Resources */,
+				BFDD7A7825C2F359006D07B7 /* alpheios_safari14.pdf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};