ARC

Author: PoomSmart

EmojiUIKit/UIKeyboardEmojiPreferences.h

@@ -8,4 +8,5 @@
 - (void)writeEmojiDefaults;
 - (NSInteger)selectedCategoryType;
 - (NSUInteger)emojiCategoryDefaultsIndex:(UIKeyboardEmojiCategory *)category;
+- (void)refreshLocalRecents;
 @end

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 - 2020 PoomSmart
+Copyright (c) 2018 - 2021 PoomSmart
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,5 +1,5 @@
 export PREFIX = $(THEOS)/toolchain/Xcode11.xctoolchain/usr/bin/
-PACKAGE_VERSION = 1.2.3
+PACKAGE_VERSION = 1.3.0
 
 ifeq ($(SIMULATOR),1)
 	TARGET = simulator:clang:latest:8.0
@@ -13,6 +13,7 @@ include $(THEOS)/makefiles/common.mk
 
 LIBRARY_NAME = libEmojiLibrary
 libEmojiLibrary_FILES = PSEmojiUtilities.m PSEmojiUtilities+Emoji.m PSEmojiUtilities+Functions.m
+libEmojiLibrary_CFLAGS = -fobjc-arc
 
 include $(THEOS_MAKE_PATH)/library.mk
 # make setup SIMULATOR=1 PL_SIMULATOR_VERSION=<target-iOS-version>

PSEmojiCategory.h

@@ -1,3 +1,5 @@
+#import <Foundation/Foundation.h>
+
 /*
    iOS 5 - 8.2
 
@@ -41,7 +43,7 @@
  */
 
 // Compatibility
-typedef NS_ENUM (NSInteger, IDXPSEmojiCategory) {
+typedef NS_ENUM(NSInteger, IDXPSEmojiCategory) {
     IDXPSEmojiCategoryRecent = 0,
     IDXPSEmojiCategoryPeople = 1,
     IDXPSEmojiCategoryNature = 2,
@@ -55,7 +57,7 @@ typedef NS_ENUM (NSInteger, IDXPSEmojiCategory) {
 };
 
 // iOS 9.1+
-typedef NS_ENUM (NSInteger, PSEmojiCategory) {
+typedef NS_ENUM(NSInteger, PSEmojiCategory) {
     PSEmojiCategoryRecent = 0,
     PSEmojiCategoryPeople = 1,
     PSEmojiCategoryNature = 2,

PSEmojiUtilities+Emoji.m

@@ -7,8 +7,8 @@ @implementation PSEmojiUtilities (Emoji)
 
 + (NSArray <NSString *> *)AsFakeSet:(NSArray <NSString *> *)array {
     if (IS_IOS_OR_NEWER(iOS_14_0))
-        return (NSArray <NSString *> *)[[NSOrderedSet orderedSetWithArray:array] retain];
-    return [array retain];
+        return (NSArray <NSString *> *)[NSOrderedSet orderedSetWithArray:array];
+    return array;
 }
 
 + (NSArray <NSString *> *)PeopleEmoji {

PSEmojiUtilities+Functions.m

@@ -1,10 +1,9 @@
 #import "../PSHeader/Misc.h"
+#import "../PSHeader/iOSVersions.h"
 #include "PSEmojiType.h"
 #include "Header.h"
 #import "PSEmojiUtilities.h"
 #import <TextInput/NSString+TIExtras.h>
-#import <objc/runtime.h>
-#import <version.h>
 
 @implementation PSEmojiUtilities (Functions)
 
@@ -307,8 +306,6 @@ + (NSString *)multiPersonStringForString:(NSString *)emojiString skinToneVariant
 + (NSArray <NSArray <NSString *> *> *)skinToneChooserVariantsForString:(NSString *)emojiString usesSilhouetteSpecifiers:(BOOL)silhouette {
     PSEmojiMultiPersonType multiPersonType = [self multiPersonTypeForString:emojiString];
     if (multiPersonType) {
-        // if ([self isHandholingCoupleEmoji:emojiString])
-        //     return [self skinToneChooserVariantsForHandHoldingCoupleType:multiPersonType];
         NSString *joiner = [self joiningStringForCoupleString:emojiString] ?: HANDSHAKE_JOINER;
         return [self skinToneChooserArraysForCoupleType:multiPersonType joiner:joiner];
     }
@@ -328,7 +325,7 @@ + (BOOL)hasSkin:(NSString *)emojiString {
 
 + (NSString *)changeEmojiSkin:(NSString *)emojiString toSkin:(NSString *)skin {
     NSString *oldSkin = [self getSkin:emojiString];
-    if (oldSkin == nil || stringEqual(oldSkin, skin))
+    if (oldSkin == nil || [oldSkin isEqualToString:skin])
         return emojiString;
     return [emojiString stringByReplacingOccurrencesOfString:oldSkin withString:skin options:NSLiteralSearch range:NSMakeRange(0, emojiString.length)];
 }
@@ -595,12 +592,13 @@ + (BOOL)hasDingbat:(NSString *)emojiString {
 
 + (UIKeyboardEmoji *)emojiWithString:(NSString *)emojiString {
     UIKeyboardEmoji *emoji = nil;
-    if ([NSClassFromString(@"UIKeyboardEmoji") respondsToSelector:@selector(emojiWithString:hasDingbat:)])
-        emoji = [NSClassFromString(@"UIKeyboardEmoji") emojiWithString:emojiString hasDingbat:[self hasDingbat:emojiString]];
-    else if ([NSClassFromString(@"UIKeyboardEmoji") respondsToSelector:@selector(emojiWithString:)])
-        emoji = [NSClassFromString(@"UIKeyboardEmoji") emojiWithString:emojiString];
+    Class UIKeyboardEmoji = NSClassFromString(@"UIKeyboardEmoji");
+    if ([UIKeyboardEmoji respondsToSelector:@selector(emojiWithString:hasDingbat:)])
+        emoji = [UIKeyboardEmoji emojiWithString:emojiString hasDingbat:[self hasDingbat:emojiString]];
+    else if ([UIKeyboardEmoji respondsToSelector:@selector(emojiWithString:)])
+        emoji = [UIKeyboardEmoji emojiWithString:emojiString];
     else
-        emoji = [[[NSClassFromString(@"UIKeyboardEmoji") alloc] initWithString:emojiString] autorelease];
+        emoji = [[UIKeyboardEmoji alloc] initWithString:emojiString];
     if ([emoji respondsToSelector:@selector(setSupportsSkin:)])
         emoji.supportsSkin = [self hasSkinToneVariants:emojiString];
     return emoji;
@@ -729,20 +727,23 @@ + (CGGlyph)emojiGlyphShift:(CGGlyph)glyph {
 #endif
 
 + (void)resetEmojiPreferences {
-    if (IS_IOS_OR_NEWER(iOS_11_0)) {
-        // Better approach: Reset keyboard dictionary
-        return;
+    id preferences = nil;
+    id innerPreferences = nil;
+    if (NSClassFromString(@"UIKeyboardEmojiPreferences")) {
+        preferences = innerPreferences = [NSClassFromString(@"UIKeyboardEmojiPreferences") sharedInstance];
+        if (IS_IOS_OR_NEWER(iOS_10_2))
+            innerPreferences = [preferences valueForKey:@"_preferencesClient"];
     }
-#if !__arm64e__
-    id preferences;
-    if (NSClassFromString(@"UIKeyboardEmojiPreferences"))
-        preferences = [NSClassFromString(@"UIKeyboardEmojiPreferences") sharedInstance];
     else
-        preferences = [NSClassFromString(@"UIKeyboardEmojiDefaultsController") sharedController];
-    object_setInstanceVariable(preferences, "_defaults", (void *)[[(UIKeyboardEmojiDefaultsController *)preferences emptyDefaultsDictionary] retain]);
-    object_setInstanceVariable(preferences, "_isDefaultDirty", (void *)YES);
+        preferences = innerPreferences = [NSClassFromString(@"UIKeyboardEmojiDefaultsController") sharedController];
+    if ([innerPreferences respondsToSelector:@selector(emptyDefaultsDictionary)])
+        [innerPreferences setValue:[(UIKeyboardEmojiDefaultsController *)preferences emptyDefaultsDictionary] forKey:@"_defaults"];
+    else
+        [innerPreferences resetEmojiDefaults];
+    [innerPreferences setValue:@(YES) forKey:@"_isDefaultDirty"];
+    if ([preferences respondsToSelector:@selector(refreshLocalRecents)])
+        [(UIKeyboardEmojiPreferences *)preferences refreshLocalRecents];
     [(UIKeyboardEmojiDefaultsController *)preferences writeEmojiDefaults];
-#endif
 }
 
 @end

control

@@ -8,3 +8,4 @@ Author: PoomSmart
 Section: Development
 Depiction: https://poomsmart.github.io/repo/depictions/emojilibrary.html
 SileoDepiction: https://poomsmart.github.io/repo/sileodepictions/emojilibrary.json
+Tag: role::developer