diff --git a/Per mille/AppDelegate.swift b/Per mille/AppDelegate.swift index 26abf60..a6d5119 100644 --- a/Per mille/AppDelegate.swift +++ b/Per mille/AppDelegate.swift @@ -246,10 +246,10 @@ class AppDelegate: NSObject, NSApplicationDelegate { if defaults.integer(forKey: "InstagramInUse") == 1{ DataLoaderInstagram().loadInstagramData() - self.instagramUsername.title = "Username: Loading, please wait" - self.instagramFollowers.title = "Followers ጰ: Loading, please wait" - self.instagramAverageLikes.title = "Average ♥: Loading, please wait" - self.instagramLastPost.title = "Last Post: Loading, please wait" + self.instagramUsername.title = "Username: Loading, please wait (10s)" + self.instagramFollowers.title = "Followers ጰ: Loading, please wait (10s)" + self.instagramAverageLikes.title = "Average ♥: Loading, please wait (10s)" + self.instagramLastPost.title = "Last Post: Loading, please wait (10s)" } else{ } @@ -265,34 +265,31 @@ class AppDelegate: NSObject, NSApplicationDelegate { if defaults.integer(forKey: "TwitterInUse") == 1{ DataLoaderTwitter().loadTwitterData() - self.twitterScreenName.title = "Screen Name: Loading, please wait" - self.twitterFollowers.title = "Followers ጰ: Loading, please wait" - self.twitterListed.title = "Listed: Loading, please wait" - self.twitterPinnedTweet.title = "Pinned Tweet: Loading, please wait" + self.twitterScreenName.title = "Screen Name: Loading, please wait (10s)" + self.twitterFollowers.title = "Followers ጰ: Loading, please wait (10s)" + self.twitterListed.title = "Listed: Loading, please wait (10s)" + self.twitterPinnedTweet.title = "Pinned Tweet: Loading, please wait (10s)" } else{ } if defaults.integer(forKey: "YouTubeInUse") == 1{ DataLoaderYouTube().loadYouTubeDataChannel() - - DispatchQueue.main.asyncAfter(deadline: .now() + 2.0, execute: { - DataLoaderYouTube().loadYouTubeDataSearch() - }) + DataLoaderYouTube().loadYouTubeDataSearch() - DispatchQueue.main.asyncAfter(deadline: .now() + 4.0, execute: { + DispatchQueue.main.asyncAfter(deadline: .now() + 10.0, execute: { DataLoaderYouTube().loadYouTubeDataVideos() }) - self.youTubeTitle.title = "Channel: Loading, please wait" - self.youTubeSubscribers.title = "Subscribers ጰ: Loading, please wait" - self.youTubeViews.title = "Lifetime ▶: Loading, please wait" - self.YouTubeLatestVideo.title = "Latest Video: Loading, please wait" + self.youTubeTitle.title = "Channel: Loading, please wait (10s)" + self.youTubeSubscribers.title = "Subscribers ጰ: Loading, please wait (10s)" + self.youTubeViews.title = "Lifetime ▶: Loading, please wait (10s)" + self.YouTubeLatestVideo.title = "Latest Video: Loading, please wait (20s)" } else{ } - DispatchQueue.main.asyncAfter(deadline: .now() + 7.0, execute: { + DispatchQueue.main.asyncAfter(deadline: .now() + 10.1, execute: { if self.defaults.integer(forKey: "InstagramInUse") == 1{ self.instagramUsername.title = "Username: \(String(instagramData.username))" @@ -313,7 +310,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { }) - DispatchQueue.main.asyncAfter(deadline: .now() + 3.0, execute: { + DispatchQueue.main.asyncAfter(deadline: .now() + 10.1, execute: { if self.defaults.integer(forKey: "TwitterInUse") == 1{ @@ -361,7 +358,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { } - DispatchQueue.main.asyncAfter(deadline: .now() + 4.1, execute: { + DispatchQueue.main.asyncAfter(deadline: .now() + 10.1, execute: { if youTubeDataVideos.pageInfo?.resultsPerPage == 1 { let YouTubeLatestVideoViews: Int = Int(youTubeDataVideos.items?[0].statistics.viewCount as! String) ?? 0 diff --git a/Per mille/Base.lproj/Main.storyboard b/Per mille/Base.lproj/Main.storyboard index 4e74234..bfc7859 100644 --- a/Per mille/Base.lproj/Main.storyboard +++ b/Per mille/Base.lproj/Main.storyboard @@ -1008,7 +1008,7 @@ - + Please check YouTube Channel ID, it should be similar to this: UClt25f9gZu4_M3sxpAAJ4QQ Click the help button for to access an (unaffiliated) service which @@ -1016,9 +1016,6 @@ converts Channel URL to Channel ID. - - - @@ -1042,7 +1039,7 @@ converts Channel URL to Channel ID. - + diff --git a/Per mille/DataLoaderYouTube.swift b/Per mille/DataLoaderYouTube.swift index 61df144..2b0079b 100644 --- a/Per mille/DataLoaderYouTube.swift +++ b/Per mille/DataLoaderYouTube.swift @@ -321,13 +321,13 @@ var youTubeDataVideos = YouTubeDataStructureVideos() print(error) } else { let httpResponse = response as? HTTPURLResponse - print("Received from the YouTube Search API") - if let data = data, - let urlContent = NSString(data: data, encoding: String.Encoding.ascii.rawValue) { - print(urlContent) - } else { - print("error with printing string encoded data") - } +// print("Received from the YouTube Search API") +// if let data = data, +// let urlContent = NSString(data: data, encoding: String.Encoding.ascii.rawValue) { +// print(urlContent) +// } else { +// print("error with printing string encoded data") +// } //Parse JSON let decoder = JSONDecoder() do {