From 2dac618caba9cff4f6f2412421dd314c9298708b Mon Sep 17 00:00:00 2001
From: Burrit0z <Burrit0z@users.noreply.github.com>
Date: Wed, 27 May 2020 08:48:03 -0400
Subject: [PATCH] new stuff

---
 KAIBatteryStack.mm    | 28 +++++++++++-----------------
 Kai.xm                |  5 +++++
 Layout/DEBIAN/control |  2 +-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/KAIBatteryStack.mm b/KAIBatteryStack.mm
index e549343..0e581fe 100644
--- a/KAIBatteryStack.mm
+++ b/KAIBatteryStack.mm
@@ -32,19 +32,12 @@ long long lastPercentage;
         BCBatteryDeviceController *bcb = [BCBatteryDeviceController sharedInstance];
         NSArray *devices = MSHookIvar<NSArray *>(bcb, "_sortedDevices");
     
-    /*if(self.oldCountOfDevices == -100) {
+    if(self.oldCountOfDevices == -100) {
         self.oldCountOfDevices = [devices count] + 1;
     }
-    self.oldCountOfDevices = [devices count];
 
-    for (BCBatteryDevice *device in devices) {
-        KAIBatteryCell *cell = [device kaiCellForDevice];
-
-        [cell updateInfo];
-    }
-
-    if(!self.isUpdating && self.oldCountOfDevices != 0 && ([devices count] + 1 == self.oldCountOfDevices || [devices count] - 1 == self.oldCountOfDevices || [devices count] == self.oldCountOfDevices)) {*/
-    if(!self.isUpdating) {
+    if(!self.isUpdating && self.oldCountOfDevices != 0 && ([devices count] + 1 == self.oldCountOfDevices || [devices count] - 1 == self.oldCountOfDevices || [devices count] == self.oldCountOfDevices)) {
+    //if(!self.isUpdating) {
 
     self.isUpdating = YES;
 
@@ -95,29 +88,27 @@ long long lastPercentage;
             }
         }
 
-         //queueTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(dispatchQueue) userInfo:nil repeats:NO];
+        queueTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(dispatchQueue) userInfo:nil repeats:NO];
         self.isUpdating = NO;
 
         } else if(self.isUpdating) {
             self.queued = YES;
         }
 
+        self.oldCountOfDevices = [devices count];
+
         self.number = [self.subviews count];
 
     [UIView animateWithDuration:0.3 animations:^{
 
 		if(!self.heightConstraint) {
-			
-			self.heightConstraint.active = NO;
+
 			self.heightConstraint = [self.heightAnchor constraintEqualToConstant:(self.number * (bannerHeight + spacing))];
-			//set an initial constraint
 			self.heightConstraint.active = YES;
 
 		} else {
-		int height = (self.number * (bannerHeight + spacing)); //big brain math
-			//self.heightConstraint.active = NO; //deactivation
+		int height = (self.number * (bannerHeight + spacing));
 			self.heightConstraint.constant = height;
-			//self.heightConstraint.active = YES; //forcing reactivation
 
 			UIStackView *s = (UIStackView *)(self.superview);
 			s.frame = CGRectMake(s.frame.origin.x, s.frame.origin.y, s.frame.size.width, (s.frame.size.height - 1));
@@ -227,6 +218,9 @@ long long lastPercentage;
     self.isUpdating = NO;
     if(self.queued) {
         [self updateBattery];
+        if([self.superview.superview.superview respondsToSelector:@selector(fixComplicationsViewFrame)]) {
+        [(NCNotificationListView *)(self.superview.superview.superview) fixComplicationsViewFrame];
+        }
         self.queued = NO;
     }
     [queueTimer invalidate];
diff --git a/Kai.xm b/Kai.xm
index 30774fc..a7e4c6b 100644
--- a/Kai.xm
+++ b/Kai.xm
@@ -17,6 +17,10 @@
 		[[self stackView] insertArrangedSubview:[KAIBatteryStack sharedInstance] atIndex:lastSlot];
 	}
 
+	if([KAISelf.superview respondsToSelector:@selector(fixComplicationsViewFrame)]) {
+        [(NCNotificationListView *)(KAISelf.superview) fixComplicationsViewFrame];
+    }
+
 	%orig;
 }
 
@@ -55,6 +59,7 @@
 		dispatch_async(dispatch_get_main_queue(), ^{
 
 		[[KAIBatteryStack sharedInstance] updateBattery];
+		[KAISelf.superview performSelector:@selector(fixComplicationsViewFrame) withObject:KAISelf.superview afterDelay:0.2];
 
 		isUpdating = NO;
 		});
diff --git a/Layout/DEBIAN/control b/Layout/DEBIAN/control
index 2931ccf..99a13c3 100644
--- a/Layout/DEBIAN/control
+++ b/Layout/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: com.burritoz.kai
 Name: Kai
-Version: 0.2.6~alpha3
+Version: 0.2.6~alpha4
 Architecture: iphoneos-arm
 Description: Show charging banners on your lock screen!
 Maintainer: burrit0z