add compatibilty for iOS 14

Author: eclair4151

Makefile

@@ -2,6 +2,7 @@ include $(THEOS)/makefiles/common.mk
 
 ARCHS = arm64 arm64e
 TWEAK_NAME = NotiBlock
+TARGET = iphone::13.0
 NotiBlock_FILES = Tweak.xm notiblockpref/NBPNotificationFilter.m notiblockpref/NBPAppInfo.m
 NotiBlock_LIBRARIES = applist
 NotiBlock_EXTRA_FRAMEWORKS += Cephei

Tweak.xm

@@ -49,7 +49,7 @@ NSMutableDictionary *filters;
 returns whether a message should be filtered based on some boolean logic of filters
 **/
 + (BOOL)doesMessageMatchFilterType:(BOOL)titleMatches arg2:(BOOL)subtitleMatches arg3:(BOOL)messageMatches  arg4:(int)filterType {
-	HBLogDebug(@"NOTIBLOCK - checking matched: title: %@, subtitle: %@, message: %@, filterType: %d",(titleMatches ? @"true" : @"false"), (subtitleMatches ? @"true" : @"false"), (messageMatches ? @"true" : @"false"), filterType);
+	NSLog(@"NOTIBLOCK - checking matched: title: %@, subtitle: %@, message: %@, filterType: %d",(titleMatches ? @"true" : @"false"), (subtitleMatches ? @"true" : @"false"), (messageMatches ? @"true" : @"false"), filterType);
 	if (filterType == 0) {
 		return titleMatches || titleMatches || messageMatches;
 	} else if (filterType == 1) {
@@ -66,42 +66,42 @@ returns whether a message should be filtered based on some boolean logic of filt
 returns whether we are currently inbetween the start time and and time and on a weekday set to true in an array of bools
 **/
 +(BOOL)areWeCurrentlyInSchedule:(NSDate *)startTime arg2:(NSDate *)endTime arg3:(NSArray *)weekdays {
-	HBLogDebug(@"NOTIBLOCK - checking schedule");
+	NSLog(@"NOTIBLOCK - checking schedule");
 
 	NSDate *curTime = [NSDate date];
 
 
 	NSCalendar *calendar = [NSCalendar currentCalendar];
 
 	NSDateComponents *startComponents = [calendar components:(NSCalendarUnitHour | NSCalendarUnitMinute) fromDate:startTime];
-	NSCalendar *newStartCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+	NSCalendar *newStartCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
 	NSDate *newStartTime = [newStartCalendar dateBySettingHour:[startComponents hour] minute:[startComponents minute] second:0 ofDate:curTime options:0];
 
 	NSDateComponents *endComponents = [calendar components:(NSCalendarUnitHour | NSCalendarUnitMinute) fromDate:endTime];
-	NSCalendar *newEndCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+	NSCalendar *newEndCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
 	NSDate *newEndTime = [newEndCalendar dateBySettingHour:[endComponents hour] minute:[endComponents minute] second:0 ofDate:curTime options:0];
 
 
 	NSInteger curWeekday = [[NSCalendar currentCalendar] component:NSCalendarUnitWeekday 
                                                    fromDate:curTime] - 1;
 	//day of week is not selected
 	if (![((NSNumber *)weekdays[curWeekday]) boolValue]) {
-		HBLogDebug(@"NOTIBLOCK - day is not active. skipping filter");
+		NSLog(@"NOTIBLOCK - day is not active. skipping filter");
 		return false;
 	} 
 
 	if ([[newStartTime earlierDate:newEndTime] isEqualToDate:newEndTime]) { //backwards (start time before end time)
-		HBLogDebug(@"NOTIBLOCK - backwards schedule mode");
+		NSLog(@"NOTIBLOCK - backwards schedule mode");
 		return [[newStartTime earlierDate:curTime] isEqualToDate:newStartTime] || [[newEndTime earlierDate:curTime] isEqualToDate:curTime];
 	} else { //regular, check for in between
 
-		HBLogDebug(@"NOTIBLOCK - regular schedule mode");
-		HBLogDebug(@"NOTIBLOCK - curTime: %f", [curTime timeIntervalSince1970]);	
-		HBLogDebug(@"NOTIBLOCK - newStartTime: %f", [newStartTime timeIntervalSince1970]);	
-		HBLogDebug(@"NOTIBLOCK - newEndTime: %f", [newEndTime timeIntervalSince1970]);	
+		NSLog(@"NOTIBLOCK - regular schedule mode");
+		NSLog(@"NOTIBLOCK - curTime: %f", [curTime timeIntervalSince1970]);	
+		NSLog(@"NOTIBLOCK - newStartTime: %f", [newStartTime timeIntervalSince1970]);	
+		NSLog(@"NOTIBLOCK - newEndTime: %f", [newEndTime timeIntervalSince1970]);	
 
-		HBLogDebug(@"NOTIBLOCK - is after start - %@",([[newStartTime earlierDate:curTime] isEqualToDate:newStartTime] ? @"true" : @"false"));
-		HBLogDebug(@"NOTIBLOCK - is before end - %@",([[newEndTime earlierDate:curTime] isEqualToDate:curTime] ? @"true" : @"false"));
+		NSLog(@"NOTIBLOCK - is after start - %@",([[newStartTime earlierDate:curTime] isEqualToDate:newStartTime] ? @"true" : @"false"));
+		NSLog(@"NOTIBLOCK - is before end - %@",([[newEndTime earlierDate:curTime] isEqualToDate:curTime] ? @"true" : @"false"));
 		return [[newEndTime earlierDate:curTime] isEqualToDate:curTime] && [[newStartTime earlierDate:curTime] isEqualToDate:newStartTime];
 	}
 }
@@ -118,17 +118,17 @@ returns whether we are currently inbetween the start time and and time and on a
 	//NSString *bulletinID = bulletin.bulletinID;
 	NSString *sectionId =  bulletin.sectionID;
 
-    // HBLogDebug(@"NOTIBLOCK - Entered publish bulletin for %@ with ID: %@ ", sectionId, bulletinID);
-	//HBLogDebug(@"NOTIBLOCK - BulletinID:%@         Title: %@      Subtitle: %@         Message: %@", bulletinID, title, subtitle, message );
+    // NSLog(@"NOTIBLOCK - Entered publish bulletin for %@ with ID: %@ ", sectionId, bulletinID);
+	//NSLog(@"NOTIBLOCK - BulletinID:%@         Title: %@      Subtitle: %@         Message: %@", bulletinID, title, subtitle, message );
 
 	BOOL filtered = NO;
 
 	if (filters == nil) {
-		HBLogDebug(@"NOTIBLOCK - No filters. returning");
+		NSLog(@"NOTIBLOCK - No filters. returning");
 		return 0;
 	}
 
-	HBLogDebug(@"NOTIBLOCK - loading all filters: %lu", (unsigned long)[filters count]);
+	NSLog(@"NOTIBLOCK - loading all filters: %lu", (unsigned long)[filters count]);
 
 	NSMutableArray *allFilters = [filters objectForKey:@""];
 	NSMutableArray *appFilters  = [filters objectForKey:sectionId];
@@ -141,7 +141,7 @@ returns whether we are currently inbetween the start time and and time and on a
 		allFilters = [[allFilters arrayByAddingObjectsFromArray:appFilters] mutableCopy];
 	}
 
-    HBLogDebug(@"NOTIBLOCK - loading relevant filters for --%@--: %lu",sectionId, (unsigned long)[allFilters count]);
+    NSLog(@"NOTIBLOCK - loading relevant filters for --%@--: %lu",sectionId, (unsigned long)[allFilters count]);
 
 	if (title == nil) {
 		title = @"";
@@ -161,7 +161,7 @@ returns whether we are currently inbetween the start time and and time and on a
 		//check for schedule and skip if not inside
 		if (filter.onSchedule && ![self areWeCurrentlyInSchedule:filter.startTime arg2:filter.endTime arg3:filter.weekDays]) {
 			//not inside schedule, skip
-			HBLogDebug(@"NOTIBLOCK - schedule was on, but we determined it is not currently active. skipping filter");
+			NSLog(@"NOTIBLOCK - schedule was on, but we determined it is not currently active. skipping filter");
 			continue;
 		}
 
@@ -172,43 +172,43 @@ returns whether we are currently inbetween the start time and and time and on a
 
 		//do filtering
 		if (filter.blockType == 0) { //starts with
-			HBLogDebug(@"NOTIBLOCK - checking if string starts with text");
+			NSLog(@"NOTIBLOCK - checking if string starts with text");
 			titleMatches = [title hasPrefix:filterText];
 			subtitleMatches = [subtitle hasPrefix:filterText];
 			messageMatches = [message hasPrefix:filterText];
 		} else if (filter.blockType == 1) { //ends with
-			HBLogDebug(@"NOTIBLOCK - checking if string end with text");
+			NSLog(@"NOTIBLOCK - checking if string end with text");
 			titleMatches = [title hasSuffix:filterText];
 			subtitleMatches = [subtitle hasSuffix:filterText];
 			messageMatches = [message hasSuffix:filterText];
 		} else if (filter.blockType == 2) { //contains
-			HBLogDebug(@"NOTIBLOCK - checking if string contains text");
+			NSLog(@"NOTIBLOCK - checking if string contains text");
 			titleMatches = [title rangeOfString:filterText].location != NSNotFound;
 			subtitleMatches = [subtitle rangeOfString:filterText].location != NSNotFound;
 			messageMatches = [message rangeOfString:filterText].location != NSNotFound;
 		} else if (filter.blockType == 3) { //exact text
-			HBLogDebug(@"NOTIBLOCK - checking if string matches text");
+			NSLog(@"NOTIBLOCK - checking if string matches text");
 			titleMatches = [title isEqualToString:filterText];
 			subtitleMatches = [subtitle isEqualToString:filterText];
 			messageMatches = [message isEqualToString:filterText];
 		} else if (filter.blockType == 4) { //regex
-			HBLogDebug(@"NOTIBLOCK - checking if string matches regex");
+			NSLog(@"NOTIBLOCK - checking if string matches regex");
 			NSPredicate *notifTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", filterText]; 
 			titleMatches = ![title isEqualToString:@""] && [notifTest evaluateWithObject: title];
 			subtitleMatches = ![subtitle isEqualToString:@""] && [notifTest evaluateWithObject: subtitle];
 			messageMatches = ![message isEqualToString:@""] && [notifTest evaluateWithObject: message];
 		} else if (filter.blockType == 5) { //always
-			HBLogDebug(@"NOTIBLOCK - app should always be filtered. filtering turned on");
+			NSLog(@"NOTIBLOCK - app should always be filtered. filtering turned on");
 			filtered = YES;
 		} 
 
 		if ([self doesMessageMatchFilterType:titleMatches arg2:subtitleMatches arg3:messageMatches  arg4:filter.filterType]) {
-			HBLogDebug(@"NOTIBLOCK - filtering was matched");
+			NSLog(@"NOTIBLOCK - filtering was matched");
 			filtered = YES;	
 		}
 
 		if (filter.whitelistMode) {
-			HBLogDebug(@"NOTIBLOCK - whitelist Mode on");
+			NSLog(@"NOTIBLOCK - whitelist Mode on");
 			filtered = !filtered;
 		}
 
@@ -242,7 +242,7 @@ Loads filters into memory from disk when springboard is loaded
 -(void)applicationDidFinishLaunching:(id)application {
     %orig;
 
-	HBLogDebug(@"NOTIBLOCK - springboard launch");
+	NSLog(@"NOTIBLOCK - springboard launch");
 
 	//do in background thread?
 	HBPreferences *defaults = [[HBPreferences  alloc] initWithIdentifier:@"com.shemeshapps.notiblock"];
@@ -252,11 +252,11 @@ Loads filters into memory from disk when springboard is loaded
    	bool enabled = [([prefDefaults objectForKey:@"enabled"] ?: @(YES)) boolValue];
 
 	//for (NSString *key in [[prefDefaults dictionaryRepresentation] allKeys]) {
-	//	HBLogDebug(@"NOTIBLOCK - pref keys: %@", key);
+	//	NSLog(@"NOTIBLOCK - pref keys: %@", key);
 	//}
 
 	if(!enabled) {
-		HBLogDebug(@"NOTIBLOCK - tweak disabled. not loading filters");
+		NSLog(@"NOTIBLOCK - tweak disabled. not loading filters");
 		return;
 	} 
 
@@ -278,10 +278,10 @@ Loads filters into memory from disk when springboard is loaded
 			NSMutableArray *appIdfilters = [filters objectForKey:dictKey];
 			[appIdfilters addObject:filter];
 
-			HBLogDebug(@"NOTIBLOCK - adding filter to dict for appkey: --%@--", dictKey);
+			NSLog(@"NOTIBLOCK - adding filter to dict for appkey: --%@--", dictKey);
 		}
 	} else {
-		HBLogDebug(@"NOTIBLOCK - springboard data load was nil");
+		NSLog(@"NOTIBLOCK - springboard data load was nil");
 	}
 }
 
@@ -307,7 +307,7 @@ Code to hide the banner dropdown view
 - (void)viewWillAppear:(BOOL)animated {
 	%orig;
 	if(self.view.hidden) {
-		HBLogDebug(@"NOTIBLOCK - NCNotificationShortLookViewController will appear - dismissing banner");
+		NSLog(@"NOTIBLOCK - NCNotificationShortLookViewController will appear - dismissing banner");
 		[self dismissViewControllerAnimated:NO completion:nil];
 	}
 }

control

@@ -1,7 +1,7 @@
 Package: com.shemeshapps.notiblock
 Name: NotiBlock
 Depends: mobilesubstrate, ws.hbang.common, preferenceloader, applist
-Version: 0.0.2
+Version: 0.0.3
 Architecture: iphoneos-arm
 Description: NotiBlock - Block notifications and take control of your digital well-being
  Push notifications are a gift and a curse, allowing you to get notified instantly of important information, but also opening a door into letting people and apps interrupt your life without your consent. The tools Apple gives us are not powerful enough to stop the spam of notifications, and required a more advanced tool set. 
@@ -17,7 +17,7 @@ Description: NotiBlock - Block notifications and take control of your digital we
 
  If you like this tweak and want to help support my development of free open source tweaks, feel free to donate: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YP44VSWZCTGE4&source=url
 
- Comptible with iOS 11 - 13.5
+ Comptible with iOS 13.0 - 14.4
 Maintainer: ShemeshApps
 Author: ShemeshApps
 Section: Tweaks

notiblockpref/NBPAppListTableViewCell.m

@@ -15,11 +15,11 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
         self.appIcon = [[UIImageView alloc] initWithFrame:CGRectMake(0,0,0,0)];
-        [self addSubview:self.appIcon];
+        [self.contentView addSubview:self.appIcon];
 
         self.appName = [[UILabel alloc] initWithFrame:CGRectMake(0,0,0,0)];
         self.appName.numberOfLines = 1;
-        [self addSubview:self.appName];
+        [self.contentView addSubview:self.appName];
     }
     return self;
 }

notiblockpref/NBPButtonTableViewCell.m

@@ -17,7 +17,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         self.buttonTextLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
         self.buttonTextLabel.text = @"Select App To Filter...";
         [self.buttonTextLabel setTextColor:[UIColor colorWithRed:0.0 green:122.0/255.0 blue:1.0 alpha:1.0]];
-        [self addSubview:self.buttonTextLabel];
+        [self.contentView addSubview:self.buttonTextLabel];
     }
     return self;
 }

notiblockpref/NBPDatePickerTableViewCell.m

@@ -15,18 +15,18 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
         self.descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(0,0,0,0)];
-        [self addSubview:self.descriptionLabel];
+        [self.contentView addSubview:self.descriptionLabel];
 
         self.selectedTimeLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
         self.selectedTimeLabel.textAlignment = NSTextAlignmentRight;
-        [self addSubview:self.selectedTimeLabel];
+        [self.contentView addSubview:self.selectedTimeLabel];
 
         self.datePicker = [[UIDatePicker alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
         self.datePicker.datePickerMode = UIDatePickerModeTime;
         [self.datePicker addTarget:self action:@selector(dateIsChanged:) forControlEvents:UIControlEventValueChanged];
         self.datePicker.hidden = YES;
 
-        [self addSubview:self.datePicker];
+        [self.contentView addSubview:self.datePicker];
         [self dateIsChanged:self.datePicker];
     }
     return self;

notiblockpref/NBPImageTableViewCell.m

@@ -22,7 +22,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         UIImage *myImage = [UIImage imageWithContentsOfFile:imagePath];
         self.cellImageView.contentMode = UIViewContentModeScaleAspectFit;
         self.cellImageView.image = myImage;
-        [self addSubview:self.cellImageView];
+        [self.contentView addSubview:self.cellImageView];
     }
     return self;
 }

notiblockpref/NBPPickerTableViewCell.m

@@ -16,19 +16,19 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
         self.descriptionLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
-        [self addSubview:self.descriptionLabel];
+        [self.contentView addSubview:self.descriptionLabel];
 
         self.selectedLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
         self.selectedLabel.textAlignment = NSTextAlignmentRight;
-        [self addSubview:self.selectedLabel];
+        [self.contentView addSubview:self.selectedLabel];
 
         self.picker = [[UIPickerView alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
         self.picker.dataSource = self;
         self.picker.delegate = self;
         self.picker.hidden = NO;
         self.picker.tag = 1;
 
-        [self addSubview:self.picker];
+        [self.contentView addSubview:self.picker];
     }
     return self;
 }

notiblockpref/NBPRootPreferenceController.m

@@ -23,7 +23,7 @@ -(void)viewFilters {
  }
 
 -(void)respringPhone {
-	HBLogDebug(@"NOTIBLOCK - respring phone");
+	NSLog(@"NOTIBLOCK - respring phone");
 	[HBRespringController respring];
 }
 

notiblockpref/NBPRootTableViewController.m

@@ -1,6 +1,3 @@
-int __isOSVersionAtLeast(int major, int minor, int patch) { NSOperatingSystemVersion version; version.majorVersion = major; version.minorVersion = minor; version.patchVersion = patch; return [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:version]; }
-
-
 #import "NBPRootTableViewController.h"
 #import <Cephei/HBPreferences.h>
 
@@ -30,9 +27,8 @@ - (void)addButtonTapped:(id)sender {
     NBPAddViewController *one = [[NBPAddViewController alloc]init];
 	one.delegate = self;
     UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:one];
-	if (@available(iOS 13, *)) {
-        navController.modalInPresentation = YES;
-	}
+    navController.modalInPresentation = YES;
+	
     [self presentViewController:navController animated:YES completion:nil];
 }
 
@@ -72,9 +68,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 	one.currentFilter = [self.filterList objectAtIndex:indexPath.row];
 
     UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:one];
-    if (@available(iOS 13, *)) {
-        navController.modalInPresentation = YES;
-	}
+    navController.modalInPresentation = YES;
+	
 	[self presentViewController:navController animated:YES completion:nil];
 	[tableView deselectRowAtIndexPath:indexPath animated:YES];
 }