diff --git a/KAIBatteryPlatter.mm b/KAIBatteryPlatter.mm index 12a00b3..969954a 100755 --- a/KAIBatteryPlatter.mm +++ b/KAIBatteryPlatter.mm @@ -16,14 +16,6 @@ NSTimer *queueTimer = nil; self.stack.alignment = 0; self.oldCountOfDevices = -100; self.queued = NO; - - if(bannerAlign==2) { //center - self.stack.alignment = UIStackViewAlignmentLeading; - } else if(bannerAlign==1) { //left - self.stack.alignment = UIStackViewAlignmentCenter; - } else if(bannerAlign==3) { //right - self.stack.alignment = UIStackViewAlignmentTrailing; - } [self setMinimumZoomScale:1]; [self setMaximumZoomScale:1]; @@ -40,10 +32,20 @@ NSTimer *queueTimer = nil; [self.stackHolder.widthAnchor constraintEqualToAnchor:self.widthAnchor].active = YES; [self.stackHolder.centerYAnchor constraintEqualToAnchor:self.centerYAnchor].active = YES; - [self.stack.widthAnchor constraintEqualToAnchor:self.stackHolder.widthAnchor].active = YES; - [self.stack.heightAnchor constraintEqualToAnchor:self.stackHolder.heightAnchor].active = YES; - [self.stack.widthAnchor constraintEqualToAnchor:self.stackHolder.widthAnchor].active = YES; - [self.stack.centerYAnchor constraintEqualToAnchor:self.stackHolder.centerYAnchor].active = YES; + if(kaiAlign==0) { + if(bannerAlign==2) { //center + self.stack.alignment = UIStackViewAlignmentLeading; + self.subviewAligner = [self.stack.centerXAnchor constraintEqualToAnchor:self.stackHolder.centerXAnchor]; + } else if(bannerAlign==1) { //left + self.stack.alignment = UIStackViewAlignmentCenter; + self.subviewAligner = [self.stack.leftAnchor constraintEqualToAnchor:self.stackHolder.leftAnchor]; + } else if(bannerAlign==3) { //right + self.stack.alignment = UIStackViewAlignmentTrailing; + self.subviewAligner = [self.stack.rightAnchor constraintEqualToAnchor:self.stackHolder.rightAnchor]; + } + + self.subviewAligner.active = YES; + } [self updateBattery]; } @@ -233,6 +235,23 @@ long long lastPercentage; [device resetKaiCellForNewPrefs]; } + if(kaiAlign==0) { + self.subviewAligner.active = NO; + if(bannerAlign==2) { //center + self.stack.alignment = UIStackViewAlignmentLeading; + self.subviewAligner = [self.stack.centerXAnchor constraintEqualToAnchor:self.stackHolder.centerXAnchor]; + } else if(bannerAlign==1) { //left + self.stack.alignment = UIStackViewAlignmentCenter; + self.subviewAligner = [self.stack.leftAnchor constraintEqualToAnchor:self.stackHolder.leftAnchor]; + } else if(bannerAlign==3) { //right + self.stack.alignment = UIStackViewAlignmentTrailing; + self.subviewAligner = [self.stack.rightAnchor constraintEqualToAnchor:self.stackHolder.rightAnchor]; + } + + self.subviewAligner.active = YES; + } + + [self updateBattery]; } diff --git a/KAIStackView.h b/KAIStackView.h index a78d2ef..d50a5bf 100644 --- a/KAIStackView.h +++ b/KAIStackView.h @@ -8,6 +8,7 @@ @property (nonatomic, assign) NSInteger oldCountOfDevices; @property (nonatomic, strong) NSLayoutConstraint *heightConstraint; @property (nonatomic, strong) NSLayoutConstraint *widthConstraint; +@property (nonatomic, strong) NSLayoutConstraint *subviewAligner; @property (nonatomic, strong) KAIStackView *stack; @property (nonatomic, assign) BOOL isUpdating; @property (nonatomic, assign) BOOL queued; diff --git a/Kai.xm b/Kai.xm index 89f0229..50652c7 100755 --- a/Kai.xm +++ b/Kai.xm @@ -113,6 +113,8 @@ CSAdjunctListView *list; //sends the noti to update battery info [[NSNotificationCenter defaultCenter] postNotificationName:@"KaiInfoChanged" object:nil userInfo:nil]; + + //[NSException raise:@":vibeok:" format:@"Notification to update kai sent"]; }