From b4e315a839dde1c4e269275ef42b6c4b9c050ca5 Mon Sep 17 00:00:00 2001 From: Conrad Kreyling Date: Sun, 8 Apr 2018 13:29:07 -0400 Subject: [PATCH] Use tabs for indentation When those Xcode defaults bite you --- ios/SubtleVolume.h | 14 +- ios/SubtleVolume.mm | 340 +++++++++++++++++++++--------------------- ios/ViewController.mm | 64 ++++---- 3 files changed, 209 insertions(+), 209 deletions(-) diff --git a/ios/SubtleVolume.h b/ios/SubtleVolume.h index 32899f7a9..4b2ac8bb7 100644 --- a/ios/SubtleVolume.h +++ b/ios/SubtleVolume.h @@ -18,10 +18,10 @@ - Dots: A bar composed by a line of dots */ typedef NS_ENUM(NSInteger, SubtleVolumeStyle) { - SubtleVolumeStylePlain, - SubtleVolumeStyleRoundedLine, - SubtleVolumeStyleDashes, - SubtleVolumeStyleDots + SubtleVolumeStylePlain, + SubtleVolumeStyleRoundedLine, + SubtleVolumeStyleDashes, + SubtleVolumeStyleDots }; @@ -32,9 +32,9 @@ typedef NS_ENUM(NSInteger, SubtleVolumeStyle) { - FadeIn: The indicator fades in and out */ typedef NS_ENUM(NSInteger, SubtleVolumeAnimation) { - SubtleVolumeAnimationNone, - SubtleVolumeAnimationSlideDown, - SubtleVolumeAnimationFadeIn + SubtleVolumeAnimationNone, + SubtleVolumeAnimationSlideDown, + SubtleVolumeAnimationFadeIn }; @class SubtleVolume; diff --git a/ios/SubtleVolume.mm b/ios/SubtleVolume.mm index 6c0293910..57296b738 100644 --- a/ios/SubtleVolume.mm +++ b/ios/SubtleVolume.mm @@ -13,10 +13,10 @@ UIView *overlay = [[UIView alloc] init]; CGFloat volumeLevel = 0; @interface SubtleVolume (){ - BOOL runningShowAnimation; - BOOL showing; - BOOL runningHideAnimation; - BOOL lastAnimated; + BOOL runningShowAnimation; + BOOL showing; + BOOL runningHideAnimation; + BOOL lastAnimated; }; @property (nonatomic, strong) NSTimer *timer; @@ -32,207 +32,207 @@ CGFloat volumeLevel = 0; @implementation SubtleVolume - (instancetype)initWithStyle:(SubtleVolumeStyle)style frame:(CGRect)frame { - - self = [super initWithFrame:frame]; - - if (self) { - self.animatedByDefault = YES; - self.style = style; - [self setup]; - } - return self; + + self = [super initWithFrame:frame]; + + if (self) { + self.animatedByDefault = YES; + self.style = style; + [self setup]; + } + return self; } - (instancetype)initWithStyle:(SubtleVolumeStyle)style { - return [self initWithStyle:style frame:CGRectZero]; + return [self initWithStyle:style frame:CGRectZero]; } - (instancetype)initWithCoder:(NSCoder *)aDecoder { - self = [super initWithCoder:aDecoder]; - if (self) { - [self setup]; - } - return self; + self = [super initWithCoder:aDecoder]; + if (self) { + [self setup]; + } + return self; } - (instancetype)initWithFrame:(CGRect)frame { - - self = [super initWithFrame:frame]; - - if (self) { - [self setup]; - } - return self; + + self = [super initWithFrame:frame]; + + if (self) { + [self setup]; + } + return self; } - (instancetype)init { - self = nil; - NSAssert(false, @"To init this class please use the designated initializer: initWithStyle or initWithStyle:frame:"); - return nil; + self = nil; + NSAssert(false, @"To init this class please use the designated initializer: initWithStyle or initWithStyle:frame:"); + return nil; } - (void)setup { - @try { - [[AVAudioSession sharedInstance] setActive:YES error:nil]; - } @catch (NSException *e) { - NSLog(@"Unable to initialize AVAudioSession"); - } - - volumeLevel = [[AVAudioSession sharedInstance] outputVolume]; - [[AVAudioSession sharedInstance] addObserver:self forKeyPath:@"outputVolume" options:NSKeyValueObservingOptionNew context:NULL]; - [volume setVolumeThumbImage:[[UIImage alloc] init] forState:UIControlStateNormal]; - [volume setUserInteractionEnabled:NO]; - [volume setAlpha:0.0001]; - [volume setShowsRouteButton:NO]; - self.alpha = 0.0001; - - [self addSubview:volume]; - - [self addSubview:overlay]; + @try { + [[AVAudioSession sharedInstance] setActive:YES error:nil]; + } @catch (NSException *e) { + NSLog(@"Unable to initialize AVAudioSession"); + } + + volumeLevel = [[AVAudioSession sharedInstance] outputVolume]; + [[AVAudioSession sharedInstance] addObserver:self forKeyPath:@"outputVolume" options:NSKeyValueObservingOptionNew context:NULL]; + [volume setVolumeThumbImage:[[UIImage alloc] init] forState:UIControlStateNormal]; + [volume setUserInteractionEnabled:NO]; + [volume setAlpha:0.0001]; + [volume setShowsRouteButton:NO]; + self.alpha = 0.0001; + + [self addSubview:volume]; + + [self addSubview:overlay]; } - (void)layoutSubviews { - [super layoutSubviews]; - overlay.frame = CGRectMake( - self.padding, - self.padding, - (self.frame.size.width - (self.padding*2)) * volumeLevel, - self.frame.size.height - (self.padding*2) - ); - - self.backgroundColor = self.barBackgroundColor; - overlay.backgroundColor = self.barTintColor; - + [super layoutSubviews]; + overlay.frame = CGRectMake( + self.padding, + self.padding, + (self.frame.size.width - (self.padding*2)) * volumeLevel, + self.frame.size.height - (self.padding*2) + ); + + self.backgroundColor = self.barBackgroundColor; + overlay.backgroundColor = self.barTintColor; + } - (void)updateVolume:(CGFloat)value animated:(BOOL)animated { - [self.delegate subtleVolume:self willChange:value]; - volumeLevel = value; - lastAnimated = animated; - [UIView animateWithDuration:(animated ? 0.1 : 0) animations:^{ - CGRect rectOverlayView = overlay.frame; - CGFloat overlyWidth = self.frame.size.width * volumeLevel; - rectOverlayView.size.width = overlyWidth; - overlay.frame = rectOverlayView; - }]; - - - if(self.timer) { - [self.timer invalidate]; - self.timer = nil; - } - - self.timer = [NSTimer scheduledTimerWithTimeInterval:2 target:self selector:@selector(timerComplete) userInfo:nil repeats:NO]; - [self doShow:animated]; - [self.delegate subtleVolume:self didChange:value]; + [self.delegate subtleVolume:self willChange:value]; + volumeLevel = value; + lastAnimated = animated; + [UIView animateWithDuration:(animated ? 0.1 : 0) animations:^{ + CGRect rectOverlayView = overlay.frame; + CGFloat overlyWidth = self.frame.size.width * volumeLevel; + rectOverlayView.size.width = overlyWidth; + overlay.frame = rectOverlayView; + }]; + + + if(self.timer) { + [self.timer invalidate]; + self.timer = nil; + } + + self.timer = [NSTimer scheduledTimerWithTimeInterval:2 target:self selector:@selector(timerComplete) userInfo:nil repeats:NO]; + [self doShow:animated]; + [self.delegate subtleVolume:self didChange:value]; } - (void)timerComplete { - [self doHide:lastAnimated]; - self.timer = nil; + [self doHide:lastAnimated]; + self.timer = nil; } - (void)doHide:(BOOL)animated { - if(!showing) { - return; - } - - if(runningHideAnimation && !animated) { - [self stopAnimations]; - } - - if(runningHideAnimation) { - return; - } - - if(animated) { - runningHideAnimation = YES; - [UIView animateWithDuration:0.333 animations:^{ - switch (self.animation) { - case SubtleVolumeAnimationNone: - break; - case SubtleVolumeAnimationFadeIn: - self.alpha = 0.0001; - break; - case SubtleVolumeAnimationSlideDown: - self.alpha = 0.0001; - self.transform = CGAffineTransformMakeTranslation(0, -self.frame.size.height); - break; - default: - break; - } - } completion:^(BOOL finished) { - showing = NO; - runningHideAnimation = NO; - }]; - } else { - showing = NO; - self.alpha = 0.0001; - if(self.animation == SubtleVolumeAnimationSlideDown) { - self.transform = CGAffineTransformMakeTranslation(0, -self.frame.size.height); - } - } + if(!showing) { + return; + } + + if(runningHideAnimation && !animated) { + [self stopAnimations]; + } + + if(runningHideAnimation) { + return; + } + + if(animated) { + runningHideAnimation = YES; + [UIView animateWithDuration:0.333 animations:^{ + switch (self.animation) { + case SubtleVolumeAnimationNone: + break; + case SubtleVolumeAnimationFadeIn: + self.alpha = 0.0001; + break; + case SubtleVolumeAnimationSlideDown: + self.alpha = 0.0001; + self.transform = CGAffineTransformMakeTranslation(0, -self.frame.size.height); + break; + default: + break; + } + } completion:^(BOOL finished) { + showing = NO; + runningHideAnimation = NO; + }]; + } else { + showing = NO; + self.alpha = 0.0001; + if(self.animation == SubtleVolumeAnimationSlideDown) { + self.transform = CGAffineTransformMakeTranslation(0, -self.frame.size.height); + } + } } - (void)doShow:(BOOL)animated { - if(showing) { - return; - } - - if(runningShowAnimation && !animated) { - [self stopAnimations]; - } - - if(runningShowAnimation) { - return; - } - - if(animated) { - // set up for first run, assuming the animation has changed - // between instantiation and first showing - if(self.animation == SubtleVolumeAnimationSlideDown) { - self.transform = CGAffineTransformMakeTranslation(0, -self.frame.size.height); - } - - runningShowAnimation = YES; - [UIView animateWithDuration:0.333 animations:^{ - switch (self.animation) { - case SubtleVolumeAnimationNone: - break; - case SubtleVolumeAnimationFadeIn: - self.alpha = 1; - break; - case SubtleVolumeAnimationSlideDown: - self.alpha = 1; - self.transform = CGAffineTransformIdentity; - break; - default: - break; - } - } completion:^(BOOL finished) { - showing = YES; - runningShowAnimation = NO; - }]; - } else { - showing = YES; - self.alpha = 1; - self.transform = CGAffineTransformIdentity; - } + if(showing) { + return; + } + + if(runningShowAnimation && !animated) { + [self stopAnimations]; + } + + if(runningShowAnimation) { + return; + } + + if(animated) { + // set up for first run, assuming the animation has changed + // between instantiation and first showing + if(self.animation == SubtleVolumeAnimationSlideDown) { + self.transform = CGAffineTransformMakeTranslation(0, -self.frame.size.height); + } + + runningShowAnimation = YES; + [UIView animateWithDuration:0.333 animations:^{ + switch (self.animation) { + case SubtleVolumeAnimationNone: + break; + case SubtleVolumeAnimationFadeIn: + self.alpha = 1; + break; + case SubtleVolumeAnimationSlideDown: + self.alpha = 1; + self.transform = CGAffineTransformIdentity; + break; + default: + break; + } + } completion:^(BOOL finished) { + showing = YES; + runningShowAnimation = NO; + }]; + } else { + showing = YES; + self.alpha = 1; + self.transform = CGAffineTransformIdentity; + } } - (void)stopAnimations { - [self.layer removeAllAnimations]; - runningHideAnimation = NO; - runningShowAnimation = NO; + [self.layer removeAllAnimations]; + runningHideAnimation = NO; + runningShowAnimation = NO; } - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { - if ([keyPath isEqual:@"outputVolume"]) { - CGFloat value = [change[@"new"] floatValue]; - [self updateVolume:value animated:self.animatedByDefault]; - } else { - return; - } - + if ([keyPath isEqual:@"outputVolume"]) { + CGFloat value = [change[@"new"] floatValue]; + [self updateVolume:value animated:self.animatedByDefault]; + } else { + return; + } + } @end diff --git a/ios/ViewController.mm b/ios/ViewController.mm index cf88bdaac..8f53c065e 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -96,7 +96,7 @@ static GraphicsContext *graphicsContext; @end @interface ViewController () { - SubtleVolume *volume; + SubtleVolume *volume; } @end @@ -208,25 +208,25 @@ static GraphicsContext *graphicsContext; } #endif - CGFloat margin = 0; - CGFloat height = 16; - volume = [[SubtleVolume alloc] - initWithStyle:SubtleVolumeStylePlain - frame:CGRectMake( - margin, // X - 0, // Y - self.view.frame.size.width-(margin*2), // width - height // height - )]; - - volume.padding = 7; - volume.barTintColor = [UIColor blackColor]; - volume.barBackgroundColor = [UIColor whiteColor]; - volume.animation = SubtleVolumeAnimationSlideDown; - volume.delegate = self; - [self.view addSubview:volume]; - [self.view bringSubviewToFront:volume]; - + CGFloat margin = 0; + CGFloat height = 16; + volume = [[SubtleVolume alloc] + initWithStyle:SubtleVolumeStylePlain + frame:CGRectMake( + margin, // X + 0, // Y + self.view.frame.size.width-(margin*2), // width + height // height + )]; + + volume.padding = 7; + volume.barTintColor = [UIColor blackColor]; + volume.barBackgroundColor = [UIColor whiteColor]; + volume.animation = SubtleVolumeAnimationSlideDown; + volume.delegate = self; + [self.view addSubview:volume]; + [self.view bringSubviewToFront:volume]; + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ NativeInitGraphics(graphicsContext); @@ -263,11 +263,11 @@ static GraphicsContext *graphicsContext; if (sharedViewController == nil) { return; } - - if(volume) { - [volume removeFromSuperview]; - volume = nil; - } + + if(volume) { + [volume removeFromSuperview]; + volume = nil; + } Audio_Shutdown(); @@ -418,13 +418,13 @@ static GraphicsContext *graphicsContext; - (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event { - for(UITouch* touch in touches) - { - CGPoint point = [touch locationInView:self.view]; - NSDictionary* dict = [self touchDictBy:touch]; - [self touchX:point.x y:point.y code:2 pointerId:[[dict objectForKey:@"index"] intValue]]; - [self.touches removeObject:dict]; - } + for(UITouch* touch in touches) + { + CGPoint point = [touch locationInView:self.view]; + NSDictionary* dict = [self touchDictBy:touch]; + [self touchX:point.x y:point.y code:2 pointerId:[[dict objectForKey:@"index"] intValue]]; + [self.touches removeObject:dict]; + } } - (void)bindDefaultFBO