diff --git a/.DS_Store b/.DS_Store index 596bf42..5073825 100755 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0576cc7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +.theos/* diff --git a/.theos/_/DEBIAN/control b/.theos/_/DEBIAN/control index 9da6ae0..b53b921 100644 --- a/.theos/_/DEBIAN/control +++ b/.theos/_/DEBIAN/control @@ -1,10 +1,11 @@ -Package: com.burritoz.testing +Package: com.burritoz.dockify Name: Dockify Depends: mobilesubstrate, preferenceloader, com.saurik.substrate.safemode, ws.hbang.common (>=1.13) +Conflicts: com.burritoz.testing Architecture: iphoneos-arm Description: A very noice tweak to configure the dock a bit more... Maintainer: burrit0z Author: burrit0z Section: Tweaks -Version: 1.2-12+debug -Installed-Size: 412 +Version: 1.2-7+debug +Installed-Size: 356 diff --git a/.theos/_/Library/MobileSubstrate/DynamicLibraries/testing.dylib b/.theos/_/Library/MobileSubstrate/DynamicLibraries/testing.dylib deleted file mode 100755 index a0ef819..0000000 Binary files a/.theos/_/Library/MobileSubstrate/DynamicLibraries/testing.dylib and /dev/null differ diff --git a/.theos/_/Library/PreferenceBundles/dockifyprefs.bundle/Root.plist b/.theos/_/Library/PreferenceBundles/dockifyprefs.bundle/Root.plist index 89e5b60..0996b5a 100755 --- a/.theos/_/Library/PreferenceBundles/dockifyprefs.bundle/Root.plist +++ b/.theos/_/Library/PreferenceBundles/dockifyprefs.bundle/Root.plist @@ -14,7 +14,19 @@ icon icon.png packageIdentifier - com.burritoz.testing + com.burritoz.dockify + + + cell + PSGroupCell + label + Made by Burrit0z. Official repo: + + + cell + PSGroupCell + label + Burrit0z.github.com/repo cell @@ -98,7 +110,7 @@ cell PSGroupCell label - Max Dock Icons: + Custom Dock Icons (exact # you want): cell @@ -110,13 +122,13 @@ key setIconNumber min - 0 + 4 max - 20 + 10 isSegmented segmentCount - 20 + 6 showValue diff --git a/.theos/last_package b/.theos/last_package index e35f42c..b8f2d0f 100755 --- a/.theos/last_package +++ b/.theos/last_package @@ -1 +1 @@ -./packages/com.burritoz.testing_1.2-12+debug_iphoneos-arm.deb +./packages/com.burritoz.dockify_1.2-7+debug_iphoneos-arm.deb diff --git a/.theos/obj/debug/arm64/Tweak.x.cce53864.Td b/.theos/obj/debug/arm64/Tweak.x.cce53864.Td index 2558dd5..f241769 100755 --- a/.theos/obj/debug/arm64/Tweak.x.cce53864.Td +++ b/.theos/obj/debug/arm64/Tweak.x.cce53864.Td @@ -5,6 +5,7 @@ /Users/carsonzielinski/Documents/theos/include/_Prefix/IOSMacros.h \ /Users/carsonzielinski/Documents/theos/include/HBLog.h \ /Users/carsonzielinski/Documents/theos/include/CoreFoundation/CFLogUtilities.h \ + /Users/carsonzielinski/Documents/theos/include/SpringBoard/SpringBoard.h \ /Users/carsonzielinski/Documents/theos/vendor/lib/Cephei.framework/Headers/HBPreferences.h \ /Users/carsonzielinski/Documents/theos/include/substrate.h @@ -18,6 +19,8 @@ /Users/carsonzielinski/Documents/theos/include/CoreFoundation/CFLogUtilities.h: +/Users/carsonzielinski/Documents/theos/include/SpringBoard/SpringBoard.h: + /Users/carsonzielinski/Documents/theos/vendor/lib/Cephei.framework/Headers/HBPreferences.h: /Users/carsonzielinski/Documents/theos/include/substrate.h: diff --git a/.theos/obj/debug/arm64/Tweak.x.cce53864.o b/.theos/obj/debug/arm64/Tweak.x.cce53864.o index 68db515..c79e27e 100644 Binary files a/.theos/obj/debug/arm64/Tweak.x.cce53864.o and b/.theos/obj/debug/arm64/Tweak.x.cce53864.o differ diff --git a/.theos/obj/debug/arm64/Tweak.x.m b/.theos/obj/debug/arm64/Tweak.x.m index 1c8d9fb..2aa55c4 100755 --- a/.theos/obj/debug/arm64/Tweak.x.m +++ b/.theos/obj/debug/arm64/Tweak.x.m @@ -3,18 +3,11 @@ + +#include +#import #import -@interface SBDockView -@property (nonatomic, assign) double dockHeight; -@end - -@interface SBDockIconListView -@end - -@interface SBIconListView -@end - static BOOL transparent; static BOOL hidden; @@ -22,6 +15,9 @@ static double setHeight; static double customOpacity; static NSInteger setIconNumber; + + + HBPreferences *preferences; @@ -46,14 +42,15 @@ HBPreferences *preferences; #define _LOGOS_RETURN_RETAINED #endif -@class SBDockView; @class SBDockIconListView; -static void (*_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static double (*_logos_orig$_ungrouped$SBDockView$dockHeight)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double _logos_method$_ungrouped$SBDockView$dockHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double (*_logos_meta_orig$_ungrouped$SBDockView$defaultHeight)(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static double _logos_meta_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSInteger (*_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons)(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSInteger _logos_meta_method$_ungrouped$SBDockIconListView$maxIcons(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static BOOL (*_logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$)(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL, unsigned long long); static BOOL _logos_method$_ungrouped$SBDockIconListView$allowsAddingIconCount$(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL, unsigned long long); +@class SBDockIconListView; @class SBDockView; +static void (*_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static double (*_logos_orig$_ungrouped$SBDockView$dockHeight)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double _logos_method$_ungrouped$SBDockView$dockHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double (*_logos_orig$_ungrouped$SBDockView$defaultHeight)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double _logos_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static NSInteger (*_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons)(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSInteger _logos_meta_method$_ungrouped$SBDockIconListView$maxIcons(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSUInteger (*_logos_orig$_ungrouped$SBDockIconListView$maximumIconCount)(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL); static NSUInteger _logos_method$_ungrouped$SBDockIconListView$maximumIconCount(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL); -#line 27 "Tweak.x" +#line 23 "Tweak.x" -static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd, double arg1) { + +static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd, double arg1) { if (transparent == NO && hidden == NO) { _logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$(self, _cmd, customOpacity); }else if (transparent || hidden) { @@ -65,12 +62,22 @@ static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_ static double _logos_method$_ungrouped$SBDockView$dockHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { + if (hidden) { + return (0); + } else { return (_logos_orig$_ungrouped$SBDockView$dockHeight(self, _cmd)*setHeight); } +} -static double _logos_meta_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { - return (_logos_meta_orig$_ungrouped$SBDockView$defaultHeight(self, _cmd)*setHeight); + +static double _logos_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { + if (hidden) { + return (0); + } else { + return (_logos_orig$_ungrouped$SBDockView$defaultHeight(self, _cmd)*setHeight); } +} + @@ -85,32 +92,34 @@ static NSInteger _logos_meta_method$_ungrouped$SBDockIconListView$maxIcons(_LOGO } } -static BOOL _logos_method$_ungrouped$SBDockIconListView$allowsAddingIconCount$(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd, unsigned long long arg1) { + +static NSUInteger _logos_method$_ungrouped$SBDockIconListView$maximumIconCount(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { if (hidden) { return (0); - _logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$(self, _cmd, NO); } else { - _logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$(self, _cmd, YES); return (setIconNumber); } } -static __attribute__((constructor)) void _logosLocalCtor_4c282753(int __unused argc, char __unused **argv, char __unused **envp) { +static __attribute__((constructor)) void _logosLocalCtor_d89c9af8(int __unused argc, char __unused **argv, char __unused **envp) { preferences = [[HBPreferences alloc] initWithIdentifier:@"com.burritoz.dockifyprefs"]; [preferences registerDefaults:@{ @"setHeight": @1, @"customOpacity": @1, @"hidden": @NO, - @"setIconNumber": @4, + + }]; [preferences registerBool:&transparent default:YES forKey:@"transparent"]; [preferences registerBool:&hidden default:NO forKey:@"hidden"]; [preferences registerDouble:(double *)&setHeight default:1 forKey:@"setHeight"]; [preferences registerDouble:(double *)&customOpacity default:1 forKey:@"customOpacity"]; [preferences registerInteger:(NSInteger *)&setIconNumber default:4 forKey:@"setIconNumber"]; + + } static __attribute__((constructor)) void _logosLocalInit() { -{Class _logos_class$_ungrouped$SBDockView = objc_getClass("SBDockView"); Class _logos_metaclass$_ungrouped$SBDockView = object_getClass(_logos_class$_ungrouped$SBDockView); MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(setBackgroundAlpha:), (IMP)&_logos_method$_ungrouped$SBDockView$setBackgroundAlpha$, (IMP*)&_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$);MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(dockHeight), (IMP)&_logos_method$_ungrouped$SBDockView$dockHeight, (IMP*)&_logos_orig$_ungrouped$SBDockView$dockHeight);MSHookMessageEx(_logos_metaclass$_ungrouped$SBDockView, @selector(defaultHeight), (IMP)&_logos_meta_method$_ungrouped$SBDockView$defaultHeight, (IMP*)&_logos_meta_orig$_ungrouped$SBDockView$defaultHeight);Class _logos_class$_ungrouped$SBDockIconListView = objc_getClass("SBDockIconListView"); Class _logos_metaclass$_ungrouped$SBDockIconListView = object_getClass(_logos_class$_ungrouped$SBDockIconListView); MSHookMessageEx(_logos_metaclass$_ungrouped$SBDockIconListView, @selector(maxIcons), (IMP)&_logos_meta_method$_ungrouped$SBDockIconListView$maxIcons, (IMP*)&_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons);MSHookMessageEx(_logos_class$_ungrouped$SBDockIconListView, @selector(allowsAddingIconCount:), (IMP)&_logos_method$_ungrouped$SBDockIconListView$allowsAddingIconCount$, (IMP*)&_logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$);} } -#line 88 "Tweak.x" +{Class _logos_class$_ungrouped$SBDockView = objc_getClass("SBDockView"); MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(setBackgroundAlpha:), (IMP)&_logos_method$_ungrouped$SBDockView$setBackgroundAlpha$, (IMP*)&_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$);MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(dockHeight), (IMP)&_logos_method$_ungrouped$SBDockView$dockHeight, (IMP*)&_logos_orig$_ungrouped$SBDockView$dockHeight);MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(defaultHeight), (IMP)&_logos_method$_ungrouped$SBDockView$defaultHeight, (IMP*)&_logos_orig$_ungrouped$SBDockView$defaultHeight);Class _logos_class$_ungrouped$SBDockIconListView = objc_getClass("SBDockIconListView"); Class _logos_metaclass$_ungrouped$SBDockIconListView = object_getClass(_logos_class$_ungrouped$SBDockIconListView); MSHookMessageEx(_logos_metaclass$_ungrouped$SBDockIconListView, @selector(maxIcons), (IMP)&_logos_meta_method$_ungrouped$SBDockIconListView$maxIcons, (IMP*)&_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons);MSHookMessageEx(_logos_class$_ungrouped$SBDockIconListView, @selector(maximumIconCount), (IMP)&_logos_method$_ungrouped$SBDockIconListView$maximumIconCount, (IMP*)&_logos_orig$_ungrouped$SBDockIconListView$maximumIconCount);} } +#line 97 "Tweak.x" diff --git a/.theos/obj/debug/arm64/testing.dylib b/.theos/obj/debug/arm64/testing.dylib index b779c7e..d2b64b4 100755 Binary files a/.theos/obj/debug/arm64/testing.dylib and b/.theos/obj/debug/arm64/testing.dylib differ diff --git a/.theos/obj/debug/arm64/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib b/.theos/obj/debug/arm64/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib index 60927c6..ab5e25e 100755 Binary files a/.theos/obj/debug/arm64/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib and b/.theos/obj/debug/arm64/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib differ diff --git a/.theos/obj/debug/arm64e/Tweak.x.1ad82ea2.Td b/.theos/obj/debug/arm64e/Tweak.x.1ad82ea2.Td index fc280f7..c52f842 100755 --- a/.theos/obj/debug/arm64e/Tweak.x.1ad82ea2.Td +++ b/.theos/obj/debug/arm64e/Tweak.x.1ad82ea2.Td @@ -5,6 +5,7 @@ /Users/carsonzielinski/Documents/theos/include/_Prefix/IOSMacros.h \ /Users/carsonzielinski/Documents/theos/include/HBLog.h \ /Users/carsonzielinski/Documents/theos/include/CoreFoundation/CFLogUtilities.h \ + /Users/carsonzielinski/Documents/theos/include/SpringBoard/SpringBoard.h \ /Users/carsonzielinski/Documents/theos/vendor/lib/Cephei.framework/Headers/HBPreferences.h \ /Users/carsonzielinski/Documents/theos/include/substrate.h @@ -18,6 +19,8 @@ /Users/carsonzielinski/Documents/theos/include/CoreFoundation/CFLogUtilities.h: +/Users/carsonzielinski/Documents/theos/include/SpringBoard/SpringBoard.h: + /Users/carsonzielinski/Documents/theos/vendor/lib/Cephei.framework/Headers/HBPreferences.h: /Users/carsonzielinski/Documents/theos/include/substrate.h: diff --git a/.theos/obj/debug/arm64e/Tweak.x.1ad82ea2.o b/.theos/obj/debug/arm64e/Tweak.x.1ad82ea2.o index 34bb156..b7ab861 100644 Binary files a/.theos/obj/debug/arm64e/Tweak.x.1ad82ea2.o and b/.theos/obj/debug/arm64e/Tweak.x.1ad82ea2.o differ diff --git a/.theos/obj/debug/arm64e/Tweak.x.m b/.theos/obj/debug/arm64e/Tweak.x.m index 71eb5e7..6ff3779 100755 --- a/.theos/obj/debug/arm64e/Tweak.x.m +++ b/.theos/obj/debug/arm64e/Tweak.x.m @@ -3,18 +3,11 @@ + +#include +#import #import -@interface SBDockView -@property (nonatomic, assign) double dockHeight; -@end - -@interface SBDockIconListView -@end - -@interface SBIconListView -@end - static BOOL transparent; static BOOL hidden; @@ -22,6 +15,9 @@ static double setHeight; static double customOpacity; static NSInteger setIconNumber; + + + HBPreferences *preferences; @@ -46,14 +42,15 @@ HBPreferences *preferences; #define _LOGOS_RETURN_RETAINED #endif -@class SBDockIconListView; @class SBDockView; -static void (*_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static double (*_logos_orig$_ungrouped$SBDockView$dockHeight)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double _logos_method$_ungrouped$SBDockView$dockHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double (*_logos_meta_orig$_ungrouped$SBDockView$defaultHeight)(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static double _logos_meta_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSInteger (*_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons)(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSInteger _logos_meta_method$_ungrouped$SBDockIconListView$maxIcons(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static BOOL (*_logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$)(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL, unsigned long long); static BOOL _logos_method$_ungrouped$SBDockIconListView$allowsAddingIconCount$(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL, unsigned long long); +@class SBDockView; @class SBDockIconListView; +static void (*_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static double (*_logos_orig$_ungrouped$SBDockView$dockHeight)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double _logos_method$_ungrouped$SBDockView$dockHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double (*_logos_orig$_ungrouped$SBDockView$defaultHeight)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double _logos_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static NSInteger (*_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons)(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSInteger _logos_meta_method$_ungrouped$SBDockIconListView$maxIcons(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSUInteger (*_logos_orig$_ungrouped$SBDockIconListView$maximumIconCount)(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL); static NSUInteger _logos_method$_ungrouped$SBDockIconListView$maximumIconCount(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL); -#line 27 "Tweak.x" +#line 23 "Tweak.x" -static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd, double arg1) { + +static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd, double arg1) { if (transparent == NO && hidden == NO) { _logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$(self, _cmd, customOpacity); }else if (transparent || hidden) { @@ -65,12 +62,22 @@ static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_ static double _logos_method$_ungrouped$SBDockView$dockHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { + if (hidden) { + return (0); + } else { return (_logos_orig$_ungrouped$SBDockView$dockHeight(self, _cmd)*setHeight); } +} -static double _logos_meta_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { - return (_logos_meta_orig$_ungrouped$SBDockView$defaultHeight(self, _cmd)*setHeight); + +static double _logos_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { + if (hidden) { + return (0); + } else { + return (_logos_orig$_ungrouped$SBDockView$defaultHeight(self, _cmd)*setHeight); } +} + @@ -85,32 +92,34 @@ static NSInteger _logos_meta_method$_ungrouped$SBDockIconListView$maxIcons(_LOGO } } -static BOOL _logos_method$_ungrouped$SBDockIconListView$allowsAddingIconCount$(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd, unsigned long long arg1) { + +static NSUInteger _logos_method$_ungrouped$SBDockIconListView$maximumIconCount(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { if (hidden) { return (0); - _logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$(self, _cmd, NO); } else { - _logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$(self, _cmd, YES); return (setIconNumber); } } -static __attribute__((constructor)) void _logosLocalCtor_4c282753(int __unused argc, char __unused **argv, char __unused **envp) { +static __attribute__((constructor)) void _logosLocalCtor_d89c9af8(int __unused argc, char __unused **argv, char __unused **envp) { preferences = [[HBPreferences alloc] initWithIdentifier:@"com.burritoz.dockifyprefs"]; [preferences registerDefaults:@{ @"setHeight": @1, @"customOpacity": @1, @"hidden": @NO, - @"setIconNumber": @4, + + }]; [preferences registerBool:&transparent default:YES forKey:@"transparent"]; [preferences registerBool:&hidden default:NO forKey:@"hidden"]; [preferences registerDouble:(double *)&setHeight default:1 forKey:@"setHeight"]; [preferences registerDouble:(double *)&customOpacity default:1 forKey:@"customOpacity"]; [preferences registerInteger:(NSInteger *)&setIconNumber default:4 forKey:@"setIconNumber"]; + + } static __attribute__((constructor)) void _logosLocalInit() { -{Class _logos_class$_ungrouped$SBDockView = objc_getClass("SBDockView"); Class _logos_metaclass$_ungrouped$SBDockView = object_getClass(_logos_class$_ungrouped$SBDockView); MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(setBackgroundAlpha:), (IMP)&_logos_method$_ungrouped$SBDockView$setBackgroundAlpha$, (IMP*)&_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$);MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(dockHeight), (IMP)&_logos_method$_ungrouped$SBDockView$dockHeight, (IMP*)&_logos_orig$_ungrouped$SBDockView$dockHeight);MSHookMessageEx(_logos_metaclass$_ungrouped$SBDockView, @selector(defaultHeight), (IMP)&_logos_meta_method$_ungrouped$SBDockView$defaultHeight, (IMP*)&_logos_meta_orig$_ungrouped$SBDockView$defaultHeight);Class _logos_class$_ungrouped$SBDockIconListView = objc_getClass("SBDockIconListView"); Class _logos_metaclass$_ungrouped$SBDockIconListView = object_getClass(_logos_class$_ungrouped$SBDockIconListView); MSHookMessageEx(_logos_metaclass$_ungrouped$SBDockIconListView, @selector(maxIcons), (IMP)&_logos_meta_method$_ungrouped$SBDockIconListView$maxIcons, (IMP*)&_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons);MSHookMessageEx(_logos_class$_ungrouped$SBDockIconListView, @selector(allowsAddingIconCount:), (IMP)&_logos_method$_ungrouped$SBDockIconListView$allowsAddingIconCount$, (IMP*)&_logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$);} } -#line 88 "Tweak.x" +{Class _logos_class$_ungrouped$SBDockView = objc_getClass("SBDockView"); MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(setBackgroundAlpha:), (IMP)&_logos_method$_ungrouped$SBDockView$setBackgroundAlpha$, (IMP*)&_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$);MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(dockHeight), (IMP)&_logos_method$_ungrouped$SBDockView$dockHeight, (IMP*)&_logos_orig$_ungrouped$SBDockView$dockHeight);MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(defaultHeight), (IMP)&_logos_method$_ungrouped$SBDockView$defaultHeight, (IMP*)&_logos_orig$_ungrouped$SBDockView$defaultHeight);Class _logos_class$_ungrouped$SBDockIconListView = objc_getClass("SBDockIconListView"); Class _logos_metaclass$_ungrouped$SBDockIconListView = object_getClass(_logos_class$_ungrouped$SBDockIconListView); MSHookMessageEx(_logos_metaclass$_ungrouped$SBDockIconListView, @selector(maxIcons), (IMP)&_logos_meta_method$_ungrouped$SBDockIconListView$maxIcons, (IMP*)&_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons);MSHookMessageEx(_logos_class$_ungrouped$SBDockIconListView, @selector(maximumIconCount), (IMP)&_logos_method$_ungrouped$SBDockIconListView$maximumIconCount, (IMP*)&_logos_orig$_ungrouped$SBDockIconListView$maximumIconCount);} } +#line 97 "Tweak.x" diff --git a/.theos/obj/debug/arm64e/testing.dylib b/.theos/obj/debug/arm64e/testing.dylib index 62db26f..4d3def7 100755 Binary files a/.theos/obj/debug/arm64e/testing.dylib and b/.theos/obj/debug/arm64e/testing.dylib differ diff --git a/.theos/obj/debug/arm64e/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib b/.theos/obj/debug/arm64e/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib index 89df88a..14ff91f 100755 Binary files a/.theos/obj/debug/arm64e/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib and b/.theos/obj/debug/arm64e/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib differ diff --git a/.theos/obj/debug/armv7s/Tweak.x.8f98122a.Td b/.theos/obj/debug/armv7s/Tweak.x.8f98122a.Td old mode 100755 new mode 100644 index 7a4f829..ba7be37 --- a/.theos/obj/debug/armv7s/Tweak.x.8f98122a.Td +++ b/.theos/obj/debug/armv7s/Tweak.x.8f98122a.Td @@ -5,6 +5,8 @@ /Users/carsonzielinski/Documents/theos/include/_Prefix/IOSMacros.h \ /Users/carsonzielinski/Documents/theos/include/HBLog.h \ /Users/carsonzielinski/Documents/theos/include/CoreFoundation/CFLogUtilities.h \ + /Users/carsonzielinski/Documents/theos/include/SpringBoard/SpringBoard.h \ + /Users/carsonzielinski/Documents/testing/dockifyHeaders.h \ /Users/carsonzielinski/Documents/theos/vendor/lib/Cephei.framework/Headers/HBPreferences.h \ /Users/carsonzielinski/Documents/theos/include/substrate.h @@ -18,6 +20,10 @@ /Users/carsonzielinski/Documents/theos/include/CoreFoundation/CFLogUtilities.h: +/Users/carsonzielinski/Documents/theos/include/SpringBoard/SpringBoard.h: + +/Users/carsonzielinski/Documents/testing/dockifyHeaders.h: + /Users/carsonzielinski/Documents/theos/vendor/lib/Cephei.framework/Headers/HBPreferences.h: /Users/carsonzielinski/Documents/theos/include/substrate.h: diff --git a/.theos/obj/debug/armv7s/Tweak.x.8f98122a.o b/.theos/obj/debug/armv7s/Tweak.x.8f98122a.o index 4c53291..b998b6d 100644 Binary files a/.theos/obj/debug/armv7s/Tweak.x.8f98122a.o and b/.theos/obj/debug/armv7s/Tweak.x.8f98122a.o differ diff --git a/.theos/obj/debug/armv7s/Tweak.x.m b/.theos/obj/debug/armv7s/Tweak.x.m index 1c8d9fb..338e663 100755 --- a/.theos/obj/debug/armv7s/Tweak.x.m +++ b/.theos/obj/debug/armv7s/Tweak.x.m @@ -3,18 +3,11 @@ +#include +#import +#import "dockifyHeaders.h" #import -@interface SBDockView -@property (nonatomic, assign) double dockHeight; -@end - -@interface SBDockIconListView -@end - -@interface SBIconListView -@end - static BOOL transparent; static BOOL hidden; @@ -22,6 +15,12 @@ static double setHeight; static double customOpacity; static NSInteger setIconNumber; + + +@implementation SBDockIconListView +@synthesize minimumNumberOfIconsToDistributeEvenlyToEdges=_minimumNumberOfIconsToDistributeEvenlyToEdges; +@end + HBPreferences *preferences; @@ -47,13 +46,14 @@ HBPreferences *preferences; #endif @class SBDockView; @class SBDockIconListView; -static void (*_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static double (*_logos_orig$_ungrouped$SBDockView$dockHeight)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double _logos_method$_ungrouped$SBDockView$dockHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double (*_logos_meta_orig$_ungrouped$SBDockView$defaultHeight)(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static double _logos_meta_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSInteger (*_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons)(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSInteger _logos_meta_method$_ungrouped$SBDockIconListView$maxIcons(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static BOOL (*_logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$)(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL, unsigned long long); static BOOL _logos_method$_ungrouped$SBDockIconListView$allowsAddingIconCount$(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL, unsigned long long); +static void (*_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL, double); static double (*_logos_orig$_ungrouped$SBDockView$dockHeight)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double _logos_method$_ungrouped$SBDockView$dockHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double (*_logos_orig$_ungrouped$SBDockView$defaultHeight)(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static double _logos_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST, SEL); static NSInteger (*_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons)(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static NSInteger _logos_meta_method$_ungrouped$SBDockIconListView$maxIcons(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST, SEL); static unsigned long long (*_logos_orig$_ungrouped$SBDockIconListView$maximumIconCount)(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL); static unsigned long long _logos_method$_ungrouped$SBDockIconListView$maximumIconCount(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL); static unsigned long long (*_logos_orig$_ungrouped$SBDockIconListView$minimumNumberOfIconsToDistributeEvenlyToEdges)(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL); static unsigned long long _logos_method$_ungrouped$SBDockIconListView$minimumNumberOfIconsToDistributeEvenlyToEdges(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST, SEL); -#line 27 "Tweak.x" +#line 26 "Tweak.x" -static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd, double arg1) { + +static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd, double arg1) { if (transparent == NO && hidden == NO) { _logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$(self, _cmd, customOpacity); }else if (transparent || hidden) { @@ -65,12 +65,22 @@ static void _logos_method$_ungrouped$SBDockView$setBackgroundAlpha$(_LOGOS_SELF_ static double _logos_method$_ungrouped$SBDockView$dockHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { + if (hidden) { + return (0); + } else { return (_logos_orig$_ungrouped$SBDockView$dockHeight(self, _cmd)*setHeight); } +} -static double _logos_meta_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL Class _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { - return (_logos_meta_orig$_ungrouped$SBDockView$defaultHeight(self, _cmd)*setHeight); + +static double _logos_method$_ungrouped$SBDockView$defaultHeight(_LOGOS_SELF_TYPE_NORMAL SBDockView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { + if (hidden) { + return (0); + } else { + return (_logos_orig$_ungrouped$SBDockView$defaultHeight(self, _cmd)*setHeight); } +} + @@ -85,32 +95,37 @@ static NSInteger _logos_meta_method$_ungrouped$SBDockIconListView$maxIcons(_LOGO } } -static BOOL _logos_method$_ungrouped$SBDockIconListView$allowsAddingIconCount$(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd, unsigned long long arg1) { + +static unsigned long long _logos_method$_ungrouped$SBDockIconListView$maximumIconCount(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { if (hidden) { return (0); - _logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$(self, _cmd, NO); } else { - _logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$(self, _cmd, YES); return (setIconNumber); } } +static unsigned long long _logos_method$_ungrouped$SBDockIconListView$minimumNumberOfIconsToDistributeEvenlyToEdges(_LOGOS_SELF_TYPE_NORMAL SBDockIconListView* _LOGOS_SELF_CONST __unused self, SEL __unused _cmd) { + return(3); +} -static __attribute__((constructor)) void _logosLocalCtor_4c282753(int __unused argc, char __unused **argv, char __unused **envp) { +static __attribute__((constructor)) void _logosLocalCtor_a036efd8(int __unused argc, char __unused **argv, char __unused **envp) { preferences = [[HBPreferences alloc] initWithIdentifier:@"com.burritoz.dockifyprefs"]; [preferences registerDefaults:@{ @"setHeight": @1, @"customOpacity": @1, @"hidden": @NO, - @"setIconNumber": @4, + + }]; [preferences registerBool:&transparent default:YES forKey:@"transparent"]; [preferences registerBool:&hidden default:NO forKey:@"hidden"]; [preferences registerDouble:(double *)&setHeight default:1 forKey:@"setHeight"]; [preferences registerDouble:(double *)&customOpacity default:1 forKey:@"customOpacity"]; [preferences registerInteger:(NSInteger *)&setIconNumber default:4 forKey:@"setIconNumber"]; + + } static __attribute__((constructor)) void _logosLocalInit() { -{Class _logos_class$_ungrouped$SBDockView = objc_getClass("SBDockView"); Class _logos_metaclass$_ungrouped$SBDockView = object_getClass(_logos_class$_ungrouped$SBDockView); MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(setBackgroundAlpha:), (IMP)&_logos_method$_ungrouped$SBDockView$setBackgroundAlpha$, (IMP*)&_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$);MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(dockHeight), (IMP)&_logos_method$_ungrouped$SBDockView$dockHeight, (IMP*)&_logos_orig$_ungrouped$SBDockView$dockHeight);MSHookMessageEx(_logos_metaclass$_ungrouped$SBDockView, @selector(defaultHeight), (IMP)&_logos_meta_method$_ungrouped$SBDockView$defaultHeight, (IMP*)&_logos_meta_orig$_ungrouped$SBDockView$defaultHeight);Class _logos_class$_ungrouped$SBDockIconListView = objc_getClass("SBDockIconListView"); Class _logos_metaclass$_ungrouped$SBDockIconListView = object_getClass(_logos_class$_ungrouped$SBDockIconListView); MSHookMessageEx(_logos_metaclass$_ungrouped$SBDockIconListView, @selector(maxIcons), (IMP)&_logos_meta_method$_ungrouped$SBDockIconListView$maxIcons, (IMP*)&_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons);MSHookMessageEx(_logos_class$_ungrouped$SBDockIconListView, @selector(allowsAddingIconCount:), (IMP)&_logos_method$_ungrouped$SBDockIconListView$allowsAddingIconCount$, (IMP*)&_logos_orig$_ungrouped$SBDockIconListView$allowsAddingIconCount$);} } -#line 88 "Tweak.x" +{Class _logos_class$_ungrouped$SBDockView = objc_getClass("SBDockView"); MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(setBackgroundAlpha:), (IMP)&_logos_method$_ungrouped$SBDockView$setBackgroundAlpha$, (IMP*)&_logos_orig$_ungrouped$SBDockView$setBackgroundAlpha$);MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(dockHeight), (IMP)&_logos_method$_ungrouped$SBDockView$dockHeight, (IMP*)&_logos_orig$_ungrouped$SBDockView$dockHeight);MSHookMessageEx(_logos_class$_ungrouped$SBDockView, @selector(defaultHeight), (IMP)&_logos_method$_ungrouped$SBDockView$defaultHeight, (IMP*)&_logos_orig$_ungrouped$SBDockView$defaultHeight);Class _logos_class$_ungrouped$SBDockIconListView = objc_getClass("SBDockIconListView"); Class _logos_metaclass$_ungrouped$SBDockIconListView = object_getClass(_logos_class$_ungrouped$SBDockIconListView); MSHookMessageEx(_logos_metaclass$_ungrouped$SBDockIconListView, @selector(maxIcons), (IMP)&_logos_meta_method$_ungrouped$SBDockIconListView$maxIcons, (IMP*)&_logos_meta_orig$_ungrouped$SBDockIconListView$maxIcons);MSHookMessageEx(_logos_class$_ungrouped$SBDockIconListView, @selector(maximumIconCount), (IMP)&_logos_method$_ungrouped$SBDockIconListView$maximumIconCount, (IMP*)&_logos_orig$_ungrouped$SBDockIconListView$maximumIconCount);MSHookMessageEx(_logos_class$_ungrouped$SBDockIconListView, @selector(minimumNumberOfIconsToDistributeEvenlyToEdges), (IMP)&_logos_method$_ungrouped$SBDockIconListView$minimumNumberOfIconsToDistributeEvenlyToEdges, (IMP*)&_logos_orig$_ungrouped$SBDockIconListView$minimumNumberOfIconsToDistributeEvenlyToEdges);} } +#line 103 "Tweak.x" diff --git a/.theos/obj/debug/armv7s/testing.dylib b/.theos/obj/debug/armv7s/testing.dylib deleted file mode 100755 index 5a83f81..0000000 Binary files a/.theos/obj/debug/armv7s/testing.dylib and /dev/null differ diff --git a/.theos/obj/debug/armv7s/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib b/.theos/obj/debug/armv7s/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib index 7e28123..c9f5c01 100755 Binary files a/.theos/obj/debug/armv7s/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib and b/.theos/obj/debug/armv7s/testing.dylib.dSYM/Contents/Resources/DWARF/testing.dylib differ diff --git a/.theos/obj/debug/dockifyprefs.bundle/Root.plist b/.theos/obj/debug/dockifyprefs.bundle/Root.plist index 89e5b60..0996b5a 100755 --- a/.theos/obj/debug/dockifyprefs.bundle/Root.plist +++ b/.theos/obj/debug/dockifyprefs.bundle/Root.plist @@ -14,7 +14,19 @@ icon icon.png packageIdentifier - com.burritoz.testing + com.burritoz.dockify + + + cell + PSGroupCell + label + Made by Burrit0z. Official repo: + + + cell + PSGroupCell + label + Burrit0z.github.com/repo cell @@ -98,7 +110,7 @@ cell PSGroupCell label - Max Dock Icons: + Custom Dock Icons (exact # you want): cell @@ -110,13 +122,13 @@ key setIconNumber min - 0 + 4 max - 20 + 10 isSegmented segmentCount - 20 + 6 showValue diff --git a/.theos/obj/debug/testing.dylib b/.theos/obj/debug/testing.dylib index a0ef819..12cbf39 100755 Binary files a/.theos/obj/debug/testing.dylib and b/.theos/obj/debug/testing.dylib differ diff --git a/.theos/packages/com.burritoz.testing-1.2 b/.theos/packages/com.burritoz.testing-1.2 index 3cacc0b..597975b 100755 --- a/.theos/packages/com.burritoz.testing-1.2 +++ b/.theos/packages/com.burritoz.testing-1.2 @@ -1 +1 @@ -12 \ No newline at end of file +35 \ No newline at end of file diff --git a/.theos/_/Library/MobileSubstrate/DynamicLibraries/testing.plist b/Dockify.plist similarity index 100% rename from .theos/_/Library/MobileSubstrate/DynamicLibraries/testing.plist rename to Dockify.plist diff --git a/Dockify.x b/Dockify.x new file mode 100755 index 0000000..1857329 --- /dev/null +++ b/Dockify.x @@ -0,0 +1,152 @@ +#import + +@interface SBCoverSheetPrimarySlidingViewController : UIViewController +- (void)viewDidDisappear:(BOOL)arg1; +- (void)viewDidAppear:(BOOL)arg1; +@end + +//Set up variables for use with Cephei +static BOOL transparent; +static BOOL hidden; +static double setHeight; +static double customOpacity; +static NSInteger setIconNumber; +//nepeta like drm +BOOL dpkgInvalid = NO; +//static NSInteger setDockRowNumber; +//static CGFloat setRowSpacing; + +HBPreferences *preferences; + +%hook SBCoverSheetPrimarySlidingViewController +- (void)viewDidDisappear:(BOOL)arg1 { + + %orig; // Thanks to Nepeta for the DRM + if (!dpkgInvalid) return; + UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"Pirate Detected!" + message:@"Seriously? Pirating a free Tweak is awful!\nPiracy repo's Tweaks could contain Malware if you didn't know that, so go ahead and get Dockify from the official Source https://Burrit0z.github.io/repo/.\nIf you're seeing this but you got it from the official source then make sure to add https://Burrit0z.github.io/repo to Cydia or Sileo." + preferredStyle:UIAlertControllerStyleAlert]; + + UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Aww man" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * action) { + + UIApplication *application = [UIApplication sharedApplication]; + [application openURL:[NSURL URLWithString:@"https://Burrit0z.github.io/repo"] options:@{} completionHandler:nil]; + + }]; + [alertController addAction:cancelAction]; + [self presentViewController:alertController animated:YES completion:nil]; + +} +%end + +//hook the dock +%hook SBDockView + +//this deals with everything adjusting opacity/transparency +//ios 12 and 13 +-(void)setBackgroundAlpha:(double)arg1 { + if (transparent == NO && hidden == NO) { //if not transparent and not hidden + %orig(customOpacity); + }else if (transparent || hidden) { // Note: || means or in objc + %orig(0.0); //hides background of the dock (transparent) + } else { + NSLog(@"Dock not Transparent/hidden, no custom opacity\n"); + } +} + +//ios 13 +-(double)defaultHeight { + if (hidden) { + return (0); + } else { + return (%orig*setHeight); //sets custom height if dock is not set to hidden + } +} + +//ios 12 +-(double)dockHeight { + if (hidden) { + return (0); + } else { + return (%orig*setHeight); //sets custom height if dock is not set to hidden + } +} + +%end + +//NEW HOOK FOR ICON STATE +%hook SBDockIconListView +//ios 12 required piece ++(NSInteger)maxIcons { + if (hidden) { + return (0); + } else { + return (setIconNumber); + } +} +- (NSUInteger)iconColumnsForCurrentOrientation { + if (hidden) { + return (0); + } else { + NSInteger reg = %orig; + return reg; //basically just returns the original value + } +} +%end +//ios 13 +%hook SBIconListGridLayoutConfiguration + +-(void)setNumberOfPortraitColumns:(unsigned long long)arg1 { + if (setIconNumber == 4) { + NSIntegr reg = %orig; + %orig(reg); + } else { + %orig(setIconNumber); + } +} +%end + +%hook SBIconListView +//fix so it doesnt set all pages to 5 columns ios 13 +-(unsigned long long)iconColumnsForCurrentOrientation { + return (4); +} +-(BOOL)automaticallyAdjustsLayoutMetricsToFit { + return YES; +} +%end +//fix for icons being off the page ios 13 and maybe 12 +%hook SBIconListFlowLayout +- (NSUInteger)numberOfColumnsForOrientation:(NSInteger)arg1 { + return (4); +} +%end +//another fix for the folders ios12 +%hook SBFolderIconListView ++(unsigned long long)iconColumnsForInterfaceOrientation:(long long)arg1 { + return (4); +} +%end + +// Thanks to Nepeta for the DRM, and thanks to Sh0rtflow as well +%ctor { + dpkgInvalid = ![[NSFileManager defaultManager] fileExistsAtPath:@"/var/lib/dpkg/info/com.burritoz.dockify.list"]; + if (!dpkgInvalid) dpkgInvalid = ![[NSFileManager defaultManager] fileExistsAtPath:@"/var/lib/dpkg/info/com.burritoz.dockify.md5sums"]; + + + preferences = [[HBPreferences alloc] initWithIdentifier:@"com.burritoz.dockifyprefs"]; + [preferences registerDefaults:@ { //defaults for prefernces + @"setHeight": @1, + @"customOpacity": @1, + @"hidden": @NO, + @"setIconNumber": @4, +// @"setRowSpacing": @0, + }]; + [preferences registerBool:&transparent default:YES forKey:@"transparent"]; //registering transparent as a Boolean + [preferences registerBool:&hidden default:NO forKey:@"hidden"]; //registering hidden as a Boolean + [preferences registerDouble:(double *)&setHeight default:1 forKey:@"setHeight"]; //registering setHeigt as a double (number) + [preferences registerDouble:(double *)&customOpacity default:1 forKey:@"customOpacity"]; //registering customOpacity as a double (number) + [preferences registerInteger:(NSInteger *)&setIconNumber default:4 forKey:@"setIconNumber"]; //Integer of how many icons to allow +// [preferences registerInteger:(NSInteger *)&setDockRowNumber default:1 forKey:@"setDockRowNumber"]; //Integer of how many dock rows to allow +// [preferences registerFloat:(CGFloat *)&setRowSpacing default:0 forKey:@"setRowSpacing"]; //custom dock row spacing? +} diff --git a/Makefile b/Makefile index a4825db..e9a64d3 100755 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ -ARCHS = armv7s arm64 arm64e +ARCHS = arm64 arm64e INSTALL_TARGET_PROCESSES = SpringBoard include $(THEOS)/makefiles/common.mk -TWEAK_NAME = testing +TWEAK_NAME = Dockify -testing_FILES = Tweak.x -testing_CFLAGS = -fobjc-arc -testing_EXTRA_FRAMEWORKS += Cephei +Dockify_FILES = Dockify.x +Dockify_CFLAGS = -fobjc-arc +Dockify_EXTRA_FRAMEWORKS += Cephei include $(THEOS_MAKE_PATH)/tweak.mk SUBPROJECTS += dockifyprefs diff --git a/README.md b/README.md index 0ae05a8..1c18a78 100755 --- a/README.md +++ b/README.md @@ -2,6 +2,5 @@ SOURCE CODE FOR DOCKIFY **Get it here:** https://burrit0z.github.io/repo -**Compatability** iOS 8 to 12.x, a12 included - -## iOS 13 support eta son ## +**Compatability:** iOS 8 and up, a12 included +**Source code:** You are looking at it. diff --git a/Tweak.x b/Tweak.x deleted file mode 100755 index 5424274..0000000 --- a/Tweak.x +++ /dev/null @@ -1,89 +0,0 @@ -//I looked at Kritanta's "Home Plus" tweak for help with ios13 stuff. I DID NOT -//copy anything, at least knowingly because these tweaks are simillar, please -//understand the code may be simillar becuase we are doing similar things. -//I am liscensing this under MIT, anyone can use anything they need to from here -#include -#import - -@interface SBDockView -@property (nonatomic, assign) double dockHeight; -@end - -@interface SBDockIconListView -@end - -@interface SBIconListView -@end - -@interface SBRootIconListView : UIView -+ (NSInteger)iconColumnsForInterfaceOrientation; -@end - -@interface SBDockIconListView : SBRootIconListView -@end - -//Set up variables for use with Cephei -static BOOL transparent; -static BOOL hidden; -static double setHeight; -static double customOpacity; -static NSInteger setIconNumber; - -HBPreferences *preferences; - -//hook the dock -%hook SBDockView - -//this deals with everything adjusting opacity/transparency -//ios 12 and 13 --(void)setBackgroundAlpha:(double)arg1 { - if (transparent == NO && hidden == NO) { //if not transparent and not hidden - %orig(customOpacity); - }else if (transparent || hidden) { // Note: || means or in objc - %orig(0.0); //hides background of the dock (transparent) - } else { - NSLog(@"Dock not Transparent/hidden, no custom opacity\n"); - } -} - -//ios 12 --(double)dockHeight { - return (%orig*setHeight); //sets custom height if dock is not set to hidden - } -//ios 13 -+(double)defaultHeight { - return (%orig*setHeight); //sets custom height if dock is not set to hidden - } - -%end - - -%hook SBDockIconListView - -//ios 12 -+(NSInteger)maxIcons { - if (hidden) { - return (0); - } else { - return (setIconNumber); - } -} - -//ios13 - -%end - -%ctor { - preferences = [[HBPreferences alloc] initWithIdentifier:@"com.burritoz.dockifyprefs"]; - [preferences registerDefaults:@{ //defaults for prefernces - @"setHeight": @1, - @"customOpacity": @1, - @"hidden": @NO, - @"setIconNumber": @4, - }]; - [preferences registerBool:&transparent default:YES forKey:@"transparent"]; //registering transparent as a Boolean - [preferences registerBool:&hidden default:NO forKey:@"hidden"]; //registering hidden as a Boolean - [preferences registerDouble:(double *)&setHeight default:1 forKey:@"setHeight"]; //registering setHeigt as a double (number) - [preferences registerDouble:(double *)&customOpacity default:1 forKey:@"customOpacity"]; //registering customOpacity as a double (number) - [preferences registerInteger:(NSInteger *)&setIconNumber default:4 forKey:@"setIconNumber"]; //Integer of how many icons to allow -} diff --git a/control b/control index 1ea9fae..e816a90 100755 --- a/control +++ b/control @@ -1,6 +1,7 @@ -Package: com.burritoz.testing +Package: com.burritoz.dockify Name: Dockify Depends: mobilesubstrate, preferenceloader, com.saurik.substrate.safemode, ws.hbang.common (>=1.13) +Conflicts: com.burritoz.testing Version: 1.2 Architecture: iphoneos-arm Description: A very noice tweak to configure the dock a bit more... diff --git a/dockifyprefs/.DS_Store b/dockifyprefs/.DS_Store index 3f383b9..d365db6 100755 Binary files a/dockifyprefs/.DS_Store and b/dockifyprefs/.DS_Store differ diff --git a/dockifyprefs/Resources/Root.plist b/dockifyprefs/Resources/Root.plist index 89e5b60..0996b5a 100755 --- a/dockifyprefs/Resources/Root.plist +++ b/dockifyprefs/Resources/Root.plist @@ -14,7 +14,19 @@ icon icon.png packageIdentifier - com.burritoz.testing + com.burritoz.dockify + + + cell + PSGroupCell + label + Made by Burrit0z. Official repo: + + + cell + PSGroupCell + label + Burrit0z.github.com/repo cell @@ -98,7 +110,7 @@ cell PSGroupCell label - Max Dock Icons: + Custom Dock Icons (exact # you want): cell @@ -110,13 +122,13 @@ key setIconNumber min - 0 + 4 max - 20 + 10 isSegmented segmentCount - 20 + 6 showValue diff --git a/dockifyprefs/Resources/notimportant(forlater).txt b/dockifyprefs/Resources/notimportant(forlater).txt new file mode 100644 index 0000000..577f7eb --- /dev/null +++ b/dockifyprefs/Resources/notimportant(forlater).txt @@ -0,0 +1,53 @@ +BACKUP cause im lazy. this is for a future feature + + cell + PSGroupCell + label + Max Dock Rows: + + + cell + PSSliderCell + default + 1 + defaults + com.burritoz.dockifyprefs + key + setDockRowNumber + min + 0 + max + 7 + isSegmented + + segmentCount + 7 + showValue + + + + cell + PSGroupCell + label + Dock Row Spacing + + + cell + PSSliderCell + default + 0 + defaults + com.burritoz.dockifyprefs + key + setRowSpacing + min + 0 + max + 200 + isSegmented + + segmentCount + 200 + showValue + + diff --git a/packages/com.burritoz.dockify_1.2-7+debug_iphoneos-arm.deb b/packages/com.burritoz.dockify_1.2-7+debug_iphoneos-arm.deb new file mode 100644 index 0000000..efd6c0a Binary files /dev/null and b/packages/com.burritoz.dockify_1.2-7+debug_iphoneos-arm.deb differ diff --git a/packages/com.burritoz.dockify_1.2-7+debug_iphoneos-arm.deb.zip b/packages/com.burritoz.dockify_1.2-7+debug_iphoneos-arm.deb.zip new file mode 100644 index 0000000..db12565 Binary files /dev/null and b/packages/com.burritoz.dockify_1.2-7+debug_iphoneos-arm.deb.zip differ diff --git a/packages/com.burritoz.testing_1.2-12+debug_iphoneos-arm.deb b/packages/com.burritoz.testing_1.2-12+debug_iphoneos-arm.deb deleted file mode 100644 index ba5c9ce..0000000 Binary files a/packages/com.burritoz.testing_1.2-12+debug_iphoneos-arm.deb and /dev/null differ diff --git a/testing.plist b/testing.plist deleted file mode 100755 index 10dc654..0000000 --- a/testing.plist +++ /dev/null @@ -1 +0,0 @@ -{ Filter = { Bundles = ( "com.apple.springboard" ); }; }