ughhh

This reverts commit 31e49bedc7.

Makefile

@@ -1,4 +1,4 @@
-ARCHS = arm64
+ARCHS = arm64 arm64e
 TARGET = iphone:clang:11.2:11.2
 
 include $(THEOS)/makefiles/common.mk

README.md

@@ -3,3 +3,7 @@
 CustomNoOlderNotifications or CNON for short is the first tweak I ever made
 
 It has been tested on iOS 11 and 12 and works (don't know about iOS 13)
+
+## Installation
+1. Add https://yaypixxo.com/ to your sources in your package manager
+2. Search for and install CustomNoOlderNotifications

Tweak.xm

@@ -1,52 +1,78 @@
 @interface SBUILegibilityLabel : UIView
 @property (nonatomic,copy) NSString *string;
+@property (assign,nonatomic) long long textAlignment; 
 @end
 
-@interface NCNotificationListSectionRevealHintView : UIView
+@interface NCNotificationListSectionRevealHintView : UIView 
--(void)_updateHintTitle;
+@property (nonatomic,retain)SBUILegibilityLabel *revealHintTitle;
 @end
 
+// prefs
+@interface NSUserDefaults (CnonPrefs)
+-(id)objectForKey:(NSString *)key inDomain:(NSString *)domain;
+-(void)setObject:(id)value forKey:(NSString *)key inDomain:(NSString *)domain;
+@end
+
+static NSString *nsDomainString = @"com.yaypixxo.cnon";
+static NSString *nsNotificationString = @"com.yaypixxo.cnon/preferences.changed";
+
+// declare switch and string
 static BOOL enabled;
-static NSString* customText = @"";
+static NSString *customText = @"";
 
-#define kIdentifier @"com.yaypixxo.cnonprefs"
+static void notificationCallback(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef userInfo) {
-#define kSettingsChangedNotification (CFStringRef)@"com.yaypixxo.cnonprefs/ReloadPrefs"
+    NSNumber *eEnabled = (NSNumber *)[[NSUserDefaults standardUserDefaults] objectForKey:@"enabled" inDomain:nsDomainString];
-#define kSettingsPath @"/var/mobile/Library/Preferences/com.yaypixxo.cnonprefs.plist"
+    NSString *eCustomText = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"customText" inDomain:nsDomainString];
+
+    enabled = (eEnabled) ? [eEnabled boolValue]:NO;
+    customText = eCustomText; //(eCustomText) ? [eCustomText value]:@"";
+}
+
+/*#ifndef kCFCoreFoundationVersionNumber_iOS_13_0
+#define kCFCoreFoundationVersionNumber_iOS_13_0 1665.15
+#endif
+
+#define kSLSystemVersioniOS13 kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_13_0*/
+
+/*%group ios13
 
 %hook NCNotificationListSectionRevealHintView
 
--(void)layoutSubviews {
+-(void)setRevealHintTitle:(SBUILegibilityLabel *)arg1 {
-	%orig;
 	if (enabled) {
-		[MSHookIvar<UILabel *>(self, "_revealHintTitle") setString:customText];
+		arg1 = customText;
 	}
 }
 
 %end
 
-static void reloadPrefs() {
+%end*/
-	CFPreferencesAppSynchronize((CFStringRef)kIdentifier);
 
-	NSDictionary *prefs = nil;
+//%group ios12
-	if ([NSHomeDirectory() isEqualToString:@"/var/mobile"]) {
+
-		CFArrayRef keyList = CFPreferencesCopyKeyList((CFStringRef)kIdentifier, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+%hook NCNotificationListSectionRevealHintView
-		if (keyList != nil) {
+
-			prefs = (NSDictionary *)CFBridgingRelease(CFPreferencesCopyMultiple(keyList, (CFStringRef)kIdentifier, kCFPreferencesCurrentUser, kCFPreferencesAnyHost));
+-(void)didMoveToWindow {
-			if (prefs == nil)
+	%orig;
-				prefs = [NSDictionary dictionary];
+	if (enabled) {
-			CFRelease(keyList);
+		self.revealHintTitle.string = customText;
-		}
+		self.revealHintTitle.textAlignment = 1;
-	} 
-	else {
-		prefs = [NSDictionary dictionaryWithContentsOfFile:kSettingsPath];
 	}
+}
 
-	enabled = [prefs objectForKey:@"enabled"] ? [(NSNumber *)[prefs objectForKey:@"enabled"] boolValue] : true;
+%end
-	customText = [prefs objectForKey:@"customText"] ? [prefs objectForKey:@"customText"] : changeNotiTxt;
 
-	}
+//%end
 
 %ctor {
-    reloadPrefs();
+	// check iOS version
-    CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), NULL, (CFNotificationCallback)reloadPrefs, kSettingsChangedNotification, NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
+    /*if (kSLSystemVersioniOS13) {
+        %init(ios13);
+    }
+    else {
+        %init(ios12);
+    }*/
+
+    notificationCallback(NULL, NULL, NULL, NULL, NULL);
+    CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), NULL, notificationCallback, (CFStringRef)nsNotificationString, NULL, CFNotificationSuspensionBehaviorCoalesce);
 }

cnonprefs/CNONRootListController.m

@@ -1,5 +1,5 @@
 #include "CNONRootListController.h"
-#import <spawn.h>
+//#import <spawn.h>
 
 @implementation CNONRootListController
 
@@ -11,12 +11,8 @@
 	return _specifiers;
 }
 
-- (void)respring:(id)sender {
+- (void)apply {
 	[self.view endEditing:YES];
-	[NSThread sleepForTimeInterval:0.5f];
-	pid_t pid;
-    const char* args[] = {"killall", "backboardd", NULL};
-    posix_spawn(&pid, "/usr/bin/killall", NULL, NULL, (char* const*)args, NULL);
 }
 
 - (void)openTwitter {
@@ -24,18 +20,22 @@
 
 	if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"tweetbot:"]]) {
 		url = [NSURL URLWithString:@"tweetbot:///user_profile/Ra1nPix"];
-	} else if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"twitterrific:"]]) {
+	} 
+	else if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"twitterrific:"]]) {
 		url = [NSURL URLWithString:@"twitterrific:///profile?screen_name=Ra1nPix"];
-	} else if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"tweetings:"]]) {
+	} 
+	else if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"tweetings:"]]) {
 		url = [NSURL URLWithString:@"tweetings:///user?screen_name=Ra1nPix"];
-	} else if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"twitter:"]]) {
+	} 
+	else if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"twitter:"]]) {
 		url = [NSURL URLWithString:@"twitter://user?screen_name=Ra1nPix"];
-	} else {
+	} 
+	else {
 		url = [NSURL URLWithString:@"https://mobile.twitter.com/Ra1nPix"];
 	}
 
 	// [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
-	[[UIApplication sharedApplication] openURL:url];
+	[[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
 }
 
 @end

cnonprefs/Makefile

@@ -1,5 +1,5 @@
-ARCHS = arm64
+ARCHS = arm64 arm64e
-TARGET = iphone:11.2:11.2
+TARGET = iphone:clang:11.2:11.2
 
 include $(THEOS)/makefiles/common.mk
 

cnonprefs/Resources/Root.plist

@@ -10,25 +10,25 @@
 			<key>default</key>
 			<true/>
 			<key>defaults</key>
-			<string>com.yaypixxo.cnonprefs</string>
+			<string>com.yaypixxo.cnon</string>
 			<key>key</key>
 			<string>enabled</string>
 			<key>label</key>
 			<string>Enable</string>
 			<key>PostNotification</key>
-			<string>com.yaypixxo.cnonprefs/ReloadPrefs</string>
+			<string>com.yaypixxo.cnon/preferences.changed</string>
 		</dict>
 		<dict>
 			<key>cell</key>
 			<string>PSGroupCell</string>
 			<key>footerText</key>
-			<string>Type your custom message or leave blank to hide the text.</string>
+			<string>Type your custom text or leave blank to hide the text</string>
 		</dict>
 		<dict>
 			<key>cell</key>
 			<string>PSEditTextCell</string>
 			<key>defaults</key>
-			<string>com.yaypixxo.cnonprefs</string>
+			<string>com.yaypixxo.cnon</string>
 			<key>default</key>
 			<string></string>
 			<key>key</key>
@@ -36,21 +36,21 @@
 			<key>placeholder</key>
 			<string>custom text here</string>
 			<key>PostNotification</key>
-			<string>com.yaypixxo.cnonprefs/ReloadPrefs</string>
+			<string>com.yaypixxo.cnon/preferences.changed</string>
 		</dict>
 		<dict>
 			<key>cell</key>
 			<string>PSButtonCell</string>
 			<key>action</key>
-			<string>respring</string>
+			<string>apply</string>
 			<key>label</key>
-			<string>Respring</string>
+			<string>Apply</string>
 		</dict>
 		<dict>
 			<key>cell</key>
 			<string>PSGroupCell</string>
 			<key>label</key>
-			<string>Follow me</string>
+			<string>Follow me on Twitter</string>
 		</dict>
 		<dict>
 			<key>action</key>
@@ -64,6 +64,6 @@
 		</dict>
 	</array>
 	<key>title</key>
-	<string>CNON</string>
+	<string>CustomNoOlderNotifications</string>
 </dict>
 </plist>

control

@@ -1,10 +1,12 @@
 Package: com.yaypixxo.cnon
 Name: CustomNoOlderNotifications
 Depends: mobilesubstrate, preferenceloader
-Version: 2.0.0
+Version: 2.2.0
 Architecture: iphoneos-arm
 Description: Change the "No Older Notifications" text to a custom one!
-Depiction: http://yaypixxo.com/depiction?p=com.yaypixxo.cnon
+Icon: https://yaypixxo.com/assets/com.yaypixxo.cnon.png
+Depiction: https://yaypixxo.com/depictions?p=com.yaypixxo.cnon
+SileoDepiction: https://yaypixxo.com/sileo/com.yaypixxo.com
 Maintainer: YaYPIXXO <viggo@lekdorf.com>
 Author: YaYPIXXO <viggo@lekdorf.com>
 Section: Tweaks