From 6e7b3b3743db9c6d03f0ebe7be35e686ea00aa2a Mon Sep 17 00:00:00 2001 From: gilshahar7 Date: Sat, 18 Feb 2017 13:01:13 +0200 Subject: [PATCH] removed debugging lines and fixed spacing --- Makefile | 2 +- Tweak.xm | 52 +++++++++++++++++++++++++--------------------------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index d9cd4ac..0dec3e6 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ include theos/makefiles/common.mk TWEAK_NAME = NotifyMusic NotifyMusic_FILES = Tweak.xm -NotifyMusic_FRAMEWORKS = CoreTelephony AudioToolbox UIKit +NotifyMusic_FRAMEWORKS = UIKit NotifyMusic_LIBRARIES = bulletin include $(THEOS_MAKE_PATH)/tweak.mk diff --git a/Tweak.xm b/Tweak.xm index 85df270..c78cf2b 100644 --- a/Tweak.xm +++ b/Tweak.xm @@ -1,52 +1,50 @@ -#import -#import #import @interface MPUNowPlayingMetadata -@property (nonatomic,readonly) NSString * title; -@property (nonatomic,readonly) NSString * artist; + @property (nonatomic,readonly) NSString * title; + @property (nonatomic,readonly) NSString * artist; @end @interface MPUNowPlayingController -@property bool isPlaying; -@property (nonatomic,readonly) NSString * nowPlayingAppDisplayID; -@property (nonatomic,readonly) MPUNowPlayingMetadata * currentNowPlayingMetadata; + @property bool isPlaying; + @property (nonatomic,readonly) NSString * nowPlayingAppDisplayID; + @property (nonatomic,readonly) MPUNowPlayingMetadata * currentNowPlayingMetadata; @end @interface JBBulletinManager : NSObject -+(id)sharedInstance; --(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message bundleID:(NSString *)bundleID; --(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message bundleID:(NSString *)bundleID soundPath:(NSString *)soundPath; --(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message bundleID:(NSString *)bundleID soundID:(int)inSoundID; --(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message overrideBundleImage:(UIImage *)overridBundleImage; --(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message overrideBundleImage:(UIImage *)overridBundleImage soundPath:(NSString *)soundPath; --(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message overridBundleImage:(UIImage *)overridBundleImage soundID:(int)inSoundID; --(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message bundleID:(NSString *)bundleID hasSound:(BOOL)hasSound soundID:(int)soundID vibrateMode:(int)vibrate soundPath:(NSString *)soundPath attachmentImage:(UIImage *)attachmentImage overrideBundleImage:(UIImage *)overrideBundleImage; + +(id)sharedInstance; + -(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message bundleID:(NSString *)bundleID; + -(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message bundleID:(NSString *)bundleID soundPath:(NSString *)soundPath; + -(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message bundleID:(NSString *)bundleID soundID:(int)inSoundID; + -(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message overrideBundleImage:(UIImage *)overridBundleImage; + -(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message overrideBundleImage:(UIImage *)overridBundleImage soundPath:(NSString *)soundPath; + -(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message overridBundleImage:(UIImage *)overridBundleImage soundID:(int)inSoundID; + -(id)showBulletinWithTitle:(NSString *)title message:(NSString *)message bundleID:(NSString *)bundleID hasSound:(BOOL)hasSound soundID:(int)soundID vibrateMode:(int)vibrate soundPath:(NSString *)soundPath attachmentImage:(UIImage *)attachmentImage overrideBundleImage:(UIImage *)overrideBundleImage; @end %hook MPUNowPlayingController -static NSString *cachedTitle; --(void)_updateCurrentNowPlaying{ -%orig; + static NSString *cachedTitle; + -(void)_updateCurrentNowPlaying{ + %orig; -double delayInSeconds = 0.5; -dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC)); -dispatch_after(popTime, dispatch_get_main_queue(), ^(void){ + double delayInSeconds = 0.5; + dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC)); + dispatch_after(popTime, dispatch_get_main_queue(), ^(void){ -if(self.isPlaying && ([self.nowPlayingAppDisplayID isEqualToString:@"com.apple.Music"] || [self.nowPlayingAppDisplayID isEqualToString:@"com.spotify.client"]) && ![cachedTitle isEqualToString:self.currentNowPlayingMetadata.title]){ + if(self.isPlaying && ([self.nowPlayingAppDisplayID isEqualToString:@"com.apple.Music"] || [self.nowPlayingAppDisplayID isEqualToString:@"com.spotify.client"]) && ![cachedTitle isEqualToString:self.currentNowPlayingMetadata.title]){ -cachedTitle = [self.currentNowPlayingMetadata.title copy]; + cachedTitle = [self.currentNowPlayingMetadata.title copy]; -[[objc_getClass("JBBulletinManager") sharedInstance] showBulletinWithTitle:self.currentNowPlayingMetadata.title message:self.currentNowPlayingMetadata.artist bundleID:self.nowPlayingAppDisplayID]; + [[objc_getClass("JBBulletinManager") sharedInstance] showBulletinWithTitle:self.currentNowPlayingMetadata.title message:self.currentNowPlayingMetadata.artist bundleID:self.nowPlayingAppDisplayID]; -} + } -}); -} + }); + } %end