fix: Fixes old preferences not being loaded properly

Author: RUGMJ

Sources/Pinnacle/Hooks/SBIconViewHook.x.swift

@@ -234,13 +234,19 @@ class SBIconViewHook: ClassHook<SBIconView> {
         activeIconList = nil
     }
 
+    // orion:new
+    func _pinnacleGetImageSize() -> CGRect {
+        return target.iconImageFrame()
+    }
+
     // orion:new
     /// Moves by the values provided
     func _pinnacleMoveWith(x: Int, y: Int) {
         let amount = _pinnacleGetEffectiveIconSpacing()
+        let imageSize = target._pinnacleGetImageSize()
 
-        let height = target.iconImageFrame.height + amount.height
-        let width = target.iconImageFrame.width + amount.width
+        let height = imageSize.height + amount.height
+        let width = imageSize.width + amount.width
 
         UIView.animate(
             withDuration: settings!.iconMoveDuration,

Sources/Pinnacle/PinnacleIconView.swift

@@ -10,6 +10,8 @@ class PinnacleIconView: SBIconView {
     var parentBundle = ""
     var index = 0
 
+    var imageView: UIImageView? = nil
+
     convenience init(fromIconView: SBIconView, xDir: Int, yDir: Int, bundle: String, parentBundle: String, index: Int, isEditing: Bool) {
         self.init()
         setupCommonProperties(xDir: xDir, yDir: yDir, bundle: bundle, parentBundle: parentBundle, index: index)
@@ -44,6 +46,8 @@ class PinnacleIconView: SBIconView {
 
         imageView.addGestureRecognizer(gesture)
 
+        self.imageView = imageView
+
         self.addSubview(imageView)
         self.isPlaceholder = true
 
@@ -80,6 +84,14 @@ class PinnacleIconView: SBIconView {
 
     }
 
+    override func _pinnacleGetImageSize() -> CGRect {
+        if let imageView = self.imageView {
+            return imageView.frame
+        } else {
+            return iconImageFrame()
+        }
+    }
+
     @objc func handleTap() { 
         let window = PinnacleIconPicker(frame: UIScreen.main.bounds)
         if !isPlaceholder {

Sources/Pinnacle/Tweak.x.swift

@@ -24,13 +24,8 @@ class Pinnacle: Tweak {
 
 
 func loadSettings() {
-    do {
-        try TweakPreferences.shared.loadSettings()
+        TweakPreferences.shared.loadSettings()
         settings = TweakPreferences.shared.settings
-    } catch {
-        remLog("Failed to load settings: \(error)")
-        remLog(error)
-    }
 }
 
 var active: Bool = false

Sources/Pinnacle/TweakPreferences.swift

@@ -7,9 +7,10 @@ final class TweakPreferences {
 
     private let preferencesFilePath = "/var/mobile/Library/Preferences/dev.rugmj.pinnacleprefs.plist"
 
-    func loadSettings() throws {
-        if let data = FileManager.default.contents(atPath: preferencesFilePath) {
-            self.settings = try PropertyListDecoder().decode(Settings.self, from: data)
+    func loadSettings() {
+        if let data = try? Data(contentsOf: URL(fileURLWithPath: preferencesFilePath)),
+           let decodedSettings = try? PropertyListDecoder().decode(Settings.self, from: data) {
+            self.settings = decodedSettings
         } else {
             self.settings = Settings()
         }

Sources/PinnacleC/include/Tweak.h

@@ -1,5 +1,4 @@
 #import <AltList/LSApplicationProxy+AltList.h>
-#include <UIKit/UIViewController.h>
 #import <Foundation/NSValue.h>
 #import <MobileCoreServices/LSApplicationProxy.h>
 #import <MobileCoreServices/LSApplicationWorkspace.h>
@@ -26,20 +25,24 @@ NSString *plusCirclePath();
 @end
 
 @interface SBFloatingDockController : UIViewController
-- (void)_presentFloatingDockIfDismissedAnimated:(BOOL)present completionHandler:(id)completionHandler;
-- (void)_dismissFloatingDockIfPresentedAnimated:(BOOL)dismiss completionHandler:(id)completionHandler;
+- (void)_presentFloatingDockIfDismissedAnimated:(BOOL)present
+                              completionHandler:(id)completionHandler;
+- (void)_dismissFloatingDockIfPresentedAnimated:(BOOL)dismiss
+                              completionHandler:(id)completionHandler;
 @end
 
 @interface SBFloatingDockBehaviorAssertion : NSObject
 @property SBFloatingDockController *floatingDockController;
 @end
 
 @interface SBHomeScreenViewController : UIViewController
-@property (nonatomic, strong, readwrite) SBFloatingDockBehaviorAssertion *homeScreenFloatingDockAssertion;
+@property(nonatomic, strong, readwrite)
+    SBFloatingDockBehaviorAssertion *homeScreenFloatingDockAssertion;
 @end
 
 @interface SBIconController ()
-@property (nonatomic, weak, readwrite) SBHomeScreenViewController *parentViewController;
+@property(nonatomic, weak, readwrite)
+    SBHomeScreenViewController *parentViewController;
 @end
 
 @interface SBRootFolderView ()
@@ -74,9 +77,9 @@ NSString *plusCirclePath();
 - (void)_pinnacleReset;
 - (void)_pinnacleCalculateRowAndColumn;
 - (CGSize)_pinnacleGetEffectiveIconSpacing;
+- (CGRect)_pinnacleGetImageSize;
 - (SBIconListView *)_pinnacleGetIconList;
-@property CGRect iconImageFrame;
-- (NSString *)applicationBundleIdentifierForShortcuts;
+- (CGRect)iconImageFrame;
 - (NSArray<NSNumber *> *)_pinnacleCalcAvailableDirections;
 - (void)_removeJitter;
 - (void)setEditing:(BOOL)arg;