From 9d0c17d53ceed281cd80b427373da78e94f446da Mon Sep 17 00:00:00 2001 From: Onne van Dijk Date: Sat, 2 Jan 2021 13:22:46 +0100 Subject: [PATCH] Updated menu bar icon for Big Sur --- Brightness Sync.xcodeproj/project.pbxproj | 8 +++---- Brightness Sync/AppDelegate.swift | 6 +++++- Brightness Sync/Assets.xcassets/Contents.json | 6 +++--- .../MenuBarIcon.imageset/Brightness Sync.png | Bin 0 -> 2025 bytes .../Contents.json | 8 +++---- .../Brightness Sync Old.png} | Bin .../MenuBarIconOld.imageset/Contents.json | 20 ++++++++++++++++++ 7 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 Brightness Sync/Assets.xcassets/MenuBarIcon.imageset/Brightness Sync.png rename Brightness Sync/Assets.xcassets/{StatusBarButtonImage.imageset => MenuBarIcon.imageset}/Contents.json (71%) rename Brightness Sync/Assets.xcassets/{StatusBarButtonImage.imageset/Brightness Sync 45.png => MenuBarIconOld.imageset/Brightness Sync Old.png} (100%) create mode 100644 Brightness Sync/Assets.xcassets/MenuBarIconOld.imageset/Contents.json diff --git a/Brightness Sync.xcodeproj/project.pbxproj b/Brightness Sync.xcodeproj/project.pbxproj index 3bb874a..0607254 100644 --- a/Brightness Sync.xcodeproj/project.pbxproj +++ b/Brightness Sync.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.3.1; + CURRENT_PROJECT_VERSION = 2.3.2; DEVELOPMENT_TEAM = 7M6D294GQ9; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "Brightness Sync/Info.plist"; @@ -372,7 +372,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.3.1; + MARKETING_VERSION = 2.3.2; PRODUCT_BUNDLE_IDENTIFIER = "dev.vandijk.Brightness-Sync"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -390,7 +390,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.3.1; + CURRENT_PROJECT_VERSION = 2.3.2; DEVELOPMENT_TEAM = 7M6D294GQ9; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "Brightness Sync/Info.plist"; @@ -398,7 +398,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.3.1; + MARKETING_VERSION = 2.3.2; PRODUCT_BUNDLE_IDENTIFIER = "dev.vandijk.Brightness-Sync"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Brightness Sync/AppDelegate.swift b/Brightness Sync/AppDelegate.swift index d9c7cf2..4d2da26 100644 --- a/Brightness Sync/AppDelegate.swift +++ b/Brightness Sync/AppDelegate.swift @@ -16,7 +16,11 @@ class AppDelegate: NSObject, NSApplicationDelegate { func applicationDidFinishLaunching(_ aNotification: Notification) { if let button = statusItem.button { - button.image = #imageLiteral(resourceName: "StatusBarButtonImage") + if #available(macOS 11.0, *) { + button.image = NSImage(named: "MenuBarIcon") + } else { + button.image = NSImage(named: "MenuBarIconOld") + } } let menu = NSMenu() diff --git a/Brightness Sync/Assets.xcassets/Contents.json b/Brightness Sync/Assets.xcassets/Contents.json index da4a164..73c0059 100644 --- a/Brightness Sync/Assets.xcassets/Contents.json +++ b/Brightness Sync/Assets.xcassets/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Brightness Sync/Assets.xcassets/MenuBarIcon.imageset/Brightness Sync.png b/Brightness Sync/Assets.xcassets/MenuBarIcon.imageset/Brightness Sync.png new file mode 100644 index 0000000000000000000000000000000000000000..f526fc26edad57ed6e917993e06622a22f54088a GIT binary patch literal 2025 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%Tgme(|mmy zw18|51~x_^24;{FAY@>aVqgWc85qJCrQz&2Mh&PMCZHNa1|Z2G3dCvcnG7sY^))~m z1U!HkXcB}D$gD`s$xSTDFH#67%2zPbGte^z$}ulsMA*5232uhM0%imosE#4H8?tx|+GK4GQ<#= zIWDQi$wiq3C7Jno3LtY6lk!VTY?YKi7Qq3;ov9U>2%GYXq22;|P#+|tZ>VRWk4;-i zW*QD{AQ_z6fMEpp7K&vRi3Jc%;J|>m(FWuKD{zEHx@6|2<`o0|V`pq+19lpQ1j2Jj z8Y6INM3O+)=$xOEUld%Bn4D^72(=4I2uU@_t5!j&#rZjR> zHal}810c{h1d&kP$kOOqBk^lRmPXg=UzC{&OfewGg1iQHD6$xmdSFahITxjZGEzu> zevTcsd}X7Lt_sZnUtq#dNi0cpNi0dVGcqtT)HMJiqYy(QD?>vo6T>Ko2`I{-M%d_s z5-w6ghU5~kC@`DYaRIf$vYZ`Pqx(*KU0pJ)ER z*mCY$ePq$*{Mxc}|1Hm3KL0uQv(0i*QQnvK^ABub`mUcCC+frSd;UUMy94&YlG^#L z*%x^C3vEfV=G&YYASHYD+mvkwqdjtGZTfrUyG@9L(`v^pHG(PE8eqn=G)RGR~iHFpIzyg6RgPcur$OWY-U3t!?(SCkrx<_ zF7P?`pnSpgPtW~%dv^*x@oaf*V7U3z;&rV*4P@00OK_a5m|3T}!aPA>+HxcJeU0DW z{ZS}(vVY4u{l(5RN_tzQr-(kdTb28$`NQprIX+I*z<|HJvXalpSk1|Cx>!wH`ci@ zA&A>eJ-&yH|MGuE+X9{B{jSpaLcgB19BhB}V!`|5shjm4yi8&pLv(Z}8Txif?9&Z#s1*pZPA6wDH@pTN6KUuubukO)!vO$o6aU)rIlNhZb_( zUVUbVU6DXhkZfGt#>sJqOgv5seLcNexOv`%Ope*N-+BJ{nte;u_nS&hN>Qj~pRYiE zUcLJ|ZWjAy4)upjb#J3QrfNJ}G_!zZpTmti*NZtTfI)O`Rk9m<3u~_KcCiogJ(~+e zZz+B={16<#b}BpS%5Cij{hd4ctrYL6Ts1db+g5kK`q;lyE+^gh32zPHFHTUJ((s>o k%R$=>Cif3cD6(q2UsuTb)b6`!Ca5;^boFyt=akR{0A)kTVE_OC literal 0 HcmV?d00001 diff --git a/Brightness Sync/Assets.xcassets/StatusBarButtonImage.imageset/Contents.json b/Brightness Sync/Assets.xcassets/MenuBarIcon.imageset/Contents.json similarity index 71% rename from Brightness Sync/Assets.xcassets/StatusBarButtonImage.imageset/Contents.json rename to Brightness Sync/Assets.xcassets/MenuBarIcon.imageset/Contents.json index fdc6bde..9076f15 100644 --- a/Brightness Sync/Assets.xcassets/StatusBarButtonImage.imageset/Contents.json +++ b/Brightness Sync/Assets.xcassets/MenuBarIcon.imageset/Contents.json @@ -5,16 +5,16 @@ "scale" : "1x" }, { + "filename" : "Brightness Sync.png", "idiom" : "mac", - "filename" : "Brightness Sync 45.png", "scale" : "2x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Brightness Sync/Assets.xcassets/StatusBarButtonImage.imageset/Brightness Sync 45.png b/Brightness Sync/Assets.xcassets/MenuBarIconOld.imageset/Brightness Sync Old.png similarity index 100% rename from Brightness Sync/Assets.xcassets/StatusBarButtonImage.imageset/Brightness Sync 45.png rename to Brightness Sync/Assets.xcassets/MenuBarIconOld.imageset/Brightness Sync Old.png diff --git a/Brightness Sync/Assets.xcassets/MenuBarIconOld.imageset/Contents.json b/Brightness Sync/Assets.xcassets/MenuBarIconOld.imageset/Contents.json new file mode 100644 index 0000000..c06b28f --- /dev/null +++ b/Brightness Sync/Assets.xcassets/MenuBarIconOld.imageset/Contents.json @@ -0,0 +1,20 @@ +{ + "images" : [ + { + "idiom" : "mac", + "scale" : "1x" + }, + { + "filename" : "Brightness Sync Old.png", + "idiom" : "mac", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +}