diff --git a/Pictures/image_github_w1920.png b/Pictures/image_github_w1920.png new file mode 100644 index 0000000..7d0660f Binary files /dev/null and b/Pictures/image_github_w1920.png differ diff --git a/VHGithubNotifier.xcodeproj/project.pbxproj b/VHGithubNotifier.xcodeproj/project.pbxproj index 4b9326d..de8df7b 100644 --- a/VHGithubNotifier.xcodeproj/project.pbxproj +++ b/VHGithubNotifier.xcodeproj/project.pbxproj @@ -213,6 +213,7 @@ 373EAB411E712C0B005B5E86 /* AFImageDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 373EAB3F1E712C0B005B5E86 /* AFImageDownloader.m */; }; 373EAB471E713E10005B5E86 /* NSImageView+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 373EAB461E713E10005B5E86 /* NSImageView+AFNetworking.m */; }; 373EAB4D1E713EF7005B5E86 /* VHCursorButton+AFNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = 373EAB4C1E713EF7005B5E86 /* VHCursorButton+AFNetworking.m */; }; + 373EAB521E729CD7005B5E86 /* image_github_w1920.png in Resources */ = {isa = PBXBuildFile; fileRef = 373EAB511E729CD7005B5E86 /* image_github_w1920.png */; }; 3748DF831E2CE3E900507D9C /* VHDateValueFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3748DF821E2CE3E900507D9C /* VHDateValueFormatter.m */; }; 3748DF861E2CEA9800507D9C /* NSDate+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3748DF851E2CEA9800507D9C /* NSDate+Utils.m */; }; 3749CDCE1E59B27C0083CEB1 /* VHPieVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 3749CDCC1E59B27C0083CEB1 /* VHPieVC.m */; }; @@ -575,6 +576,7 @@ 373EAB461E713E10005B5E86 /* NSImageView+AFNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSImageView+AFNetworking.m"; sourceTree = ""; }; 373EAB4B1E713EF7005B5E86 /* VHCursorButton+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "VHCursorButton+AFNetworking.h"; sourceTree = ""; }; 373EAB4C1E713EF7005B5E86 /* VHCursorButton+AFNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "VHCursorButton+AFNetworking.m"; sourceTree = ""; }; + 373EAB511E729CD7005B5E86 /* image_github_w1920.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = image_github_w1920.png; sourceTree = ""; }; 3748DF811E2CE3E900507D9C /* VHDateValueFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VHDateValueFormatter.h; sourceTree = ""; }; 3748DF821E2CE3E900507D9C /* VHDateValueFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VHDateValueFormatter.m; sourceTree = ""; }; 3748DF841E2CEA9800507D9C /* NSDate+Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Utils.h"; sourceTree = ""; }; @@ -1058,6 +1060,14 @@ path = UAGithubEngine; sourceTree = ""; }; + 373EAB501E729CD7005B5E86 /* Pictures */ = { + isa = PBXGroup; + children = ( + 373EAB511E729CD7005B5E86 /* image_github_w1920.png */, + ); + path = Pictures; + sourceTree = ""; + }; 3752DD161E12AAAE000AB94A /* Manager */ = { isa = PBXGroup; children = ( @@ -1112,6 +1122,7 @@ 378E0AD21E0ECD060033CBD5 = { isa = PBXGroup; children = ( + 373EAB501E729CD7005B5E86 /* Pictures */, 373BA7101E6AC9AC00653C92 /* Assets */, 378E0ADD1E0ECD070033CBD5 /* VHGithubNotifier */, 378E0ADC1E0ECD070033CBD5 /* Products */, @@ -1445,6 +1456,7 @@ 3749CDDB1E59B42A0083CEB1 /* VHNotificationVC.xib in Resources */, 373185F61E5DDB5B00926F4F /* VHTrendingRepositoryCellView.xib in Resources */, 373BA6F91E6993FA00653C92 /* VHNotificationHeaderCellView.xib in Resources */, + 373EAB521E729CD7005B5E86 /* image_github_w1920.png in Resources */, 373BA6F41E6959C600653C92 /* Assets.xcassets in Resources */, 379E09BB1E659B240032EB7E /* VHNotificationGroupBodyCellView.xib in Resources */, 3731879B1E61D95200926F4F /* Info.plist in Resources */, diff --git a/VHGithubNotifier.xcworkspace/xcuserdata/huangweiping.xcuserdatad/xcdebugger/Expressions.xcexplist b/VHGithubNotifier.xcworkspace/xcuserdata/huangweiping.xcuserdatad/xcdebugger/Expressions.xcexplist index 49ea61d..c24b910 100644 --- a/VHGithubNotifier.xcworkspace/xcuserdata/huangweiping.xcuserdatad/xcdebugger/Expressions.xcexplist +++ b/VHGithubNotifier.xcworkspace/xcuserdata/huangweiping.xcuserdatad/xcdebugger/Expressions.xcexplist @@ -3,62 +3,81 @@ version = "1.0"> - - + contextName = "+[VHUtils scrollViewToTop:]:VHUtils.m"> - - + value = "[scrollView.documentView bounds]"> + value = "scrollView.contentView"> + value = "scrollView.documentView"> + contextName = "-[VHWebLoginWC webView:didFinishNavigation:]:VHWebLoginWC.m"> + contextName = "-[VHUser starNumber]:VHUser.m"> + contextName = "__52-[VHGithubNotifierManager(Language) updateLanguages]_block_invoke:VHGithubNotifierManager+Language.m"> + contextName = "__64-[VHGithubNotifierManager(Notification) innerUpdateNotification]_block_invoke_2:VHGithubNotifierManager+Notification.m"> + value = "notificationDic"> + + + + + value = "self.window.frame"> + + + + + + + value = "self.window"> + contextName = "-[VHGithubNotifierManager innerLoadRepositories]:VHGithubNotifierManager.m"> + contextName = "__52-[VHGithubNotifierManager(Language) updateLanguages]_block_invoke_2:VHGithubNotifierManager+Language.m"> + contextName = "-[VHSettingsWC onStatusBarContentChanged:]:VHSettingsWC.m"> + value = "self.followersNumberButton.state & VHStatusBarButtonContentTypeFollowers"> + + + + + + + + @@ -68,43 +87,38 @@ + contextName = "-[VHTrendingRepositoryCellView setTrendingRepository:]:VHTrendingRepositoryCellView.m"> + value = "[self.languageDot getTop]"> + contextName = "__41+[VHNotification dictionaryFromResponse:]_block_invoke:VHNotification.m"> + contextName = "-[VHTextField performKeyEquivalent:]:VHTextField.m"> + value = "[event charactersIgnoringModifiers]"> + contextName = "-[VHGithubNotifierManager(Trending) trendingRepositoriesFromHtmlString:]:VHGithubNotifierManager+Trending.m"> + value = "childElement.children.count"> - - - - - - - - + value = "element.children"> + + + + diff --git a/VHGithubNotifier/Assets.xcassets/background_account_info_window.imageset/background_account_info_window.jpg b/VHGithubNotifier/Assets.xcassets/background_account_info_window.imageset/background_account_info_window.jpg deleted file mode 100644 index 8acdf23..0000000 Binary files a/VHGithubNotifier/Assets.xcassets/background_account_info_window.imageset/background_account_info_window.jpg and /dev/null differ diff --git a/VHGithubNotifier/Assets.xcassets/background_account_info_window.imageset/Contents.json b/VHGithubNotifier/Assets.xcassets/image_account_info_window.imageset/Contents.json similarity index 82% rename from VHGithubNotifier/Assets.xcassets/background_account_info_window.imageset/Contents.json rename to VHGithubNotifier/Assets.xcassets/image_account_info_window.imageset/Contents.json index 28550c8..7f88062 100644 --- a/VHGithubNotifier/Assets.xcassets/background_account_info_window.imageset/Contents.json +++ b/VHGithubNotifier/Assets.xcassets/image_account_info_window.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "background_account_info_window.jpg", + "filename" : "image_account_info_window.png", "scale" : "1x" }, { diff --git a/VHGithubNotifier/Assets.xcassets/image_account_info_window.imageset/image_account_info_window.png b/VHGithubNotifier/Assets.xcassets/image_account_info_window.imageset/image_account_info_window.png new file mode 100644 index 0000000..60e86a2 Binary files /dev/null and b/VHGithubNotifier/Assets.xcassets/image_account_info_window.imageset/image_account_info_window.png differ diff --git a/VHGithubNotifier/Info.plist b/VHGithubNotifier/Info.plist index 2cef522..b2f4d5b 100644 --- a/VHGithubNotifier/Info.plist +++ b/VHGithubNotifier/Info.plist @@ -21,7 +21,7 @@ CFBundleShortVersionString 1.0.0 CFBundleVersion - 1003 + 1004 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) LSUIElement diff --git a/VHGithubNotifier/Model/Manager/VHGithubNotifierManager.m b/VHGithubNotifier/Model/Manager/VHGithubNotifierManager.m index ae8154d..90a31d4 100644 --- a/VHGithubNotifier/Model/Manager/VHGithubNotifierManager.m +++ b/VHGithubNotifier/Model/Manager/VHGithubNotifierManager.m @@ -165,8 +165,7 @@ - (void)recoverUser - (void)resetFromWakeNotification { SystemLog(@"Wake up"); - [self stopTimerOfBasicInfo]; - [self startTimerOfBasicInfo]; + [self updateAllTimer]; } - (NSURL *)logFileURL diff --git a/VHGithubNotifier/Window/VHAccountInfoWC.m b/VHGithubNotifier/Window/VHAccountInfoWC.m index 1e4f714..943c8fd 100644 --- a/VHGithubNotifier/Window/VHAccountInfoWC.m +++ b/VHGithubNotifier/Window/VHAccountInfoWC.m @@ -31,7 +31,7 @@ - (void)windowDidLoad [self.window.contentView setWantsLayer:YES]; self.window.contentView.layer.contentsGravity = kCAGravityResizeAspectFill; - self.window.contentView.layer.contents = [NSImage imageNamed:@"background_account_info_window"]; + self.window.contentView.layer.contents = [NSImage imageNamed:@"image_account_info_window"]; self.window.titlebarAppearsTransparent = YES; self.window.titleVisibility = NSWindowTitleHidden; diff --git a/VHGithubNotifier/Window/VHAccountInfoWC.xib b/VHGithubNotifier/Window/VHAccountInfoWC.xib index 7a26b78..cbef075 100644 --- a/VHGithubNotifier/Window/VHAccountInfoWC.xib +++ b/VHGithubNotifier/Window/VHAccountInfoWC.xib @@ -35,7 +35,7 @@ - + diff --git a/VHGithubNotifier/Window/VHWindow.m b/VHGithubNotifier/Window/VHWindow.m index f501537..ec1f5f3 100644 --- a/VHGithubNotifier/Window/VHWindow.m +++ b/VHGithubNotifier/Window/VHWindow.m @@ -37,7 +37,7 @@ - (instancetype)initWithStatusItem:(NSStatusItem *)statusBarButton withDelegate: _windowDelegate = delegate; [self setHasShadow:YES]; - [self setLevel:NSPopUpMenuWindowLevel]; + [self setLevel:NSStatusWindowLevel]; [self setOpaque:NO]; [self setBackgroundColor:[NSColor clearColor]]; [self setCollectionBehavior:NSWindowCollectionBehaviorStationary];