Skip to content

Cleanup #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryannair05 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Cleanup #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 0 additions & 156 deletions MediaRemote.h
View file
Open in desktop

This file was deleted.

105 changes: 39 additions & 66 deletions Tweak.x
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#import "MediaRemote.h"

#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
#import <MediaRemote/MediaRemote.h>

@interface SBDisplayItem: NSObject
@property (nonatomic,copy,readonly) NSString * bundleIdentifier;
Expand All @@ -20,9 +18,6 @@
+ (id)sharedInstance;
-(id)recentAppLayouts;
-(id)appLayouts;
-(void)_rebuildAppListCache;
-(void)_destroyAppListCache;
-(void)_removeCardForDisplayIdentifier:(id)arg1 ;
-(void)_deleteAppLayout:(id)arg1 forReason:(long long)arg2;
-(void)_quitAppsRepresentedByAppLayout:(id)arg1 forReason:(long long)arg2;
@end
Expand All @@ -33,9 +28,7 @@

@interface SBRecentAppLayouts: NSObject
+ (id)sharedInstance;
-(id)_recentsFromPrefs;
-(void)remove:(SBAppLayout* )arg1;
-(void)removeAppLayouts:(id)arg1 ;
@end

// iOS 13
Expand Down Expand Up @@ -79,6 +72,39 @@ BOOL dismissAutomatically;
int dismissDuration;
int timeInterval;


%hook NotificationAdjunctListViewController
%new
-(void)isPlayingChanged {
MRMediaRemoteGetNowPlayingApplicationIsPlaying(dispatch_get_main_queue(), ^(Boolean isPlaying){
isMusicPlaying = isPlaying;
if(dismissAutomatically){
int timerTime;
switch (timeInterval) {
case 0:
timerTime = dismissDuration;
break;
case 1:
timerTime = dismissDuration * 60;
break;
case 2:
timerTime = dismissDuration * 60 * 60;
break;
}
[NSTimer scheduledTimerWithTimeInterval:(CGFloat)timerTime target:self selector:@selector(dismissMediaControls:) userInfo:nil repeats:NO];
}
});
}
%end

// Makes it easier to dismiss when using Sylph. Sylph disables userInteraction on this view by default.
%hook MediaControlsHeaderView
-(void)setFrame:(CGRect)arg1 {
%orig;
self.userInteractionEnabled = YES;
}
%end

%group iOS13
%hook CSNotificationAdjunctListViewController
-(id)init {
Expand Down Expand Up @@ -108,27 +134,6 @@ int timeInterval;
}
}
}
%new
-(void)isPlayingChanged {
MRMediaRemoteGetNowPlayingApplicationIsPlaying(dispatch_get_main_queue(), ^(Boolean isPlaying){
isMusicPlaying = isPlaying;
if(dismissAutomatically){
int timerTime;
switch (timeInterval) {
case 0:
timerTime = dismissDuration;
break;
case 1:
timerTime = dismissDuration * 60;
break;
case 2:
timerTime = dismissDuration * 60 * 60;
break;
}
[NSTimer scheduledTimerWithTimeInterval:(CGFloat)timerTime target:self selector:@selector(dismissMediaControls:) userInfo:nil repeats:NO];
}
});
}
%end

%hook CSMediaControlsViewController
Expand Down Expand Up @@ -169,14 +174,6 @@ int timeInterval;
[adjunctListViewController dismissMediaControls:nil];
}
%end

// Makes it easier to dismiss when using Sylph. Sylph disables userInteraction on this view by default.
%hook MediaControlsHeaderView
-(void)setFrame:(CGRect)arg1 {
%orig;
self.userInteractionEnabled = YES;
}
%end
%end

%group iOS12
Expand Down Expand Up @@ -209,27 +206,6 @@ int timeInterval;
}
}
}
%new
-(void)isPlayingChanged {
MRMediaRemoteGetNowPlayingApplicationIsPlaying(dispatch_get_main_queue(), ^(Boolean isPlaying){
isMusicPlaying = isPlaying;
if(dismissAutomatically){
int timerTime;
switch (timeInterval) {
case 0:
timerTime = dismissDuration;
break;
case 1:
timerTime = dismissDuration * 60;
break;
case 2:
timerTime = dismissDuration * 60 * 60;
break;
}
[NSTimer scheduledTimerWithTimeInterval:(CGFloat)timerTime target:self selector:@selector(dismissMediaControls:) userInfo:nil repeats:NO];
}
});
}
%end

%hook SBDashBoardMediaControlsViewController
Expand Down Expand Up @@ -271,13 +247,6 @@ int timeInterval;
}
%end

// Makes it easier to dismiss when using Sylph. Sylph disables userInteraction on this view by default.
%hook MediaControlsHeaderView
-(void)setFrame:(CGRect)arg1 {
%orig;
self.userInteractionEnabled = YES;
}
%end
%end

static void loadPrefs(){
Expand All @@ -294,10 +263,14 @@ static void loadPrefs(){
%ctor {
loadPrefs();
if(isEnabled){
if(SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"13.0")) {
Class NotificationAdjunctListViewControllerClass;
if (@available(iOS 13.0, *)) {
%init(iOS13);
NotificationAdjunctListViewControllerClass = %c(CSNotificationAdjunctListViewController);
} else {
%init(iOS12);
NotificationAdjunctListViewControllerClass = %c(SBDashBoardNotificationAdjunctListViewController);
}
%init(NotificationAdjunctListViewController = NotificationAdjunctListViewControllerClass)
}
}
1 change: 0 additions & 1 deletion notfinicalprefs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ BUNDLE_NAME = NotFinicalPrefs

NotFinicalPrefs_FILES = NFNRootListController.m
NotFinicalPrefs_INSTALL_PATH = /Library/PreferenceBundles
NotFinicalPrefs_FRAMEWORKS = UIKit
NotFinicalPrefs_PRIVATE_FRAMEWORKS = Preferences
NotFinicalPrefs_CFLAGS = -fobjc-arc

Expand Down