From 11abdb72f24e6f06b8c543cd0cd040d7e1caefff Mon Sep 17 00:00:00 2001
From: Burrit0z <Burrit0z@users.noreply.github.com>
Date: Wed, 3 Jun 2020 10:34:34 -0400
Subject: [PATCH] FIX IT NOT APPEARING

---
 KAIBatteryPlatter.mm | 40 +++++++++-------------------------------
 KAIStackView.mm      | 17 +++++++++++++++--
 Kai.xm               |  8 ++------
 3 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/KAIBatteryPlatter.mm b/KAIBatteryPlatter.mm
index 2828f3f..2bf1389 100755
--- a/KAIBatteryPlatter.mm
+++ b/KAIBatteryPlatter.mm
@@ -107,7 +107,7 @@ long long lastPercentage;
 
         self.oldCountOfDevices = [devices count];
 
-        self.number = [self.stack.subviews count];
+        [self calculateHeight];
 
     if([self.superview.superview.superview respondsToSelector:@selector(fixComplicationsViewFrame)]) {
         [(NCNotificationListView *)(self.superview.superview.superview) fixComplicationsViewFrame];
@@ -121,29 +121,6 @@ long long lastPercentage;
     [super setContentOffset:CGPointMake(arg1.x, 0)];
 }
 
--(void)addSubview:(UIView *)view {
-    [super addSubview:view];
-    self.number = [self.stack.subviews count];
-    if([self.superview.superview.superview respondsToSelector:@selector(fixComplicationsViewFrame)]) {
-        [(NCNotificationListView *)(self.superview.superview.superview) fixComplicationsViewFrame];
-    }
-
-    if(textColor==0 && [view respondsToSelector:@selector(updateInfo)]) {
-        KAIBatteryCell *cell = (KAIBatteryCell *)view;
-        if(@available(iOS 12.0, *)) {
-			if(self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
-                [cell.label setTextColor:[UIColor whiteColor]];
-                [cell.percentLabel setTextColor:[UIColor whiteColor]];
-            } else if(self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleLight) {
-                [cell.label setTextColor:[UIColor blackColor]];
-                [cell.percentLabel setTextColor:[UIColor blackColor]];   
-            }
-        }
-    }
-
-    [self setContentSize:self.stack.frame.size];
-}
-
 -(void)layoutSubviews {
     if([self.superview.superview.superview respondsToSelector:@selector(fixComplicationsViewFrame)]) {
         [(NCNotificationListView *)(self.superview.superview.superview) fixComplicationsViewFrame];
@@ -154,6 +131,14 @@ long long lastPercentage;
 -(void)calculateHeight {
     self.number = [self.stack.subviews count];
 
+    if(self.number==0) {
+        [(UIStackView *)(self.superview) removeArrangedSubview:self];
+    } else if(self.number!=0 && self.superview == nil) {
+        [[[[objc_getClass("CSAdjunctListView") class] sharedListViewForKai] stackView] addArrangedSubview:self];
+        //[self performSelector:@selector(calculateHeight) withObject:self afterDelay:0.1];
+    }
+
+
     [UIView animateWithDuration:0.3 animations:^{
 
 		if(!self.heightConstraint) {
@@ -182,13 +167,6 @@ long long lastPercentage;
 		}
 
         }];
-
-        if(self.number==0) {
-            [(UIStackView *)(self.superview) removeArrangedSubview:self];
-        } else if(self.number!=0 && !self.superview) {
-            [[[[objc_getClass("CSAdjunctListView") class] sharedListViewForKai] stackView] addArrangedSubview:self];
-            [self performSelector:@selector(calculateHeight) withObject:self afterDelay:0.1];
-        }
 }
 
 -(void)refreshForPrefs {
diff --git a/KAIStackView.mm b/KAIStackView.mm
index 4b97397..87f9c83 100644
--- a/KAIStackView.mm
+++ b/KAIStackView.mm
@@ -8,9 +8,22 @@
     return self;
 }
 
--(void)addSubview:(UIView *)arg1 {
-    [super addSubview:arg1];
+-(void)addSubview:(UIView *)view {
+    [super addSubview:view];
     [(UIScrollView *)self.superview setContentSize:self.frame.size];
+
+    if(textColor==0 && [view respondsToSelector:@selector(updateInfo)]) {
+        KAIBatteryCell *cell = (KAIBatteryCell *)view;
+        if(@available(iOS 12.0, *)) {
+			if(self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
+                [cell.label setTextColor:[UIColor whiteColor]];
+                [cell.percentLabel setTextColor:[UIColor whiteColor]];
+            } else if(self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleLight) {
+                [cell.label setTextColor:[UIColor blackColor]];
+                [cell.percentLabel setTextColor:[UIColor blackColor]];   
+            }
+        }
+    }
 }
 
 -(void)layoutSubviews {
diff --git a/Kai.xm b/Kai.xm
index 5e0836b..ab0b3da 100755
--- a/Kai.xm
+++ b/Kai.xm
@@ -10,16 +10,12 @@ CSAdjunctListView *list;
 
 -(void)_layoutStackView {
 
-	NSInteger lastSlot = [[self stackView].subviews count] -1;
 	//this code is used to determine if kai is at the bottom of the stack view
-	if([[self stackView].subviews objectAtIndex:lastSlot] != [KAIBatteryPlatter sharedInstance] && belowMusic) {
+	if([[self stackView].subviews objectAtIndex:([[self stackView].subviews count] -1)] != [KAIBatteryPlatter sharedInstance] && belowMusic) {
 		//if it is not, but the option to have kai below music is on, i simply remove from it's current pos. 
 		//and insert into last slot.
 		[[self stackView] removeArrangedSubview:[KAIBatteryPlatter sharedInstance]];
-		[[self stackView] insertArrangedSubview:[KAIBatteryPlatter sharedInstance] atIndex:lastSlot];
-	} else if(!belowMusic && ![[self stackView].subviews containsObject:[KAIBatteryPlatter sharedInstance]]) {
-		[[self stackView] removeArrangedSubview:[KAIBatteryPlatter sharedInstance]];
-		[[self stackView] insertArrangedSubview:[KAIBatteryPlatter sharedInstance] atIndex:0];
+		[[self stackView] insertArrangedSubview:[KAIBatteryPlatter sharedInstance] atIndex:([[self stackView].subviews count] -1)];
 	}
 
 	if([KAISelf.superview respondsToSelector:@selector(fixComplicationsViewFrame)]) {