Merge branch 'master' of https://github.com/n0shake/Clocker

Author: n0shake

Clocker/Onboarding/FinalOnboardingViewController.swift

@@ -70,8 +70,8 @@ class FinalOnboardingViewController: NSViewController {
     }
 
     @IBAction func localizationAction(_: Any) {
-        guard let localizationURL = URL(string: AboutUsConstants.TwitterLink),
-              let languageCode = Locale.preferredLanguages.first else { return }
+        guard let localizationURL = URL(string: AboutUsConstants.TwitterFollowIntentLink),
+            let languageCode = Locale.preferredLanguages.first else { return }
 
         NSWorkspace.shared.open(localizationURL)
 

Clocker/Panel/ParentPanelController.swift

@@ -700,19 +700,19 @@ class ParentPanelController: NSWindowController {
     }
 
     @IBAction func dismissNextEventLabel(_: NSButton) {
+      let eventCenter = EventCenter.sharedCenter()
+      let now = Date()
+      if let events = eventCenter.eventsForDate[NSCalendar.autoupdatingCurrent.startOfDay(for: now)], events.isEmpty == false {
+          if let upcomingEvent = eventCenter.nextOccuring(events), let meetingLink = upcomingEvent.meetingURL {
+              NSWorkspace.shared.open(meetingLink)
+          }
+      } else {
         removeUpcomingEventView()
+      }
     }
 
     func removeUpcomingEventView() {
         OperationQueue.main.addOperation {
-            let eventCenter = EventCenter.sharedCenter()
-            let now = Date()
-            if let events = eventCenter.eventsForDate[NSCalendar.autoupdatingCurrent.startOfDay(for: now)], events.isEmpty == false {
-                if let upcomingEvent = eventCenter.nextOccuring(events), let meetingLink = upcomingEvent.meetingURL {
-                    NSWorkspace.shared.open(meetingLink)
-                }
-            }
-
             if self.stackView.arrangedSubviews.contains(self.upcomingEventView!), self.upcomingEventView?.isHidden == false {
                 self.upcomingEventView?.isHidden = true
                 UserDefaults.standard.set("NO", forKey: CLShowUpcomingEventView)

Clocker/Preferences/About/AboutViewController.swift

@@ -8,6 +8,7 @@ struct AboutUsConstants {
     static let GitHubURL = "https://github.com/abhishekbanthia/Clocker/?ref=ClockerApp"
     static let PayPalURL = "https://paypal.me/abhishekbanthia1712"
     static let TwitterLink = "https://twitter.com/clocker_support/?ref=ClockerApp"
+    static let TwitterFollowIntentLink = "https://twitter.com/intent/follow?screen_name=clocker_support"
     static let AppStoreLink = "macappstore://itunes.apple.com/us/app/clocker/id1056643111?action=write-review"
     static let CrowdInLocalizationLink = "https://crwd.in/clocker"
 }