so close to beta 1

KAIBatteryCell.h

@@ -32,6 +32,7 @@
 @property (nonatomic, strong) NSString *identifier;
 -(id)glyph;
 -(id)kaiCellForDevice;
+-(void)resetKaiCellForNewPrefs;
 @end
 
 @interface KAIBatteryCell : UIView
@@ -44,6 +45,4 @@
 @property (nonatomic, strong) NSLayoutConstraint *height;
 -(instancetype)initWithFrame:(CGRect)arg1 device:(BCBatteryDevice *)device;
 -(void)updateInfo;
-+(instancetype)cellForDeviceIfExists:(BCBatteryDevice *)device frameToCreateNew:(CGRect)arg2;
-+(void)resetArray;
 @end

KAIBatteryCell.mm

@@ -1,7 +1,5 @@
 #import "KAIBatteryCell.h"
 
-NSMutableArray *deviceInstances = [[NSMutableArray alloc] init];
-
 @implementation KAIBatteryCell
 
 -(instancetype)initWithFrame:(CGRect)arg1 device:(BCBatteryDevice *)device {
@@ -113,7 +111,6 @@ NSMutableArray *deviceInstances = [[NSMutableArray alloc] init];
         [self.battery.widthAnchor constraintEqualToConstant:20].active = YES;
         [self.battery.heightAnchor constraintEqualToConstant:10].active = YES;
 
-        [deviceInstances addObject:self];
     }
 
     return self;
@@ -166,28 +163,4 @@ NSMutableArray *deviceInstances = [[NSMutableArray alloc] init];
 
 }
 
-+(instancetype)cellForDeviceIfExists:(BCBatteryDevice *)device frameToCreateNew:(CGRect)arg2 {
-    KAIBatteryCell *foundCell;
-
-    //NSString *deviceName = MSHookIvar<NSString *>(device, "_name");
-
-    for(KAIBatteryCell *cell in deviceInstances) {
-        if(cell.device == device || [cell.device.identifier isEqualToString:device.identifier]) {
-            foundCell = cell;
-            break;
-        }
-    }
-
-    if(foundCell == nil) {
-        foundCell = [[KAIBatteryCell alloc] initWithFrame:arg2 device:device];
-    }
-
-    return foundCell;
-    //return deviceInstances;
-}
-
-+(void)resetArray {
-    deviceInstances = [[NSMutableArray alloc] init];
-}
-
 @end

KAIBatteryStack.h

@@ -5,6 +5,6 @@
 @property (nonatomic, assign) BOOL isUpdating;
 +(KAIBatteryStack *)sharedInstance;
 -(instancetype)init;
--(void)removeAllAndRefresh;
+-(void)refreshForPrefs;
 -(void)updateBattery;
 @end

KAIBatteryStack.mm

@@ -36,7 +36,7 @@ long long lastPercentage;
     BCBatteryDeviceController *bcb = [BCBatteryDeviceController sharedInstance];
         NSArray *devices = MSHookIvar<NSArray *>(bcb, "_sortedDevices");
 
-        NSLog(@"kai: devices are %@", devices);
+        //NSLog(@"kai: devices are %@", devices);
         
         for (BCBatteryDevice *device in devices) {
             KAIBatteryCell *cell = [device kaiCellForDevice];
@@ -71,20 +71,6 @@ long long lastPercentage;
 
         }
                                                                                                                                                                                               
-        for(KAIBatteryCell *cell in self.subviews) {
-            //BCBatteryDevice *device = cell.device;
-            [cell updateInfo];
-            if(![devices containsObject:cell.device]) {
-                [UIView animateWithDuration:0.3 animations:^{
-                    cell.alpha = 0;
-                } completion:^(BOOL finished) {
-                    [cell removeFromSuperview];
-                    [self removeArrangedSubview:cell];
-                    cell.alpha = 1;
-                }];
-            }
-        }
-                                                                                                                                                                                              
         self.number = [self.subviews count];
         }
         self.isUpdating = NO;
@@ -95,17 +81,13 @@ long long lastPercentage;
     self.number = [self.subviews count];
 }
 
--(void)removeAllAndRefresh {
+-(void)refreshForPrefs {
-    for( UIView *view in self.subviews ) {
+    BCBatteryDeviceController *bcb = [BCBatteryDeviceController sharedInstance];
-        @try {
+        NSArray *devices = MSHookIvar<NSArray *>(bcb, "_sortedDevices");
-            [view removeFromSuperview];
+    for(BCBatteryDevice *device in devices) {
-        } @catch (NSException *exception) {
+        [device resetKaiCellForNewPrefs];
-            //Panik
     }
 }
-    [KAIBatteryCell resetArray];
-    [self updateBattery];
-}
 
 +(KAIBatteryStack *)sharedInstance {
     return instance;

Kai.h

@@ -115,7 +115,7 @@ static void applyPrefs()
 
     isUpdating = YES;
 
-    [[KAIBatteryStack sharedInstance] removeAllAndRefresh];
+    [[KAIBatteryStack sharedInstance] refreshForPrefs];
     [(CSAdjunctListView *)([KAIBatteryStack sharedInstance].superview.superview) KaiUpdate];
 
     isUpdating = NO;

Kai.xm

@@ -50,6 +50,21 @@
 -(void)KaiUpdate {
 	KAIBatteryStack *battery = [KAIBatteryStack sharedInstance];
 	//battery.number = [battery.subviews count];
+	BCBatteryDeviceController *bcb = [BCBatteryDeviceController sharedInstance];
+        NSArray *devices = MSHookIvar<NSArray *>(bcb, "_sortedDevices");
+	for(KAIBatteryCell *cell in battery.subviews) {
+            //BCBatteryDevice *device = cell.device;
+            [cell updateInfo];
+            if(![devices containsObject:cell.device]) {
+                [UIView animateWithDuration:0.3 animations:^{
+                    cell.alpha = 0;
+                } completion:^(BOOL finished) {
+                    [cell removeFromSuperview];
+                    [battery removeArrangedSubview:cell];
+                    cell.alpha = 1;
+                }];
+            }
+        }
 
 	[UIView animateWithDuration:0.3 animations:^{
 
@@ -130,6 +145,15 @@
 
 	return self.kaiCell;
 }
+
+%new
+-(void)resetKaiCellForNewPrefs {
+	self.kaiCell = [[KAIBatteryCell alloc] initWithFrame:CGRectMake(0,0,[KAIBatteryStack sharedInstance].frame.size.width,0) device:self]; 
+		((KAIBatteryCell *)self.kaiCell).translatesAutoresizingMaskIntoConstraints = NO;
+		[((KAIBatteryCell *)self.kaiCell).heightAnchor constraintEqualToConstant:bannerHeight].active = YES;
+
+		[(KAIBatteryCell *)self.kaiCell updateInfo];
+}
 %end
 
 %hook KAICSTarget //Again, not a class