From d8b6c9ed888bff8321dc543201eb457fd98ff748 Mon Sep 17 00:00:00 2001
From: Burrit0z <Burrit0z@users.noreply.github.com>
Date: Sun, 24 May 2020 18:43:00 -0400
Subject: [PATCH] bro why am i trash

---
 KAIBatteryCell.mm  | 22 +++++++++++++++++++++
 KAIBatteryStack.mm | 49 +++++++++++++---------------------------------
 Kai.xm             |  6 +++---
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/KAIBatteryCell.mm b/KAIBatteryCell.mm
index 1bc17d1..bc0074c 100644
--- a/KAIBatteryCell.mm
+++ b/KAIBatteryCell.mm
@@ -142,6 +142,28 @@ NSMutableArray *deviceInstances = [[NSMutableArray alloc] init];
 
     [self.glyphView setImage:[self.device glyph]];
 
+    if(!self.height) {
+                
+        self.height.active = NO;
+        self.height = [self.heightAnchor constraintEqualToConstant:(bannerHeight + spacing)];
+        self.height.active = YES;
+
+    } //else {
+        //int height = (bannerHeight + spacing);
+        //self.height.constant = height;
+    //}
+
+    if(!self.width) {
+        
+        self.width.active = NO;
+        self.width = [self.widthAnchor constraintEqualToConstant:(self.frame.size.width)];
+        self.width.active = YES;
+
+    } //else {
+        //int width = self.frame.size.width;
+        //self.width.constant = width;
+    //}
+
 }
 
 +(instancetype)cellForDeviceIfExists:(BCBatteryDevice *)device frameToCreateNew:(CGRect)arg2 {
diff --git a/KAIBatteryStack.mm b/KAIBatteryStack.mm
index 8f75cc9..8c0dbc3 100644
--- a/KAIBatteryStack.mm
+++ b/KAIBatteryStack.mm
@@ -37,11 +37,6 @@ long long lastPercentage;
         NSArray *devices = MSHookIvar<NSArray *>(bcb, "_sortedDevices");
 
         NSLog(@"kai: devices are %@", devices);
- 
-        for(KAIBatteryCell *cell in self.subviews) {
-            //BCBatteryDevice *device = cell.device;
-            [cell updateInfo];
-        }
         
         for (BCBatteryDevice *device in devices) {
             KAIBatteryCell *cell = [device kaiCellForDevice];
@@ -56,41 +51,25 @@ long long lastPercentage;
             }
 
             if(![self.subviews containsObject:cell] && shouldAdd && [devices containsObject:device]) {
-                [cell setFrame:CGRectMake(0,0,self.frame.size.width, bannerHeight + spacing)];
+                //[cell setFrame:CGRectMake(0,0,self.frame.size.width, bannerHeight + spacing)];
+                [self addSubview:cell];
                 [self addArrangedSubview:cell];
-            } else {
+            } else if([self.subviews containsObject:cell] && !shouldAdd){
+                [cell removeFromSuperview];
                 [self removeArrangedSubview:cell];
             }
 
-            if(!cell.height) {
-                
-                cell.height.active = NO;
-                cell.height = [cell.heightAnchor constraintEqualToConstant:(bannerHeight + spacing)];
-                cell.height.active = YES;
-
-            } else {
-                int height = (bannerHeight + spacing);
-                cell.height.constant = height;
-
-                UIStackView *s = self;
-                s.frame = CGRectMake(s.frame.origin.x, s.frame.origin.y, s.frame.size.width, (s.frame.size.height - 1));
-            }
-
-            if(!cell.width) {
-                
-                cell.width.active = NO;
-                cell.width = [cell.widthAnchor constraintEqualToConstant:(self.frame.size.width)];
-                cell.width.active = YES;
-
-            } else {
-                int width = self.frame.size.width;
-                cell.width.constant = width;
-
-                UIStackView *s = self;
-                s.frame = CGRectMake(s.frame.origin.x, s.frame.origin.y, s.frame.size.width, (s.frame.size.height - 1));
-            }
-
         }
+
+        for(KAIBatteryCell *cell in self.subviews) {
+            //BCBatteryDevice *device = cell.device;
+            [cell updateInfo];
+            if(![devices containsObject:cell.device]) {
+                [cell removeFromSuperview];
+                [self removeArrangedSubview:cell];
+            }
+        }
+                                                                                                                                                                                              
         self.number = [self.subviews count];
         }
         self.isUpdating = NO;
diff --git a/Kai.xm b/Kai.xm
index 0c7db0a..216c1bd 100644
--- a/Kai.xm
+++ b/Kai.xm
@@ -49,11 +49,11 @@
 %new
 -(void)KaiUpdate {
 	KAIBatteryStack *battery = [KAIBatteryStack sharedInstance];
-	battery.number = [battery.subviews count];
+	//battery.number = [battery.subviews count];
 
 	[UIView animateWithDuration:0.3 animations:^{
 
-		if(!battery.heightConstraint) {
+		/*if(!battery.heightConstraint) {
 			
 			battery.heightConstraint.active = NO;
 			battery.heightConstraint = [battery.heightAnchor constraintEqualToConstant:85];
@@ -69,7 +69,7 @@
 			UIStackView *s = [self stackView];
 			s.frame = CGRectMake(s.frame.origin.x, s.frame.origin.y, s.frame.size.width, (s.frame.size.height - 1));
 			//literally does nothing but makes the stack view lay itself out (doesnt adjust frame because translatesAutoreszingMaskIntoConstraints = NO on stack views)
-		}
+		}*/
 
 	}];