From 299289b508373c5b76237420beee24c8a8caddcf Mon Sep 17 00:00:00 2001 From: Pierrick Rouxel Date: Mon, 17 Apr 2023 09:06:41 +0200 Subject: [PATCH 1/2] Fix dark theme --- BingSearchMenubar.xcodeproj/project.pbxproj | 14 ++++++++++++++ .../Components/WebView/BingWebView.swift | 3 +-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/BingSearchMenubar.xcodeproj/project.pbxproj b/BingSearchMenubar.xcodeproj/project.pbxproj index 66796a9..04e25dd 100644 --- a/BingSearchMenubar.xcodeproj/project.pbxproj +++ b/BingSearchMenubar.xcodeproj/project.pbxproj @@ -410,6 +410,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -470,6 +471,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -496,10 +498,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = BingSearchMenubar/BingSearchMenubar.entitlements; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"BingSearchMenubar/Preview Content\""; + DEVELOPMENT_TEAM = A82KSRSDK8; + ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_CFBundleDisplayName = "Bing Search Menubar"; @@ -524,10 +530,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = BingSearchMenubar/BingSearchMenubar.entitlements; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"BingSearchMenubar/Preview Content\""; + DEVELOPMENT_TEAM = A82KSRSDK8; + ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_CFBundleDisplayName = "Bing Search Menubar"; @@ -553,6 +563,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; GENERATE_INFOPLIST_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 13.3; MARKETING_VERSION = 1.0; @@ -571,6 +582,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; GENERATE_INFOPLIST_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 13.3; MARKETING_VERSION = 1.0; @@ -588,6 +600,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = fr.pierrickrouxel.BingSearchUITests; @@ -604,6 +617,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = fr.pierrickrouxel.BingSearchUITests; diff --git a/BingSearchMenubar/Components/WebView/BingWebView.swift b/BingSearchMenubar/Components/WebView/BingWebView.swift index 301354b..c6b18e0 100644 --- a/BingSearchMenubar/Components/WebView/BingWebView.swift +++ b/BingSearchMenubar/Components/WebView/BingWebView.swift @@ -49,8 +49,7 @@ struct BingWebView: View { private func generateEdgeServicesParameters(_ url: String) -> String { return url + - "?clientscopes=chat,coauthor,noheader" + - "&darkschemeovr=\(colorScheme == .dark ? "1" : "0")" + "?clientscopes=chat,coauthor,noheader\(colorScheme == .dark ? "&darkschemeovr=1" : "")" } private func generateAuthCheckRuParam(_ url: String) -> String { From bd4af62eb98ae1f53ead397a0eb8d8f67efe527d Mon Sep 17 00:00:00 2001 From: Pierrick Rouxel Date: Mon, 17 Apr 2023 09:07:17 +0200 Subject: [PATCH 2/2] Bump version --- BingSearchMenubar.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BingSearchMenubar.xcodeproj/project.pbxproj b/BingSearchMenubar.xcodeproj/project.pbxproj index 04e25dd..397e4a8 100644 --- a/BingSearchMenubar.xcodeproj/project.pbxproj +++ b/BingSearchMenubar.xcodeproj/project.pbxproj @@ -516,7 +516,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.2.0; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = fr.pierrickrouxel.BingSearchMenubar; PRODUCT_NAME = "Bing Search Menubar"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -548,7 +548,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.2.0; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = fr.pierrickrouxel.BingSearchMenubar; PRODUCT_NAME = "Bing Search Menubar"; SWIFT_EMIT_LOC_STRINGS = YES;