Merge branch 'master' into zoom-webinar

benbernard · Jun 7, 2023 · 08665e6 · 08665e6
2 parents e0e86ed + b605bd4
commit 08665e6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 37 deletions.
diff --git a/MeetingBar/ActionsOnEventStart.swift b/MeetingBar/ActionsOnEventStart.swift
@@ -35,7 +35,7 @@ class ActionsOnEventStart: NSObject {
 
         // Only run if the user has activated it.
         let autoJoinActionActive = Defaults[.automaticEventJoin]
-        let runEventStartScriptActionActive = Defaults[.runEventStartScript] && (Defaults[.joinEventScriptLocation] != nil)
+        let runEventStartScriptActionActive = Defaults[.runEventStartScript] && (Defaults[.eventStartScriptLocation] != nil)
 
         if !autoJoinActionActive, !runEventStartScriptActionActive {
             return

diff --git a/...Bar/Assets.xcassets/vendor-icons/google_meet_icon.imageset/google_meet_icon.svg b/...Bar/Assets.xcassets/vendor-icons/google_meet_icon.imageset/google_meet_icon.svg
diff --git a/MeetingBar/Assets.xcassets/vendor-icons/ms_teams_icon.imageset/ms-teams-icon.svg b/MeetingBar/Assets.xcassets/vendor-icons/ms_teams_icon.imageset/ms-teams-icon.svg
diff --git a/MeetingBar/Assets.xcassets/vendor-icons/slack_icon.imageset/slack_icon.svg b/MeetingBar/Assets.xcassets/vendor-icons/slack_icon.imageset/slack_icon.svg
diff --git a/MeetingBar/MeetingServices.swift b/MeetingBar/MeetingServices.swift
@@ -362,7 +362,7 @@ func getIconForMeetingService(_ meetingService: MeetingServices?) -> NSImage {
     // tested and verified -> deprecated, can be removed because hangouts was replaced by google meet
     case .some(.hangouts):
         image = NSImage(named: "google_hangouts_icon")!
-        image.size = NSSize(width: 16, height: 17.8)
+        image.size = NSSize(width: 16, height: 16)
 
     // tested and verified
     case .some(.zoom), .some(.zoomgov), .some(.zoom_native):

diff --git a/MeetingBar/Views/Changelog/Changelog.swift b/MeetingBar/Views/Changelog/Changelog.swift
@@ -139,6 +139,11 @@ struct ChangelogView: View {
                             Text("⚙️ Integration with the Shortcuts app!\n\nYou can automate your flows with \"Join Nearest Meeting\" and \"Get Nearest Event Details\" actions.").lineLimit(nil)
                         }
                     }
+                    if compareVersions("4.5.0", lastRevisedVersionInChangelog) {
+                        Section(header: Text("Version 4.5")) {
+                            Text("• Updates the Slack huddle icon to properly scale within menu").lineLimit(nil)
+                        }
+                    }
                 }
             }.listStyle(SidebarListStyle())
             Button("general_close".loco(), action: close)