From d3937dbc4fe258003edf004670a31fa9dbb64d2e Mon Sep 17 00:00:00 2001
From: yaypixxo <viggo@lekdorf.com>
Date: Sun, 5 Jan 2020 02:31:06 +0100
Subject: [PATCH] fix %groups

---
 Tweak.x                        | 138 ++++++++++++++++-----------------
 kageprefs/Resources/Root.plist |   4 +-
 2 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/Tweak.x b/Tweak.x
index b7877ba..39bccab 100644
--- a/Tweak.x
+++ b/Tweak.x
@@ -71,25 +71,20 @@ static void notificationCallback(CFNotificationCenterRef center, void *observer,
 @property (nonatomic,retain) UIView * controlCenterGrabberView;
 @end
 
+@interface SBDashBoardTeachableMomentsContainerView {
+    
+}
+
+@property (nonatomic,retain) UIView * controlCenterGrabberView;
+@end
+
 #ifndef kCFCoreFoundationVersionNumber_iOS_13_0
 #define kCFCoreFoundationVersionNumber_iOS_13_0 1665.15
 #endif
 
 #define kSLSystemVersioniOS13 kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_13_0
 
-// HIDE CC GRABBER START //
-%hook CSTeachableMomentsContainerView
-- (void)layoutSubviews {
-    if (enabled && hideCCGrabber) {
-        [self.controlCenterGrabberView setHidden:YES];
-    }
-    else {
-        [self.controlCenterGrabberView setHidden:NO];
-    }
-    return %orig;
-}
-%end
-// HIDE CC GRABBER END //
+%group universal
 
 // QUICK ACTIONS BG START //
 %hook UICoverSheetButton
@@ -128,6 +123,65 @@ static void notificationCallback(CFNotificationCenterRef center, void *observer,
 %end
 // HIDE LABELS END //
 
+// GRID SWITCHER START //
+%hook SBAppSwitcherSettings
+- (void)setGridSwitcherPageScale:(double)arg1 {
+    if (enabled && gridSwitcher) {
+       arg1 = 0.4; 
+    }
+    %orig;
+}
+
+- (void)setGridSwitcherHorizontalInterpageSpacingPortrait:(double)arg1 {
+    if (enabled && gridSwitcher) {
+        arg1 = 25.5;
+    }
+    %orig;
+}
+
+- (void)setGridSwitcherHorizontalInterpageSpacingLandscape:(double)arg1 {
+    if (enabled && gridSwitcher) {
+        arg1 = 11.6;
+    }
+    %orig;
+}
+
+- (void)setGridSwitcherVerticalNaturalSpacingPortrait:(double)arg1 {
+    if (enabled && gridSwitcher) {
+        arg1 = 42;
+    }
+    %orig;
+}
+
+- (void)setGridSwitcherVerticalNaturalSpacingLandscape:(double)arg1 {
+    if (enabled && gridSwitcher) {
+        arg1 = 38;
+    }
+    %orig;
+}
+
+- (void)setSwitcherStyle:(long long)arg1 {
+    if (enabled && gridSwitcher) {
+        arg1 = 2;
+    }
+    %orig;
+}
+%end
+// GRID SWITCHER END //
+
+// NO LS BATTERY START //
+%hook CSCoverSheetViewController
+- (void)_transitionChargingViewToVisible:(bool)arg1 showBattery:(bool)arg2 animated:(bool)arg3 {
+    if (enabled && hideLSBatt) {
+        arg1 = 0;
+    }
+    %orig;
+}
+%end
+// NO LS BATTERY END //
+
+%end // end universal group
+
 // stuff that only works on iOS 13
 %group ios13
 
@@ -218,65 +272,9 @@ static void notificationCallback(CFNotificationCenterRef center, void *observer,
 
 %end // end ios12 group
 
-// GRID SWITCHER START //
-%hook SBAppSwitcherSettings
-- (void)setGridSwitcherPageScale:(double)arg1 {
-    if (enabled && gridSwitcher) {
-       arg1 = 0.4; 
-    }
-    %orig;
-}
-
-- (void)setGridSwitcherHorizontalInterpageSpacingPortrait:(double)arg1 {
-    if (enabled && gridSwitcher) {
-        arg1 = 25.5;
-    }
-    %orig;
-}
-
-- (void)setGridSwitcherHorizontalInterpageSpacingLandscape:(double)arg1 {
-    if (enabled && gridSwitcher) {
-        arg1 = 11.6;
-    }
-    %orig;
-}
-
-- (void)setGridSwitcherVerticalNaturalSpacingPortrait:(double)arg1 {
-    if (enabled && gridSwitcher) {
-        arg1 = 42;
-    }
-    %orig;
-}
-
-- (void)setGridSwitcherVerticalNaturalSpacingLandscape:(double)arg1 {
-    if (enabled && gridSwitcher) {
-        arg1 = 38;
-    }
-    %orig;
-}
-
-- (void)setSwitcherStyle:(long long)arg1 {
-    if (enabled && gridSwitcher) {
-        arg1 = 2;
-    }
-    %orig;
-}
-%end
-// GRID SWITCHER END //
-
-// NO LS BATTERY START //
-%hook CSCoverSheetViewController
-- (void)_transitionChargingViewToVisible:(bool)arg1 showBattery:(bool)arg2 animated:(bool)arg3 {
-    if (enabled && hideLSBatt) {
-        arg1 = 0;
-    }
-    %orig;
-}
-%end
-// NO LS BATTERY END //
-
 // LISTENERS
 %ctor {
+    %init(universal);
     // check iOS version
     if (kSLSystemVersioniOS13) {
         %init(ios13);
diff --git a/kageprefs/Resources/Root.plist b/kageprefs/Resources/Root.plist
index b59ff20..506fe41 100644
--- a/kageprefs/Resources/Root.plist
+++ b/kageprefs/Resources/Root.plist
@@ -34,7 +34,7 @@
 			<key>key</key>
 			<string>hideQuickActionsBG</string>
 			<key>label</key>
-			<string>Hide Quick Actions BG*</string>
+			<string>Hide Quick Actions BG (iPhone X)*</string>
 			<key>PostNotification</key>
 			<string>com.yaypixxo.kage/preferences.changed</string>
 		</dict>
@@ -76,7 +76,7 @@
 			<key>key</key>
 			<string>statusBarShowTimeLS</string>
 			<key>label</key>
-			<string>Time in LS Status Bar</string>
+			<string>Time in LS Status Bar (iPhone X)</string>
 			<key>PostNotification</key>
 			<string>com.yaypixxo.kage/preferences.changed</string>
 		</dict>