From b01532507733f28f62f22ca78dc02347b067d88d Mon Sep 17 00:00:00 2001 From: Burrit0z Date: Fri, 22 May 2020 17:10:06 -0400 Subject: [PATCH] bro not trash i swear --- KAIBattery.mm | 34 +++++++++++++++++++++++----------- Kai.xm | 1 + Layout/DEBIAN/control | 2 +- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/KAIBattery.mm b/KAIBattery.mm index 4ffcd5a..10bc59b 100644 --- a/KAIBattery.mm +++ b/KAIBattery.mm @@ -11,6 +11,7 @@ KAIBattery *instance; if (self) { self.displayingDevices = [[NSMutableArray alloc] init]; [self updateBattery]; + self.clipsToBounds = YES; self.userInteractionEnabled = NO; } return self; @@ -32,13 +33,17 @@ long long lastPercentage; if([devices count]!=0) { //NSLog(@"kai: info is good, will proceed"); - __block float ytwo = 0; + float ytwo = 0; for(KAIBatteryCell *cell in self.subviews) { if([cell respondsToSelector:@selector(updateInfo)] && ![devices containsObject:cell.device]) { //to confirm is a cell and battery device does not exist - dispatch_async(dispatch_get_main_queue(), ^{ - [cell removeFromSuperview]; - }); + //dispatch_async(dispatch_get_main_queue(), ^{ + [UIView animateWithDuration:0.2 animations:^{ + cell.alpha = 0; + } completion:^(BOOL finished){ + [cell removeFromSuperview]; + }]; + //}); } else if([cell respondsToSelector:@selector(updateInfo)]) { cell.frame = CGRectMake(0, y, self.frame.size.width, bannerHeight); [cell updateInfo]; @@ -75,16 +80,22 @@ long long lastPercentage; if(shouldAdd && [deviceName length]!=0) { if(![self.subviews containsObject:cell]) { cell.frame = CGRectMake(0, y, self.frame.size.width, bannerHeight); - dispatch_async(dispatch_get_main_queue(), ^{ - [self addSubview:cell]; - }); + cell.alpha = 0; + [self addSubview:cell]; + [UIView animateWithDuration:0.3 animations:^{ + cell.alpha = 1; + }]; } y+=bannerHeight + spacing; } else if(!shouldAdd) { - dispatch_async(dispatch_get_main_queue(), ^{ - [cell removeFromSuperview]; - }); + //dispatch_async(dispatch_get_main_queue(), ^{ + [UIView animateWithDuration:0.2 animations:^{ + cell.alpha = 0; + } completion:^(BOOL finished){ + [cell removeFromSuperview]; + }]; + //}); } } //[self.heightAnchor constraintEqualToConstant:(self.number * 85)].active = YES; @@ -93,7 +104,8 @@ long long lastPercentage; } self.isUpdating = NO; //NSLog(@"kai: finished update"); - [(CSAdjunctListView *)self.superview.superview KaiUpdate]; + //[(CSAdjunctListView *)self.superview.superview KaiUpdate]; + [(CSAdjunctListView *)self.superview.superview performSelector:@selector(KaiUpdate) withObject:(CSAdjunctListView *)self.superview.superview afterDelay:0.2]; } }); } diff --git a/Kai.xm b/Kai.xm index 68727e9..03265f5 100644 --- a/Kai.xm +++ b/Kai.xm @@ -48,6 +48,7 @@ %new -(void)KaiUpdate { KAIBattery *battery = [KAIBattery sharedInstance]; + battery.number = [battery.subviews count]; [UIView animateWithDuration:0.3 animations:^{ diff --git a/Layout/DEBIAN/control b/Layout/DEBIAN/control index 7c388e9..2b0bf10 100644 --- a/Layout/DEBIAN/control +++ b/Layout/DEBIAN/control @@ -1,6 +1,6 @@ Package: com.burritoz.kai Name: Kai -Version: 0.1.5~alpha +Version: 0.2.0~alpha Architecture: iphoneos-arm Description: Show charging banners on your lock screen! Maintainer: burrit0z