Merge branch 'dev/v1.1.4'

jacobcxdev · Feb 6, 2021 · 82c2a92 · 82c2a92
2 parents 53d3777 + 464c33c
commit 82c2a92
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Preferences/Resources/Root.plist b/Preferences/Resources/Root.plist
@@ -349,6 +349,8 @@
             <string>Follow me on Twitter</string>
             <key>username</key>
             <string>jcxdev</string>
+            <key>avatarURL</key>
+            <string>https://github.com/jacobcxdev.png</string>
             <key>shouldDisplayAvatar</key>
             <true/>
         </dict>

diff --git a/layout/DEBIAN/control b/layout/DEBIAN/control
@@ -7,7 +7,7 @@ Description: Put the sparkle back in 'i'Message!
 Maintainer: JacobCXDev <[email protected]>
 Author: JacobCXDev <[email protected]>
 Section: Tweaks
-Version: 1.1.3
+Version: 1.1.4
 Tag: cydia::commercial, compatible::ios13
 Icon: https://chariz.com/cdn/icon/iris/[email protected]
 Depiction: https://repo.chariz.com/package/com.jacobcxdev.iris/
diff --git a/src/Objective-C/Controller/IrisTagCreationAlertCollectionViewController.x b/src/Objective-C/Controller/IrisTagCreationAlertCollectionViewController.x
@@ -117,8 +117,9 @@
             self.colourPickerWindow.windowLevel = UIWindowLevelAlert + 1000;
             [self.colourPickerWindow makeKeyAndVisible];
 
+            HBColorPickerConfiguration *configuration = [[HBColorPickerConfiguration alloc] initWithColor:buttonModel.tintColour];
             HBColorPickerViewController *colourPicker = [HBColorPickerViewController new];
-            colourPicker.color = buttonModel.tintColour;
+            colourPicker.configuration = configuration;
             colourPicker.delegate = self;
             [viewController presentViewController:colourPicker animated:true completion:nil];
         }

diff --git a/src/Objective-C/Tweak/Tweak.x b/src/Objective-C/Tweak/Tweak.x
@@ -7,18 +7,14 @@
 //
 
 #import "Tweak.h"
+#import <dlfcn.h>
 #import <LocalAuthentication/LocalAuthentication.h>
 #import <libJCX/Utilities.h>
 #import "../Globals.h"
 #import "../View/IrisAvatarCollectionViewCell.h"
 #import "../View/IrisRoundedBorderLayer.h"
 #import "../Controller/IrisTagListTableViewController.h"
 
-// MobileSubstrate
-
-typedef void (*MSHookMemory_t)(void *, const void *, size_t);
-static MSHookMemory_t MSHookMemory;
-
 // Static Variables
 
 static bool shouldOpenWithDefaults = false;
@@ -1230,7 +1226,6 @@ static NSMutableArray *filterConversations(NSArray *conversations, IrisConversat
             if (isQuickSwitchEnabled) {
                 void *handle = dlopen("/Library/Frameworks/CydiaSubstrate.framework/CydiaSubstrate", RTLD_NOW);
                 if (handle) {
-                    MSHookMemory = (MSHookMemory_t)(dlsym(handle, "MSHookMemory"));
                     favouritesSectionSym = MSFindSymbol(MSGetImageByName("/System/Library/PrivateFrameworks/ChatKit.framework/ChatKit"), "_CKAppStripFavoritesSection");
                     recentsSectionSym = MSFindSymbol(MSGetImageByName("/System/Library/PrivateFrameworks/ChatKit.framework/ChatKit"), "_CKAppStripRecentsSection");
                     const NSInteger favouritesSection = 1;